From 7eb36b2458ad972ea6be580e5af90a967d0d147c Mon Sep 17 00:00:00 2001
From: Nicholas Blumhardt <nblumhardt@nblumhardt.com>
Date: Thu, 7 Mar 2024 13:07:09 +1000
Subject: [PATCH] Enable .NET tool major-version roll-forward; update
 dependencies incl. internalizing single-class JSON.NET destructuring support

---
 Build.ps1                                      | 3 +--
 src/Roastery/Roastery.csproj                   | 2 +-
 src/SeqCli/Cli/Features/OutputFormatFeature.cs | 1 -
 src/SeqCli/SeqCli.csproj                       | 5 +++--
 test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj    | 4 +---
 test/SeqCli.Tests/SeqCli.Tests.csproj          | 6 +++---
 6 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/Build.ps1 b/Build.ps1
index 2b67ba43..29f5ea0f 100644
--- a/Build.ps1
+++ b/Build.ps1
@@ -86,8 +86,7 @@ Clean-Output
 Create-ArtifactDir
 Restore-Packages
 Publish-Archives($version)
-# Temporarily disabled while SerilogTracing is in pre-release
-# Publish-DotNetTool($version)
+Publish-DotNetTool($version)
 Execute-Tests($version)
 Publish-Docs($version)
 
diff --git a/src/Roastery/Roastery.csproj b/src/Roastery/Roastery.csproj
index f5c03f1e..6451f899 100644
--- a/src/Roastery/Roastery.csproj
+++ b/src/Roastery/Roastery.csproj
@@ -7,7 +7,7 @@
 
     <ItemGroup>
         <PackageReference Include="Serilog" Version="3.1.1" />
-        <PackageReference Include="SerilogTracing" Version="1.0.0-dev-00088" />
+        <PackageReference Include="SerilogTracing" Version="1.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/SeqCli/Cli/Features/OutputFormatFeature.cs b/src/SeqCli/Cli/Features/OutputFormatFeature.cs
index f64ef386..3f16eb7b 100644
--- a/src/SeqCli/Cli/Features/OutputFormatFeature.cs
+++ b/src/SeqCli/Cli/Features/OutputFormatFeature.cs
@@ -21,7 +21,6 @@
 using Seq.Api.Model;
 using SeqCli.Config;
 using SeqCli.Csv;
-using SeqCli.Levels;
 using SeqCli.Output;
 using Serilog;
 using Serilog.Core;
diff --git a/src/SeqCli/SeqCli.csproj b/src/SeqCli/SeqCli.csproj
index 0ee292ec..36234e7b 100644
--- a/src/SeqCli/SeqCli.csproj
+++ b/src/SeqCli/SeqCli.csproj
@@ -10,7 +10,8 @@
     <TreatSpecificWarningsAsErrors />
     <PackAsTool>true</PackAsTool>
     <ToolCommandName>seqcli</ToolCommandName>
-    <LangVersion>default</LangVersion>
+    <RollForward>Major</RollForward>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
   </PropertyGroup>
   <ItemGroup>
@@ -34,7 +35,7 @@
     <PackageReference Include="Serilog.Formatting.Compact.Reader" Version="3.0.0" />
     <PackageReference Include="Serilog.Sinks.Console" Version="5.0.1" />
     <PackageReference Include="Autofac" Version="8.0.0" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
+    <PackageReference Include="Serilog.Sinks.Seq" Version="7.0.0" />
     <PackageReference Include="Superpower" Version="3.0.0" />
     <PackageReference Include="System.Reactive" Version="6.0.0" />
     <PackageReference Include="System.Security.Cryptography.ProtectedData" Version="8.0.0" />
diff --git a/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj b/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj
index 2c417644..669a70aa 100644
--- a/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj
+++ b/test/SeqCli.EndToEnd/SeqCli.EndToEnd.csproj
@@ -5,9 +5,7 @@
     <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Autofac" Version="8.0.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="Serilog.Sinks.Seq" Version="6.0.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="Data\*">
diff --git a/test/SeqCli.Tests/SeqCli.Tests.csproj b/test/SeqCli.Tests/SeqCli.Tests.csproj
index 8383a9bc..228e5f4e 100644
--- a/test/SeqCli.Tests/SeqCli.Tests.csproj
+++ b/test/SeqCli.Tests/SeqCli.Tests.csproj
@@ -3,9 +3,9 @@
     <TargetFrameworks>net8.0;net8.0-windows</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="xunit" Version="2.6.2" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.4">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+    <PackageReference Include="xunit" Version="2.7.0" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>