From 69524975e3adbfb3aa0d37eed1b8818e94dc154c Mon Sep 17 00:00:00 2001
From: Nikolay Gekht <nikolay.gekht@gehtsoftusa.com>
Date: Fri, 10 Jan 2025 15:03:36 -0500
Subject: [PATCH] - update dependencies and nuspec generation process

---
 .../Gehtsoft.Measurements.Test.csproj                | 12 ++++++------
 Gehtsoft.Measurements/DecimalMeasurement.cs          |  2 +-
 Gehtsoft.Measurements/Gehtsoft.Measurements.csproj   |  2 +-
 doc/project.proj                                     | 10 +++++-----
 nuget/config.xml                                     |  6 ++++--
 nuget/nuget.proj                                     |  4 ++--
 nuget/sign-cloud.bat                                 |  3 +++
 7 files changed, 22 insertions(+), 17 deletions(-)
 create mode 100644 nuget/sign-cloud.bat

diff --git a/Gehtsoft.Measurements.Test/Gehtsoft.Measurements.Test.csproj b/Gehtsoft.Measurements.Test/Gehtsoft.Measurements.Test.csproj
index c0c9d19..df2afa7 100644
--- a/Gehtsoft.Measurements.Test/Gehtsoft.Measurements.Test.csproj
+++ b/Gehtsoft.Measurements.Test/Gehtsoft.Measurements.Test.csproj
@@ -1,19 +1,19 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net60</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="Binaron.Serializer" Version="4.1.0" />
-    <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="xunit" Version="2.4.2" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+    <PackageReference Include="FluentAssertions" Version="7.0.0" />
+    <PackageReference Include="xunit" Version="2.9.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="3.0.1">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="coverlet.collector" Version="6.0.3">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/Gehtsoft.Measurements/DecimalMeasurement.cs b/Gehtsoft.Measurements/DecimalMeasurement.cs
index f81f863..42affa1 100644
--- a/Gehtsoft.Measurements/DecimalMeasurement.cs
+++ b/Gehtsoft.Measurements/DecimalMeasurement.cs
@@ -323,7 +323,7 @@ public bool Equals(DecimalMeasurement<T> other)
         [MethodImpl(MethodImplOptions.AggressiveInlining)]
         public int CompareTo(DecimalMeasurement<T> other) 
         {
-            decimal v1, v2, e;
+            decimal v1, v2;
             v1 = In(BaseUnit);
             v2 = other.In(BaseUnit);
             return v1.CompareTo(v2);
diff --git a/Gehtsoft.Measurements/Gehtsoft.Measurements.csproj b/Gehtsoft.Measurements/Gehtsoft.Measurements.csproj
index aebaf65..2427a88 100644
--- a/Gehtsoft.Measurements/Gehtsoft.Measurements.csproj
+++ b/Gehtsoft.Measurements/Gehtsoft.Measurements.csproj
@@ -10,7 +10,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="6.0.6" />
+    <PackageReference Include="System.Text.Json" Version="9.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/doc/project.proj b/doc/project.proj
index 8fd9981..d656d45 100644
--- a/doc/project.proj
+++ b/doc/project.proj
@@ -4,7 +4,7 @@
   <TargetFramework>netstandard2.0</TargetFramework>
  </PropertyGroup>
  <ItemGroup>
-  <PackageReference Include="Gehtsoft.Build.DocGen" Version="0.1.28" IncludeAssets="build" />
+  <PackageReference Include="Gehtsoft.Build.DocGen" Version="0.1.32" IncludeAssets="build" />
   <PackageReference Include="Gehtsoft.Build.ContentDelivery" Version="0.1.10" IncludeAssets="build" />
  </ItemGroup>
  <PropertyGroup>
@@ -25,10 +25,10 @@
   <MakeDir Directories="$(DocTargetDir)" />
   <DocGen Project="project.xml" />
   <Copy SourceFiles="@(CustomFile)" DestinationFolder="$(DocTargetDir)" />
-  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/res" Version="0.1.28" Destination="$(DocTargetDir)/res" />
-  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/highlighter" Version="0.1.28" Destination="$(DocTargetDir)/highlighter" />
-  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/menu" Version="0.1.28" Destination="$(DocTargetDir)/menu" />
-  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/pageImages" Version="0.1.28" Destination="$(DocTargetDir)/pageImages" />
+  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/res" Version="0.1.32" Destination="$(DocTargetDir)/res" />
+  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/highlighter" Version="0.1.32" Destination="$(DocTargetDir)/highlighter" />
+  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/menu" Version="0.1.32" Destination="$(DocTargetDir)/menu" />
+  <ContentFromPackage Package="gehtsoft.build.docgen" Source="Content/template/html/pageImages" Version="0.1.32" Destination="$(DocTargetDir)/pageImages" />
  </Target>
  <ItemGroup>
   <DocSource Include="$(MSBuildProjectDirectory)/../Gehtsoft.Measurements/bin/Release/netstandard2.0/Gehtsoft.Measurements.dll" />
diff --git a/nuget/config.xml b/nuget/config.xml
index a2e22fa..4604832 100644
--- a/nuget/config.xml
+++ b/nuget/config.xml
@@ -2,6 +2,7 @@
 <nuget xmlns="http://www.gehtsoft.com/build/nuget">
  <!-- versions. the FIRST version is the current -->
  <versions>
+  <version id="1.1.15">Update dependencies.</version>
   <version id="1.1.14">Add decimal measurements. Update dependencies.</version>
   <version id="1.1.13">Add solid angle units.</version>
   <version id="1.1.12">Fix comparison of very small values. Update dependencies, minor changes.</version>
@@ -11,13 +12,14 @@
   <owner>Gehtsoft</owner>
   <projectUrl>https://github.com/gehtsoft-usa/Gehtsoft.Measurements</projectUrl>
   <license type="expression">LGPL-2.1-or-later</license>
-  <copyright>Gehtsoft USA LLC 2016-2022</copyright>
+  <copyright>Gehtsoft USA LLC 2016-2024</copyright>
+  <custom-property id="readme">docs/README.md</custom-property>
  </properties>
  <projects>
    <project id="Gehtsoft.Measurements">
     <description>Measurements math, manipulations and unit conversion library</description>
     <additional-file file="../doc/Gehtsoft.Measurements.xml" target="*" />
-    <additional-file file="../nuget/readme.md" target="docs/" />
+    <additional-file file="../nuget/README.md" target="docs/" />
    </project>
  </projects>
 </nuget>
\ No newline at end of file
diff --git a/nuget/nuget.proj b/nuget/nuget.proj
index 7f293e0..dbf24fd 100644
--- a/nuget/nuget.proj
+++ b/nuget/nuget.proj
@@ -1,12 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFramework>net46</TargetFramework>
+    <TargetFramework>net472</TargetFramework>
   </PropertyGroup>
 
 
  <ItemGroup>
-  <PackageReference Include="Gehtsoft.Build.Nuget" Version="0.1.5" PrivateAssets="All" />
+  <PackageReference Include="Gehtsoft.Build.Nuget" Version="0.1.6" PrivateAssets="All" />
  </ItemGroup>
 
  <Target Name="Prepare">
diff --git a/nuget/sign-cloud.bat b/nuget/sign-cloud.bat
new file mode 100644
index 0000000..e735db2
--- /dev/null
+++ b/nuget/sign-cloud.bat
@@ -0,0 +1,3 @@
+rem @ECHO off
+forfiles /m *.nupkg /c "cmd /c smctl sign --fingerprint %digicert-fingerprint% --input @path"
+rem for /f %f in ('dir /b *.nupkg' ) do smctl sign --keypair-alias %digicert-alias% %f