.NET Standard 2.0 does not need PlatformAbstractions (DNET-820, #76 f…

…rom @dlichterman).
FirebirdSQL · Jun 4, 2018 · c32f603 · c32f603
1 parent 5f5c229
commit c32f603
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/Provider/nuget/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.nuspec b/Provider/nuget/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.nuspec
@@ -34,7 +34,6 @@
 				<dependency id="System.Threading.Thread" version="4.3.0" />
 			</group>
 			<group targetFramework="netstandard2.0">
-				<dependency id="Microsoft.Extensions.PlatformAbstractions" version="1.1.0" />
 				<dependency id="System.Reflection.Emit" version="4.3.0" />
 			</group>
 		</dependencies>

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs
@@ -22,7 +22,7 @@
 using System.Diagnostics;
 using System.IO;
 using System.Reflection;
-#if NETSTANDARD1_6 || NETSTANDARD2_0
+#if NETSTANDARD1_6
 using Microsoft.Extensions.PlatformAbstractions;
 #endif
 using FirebirdSql.Data.Common;
@@ -467,8 +467,10 @@ private string GetProcessName()
 
 		private string GetHostingPath()
 		{
-#if NETSTANDARD1_6 || NETSTANDARD2_0
+#if NETSTANDARD1_6
 			return PlatformServices.Default.Application.ApplicationBasePath;
+#elif NETSTANDARD2_0
+			return System.AppContext.BaseDirectory;
 #else
 			Assembly assembly;
 			try

diff --git a/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj b/Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj
@@ -45,7 +45,6 @@
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
-		<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
 		<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
 	</ItemGroup>
 </Project>