System.Data.SQLite
Check-in [fad33d0e23]
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:For the design-time components installer, remove ConfigInvariantName as a Package class property.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | designOptions
Files: files | file ages | folders
SHA1: fad33d0e2350d330671accb08a7a12d5f6947974
User & Date: mistachkin 2014-08-02 03:27:31
Context
2014-08-02
03:57
Add ProviderFlags configuration property and associated handling to the design-time components installer. check-in: 940f8b3976 user: mistachkin tags: designOptions
03:27
For the design-time components installer, remove ConfigInvariantName as a Package class property. check-in: fad33d0e23 user: mistachkin tags: designOptions
02:30
Support the 'FullUri' connection string property in the design-time components. check-in: bb7dce2c26 user: mistachkin tags: designOptions
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to tools/install/Installer.cs.

  1822   1822                   // do nothing.
  1823   1823               }
  1824   1824               #endregion
  1825   1825   
  1826   1826               ///////////////////////////////////////////////////////////////////
  1827   1827   
  1828   1828               #region Public Properties
  1829         -            private string configInvariantName;
  1830         -            public string ConfigInvariantName
  1831         -            {
  1832         -                get { return configInvariantName; }
  1833         -                set { configInvariantName = value; }
  1834         -            }
  1835         -
  1836         -            ///////////////////////////////////////////////////////////////////
  1837         -
  1838   1829               private string providerInvariantName;
  1839   1830               public string ProviderInvariantName
  1840   1831               {
  1841   1832                   get { return providerInvariantName; }
  1842   1833                   set { providerInvariantName = value; }
  1843   1834               }
  1844   1835   
................................................................................
  3401   3392   
  3402   3393                   return false;
  3403   3394               }
  3404   3395               #endregion
  3405   3396   
  3406   3397               ///////////////////////////////////////////////////////////////////
  3407   3398   
         3399  +            #region Private Methods
         3400  +            private string GetInvariantName()
         3401  +            {
         3402  +                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
         3403  +            }
         3404  +            #endregion
         3405  +
         3406  +            ///////////////////////////////////////////////////////////////////
         3407  +
  3408   3408               #region Public Methods
  3409   3409               public bool HasFlags(
  3410   3410                   InstallFlags hasFlags,
  3411   3411                   bool all
  3412   3412                   )
  3413   3413               {
  3414   3414                   if (all)
................................................................................
  3500   3500                   return designerAssemblyName;
  3501   3501               }
  3502   3502   
  3503   3503               ///////////////////////////////////////////////////////////////////
  3504   3504   
  3505   3505               public string GetConfigInvariantName()
  3506   3506               {
  3507         -                return InvariantName;
         3507  +                return GetInvariantName();
  3508   3508               }
  3509   3509   
  3510   3510               ///////////////////////////////////////////////////////////////////
  3511   3511   
  3512   3512               public string GetProviderInvariantName()
  3513   3513               {
  3514         -                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
         3514  +                return GetInvariantName();
  3515   3515               }
  3516   3516   
  3517   3517               ///////////////////////////////////////////////////////////////////
  3518   3518   
  3519   3519               public string GetFactoryTypeName()
  3520   3520               {
  3521   3521                   return IsEf6Supported() ? Ef6FactoryTypeName : FactoryTypeName;
................................................................................
  3733   3733                           GetEf6AssemblyName())), traceCategory);
  3734   3734   
  3735   3735                       traceCallback(String.Format(NameAndValueFormat,
  3736   3736                           "GetDesignerAssemblyName", ForDisplay(
  3737   3737                           GetDesignerAssemblyName())), traceCategory);
  3738   3738   
  3739   3739                       ///////////////////////////////////////////////////////////
         3740  +
         3741  +                    traceCallback(String.Format(NameAndValueFormat,
         3742  +                        "GetInvariantName", ForDisplay(GetInvariantName())),
         3743  +                        traceCategory);
  3740   3744   
  3741   3745                       traceCallback(String.Format(NameAndValueFormat,
  3742   3746                           "GetConfigInvariantName", ForDisplay(
  3743   3747                           GetConfigInvariantName())), traceCategory);
  3744   3748   
  3745   3749                       traceCallback(String.Format(NameAndValueFormat,
  3746   3750                           "GetProviderInvariantName", ForDisplay(
................................................................................
  6194   6198           }
  6195   6199           #endregion
  6196   6200   
  6197   6201           ///////////////////////////////////////////////////////////////////////
  6198   6202   
  6199   6203           #region Visual Studio Package Handling
  6200   6204           private static void InitializeVsPackage(
  6201         -            string configInvariantName,
  6202   6205               string providerInvariantName,
  6203   6206               string factoryTypeName,
  6204   6207               AssemblyName providerAssemblyName,
  6205   6208               AssemblyName designerAssemblyName,
  6206   6209               bool globalAssemblyCache,
  6207   6210               ref Package package
  6208   6211               )
  6209   6212           {
  6210   6213               if (package == null)
  6211   6214               {
  6212   6215                   package = new Package();
  6213   6216   
  6214         -                package.ConfigInvariantName = configInvariantName;
  6215   6217                   package.ProviderInvariantName = providerInvariantName;
  6216   6218                   package.FactoryTypeName = factoryTypeName;
  6217   6219                   package.ProviderAssemblyName = providerAssemblyName;
  6218   6220                   package.DesignerAssemblyName = designerAssemblyName;
  6219   6221                   package.GlobalAssemblyCache = globalAssemblyCache;
  6220   6222   
  6221   6223                   package.AdoNetTechnologyId = new Guid(
................................................................................
  6858   6860                       Package package = null;
  6859   6861                       FrameworkList frameworkList = null;
  6860   6862                       VsList vsList = null;
  6861   6863   
  6862   6864                       ///////////////////////////////////////////////////////////
  6863   6865   
  6864   6866                       InitializeVsPackage(
  6865         -                        configuration.GetConfigInvariantName(),
  6866   6867                           configuration.GetProviderInvariantName(),
  6867   6868                           configuration.GetFactoryTypeName(),
  6868   6869                           configuration.GetProviderAssemblyName(),
  6869   6870                           configuration.GetDesignerAssemblyName(),
  6870   6871                           configuration.HasFlags(
  6871   6872                               InstallFlags.GlobalAssemblyCache, true) &&
  6872   6873                           configuration.HasFlags(
................................................................................
  7048   7049                               InstallFlags.DbProviderFactory, true))
  7049   7050                       {
  7050   7051                           bool saved = false;
  7051   7052   
  7052   7053                           if (!ForEachFrameworkConfig(registry,
  7053   7054                                   frameworkList, ProcessDbProviderFactory,
  7054   7055                                   configuration.ConfigVersion,
  7055         -                                package.ConfigInvariantName, ProviderName,
  7056         -                                Description, package.FactoryTypeName,
         7056  +                                configuration.GetConfigInvariantName(),
         7057  +                                ProviderName, Description,
         7058  +                                package.FactoryTypeName,
  7057   7059                                   package.ProviderAssemblyName, directoryData,
  7058   7060                                   configuration.PerUser,
  7059   7061                                   NetFxIs32BitOnly || configuration.Wow64,
  7060   7062                                   configuration.ThrowOnMissing,
  7061   7063                                   configuration.WhatIf, configuration.Verbose,
  7062   7064                                   ref saved, ref error))
  7063   7065                           {