Skip to content

Commit c32f603

Browse files
committed
.NET Standard 2.0 does not need PlatformAbstractions (DNET-820, #76 from @dlichterman).
1 parent 5f5c229 commit c32f603

File tree

3 files changed

+4
-4
lines changed

3 files changed

+4
-4
lines changed

Provider/nuget/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.nuspec

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
<dependency id="System.Threading.Thread" version="4.3.0" />
3535
</group>
3636
<group targetFramework="netstandard2.0">
37-
<dependency id="Microsoft.Extensions.PlatformAbstractions" version="1.1.0" />
3837
<dependency id="System.Reflection.Emit" version="4.3.0" />
3938
</group>
4039
</dependencies>

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdClient/FbConnectionInternal.cs

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
using System.Diagnostics;
2323
using System.IO;
2424
using System.Reflection;
25-
#if NETSTANDARD1_6 || NETSTANDARD2_0
25+
#if NETSTANDARD1_6
2626
using Microsoft.Extensions.PlatformAbstractions;
2727
#endif
2828
using FirebirdSql.Data.Common;
@@ -467,8 +467,10 @@ private string GetProcessName()
467467

468468
private string GetHostingPath()
469469
{
470-
#if NETSTANDARD1_6 || NETSTANDARD2_0
470+
#if NETSTANDARD1_6
471471
return PlatformServices.Default.Application.ApplicationBasePath;
472+
#elif NETSTANDARD2_0
473+
return System.AppContext.BaseDirectory;
472474
#else
473475
Assembly assembly;
474476
try

Provider/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
</ItemGroup>
4646

4747
<ItemGroup Condition="'$(TargetFramework)'=='netstandard2.0'">
48-
<PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
4948
<PackageReference Include="System.Reflection.Emit" Version="4.3.0" />
5049
</ItemGroup>
5150
</Project>

0 commit comments

Comments
 (0)