Add multi-targeting back in

libplctag · Jul 16, 2024 · c807938 · c807938
1 parent f20efdc
commit c807938
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 4 deletions.
diff --git a/...mework.DirectDependency/libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj b/...mework.DirectDependency/libplctag.NativeImport.Tests.NetFramework.DirectDependency.csproj
@@ -44,7 +44,7 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="libplctag.NativeImport, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\libplctag.NativeImport.1.0.41\lib\netstandard2.0\libplctag.NativeImport.dll</HintPath>
+      <HintPath>..\packages\libplctag.NativeImport.1.0.41\lib\net472\libplctag.NativeImport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationInsights, Version=2.22.0.997, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/...ransitiveDependency/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj b/...ransitiveDependency/libplctag.NativeImport.Tests.NetFramework.TransitiveDependency.csproj
@@ -48,7 +48,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="libplctag.NativeImport, Version=1.0.41.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\libplctag.NativeImport.1.0.41\lib\netstandard2.0\libplctag.NativeImport.dll</HintPath>
+      <HintPath>..\packages\libplctag.NativeImport.1.0.41\lib\net472\libplctag.NativeImport.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.ApplicationInsights, Version=2.22.0.997, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

diff --git a/src/libplctag.NativeImport/NativeMethods.cs b/src/libplctag.NativeImport/NativeMethods.cs
@@ -20,6 +20,7 @@ static class NativeMethods
 
         static NativeMethods()
         {
+#if NET472_OR_GREATER
             // Assume we're running on Windows because .NET Framework is not supported on other platforms
             string executingDirectory = System.IO.Path.GetDirectoryName(typeof(NativeMethods).Assembly.Location);
 			string system = Environment.Is64BitProcess ? "X64" : "X86";
@@ -32,6 +33,7 @@ static NativeMethods()
             {
                 SetDllDirectory(executingDirectory);
             }
+#endif
         }
 
 

diff --git a/src/libplctag.NativeImport/libplctag.NativeImport.csproj b/src/libplctag.NativeImport/libplctag.NativeImport.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net47;net471;net472;net48;net481</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net47;net471;net472;net48;net481</TargetFrameworks>
     <AssemblyName>libplctag.NativeImport</AssemblyName>
     <RootNamespace>libplctag.NativeImport</RootNamespace>
     <PackageId>libplctag.NativeImport</PackageId>

diff --git a/src/libplctag/libplctag.csproj b/src/libplctag/libplctag.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0;netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net47;net471;net472;net48;net481</TargetFrameworks>
+    <TargetFrameworks>netcoreapp3.0;netcoreapp3.1;net5.0;net6.0;net7.0;net8.0;net47;net471;net472;net48;net481</TargetFrameworks>
     <AssemblyName>libplctag</AssemblyName>
     <RootNamespace>libplctag</RootNamespace>
     <PackageId>libplctag</PackageId>