From 63f2c4b71e9b26736f8005410aa13ad960b46061 Mon Sep 17 00:00:00 2001
From: Scott Holodak <scottt732@gmail.com>
Date: Mon, 18 Dec 2023 11:52:44 -0500
Subject: [PATCH] WiP

---
 Directory.Build.props                                     | 6 +++---
 Source/Directory.Build.props                              | 2 +-
 .../Sholo.CommandLine.Containers.csproj                   | 2 +-
 Source/Sholo.CommandLine/CommandLineApp.cs                | 4 ++++
 Source/Sholo.CommandLine/Sholo.CommandLine.csproj         | 8 ++++----
 Tests/Directory.Build.props                               | 2 +-
 .../Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj  | 2 +-
 global.json                                               | 5 +++--
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0b94847..cb84fd2 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -26,9 +26,9 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.2.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" Version="7.0.4" />
-    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="17.7.30" />
+    <PackageReference Include="JetBrains.Annotations" PrivateAssets="All" Version="2023.3.0" />
+    <PackageReference Include="Microsoft.CodeAnalysis.NetAnalyzers" PrivateAssets="All" Version="[8.0.0,)" />
+    <PackageReference Include="Microsoft.VisualStudio.Threading.Analyzers" PrivateAssets="All" Version="[17.8.14,)" />
     <PackageReference Include="MinVer" PrivateAssets="All" Version="4.3.0" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" Version="1.1.118" />
   </ItemGroup>
diff --git a/Source/Directory.Build.props b/Source/Directory.Build.props
index 4835981..b868874 100644
--- a/Source/Directory.Build.props
+++ b/Source/Directory.Build.props
@@ -17,7 +17,7 @@
   </PropertyGroup>
 
   <ItemGroup Label="Package References">
-    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="1.1.1" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" PrivateAssets="All" Version="8.0.0" />
   </ItemGroup>
 
   <ItemGroup Label="Files">
diff --git a/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj b/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
index 58132a4..61741d4 100644
--- a/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
+++ b/Source/Sholo.CommandLine.Containers/Sholo.CommandLine.Containers.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/Source/Sholo.CommandLine/CommandLineApp.cs b/Source/Sholo.CommandLine/CommandLineApp.cs
index 1b04127..8edcabe 100644
--- a/Source/Sholo.CommandLine/CommandLineApp.cs
+++ b/Source/Sholo.CommandLine/CommandLineApp.cs
@@ -46,7 +46,9 @@ void CancelHandler(object o, ConsoleCancelEventArgs e)
 
             if (!cts.IsCancellationRequested)
             {
+#pragma warning disable VSTHRD103
                 cts.Cancel();
+#pragma warning restore VSTHRD103
                 e.Cancel = true;
             }
             else
@@ -63,7 +65,9 @@ void UnloadingHandler(AssemblyLoadContext ctx)
 
             if (!cts.IsCancellationRequested)
             {
+#pragma warning disable VSTHRD103
                 cts.Cancel();
+#pragma warning restore VSTHRD103
             }
 
             // ReSharper restore AccessToDisposedClosure
diff --git a/Source/Sholo.CommandLine/Sholo.CommandLine.csproj b/Source/Sholo.CommandLine/Sholo.CommandLine.csproj
index a02d4c0..1463948 100644
--- a/Source/Sholo.CommandLine/Sholo.CommandLine.csproj
+++ b/Source/Sholo.CommandLine/Sholo.CommandLine.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="McMaster.Extensions.CommandLineUtils" Version="[4.1.0,5.0.0)" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="[7.0.0,)" />
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[7.0.0,)" />
-    <PackageReference Include="Microsoft.Extensions.Logging" Version="[7.0.0,)" />
+    <PackageReference Include="Microsoft.Extensions.Configuration" Version="[8.0.0,)" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="[8.0.0,)" />
+    <PackageReference Include="Microsoft.Extensions.Logging" Version="[8.0.0,)" />
     <PackageReference Include="System.Runtime.Loader" Version="[4.3.0,5.0.0)" />
   </ItemGroup>
 
diff --git a/Tests/Directory.Build.props b/Tests/Directory.Build.props
index 893680b..be0d2bd 100644
--- a/Tests/Directory.Build.props
+++ b/Tests/Directory.Build.props
@@ -11,7 +11,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
     <PackageReference Include="Moq" Version="4.20.69" />
     <PackageReference Include="xunit" Version="2.5.1" />
     <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="All" Version="2.5.1">
diff --git a/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj b/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
index 553b400..91e0412 100644
--- a/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
+++ b/Tests/Sholo.CommandLine.Test/Sholo.CommandLine.Test.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup Label="Build">
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Label="Project References">
diff --git a/global.json b/global.json
index eec76ea..f7fb55b 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,7 @@
 {
   "sdk": {
-    "rollForward": "latestMajor",
-    "version": "6.0.400"
+    "version": "8.0.100",
+    "rollForward": "latestMinor",
+    "allowPrerelease": false
   }
 }