System.Data.SQLite
Check-in [1e2ed0931a]
Not logged in

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

Overview
Comment:Make sure the EF6 provider name is only available for .NET 4.0 and later.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | designOptions
Files: files | file ages | folders
SHA1: 1e2ed0931a0806d8a33afc14207ba22794cbddde
User & Date: mistachkin 2014-08-01 04:32:57
Context
2014-08-01
17:13
Permit the default ADO.NET provider name used by the design-time components to be overridden via the environment. check-in: e2413cdd97 user: mistachkin tags: designOptions
04:32
Make sure the EF6 provider name is only available for .NET 4.0 and later. check-in: 1e2ed0931a user: mistachkin tags: designOptions
04:24
Add user-interface integration for the per-solution provider name configuration option. check-in: 1e8b52743b user: mistachkin tags: designOptions
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Changes to SQLite.Designer/SQLiteOptions.cs.

    33     33           /// <summary>
    34     34           /// This is the legacy provider name used by the System.Data.SQLite
    35     35           /// design-time components.  It is also the default value for the
    36     36           /// associated option key.
    37     37           /// </summary>
    38     38           private static readonly string DefaultProviderName = "System.Data.SQLite";
    39     39   
           40  +        ///////////////////////////////////////////////////////////////////////
           41  +
           42  +#if NET_40 || NET_45 || NET_451
    40     43           /// <summary>
    41     44           /// This is the provider name used when Entity Framework 6.x support is
    42     45           /// required for use with the System.Data.SQLite design-time components.
           46  +        /// This provider name is only available when this class is compiled for
           47  +        /// the .NET Framework 4.0 or later.
    43     48           /// </summary>
    44     49           private static readonly string Ef6ProviderName = "System.Data.SQLite.EF6";
           50  +#endif
    45     51           #endregion
    46     52   
    47     53           ///////////////////////////////////////////////////////////////////////
    48     54   
    49     55           #region Private Static Data
    50     56           /// <summary>
    51     57           /// This is used to synchronize access to the static dictionary of
................................................................................
   272    278               string key,
   273    279               string value
   274    280               )
   275    281           {
   276    282               if (String.Equals(
   277    283                       key, ProviderNameKey, StringComparison.Ordinal) &&
   278    284                   (String.Equals(
   279         -                    value, DefaultProviderName, StringComparison.Ordinal) ||
   280         -                String.Equals(
   281         -                    value, Ef6ProviderName, StringComparison.Ordinal)))
          285  +                    value, DefaultProviderName, StringComparison.Ordinal)
          286  +#if NET_40 || NET_45 || NET_451
          287  +                || String.Equals(
          288  +                    value, Ef6ProviderName, StringComparison.Ordinal)
          289  +#endif
          290  +                ))
   282    291               {
   283    292                   return true;
   284    293               }
   285    294   
   286    295               return false;
   287    296           }
   288    297           #endregion