From b5979b064ebff44edcb75cf2c81183e7b4a5d543 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20Luthi?= <cedric.luthi@gmail.com>
Date: Tue, 9 Jul 2024 00:01:00 +0200
Subject: [PATCH] Use the new officially supported way to roll forward dotnet
 global tools

Implemented in [dotnet tool run and install roll-forward option][1].

Supported [since the .NET SDK v8.0.300][2].

Documented in [
.NET tool roll-forward][3].

[1]: https://github.com/dotnet/sdk/pull/37231
[2]: https://github.com/dotnet/sdk/commit/dc2a5fe965efcafe5a9babaf983cd9b8867bd0a4
[3]: https://learn.microsoft.com/en-us/dotnet/core/whats-new/dotnet-9/sdk#net-tool-roll-forward
---
 .config/dotnet-tools.json             | 6 ++++--
 global.json                           | 2 +-
 src/Serilog.Formatting.Log4Net.csproj | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
index f127898..f0db6a9 100644
--- a/.config/dotnet-tools.json
+++ b/.config/dotnet-tools.json
@@ -6,13 +6,15 @@
       "version": "0.0.1-preview.304",
       "commands": [
         "dotnet-validate"
-      ]
+      ],
+      "rollForward": true
     },
     "dotnet-stryker": {
       "version": "4.0.6",
       "commands": [
         "dotnet-stryker"
-      ]
+      ],
+      "rollForward": true
     }
   }
 }
\ No newline at end of file
diff --git a/global.json b/global.json
index 09fb573..76491e3 100644
--- a/global.json
+++ b/global.json
@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/global",
   "sdk": {
-    "version": "8.0.100",
+    "version": "8.0.300",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }
diff --git a/src/Serilog.Formatting.Log4Net.csproj b/src/Serilog.Formatting.Log4Net.csproj
index db1c762..b5ad6db 100644
--- a/src/Serilog.Formatting.Log4Net.csproj
+++ b/src/Serilog.Formatting.Log4Net.csproj
@@ -65,7 +65,7 @@
   <Target Name="ValidateNuGetPackage" AfterTargets="Pack">
     <!-- For reference: the file `.config/dotnet-tools.json` was created by running `dotnet new tool-manifest && dotnet tool install dotnet-validate` -->
     <Exec Command="dotnet tool restore" />
-    <Exec Command="dotnet validate package local $([MSBuild]::EnsureTrailingSlash($(PackageOutputPath)))$(PackageId).$(PackageVersion).nupkg" EnvironmentVariables="DOTNET_ROLL_FORWARD=LatestMajor" />
+    <Exec Command="dotnet validate package local $([MSBuild]::EnsureTrailingSlash($(PackageOutputPath)))$(PackageId).$(PackageVersion).nupkg" />
   </Target>
 
 </Project>