From 82f66daa52ff8eaa442f5d16f54304af3afdce9b Mon Sep 17 00:00:00 2001
From: Patrick Ritchie <patrick@trakhound.com>
Date: Wed, 22 Jun 2022 12:05:49 -0400
Subject: [PATCH] Updated to use
 System.Runtime.InteropServices.RuntimeInformation instead of
 Microsoft.Windows.Compatibility in order to be compliant on older framework
 versions

---
 .../MTConnect-Agent-Http-Gateway.csproj       | 17 ++++++++++----
 .../MTConnect-Agent-Http-Persistent.csproj    | 22 +++++++++++--------
 .../MTConnect-Agent-Http.csproj               |  2 +-
 3 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/applications/Agents/MTConnect-Agent-Http-Gateway/MTConnect-Agent-Http-Gateway.csproj b/applications/Agents/MTConnect-Agent-Http-Gateway/MTConnect-Agent-Http-Gateway.csproj
index 2cf15190..1e6d8301 100644
--- a/applications/Agents/MTConnect-Agent-Http-Gateway/MTConnect-Agent-Http-Gateway.csproj
+++ b/applications/Agents/MTConnect-Agent-Http-Gateway/MTConnect-Agent-Http-Gateway.csproj
@@ -30,12 +30,21 @@
 	  <None Include="Program-old.cs" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NLog" Version="4.7.14" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(Configuration)'=='Debug'">
+		<ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
+	</ItemGroup>
 
+	<ItemGroup Condition="'$(Configuration)'=='Release'">
+		<ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
+	</ItemGroup>
+
+	<ItemGroup Condition="'$(Configuration)'=='Docker'">
+		<PackageReference Include="MTConnect.NET" Version="3.4.2" />
+	</ItemGroup>
+	
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
+    <PackageReference Include="NLog" Version="4.7.14" />
+    <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/applications/Agents/MTConnect-Agent-Http-Persistent/MTConnect-Agent-Http-Persistent.csproj b/applications/Agents/MTConnect-Agent-Http-Persistent/MTConnect-Agent-Http-Persistent.csproj
index 18754cba..b02ef317 100644
--- a/applications/Agents/MTConnect-Agent-Http-Persistent/MTConnect-Agent-Http-Persistent.csproj
+++ b/applications/Agents/MTConnect-Agent-Http-Persistent/MTConnect-Agent-Http-Persistent.csproj
@@ -24,18 +24,22 @@
 		<Product>TrakHound MTConnect Http Agent</Product>
 	</PropertyGroup>
 
-	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
-		<PackageReference Include="NLog" Version="4.7.14" />
+	<ItemGroup Condition="'$(Configuration)'=='Debug'">
+		<ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
 	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="NLog" Version="5.0.0" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(Configuration)'=='Release'">
+		<ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\src\MTConnect.NET\MTConnect.NET.csproj" />
-  </ItemGroup>
+	<ItemGroup Condition="'$(Configuration)'=='Docker'">
+		<PackageReference Include="MTConnect.NET" Version="3.4.2" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="NLog" Version="4.7.14" />
+		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
+	</ItemGroup>
 
   <ItemGroup>
     <Compile Update="Service.cs">
diff --git a/applications/Agents/MTConnect-Agent-Http/MTConnect-Agent-Http.csproj b/applications/Agents/MTConnect-Agent-Http/MTConnect-Agent-Http.csproj
index 6d6bce3f..174b7c5c 100644
--- a/applications/Agents/MTConnect-Agent-Http/MTConnect-Agent-Http.csproj
+++ b/applications/Agents/MTConnect-Agent-Http/MTConnect-Agent-Http.csproj
@@ -41,8 +41,8 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Windows.Compatibility" Version="6.0.0" />
 		<PackageReference Include="NLog" Version="4.7.14" />
+		<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
 	</ItemGroup>
 
 	<ItemGroup>