System.Data.SQLite

Check-in [fad33d0e23]
Login

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
Timelines: family | ancestors | descendants | both | designOptions
Files: files | file ages | folders
SHA1: fad33d0e2350d330671accb08a7a12d5f6947974
User & Date: mistachkin 2014-08-02 03:27:31.148
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
Unified Diff Show Whitespace Changes Patch
Changes to tools/install/Installer.cs.
1822
1823
1824
1825
1826
1827
1828
1829
1830
1831
1832
1833
1834
1835
1836
1837
1838
1839
1840
1841
1842
1843
1844
                // do nothing.
            }
            #endregion

            ///////////////////////////////////////////////////////////////////

            #region Public Properties
            private string configInvariantName;
            public string ConfigInvariantName
            {
                get { return configInvariantName; }
                set { configInvariantName = value; }
            }

            ///////////////////////////////////////////////////////////////////

            private string providerInvariantName;
            public string ProviderInvariantName
            {
                get { return providerInvariantName; }
                set { providerInvariantName = value; }
            }








<
<
<
<
<
<
<
<
<







1822
1823
1824
1825
1826
1827
1828









1829
1830
1831
1832
1833
1834
1835
                // do nothing.
            }
            #endregion

            ///////////////////////////////////////////////////////////////////

            #region Public Properties









            private string providerInvariantName;
            public string ProviderInvariantName
            {
                get { return providerInvariantName; }
                set { providerInvariantName = value; }
            }

3401
3402
3403
3404
3405
3406
3407









3408
3409
3410
3411
3412
3413
3414

                return false;
            }
            #endregion

            ///////////////////////////////////////////////////////////////////










            #region Public Methods
            public bool HasFlags(
                InstallFlags hasFlags,
                bool all
                )
            {
                if (all)







>
>
>
>
>
>
>
>
>







3392
3393
3394
3395
3396
3397
3398
3399
3400
3401
3402
3403
3404
3405
3406
3407
3408
3409
3410
3411
3412
3413
3414

                return false;
            }
            #endregion

            ///////////////////////////////////////////////////////////////////

            #region Private Methods
            private string GetInvariantName()
            {
                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
            }
            #endregion

            ///////////////////////////////////////////////////////////////////

            #region Public Methods
            public bool HasFlags(
                InstallFlags hasFlags,
                bool all
                )
            {
                if (all)
3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
                return designerAssemblyName;
            }

            ///////////////////////////////////////////////////////////////////

            public string GetConfigInvariantName()
            {
                return InvariantName;
            }

            ///////////////////////////////////////////////////////////////////

            public string GetProviderInvariantName()
            {
                return IsEf6Supported() ? Ef6InvariantName : InvariantName;
            }

            ///////////////////////////////////////////////////////////////////

            public string GetFactoryTypeName()
            {
                return IsEf6Supported() ? Ef6FactoryTypeName : FactoryTypeName;







|






|







3500
3501
3502
3503
3504
3505
3506
3507
3508
3509
3510
3511
3512
3513
3514
3515
3516
3517
3518
3519
3520
3521
                return designerAssemblyName;
            }

            ///////////////////////////////////////////////////////////////////

            public string GetConfigInvariantName()
            {
                return GetInvariantName();
            }

            ///////////////////////////////////////////////////////////////////

            public string GetProviderInvariantName()
            {
                return GetInvariantName();
            }

            ///////////////////////////////////////////////////////////////////

            public string GetFactoryTypeName()
            {
                return IsEf6Supported() ? Ef6FactoryTypeName : FactoryTypeName;
3733
3734
3735
3736
3737
3738
3739




3740
3741
3742
3743
3744
3745
3746
                        GetEf6AssemblyName())), traceCategory);

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetDesignerAssemblyName", ForDisplay(
                        GetDesignerAssemblyName())), traceCategory);

                    ///////////////////////////////////////////////////////////





                    traceCallback(String.Format(NameAndValueFormat,
                        "GetConfigInvariantName", ForDisplay(
                        GetConfigInvariantName())), traceCategory);

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetProviderInvariantName", ForDisplay(







>
>
>
>







