Merge pull request #525 from johelvisguzman/issue524

johelvisguzman · web-flow · commit c684850130ea · 2019-06-27T10:19:23.000-04:00
Removed unnecessary dependencies
diff --git a/src/DotNetToolkit.Repository.AdoNet/DotNetToolkit.Repository.AdoNet.csproj b/src/DotNetToolkit.Repository.AdoNet/DotNetToolkit.Repository.AdoNet.csproj
@@ -22,10 +22,6 @@
     <DefineConstants>NET45;NETFULL</DefineConstants>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\DotNetToolkit.Repository\DotNetToolkit.Repository.csproj" />
   </ItemGroup>
@@ -34,6 +30,14 @@
     <Reference Include="System.Configuration" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+  </ItemGroup>
+
   <ItemGroup>
     <Compile Update="Properties\Resources.Designer.cs">
       <DesignTime>True</DesignTime>
diff --git a/src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProvider.cs b/src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProvider.cs
@@ -0,0 +1,32 @@
+﻿namespace DotNetToolkit.Repository.AdoNet.Internal
+{
+    using System;
+
+    internal static class DataAccessProvider
+    {
+        public static DataAccessProviderType GetProviderType(string providerName)
+        {
+            switch (providerName.ToLower())
+            {
+#if NETFULL
+                case "system.data.sqlserverce.4.0":
+                    return DataAccessProviderType.SqlServerCompact;
+                case "microsoft.jet.oledb.4.0":
+                    return DataAccessProviderType.OleDb;
+#endif
+                case "system.data.sqlclient":
+                    return DataAccessProviderType.SqlServer;
+                case "system.data.sqlite":
+                case "microsoft.data.sqlite":
+                    return DataAccessProviderType.SqLite;
+                case "mysql.data.mysqlclient":
+                case "mysql.data":
+                    return DataAccessProviderType.MySql;
+                case "npgsql":
+                    return DataAccessProviderType.PostgreSql;
+                default:
+                    throw new NotSupportedException($"Unsupported Provider Factory specified: {providerName}");
+            }
+        }
+    }
+}
diff --git a/src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProviderType.cs b/src/DotNetToolkit.Repository.AdoNet/Internal/DataAccessProviderType.cs
@@ -0,0 +1,15 @@
+﻿namespace DotNetToolkit.Repository.AdoNet.Internal
+{
+    internal enum DataAccessProviderType
+    {
+        SqlServer,
+        SqLite,
+        MySql,
+        PostgreSql,
+
+#if NETFULL
+        OleDb,
+        SqlServerCompact
+#endif
+    }
+}
diff --git a/src/DotNetToolkit.Repository.AdoNet/Internal/DbProviderFactories.cs b/src/DotNetToolkit.Repository.AdoNet/Internal/DbProviderFactories.cs
@@ -1,14 +1,16 @@
 ﻿namespace DotNetToolkit.Repository.AdoNet.Internal
 {
+#if NETSTANDARD
     using Microsoft.DotNet.PlatformAbstractions;
     using Microsoft.Extensions.DependencyModel;
     using System;
     using System.Collections.Generic;
-    using System.Data.Common;
     using System.Data.SqlClient;
     using System.IO;
     using System.Linq;
     using System.Reflection;
+#endif
+    using System.Data.Common;
 
     /// <summary>
     /// Represents a set of static methods for creating one or more instances of System.Data.Common.DbProviderFactory classes.
@@ -41,14 +43,15 @@ public static DbProviderFactory GetFactory(string providerName)
                     return GetFactory(DataAccessProviderType.PostgreSql);
                 default:
                     throw new NotSupportedException($"Unsupported Provider Factory specified: {providerName}");
-            } 
+            }
 #endif
         }
 
         #endregion
 
         #region Private Methods
 
+#if NETSTANDARD
         private static Type GetTypeFromName(string typeName)
         {
             return GetTypeFromName(typeName, null);
@@ -157,7 +160,9 @@ private static DbProviderFactory GetFactory(string dbProviderFactoryTypename, st
 
             return instance as DbProviderFactory;
         }
+#endif
 
+#if NETSTANDARD
         private static DbProviderFactory GetFactory(DataAccessProviderType type)
         {
             if (type == DataAccessProviderType.SqlServer)
@@ -171,61 +176,25 @@ private static DbProviderFactory GetFactory(DataAccessProviderType type)
                 return GetFactory("Microsoft.Data.Sqlite.SqliteFactory", "Microsoft.Data.Sqlite");
 #endif
             }
+
             if (type == DataAccessProviderType.MySql)
                 return GetFactory("MySql.Data.MySqlClient.MySqlClientFactory", "MySql.Data");
+
             if (type == DataAccessProviderType.PostgreSql)
                 return GetFactory("Npgsql.NpgsqlFactory", "Npgsql");
 #if NETFULL
+            
             if (type == DataAccessProviderType.OleDb)
                 return System.Data.OleDb.OleDbFactory.Instance;
+            
             if (type == DataAccessProviderType.SqlServerCompact)
                 return System.Data.Common.DbProviderFactories.GetFactory("System.Data.SqlServerCe.4.0");
 #endif
 
             throw new NotSupportedException($"Unsupported Provider Factory specified: {type}");
         }
-
-        #endregion
-    }
-
-    internal enum DataAccessProviderType
-    {
-        SqlServer,
-        SqLite,
-        MySql,
-        PostgreSql,
-
-#if NETFULL
-        OleDb,
-        SqlServerCompact
 #endif
-    }
 
