From 78b58f2e53b25ced95a0dfa9972630ea8755fcae Mon Sep 17 00:00:00 2001
From: pinzart90 <tiberiu.pinzariu@gmail.com>
Date: Thu, 3 Oct 2024 14:46:05 -0400
Subject: [PATCH 1/4] Update UnitsCore.csproj

---
 src/Libraries/DynamoUnits/UnitsCore.csproj | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj
index d6bb215a00d..abf10c17eea 100644
--- a/src/Libraries/DynamoUnits/UnitsCore.csproj
+++ b/src/Libraries/DynamoUnits/UnitsCore.csproj
@@ -16,7 +16,8 @@
   <ItemGroup>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
-    <PackageReference Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
+    <PackageReference Condition="$(Platform.Contains('Linux'))" Include="ForgeUnits.NET" Version="5.3.2" />
+    <PackageReference Condition=" $(RuntimeIdentifier.Contains('win')) " Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
         <!--Skip copying the runtime dlls because we only need one (ForgeUnitsManaged.dll) which we copy in a task bellow.-->
         <ExcludeAssets>runtime;build</ExcludeAssets>
     </PackageReference>
@@ -38,17 +39,17 @@
     </Compile>
   </ItemGroup>
   <Target Name="CopyFiles" BeforeTargets="Build">
+    <ItemGroup>
+        <UnitSchemas Include="$(PkgForgeUnits_Schemas)\Content\unit\**\*.*" />
+    </ItemGroup>
+    <Copy SourceFiles="@(UnitSchemas)" DestinationFolder="$(OutDir)unit\%(RecursiveDir)" />
     <Copy SourceFiles="$(ProjectDir)DynamoUnits_DynamoCustomization.xml" DestinationFolder="$(OutputPath)" />
-    <Copy SourceFiles="$(PkgForgeUnits_NET)\lib\net6.0\ForgeUnitsManaged.dll" DestinationFolder="$(OutputPath)" />
-    <Copy SourceFiles="$(PkgForgeUnits_NET)\runtimes\win10-x64\native\Units.dll" DestinationFolder="$(OutputPath)" />
+    <Copy Condition="$(RuntimeIdentifier.Contains('win'))" SourceFiles="$(PkgForgeUnits_NET)\lib\net6.0\ForgeUnitsManaged.dll" DestinationFolder="$(OutputPath)" />
+    <Copy Condition="$(RuntimeIdentifier.Contains('win'))" SourceFiles="$(PkgForgeUnits_NET)\runtimes\win10-x64\native\Units.dll" DestinationFolder="$(OutputPath)" />
   </Target>
   <Target Name="GenerateFiles" AfterTargets="ResolveSateliteResDeps" Condition=" $(RuntimeIdentifier.Contains('win')) ">
     <!-- Generate customization dll -->
     <GenerateResource SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" UseSourcePath="true" Sources="$(ProjectDir)DynamoUnitsImages.resx" OutputResources="$(ProjectDir)DynamoUnitsImages.resources" />
     <AL SdkToolsPath="$(TargetFrameworkSDKToolsDirectory)" TargetType="library" EmbedResources="$(ProjectDir)DynamoUnitsImages.resources" OutputAssembly="$(OutDir)DynamoUnits.customization.dll" Version="%(AssemblyInfo.Version)" />
-    <ItemGroup>
-      <UnitSchemas Include="$(PkgForgeUnits_Schemas)\Content\unit\**\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(UnitSchemas)" DestinationFolder="$(OutDir)unit\%(RecursiveDir)" />
   </Target>
 </Project>

From c6c860d2ce35b3c4819b779c9d41682ac0e270c6 Mon Sep 17 00:00:00 2001
From: pinzart90 <tiberiu.pinzariu@gmail.com>
Date: Thu, 3 Oct 2024 14:49:00 -0400
Subject: [PATCH 2/4] Update UnitsCore.csproj

