From 5b633e9a76a49a73476ed3945373dff3e1d3744a Mon Sep 17 00:00:00 2001
From: Peter Simpson <38855929+Peter-Simpson@users.noreply.github.com>
Date: Thu, 11 Jan 2024 07:29:53 +0000
Subject: [PATCH] Up-level version to 2.1.0 and ASCOM Library to v2.0.0-rc.3.

---
 ConformU/ConformU.csproj | 13 +++++++------
 publish.cmd              | 22 +++++++++++++---------
 2 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/ConformU/ConformU.csproj b/ConformU/ConformU.csproj
index 235ce61..bcfd455 100644
--- a/ConformU/ConformU.csproj
+++ b/ConformU/ConformU.csproj
@@ -26,11 +26,11 @@
 	<PropertyGroup>
 		<!-- Set version numbers -->
 		<ProductMajor>2</ProductMajor>
-		<ProductMinor>0</ProductMinor>
-		<ProductPatch>1</ProductPatch>
+		<ProductMinor>1</ProductMinor>
+		<ProductPatch>0</ProductPatch>
 
 		<!-- Set the pre-release string without a leading minus e.g. rc.1 -->
-		<ProductPreRelease>rc.8</ProductPreRelease>
+		<ProductPreRelease></ProductPreRelease>
 
 		<!--Create a dynamic revision number based on time of build
 		 
@@ -167,10 +167,11 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="ASCOM.Alpaca.Components" Version="1.0.113-rc.3" />
-		<PackageReference Include="ASCOM.Com.Components" Version="1.0.113-rc.3" />
+		<PackageReference Include="ASCOM.Alpaca.Components" Version="2.0.0-rc.2" />
+		<PackageReference Include="ASCOM.AstrometryTools" Version="2.0.0-rc.2" />
+		<PackageReference Include="ASCOM.Com.Components" Version="2.0.0-rc.2" />
 		<PackageReference Include="ASCOM.Exception.Library" Version="7.0.0-rc.16" />
-		<PackageReference Include="ASCOM.Tools" Version="1.0.113-rc.3" />
+		<PackageReference Include="ASCOM.Tools" Version="2.0.0-rc.2" />
 		<PackageReference Include="Blazorise.Bootstrap" Version="1.3.1" />
 		<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.3.1" />
 		<PackageReference Include="Blazorise.TreeView" Version="1.3.1" />
diff --git a/publish.cmd b/publish.cmd
index c46abc2..63dc43f 100644
--- a/publish.cmd
+++ b/publish.cmd
@@ -14,36 +14,40 @@ MSBuild ConformU.sln /p:Configuration=Debug /p:Platform="Any CPU" /t:Rebuild
 echo *** Completed Build
 
 echo *** Publishing MacOS Intel silicon
-dotnet publish -c Debug -p:Platform="Any CPU" -r osx-x64 --framework net 8.0 --self-contained true -p:PublishSingleFile=true -p:PublishReadyToRunShowWarnings=true
+dotnet publish -c Debug -p:Platform="Any CPU" -r osx-x64   --framework net8.0 --self-contained true /p:PublishTrimmed=false -p:PublishSingleFile=true -p:PublishReadyToRunShowWarnings=true
 bsdtar -cJf publish/conformu.macos-x64.tar.xz -C ConformU\bin\Debug\net 8.0\osx-x64\publish\ *
 echo *** Completed MacOS Intel silicon
 
 echo *** Publishing MacOS Apple silicon
-dotnet publish -c Debug -p:Platform="Any CPU" -r osx-arm64 --framework net 8.0 --self-contained true -p:PublishSingleFile=true 
+dotnet publish -c Debug -p:Platform="Any CPU" -r osx-arm64 --framework net8.0 --self-contained true /p:PublishTrimmed=false -p:PublishSingleFile=true 
 bsdtar -cJf publish/conformu.macos-arm64.tar.xz -C ConformU\bin\Debug\net 8.0\osx-arm64\publish\ *
 echo *** Completed MacOS Apple silicon
 
 echo *** Publishing Linux ARM32
-dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm --framework net 8.0 --self-contained true /p:PublishSingleFile=true 
+dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true 
 bsdtar -cJf publish/conformu.linux-arm32.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-arm\publish\ *
 echo *** Completed Linux ARM32
 
 echo *** Publishing Linux ARM64
-dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm64 --framework net 8.0 --self-contained true /p:PublishSingleFile=true
+dotnet publish -c Debug /p:Platform="Any CPU" -r linux-arm64 --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true
 bsdtar -cJf publish/conformu.linux-arm64.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-arm64\publish\ *
 echo *** Completed Linux ARM64
 
 echo *** Publishing Linux X64
-dotnet publish -c Debug /p:Platform="Any CPU" -r linux-x64 --framework net 8.0 --self-contained true /p:PublishSingleFile=true
+dotnet publish -c Debug /p:Platform="Any CPU" -r linux-x64 --framework net8.0 --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true
 bsdtar -cJf publish/conformu.linux-x64.needsexec.tar.xz -C ConformU\bin\Debug\net 8.0\linux-x64\publish\ *
 echo *** Completed Linux X64
 
-echo *** Publishing Windows 64bit
-dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x64 --framework net 8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU64/
+echo *** Publishing Windows ARM 64bit
+dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-arm64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU64/
 echo *** Completed 64bit publish
 
-echo *** Publishing Windows 32bit
-dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x86 --framework net 8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU86/
+echo *** Publishing Windows Intel 64bit
+dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x64 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU64/
+echo *** Completed 64bit publish
+
+echo *** Publishing Windows Intel 32bit
+dotnet publish ConformU/ConformU.csproj -c Debug /p:Platform="Any CPU" -r win-x86 --framework net8.0-windows --self-contained true /p:PublishTrimmed=false /p:PublishSingleFile=true -o ./publish/ConformU86/
 echo *** Completed 32bit publish
 
 editbin /LARGEADDRESSAWARE ./publish/ConformU86/Conformu.exe