3733
3734
3735
3736
3737
3738
3739
3740
3741
3742
3743
3744
3745
3746
3747
3748
3749
3750
                        GetEf6AssemblyName())), traceCategory);

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetDesignerAssemblyName", ForDisplay(
                        GetDesignerAssemblyName())), traceCategory);

                    ///////////////////////////////////////////////////////////

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetInvariantName", ForDisplay(GetInvariantName())),
                        traceCategory);

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetConfigInvariantName", ForDisplay(
                        GetConfigInvariantName())), traceCategory);

                    traceCallback(String.Format(NameAndValueFormat,
                        "GetProviderInvariantName", ForDisplay(
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
        }
        #endregion

        ///////////////////////////////////////////////////////////////////////

        #region Visual Studio Package Handling
        private static void InitializeVsPackage(
            string configInvariantName,
            string providerInvariantName,
            string factoryTypeName,
            AssemblyName providerAssemblyName,
            AssemblyName designerAssemblyName,
            bool globalAssemblyCache,
            ref Package package
            )
        {
            if (package == null)
            {
                package = new Package();

                package.ConfigInvariantName = configInvariantName;
                package.ProviderInvariantName = providerInvariantName;
                package.FactoryTypeName = factoryTypeName;
                package.ProviderAssemblyName = providerAssemblyName;
                package.DesignerAssemblyName = designerAssemblyName;
                package.GlobalAssemblyCache = globalAssemblyCache;

                package.AdoNetTechnologyId = new Guid(







<












<







6198
6199
6200
6201
6202
6203
6204

6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216

6217
6218
6219
6220
6221
6222
6223
        }
        #endregion

        ///////////////////////////////////////////////////////////////////////

        #region Visual Studio Package Handling
        private static void InitializeVsPackage(

            string providerInvariantName,
            string factoryTypeName,
            AssemblyName providerAssemblyName,
            AssemblyName designerAssemblyName,
            bool globalAssemblyCache,
            ref Package package
            )
        {
            if (package == null)
            {
                package = new Package();


                package.ProviderInvariantName = providerInvariantName;
                package.FactoryTypeName = factoryTypeName;
                package.ProviderAssemblyName = providerAssemblyName;
                package.DesignerAssemblyName = designerAssemblyName;
                package.GlobalAssemblyCache = globalAssemblyCache;

                package.AdoNetTechnologyId = new Guid(
6858
6859
6860
6861
6862
6863
6864
6865
6866
6867
6868
6869
6870
6871
6872
                    Package package = null;
                    FrameworkList frameworkList = null;
                    VsList vsList = null;

                    ///////////////////////////////////////////////////////////

                    InitializeVsPackage(
                        configuration.GetConfigInvariantName(),
                        configuration.GetProviderInvariantName(),
                        configuration.GetFactoryTypeName(),
                        configuration.GetProviderAssemblyName(),
                        configuration.GetDesignerAssemblyName(),
                        configuration.HasFlags(
                            InstallFlags.GlobalAssemblyCache, true) &&
                        configuration.HasFlags(







<







6860
6861
6862
6863
6864
6865
6866

6867
6868
6869
6870
6871
6872
6873
                    Package package = null;
                    FrameworkList frameworkList = null;
                    VsList vsList = null;

                    ///////////////////////////////////////////////////////////

                    InitializeVsPackage(

                        configuration.GetProviderInvariantName(),
                        configuration.GetFactoryTypeName(),
                        configuration.GetProviderAssemblyName(),
                        configuration.GetDesignerAssemblyName(),
                        configuration.HasFlags(
                            InstallFlags.GlobalAssemblyCache, true) &&
                        configuration.HasFlags(
7048
7049
7050
7051
7052
7053
7054
7055

7056
7057
7058
7059
7060
7061
7062
7063
                            InstallFlags.DbProviderFactory, true))
                    {
                        bool saved = false;

                        if (!ForEachFrameworkConfig(registry,
                                frameworkList, ProcessDbProviderFactory,
                                configuration.ConfigVersion,
                                package.ConfigInvariantName, ProviderName,

                                Description, package.FactoryTypeName,
                                package.ProviderAssemblyName, directoryData,
                                configuration.PerUser,
                                NetFxIs32BitOnly || configuration.Wow64,
                                configuration.ThrowOnMissing,
                                configuration.WhatIf, configuration.Verbose,
                                ref saved, ref error))
                        {







|
>
|







7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
                            InstallFlags.DbProviderFactory, true))
                    {
                        bool saved = false;

                        if (!ForEachFrameworkConfig(registry,
                                frameworkList, ProcessDbProviderFactory,
                                configuration.ConfigVersion,
                                configuration.GetConfigInvariantName(),
                                ProviderName, Description,
                                package.FactoryTypeName,
                                package.ProviderAssemblyName, directoryData,
                                configuration.PerUser,
                                NetFxIs32BitOnly || configuration.Wow64,
                                configuration.ThrowOnMissing,
                                configuration.WhatIf, configuration.Verbose,
                                ref saved, ref error))
                        {