-    internal static class DataAccessProvider
-    {
-        public static DataAccessProviderType GetProviderType(string providerName)
-        {
-            switch (providerName.ToLower())
-            {
-#if NETFULL
-                case "system.data.sqlserverce.4.0":
-                    return DataAccessProviderType.SqlServerCompact;
-                case "microsoft.jet.oledb.4.0":
-                    return DataAccessProviderType.OleDb;
-#endif
-                case "system.data.sqlclient":
-                    return DataAccessProviderType.SqlServer;
-                case "system.data.sqlite":
-                case "microsoft.data.sqlite":
-                    return DataAccessProviderType.SqLite;
-                case "mysql.data.mysqlclient":
-                case "mysql.data":
-                    return DataAccessProviderType.MySql;
-                case "npgsql":
-                    return DataAccessProviderType.PostgreSql;
-                default:
-                    throw new NotSupportedException($"Unsupported Provider Factory specified: {providerName}");
-            }
-        }
+        #endregion
     }
 }
diff --git a/src/DotNetToolkit.Repository/Configuration/Options/RepositoryOptionsBuilder.cs b/src/DotNetToolkit.Repository/Configuration/Options/RepositoryOptionsBuilder.cs
@@ -108,6 +108,7 @@ public virtual RepositoryOptionsBuilder UseConfiguration([CanBeNull] string file
         }
 #endif
 
+#if NETSTANDARD
         /// <summary>
         /// Configures the repository options using the specified configuration.
         /// </summary>
@@ -130,8 +131,9 @@ public virtual RepositoryOptionsBuilder UseConfiguration([NotNull]  Microsoft.Ex
             UseConfiguration(config);
 
             return this;
-        }
-        
+        } 
+#endif
+
         /// <summary>
         /// Configures the repository options with an interceptor that intercepts any activity within the repository.
         /// </summary>
diff --git a/src/DotNetToolkit.Repository/DotNetToolkit.Repository.csproj b/src/DotNetToolkit.Repository/DotNetToolkit.Repository.csproj
@@ -29,7 +29,6 @@
   
   <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
     <Reference Include="System.Configuration" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="1.1.2" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
diff --git a/src/DotNetToolkit.Repository/Internal/ConfigFile/Json/ConfigurationSection.cs b/src/DotNetToolkit.Repository/Internal/ConfigFile/Json/ConfigurationSection.cs
@@ -1,4 +1,6 @@
-﻿namespace DotNetToolkit.Repository.Internal.ConfigFile.Json
+﻿#if NETSTANDARD
+
+namespace DotNetToolkit.Repository.Internal.ConfigFile.Json
 {
     using Configuration;
     using Configuration.Caching;
@@ -207,3 +209,5 @@ private T GetTypedValue<T>([NotNull] IConfigurationSection section, [CanBeNull]
         #endregion
     }
 }
+
+#endif
diff --git a/test/DotNetToolkit.Repository.Test/OptionsBuilderTests.cs b/test/DotNetToolkit.Repository.Test/OptionsBuilderTests.cs
@@ -171,6 +171,7 @@ public void ConfigureFromRepositoryConfig()
             TestConfiguration(optionsBuilder);
         }
 
+#if NETSTANDARD
         [Fact]
         public void ConfigureFromAppSetting()
         {
@@ -183,7 +184,8 @@ public void ConfigureFromAppSetting()
             Assert.True(optionsBuilder.IsConfigured);
 
             TestConfiguration(optionsBuilder);
-        }
+        } 
+#endif
 
 
         [Fact]
@@ -206,11 +208,13 @@ public void ThrowsIfConfigurationSectionNotFound()
 
             Assert.Equal("Unable to find a 'repository' configuration section. For more information on DotNetToolkit.Repository configuration, visit the https://github.com/johelvisguzman/DotNetToolkit.Repository/wiki/Config-File-Setup.", ex.Message);
 
+#if NETSTANDARD
             ex = Assert.Throws<InvalidOperationException>(
-                () => new RepositoryOptionsBuilder()
-                    .UseConfiguration(TestConfigurationHelper.GetConfiguration("empty_repository.json")));
+                    () => new RepositoryOptionsBuilder()
+                        .UseConfiguration(TestConfigurationHelper.GetConfiguration("empty_repository.json")));
 
-            Assert.Equal("Unable to find a 'repository' configuration section. For more information on DotNetToolkit.Repository configuration, visit the https://github.com/johelvisguzman/DotNetToolkit.Repository/wiki/Config-File-Setup.", ex.Message);
+            Assert.Equal("Unable to find a 'repository' configuration section. For more information on DotNetToolkit.Repository configuration, visit the https://github.com/johelvisguzman/DotNetToolkit.Repository/wiki/Config-File-Setup.", ex.Message); 
+#endif
         }
 
         private static void TestConfiguration(RepositoryOptionsBuilder optionsBuilder)
diff --git a/version.props b/version.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <VersionPrefix>2.8.0</VersionPrefix>
-    <VersionSuffix></VersionSuffix>
+    <VersionPrefix>2.9.0</VersionPrefix>
+    <VersionSuffix>beta</VersionSuffix>
   </PropertyGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,6 @@`
`1`		`-namespace DotNetToolkit.Repository.Internal.ConfigFile.Json`
	`1`	`+#if NETSTANDARD`
	`2`	`+`
	`3`	`+namespace DotNetToolkit.Repository.Internal.ConfigFile.Json`
`2`	`4`	`{`
`3`	`5`	`using Configuration;`
`4`	`6`	`using Configuration.Caching;`
`@@ -207,3 +209,5 @@ private T GetTypedValue<T>([NotNull] IConfigurationSection section, [CanBeNull]`
`207`	`209`	`#endregion`
`208`	`210`	`}`
`209`	`211`	`}`
	`212`	`+`
	`213`	`+#endif`