---
 src/Libraries/DynamoUnits/UnitsCore.csproj | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj
index abf10c17eea..0d4e4d9fe65 100644
--- a/src/Libraries/DynamoUnits/UnitsCore.csproj
+++ b/src/Libraries/DynamoUnits/UnitsCore.csproj
@@ -16,7 +16,7 @@
   <ItemGroup>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
-    <PackageReference Condition="$(Platform.Contains('Linux'))" Include="ForgeUnits.NET" Version="5.3.2" />
+    <PackageReference Condition="$(Platform.Contains('Linux'))" Include="ForgeUnits.NET.Linux" Version="5.3.2" />
     <PackageReference Condition=" $(RuntimeIdentifier.Contains('win')) " Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
         <!--Skip copying the runtime dlls because we only need one (ForgeUnitsManaged.dll) which we copy in a task bellow.-->
         <ExcludeAssets>runtime;build</ExcludeAssets>

From 2cb30dc3f6982c7f72a093720df759823a4041e6 Mon Sep 17 00:00:00 2001
From: pinzart90 <tiberiu.pinzariu@gmail.com>
Date: Thu, 3 Oct 2024 14:50:59 -0400
Subject: [PATCH 3/4] Update UnitsCore.csproj

---
 src/Libraries/DynamoUnits/UnitsCore.csproj | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj
index 0d4e4d9fe65..378a7f08dec 100644
--- a/src/Libraries/DynamoUnits/UnitsCore.csproj
+++ b/src/Libraries/DynamoUnits/UnitsCore.csproj
@@ -16,6 +16,8 @@
   <ItemGroup>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
+    <!--At this time the nuget package ForgeUnits.NET.Linux is manually built and pushed to dynamo-team-nuget -->
+    <!-- TODO: integrate the linux changes in the ForgeUnits repo and use a single package reference -->
     <PackageReference Condition="$(Platform.Contains('Linux'))" Include="ForgeUnits.NET.Linux" Version="5.3.2" />
     <PackageReference Condition=" $(RuntimeIdentifier.Contains('win')) " Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
         <!--Skip copying the runtime dlls because we only need one (ForgeUnitsManaged.dll) which we copy in a task bellow.-->

From c1e1b0a331bdddb0b35ad72970facda3fa46c2c5 Mon Sep 17 00:00:00 2001
From: pinzart90 <tiberiu.pinzariu@gmail.com>
Date: Thu, 3 Oct 2024 15:09:04 -0400
Subject: [PATCH 4/4] Update UnitsCore.csproj

---
 src/Libraries/DynamoUnits/UnitsCore.csproj | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/Libraries/DynamoUnits/UnitsCore.csproj b/src/Libraries/DynamoUnits/UnitsCore.csproj
index 378a7f08dec..5d83892d74f 100644
--- a/src/Libraries/DynamoUnits/UnitsCore.csproj
+++ b/src/Libraries/DynamoUnits/UnitsCore.csproj
@@ -16,10 +16,7 @@
   <ItemGroup>
     <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0" />
     <PackageReference Include="System.Resources.Extensions" Version="5.0.0" />
-    <!--At this time the nuget package ForgeUnits.NET.Linux is manually built and pushed to dynamo-team-nuget -->
-    <!-- TODO: integrate the linux changes in the ForgeUnits repo and use a single package reference -->
-    <PackageReference Condition="$(Platform.Contains('Linux'))" Include="ForgeUnits.NET.Linux" Version="5.3.2" />
-    <PackageReference Condition=" $(RuntimeIdentifier.Contains('win')) " Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
+    <PackageReference Include="ForgeUnits.NET" Version="5.0.5" GeneratePathProperty="true">
         <!--Skip copying the runtime dlls because we only need one (ForgeUnitsManaged.dll) which we copy in a task bellow.-->
         <ExcludeAssets>runtime;build</ExcludeAssets>
     </PackageReference>