try to support net 8

microsoft · Nov 30, 2023 · a81bc96 · a81bc96
1 parent 992a263
commit a81bc96
Show file tree

Hide file tree

Showing 42 changed files with 153 additions and 120 deletions.
diff --git a/.config/dotnet-tools.json b/.config/dotnet-tools.json
@@ -3,19 +3,19 @@
   "isRoot": true,
   "tools": {
     "dotnet-counters": {
-      "version": "6.0.351802",
+      "version": "8.0.452401",
       "commands": [
         "dotnet-counters"
       ]
     },
     "dotnet-dump": {
-      "version": "6.0.351802",
+      "version": "8.0.452401",
       "commands": [
         "dotnet-dump"
       ]
     },
     "dotnet-ilverify": {
-      "version": "7.0.0",
+      "version": "8.0.0",
       "commands": [
         "ilverify"
       ]

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -26,10 +26,10 @@ jobs:
       uses: NuGet/setup-nuget@v1
       with:
         nuget-version: '6.x'
-    - name: Setup .NET 7.0 SDK
+    - name: Setup .NET 8.0 SDK
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: '7.0.x'
+        dotnet-version: '8.0.x'
     - name: Set environment variables
       run: echo "COYOTE_CLI_TELEMETRY_OPTOUT=1" >> $GITHUB_ENV
     # Initializes the CodeQL tools for scanning.

diff --git a/.github/workflows/test-coyote.yml b/.github/workflows/test-coyote.yml
@@ -30,18 +30,14 @@ jobs:
         uses: NuGet/setup-nuget@v1
         with:
           nuget-version: '6.x'
-      - name: Setup .NET 7.0 SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '7.0.x'
-      - name: Setup .NET 6.0 SDK
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: '6.0.x'
-      - name: Setup .NET Core 3.1 SDK
-        uses: actions/setup-dotnet@v1
+      - name: Setup .NET SDK
+        uses: actions/setup-dotnet@v3
         with:
-          dotnet-version: '3.1.x'
+          dotnet-version: |
+            3.1.x
+            6.0.x
+            7.0.x
+            8.0.x
       - name: Setup debugging tools
         if: ${{ matrix.platform == 'windows-latest' }}
         run: |

diff --git a/.github/workflows/test-performance.yml b/.github/workflows/test-performance.yml
@@ -23,10 +23,10 @@ jobs:
         uses: NuGet/setup-nuget@v1
         with:
           nuget-version: '6.x'
-      - name: Setup .NET 7.0 SDK
+      - name: Setup .NET 8.0 SDK
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: '7.0.x'
+          dotnet-version: '8.0.x'
       - name: Setup Powershell
         run: ./Scripts/install-pwsh.cmd
       - name: Build Coyote projects

diff --git a/Common/build.props b/Common/build.props
@@ -16,6 +16,9 @@
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <PackageOutputPath>$(MSBuildThisFileDirectory)/../bin/nuget</PackageOutputPath>
   </PropertyGroup>
+  <PropertyGroup Condition="'$(TargetFramework)' == 'net8.0'>
+    <LangVersion>12.0</LangVersion>
+  </PropertyGroup>
   <PropertyGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
     <LangVersion>10.0</LangVersion>
   </PropertyGroup>
@@ -48,10 +51,15 @@
     <Net6Installed>false</Net6Installed>
     <Net6Installed Condition="$(GlobalVersion.StartsWith('6.0'))">true</Net6Installed>
     <Net6Installed Condition="'$(BUILD_NET6)'=='yes'">true</Net6Installed>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <Net7Supported Condition="'$(Net6Supported)'==''">true</Net6Supported>
+    <Net7Installed>false</Net7Installed>
+    <Net7Installed Condition="$(GlobalVersion.StartsWith('7.0'))">true</Net7Installed>
+    <Net7Installed Condition="'$(BUILD_NET7)'=='yes'">true</Net7Installed>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetStandard2Supported)'">$(TargetFrameworks);netstandard2.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(NetCore31Installed)' and '$(NetCore31Supported)'">$(TargetFrameworks);netcoreapp3.1</TargetFrameworks>
     <TargetFrameworks Condition="'$(Net6Installed)' and '$(Net6Supported)'">$(TargetFrameworks);net6.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(Net7Installed)' and '$(Net7Supported)'">$(TargetFrameworks);net7.0</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup Condition="'$(OS)'=='Windows_NT'">
     <TargetFrameworks Condition="'$(Framework462Installed)' and '$(Framework462Supported)'">$(TargetFrameworks);net462</TargetFrameworks>

diff --git a/Samples/CloudMessaging/run-mock.cmd b/Samples/CloudMessaging/run-mock.cmd
@@ -1,2 +1,2 @@
 cd %~dp0
-dotnet ..\..\bin\net7.0\coyote.dll test /../bin/net7.0/Raft.Mocking.dll -i 1000 -ms 500 -graph-bug
+dotnet ..\..\bin\net8.0\coyote.dll test /../bin/net8.0/Raft.Mocking.dll -i 1000 -ms 500 -graph-bug
diff --git a/Samples/CloudMessaging/run-nondeterminism.cmd b/Samples/CloudMessaging/run-nondeterminism.cmd
@@ -1,2 +1,2 @@
 cd %~dp0
-dotnet ..\..\bin\net7.0\coyote.dll test ../bin/net7.0/Raft.Nondeterminism.dll -i 1000 -ms 500 -graph-bug
+dotnet ..\..\bin\net8.0\coyote.dll test ../bin/net8.0/Raft.Nondeterminism.dll -i 1000 -ms 500 -graph-bug
diff --git a/Samples/CloudMessaging/run.cmd b/Samples/CloudMessaging/run.cmd
@@ -1 +1 @@
-dotnet %~dp0\..\bin\net7.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5 
+dotnet %~dp0\..\bin\net8.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5 
diff --git a/Samples/Common/TestDriver/rewrite.coyote.json b/Samples/Common/TestDriver/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "../bin/net7.0",
+  "AssembliesPath": "../bin/net8.0",
   "Assemblies": [
     "AccountManager.dll",
     "AccountManager.ETags.dll",

diff --git a/Samples/Common/build.props b/Samples/Common/build.props
@@ -4,8 +4,8 @@
     <Product>CoyoteSamples</Product>
     <Company>Microsoft Corporation</Company>
     <Copyright>Copyright © Microsoft Corporation.</Copyright>
-    <LangVersion>10.0</LangVersion>
-    <TargetFrameworks>net7.0</TargetFrameworks>
+    <LangVersion>12.0</LangVersion>
+    <TargetFrameworks>net8.0</TargetFrameworks>
     <UseLocalCoyote>False</UseLocalCoyote>
     <UseLocalNugetPackages>False</UseLocalNugetPackages>
     <UseNugetPackages>True</UseNugetPackages>

diff --git a/Samples/Scripts/run-tests.ps1 b/Samples/Scripts/run-tests.ps1
@@ -7,7 +7,7 @@ CheckPSVersion
 
 Write-Comment -prefix "." -text "Testing the Coyote samples" -color "yellow"
 
-$framework = "net7.0"
+$framework = "net8.0"
 $tests = "$PSScriptRoot/../Common/bin/$framework/TestDriver.dll"
 if (-not (Test-Path $tests)) {
     Write-Error "tests for the Coyote samples not found."

diff --git a/Samples/WebApps/ImageGalleryAspNet/ImageGallery/design.dgml b/Samples/WebApps/ImageGalleryAspNet/ImageGallery/design.dgml
@@ -617,7 +617,7 @@
     <Alias n="93" Id="(@1 @21 @44 Member=(Name=Create OverloadingParameters=[@43]))" />
     <Alias n="94" Id="(@1 @21 @44 Member=(Name=Update OverloadingParameters=[@43]))" />
     <Alias n="95" Id="(@1 @21 @67 Member=(Name=Store OverloadingParameters=[@76]))" />
-    <Alias n="96" Uri="Assembly=file:///C:/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/7.0.100/ref/net7.0/System.Runtime.dll" />
+    <Alias n="96" Uri="Assembly=file:///C:/Program Files/dotnet/packs/Microsoft.NETCore.App.Ref/7.0.100/ref/net8.0/System.Runtime.dll" />
     <Alias n="97" Id="(@96 Namespace=System Type=String)" />
     <Alias n="98" Id="OverloadingParameters=[@97]" />
     <Alias n="99" Id="(@1 @21 @44 Member=(Name=Get @98))" />
@@ -869,13 +869,13 @@
     </Style>
   </Styles>
   <Paths>
-    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryClient.dll" />
-    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryClient.dll" />
-    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryTests.dll" />
-    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryTests.dll" />
-    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\ImageGallery\bin\Debug\net7.0\ImageGallery.dll" />
-    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/ImageGallery/bin/Debug/net7.0/ImageGallery.dll" />
-    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net7.0\ImageGalleryService.dll" />
-    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net7.0/ImageGalleryService.dll" />
+    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net8.0\ImageGalleryClient.dll" />
+    <Path Id="a5b18c87-5523-45ca-ad7c-ba9f9cd970f0.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net8.0/ImageGalleryClient.dll" />
+    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net8.0\ImageGalleryTests.dll" />
+    <Path Id="b61697f0-7146-4c6a-8b6f-22f47731b799.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net8.0/ImageGalleryTests.dll" />
+    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\ImageGallery\bin\Debug\net8.0\ImageGallery.dll" />
+    <Path Id="c1ca4fb9-7c59-425f-b437-04cc48ba1988.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/ImageGallery/bin/Debug/net8.0/ImageGallery.dll" />
+    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPath" Value="C:\git\microsoft\CoyoteSamples\ImageGalleryAspNet\bin\net8.0\ImageGalleryService.dll" />
+    <Path Id="e140c75e-8fc0-4c25-a744-2172d419a56a.OutputPathUri" Value="file:///C:/git/microsoft/CoyoteSamples/ImageGalleryAspNet/bin/net8.0/ImageGalleryService.dll" />
   </Paths>
 </DirectedGraph>
diff --git a/Samples/WebApps/ImageGalleryAspNet/rewrite.coyote.json b/Samples/WebApps/ImageGalleryAspNet/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "./bin/net7.0",
+  "AssembliesPath": "./bin/net8.0",
   "OutputPath": "./bin/coyote",
   "Assemblies": [
       "ImageGalleryService.dll",

diff --git a/Samples/WebApps/PetImagesAspNet/PetImages.Tests/rewrite.coyote.json b/Samples/WebApps/PetImagesAspNet/PetImages.Tests/rewrite.coyote.json
@@ -1,5 +1,5 @@
 {
-  "AssembliesPath": "./bin/net7.0",
+  "AssembliesPath": "./bin/net8.0",
   "Assemblies": [
     "PetImages.dll",
     "PetImages.Tests.dll"

diff --git a/Scripts/CI/azure-nuget-sign-publish.yml b/Scripts/CI/azure-nuget-sign-publish.yml
@@ -7,6 +7,11 @@ steps:
   inputs:
     versionSpec: 6.x
 
+- task: UseDotNet@2
+  displayName: 'Install .NET 8.0 SDK'
+  inputs:
+    version: 8.0.x
+
 - task: UseDotNet@2
   displayName: 'Install .NET 7.0 SDK'
   inputs:
@@ -38,6 +43,36 @@ steps:
     failOnStderr: true
     pwsh: true
 
+- task: EsrpCodeSigning@2
+  displayName: 'ESRP CodeSigning .NET 8.0'
+  inputs:
+    ConnectedServiceName: CoyoteNugetSign
+    FolderPath: bin\net8.0
+    signConfigType: inlineSignParams
+    inlineOperation: |
+     [
+         {
+             "KeyCode": "CP-230012",
+             "OperationCode": "SigntoolSign",
+             "Parameters": {
+                 "OpusName": "Microsoft.Coyote",
+                 "OpusInfo": "https://github.com/Microsoft/Coyote",
+                 "FileDigest": "/fd \"SHA256\"",
+                 "PageHash": "/PH",
+                 "TimeStamp": "/tr \"http://rfc3161.gtm.corp.microsoft.com/TSS/HttpTspServer\" /td sha256"
+             },
+             "ToolName": "sign",
+             "ToolVersion": "1.0"
+         },
+         {
+             "KeyCode": "CP-230012",
+             "OperationCode": "SigntoolVerify",
+             "Parameters": {},
+             "ToolName": "sign",
+             "ToolVersion": "1.0"
+         }
+     ]
+
 - task: EsrpCodeSigning@2
   displayName: 'ESRP CodeSigning .NET 7.0'
   inputs:

diff --git a/Scripts/common.psm1 b/Scripts/common.psm1
@@ -23,7 +23,7 @@ function Invoke-CoyoteTool([String]$cmd, [String]$dotnet, [String]$framework, [S
         $command = "$coyote $cmd $target"
     }
 
-    if ($command -eq "rewrite" -and $framework -ne "netcoreapp3.1" -and $framework -ne "net6.0" -and $framework -ne "net7.0" -and $IsWindows) {
+    if ($command -eq "rewrite" -and $framework -ne "netcoreapp3.1" -and $framework -ne "net6.0" -and $framework -ne "net7.0" -and $framework -ne "net8.0" -and $IsWindows) {
         # NOTE: Mono.Cecil cannot sign assemblies on unix platforms.
         $command = "$command -snk $key"
     }

diff --git a/Scripts/gen-docs.ps1 b/Scripts/gen-docs.ps1
@@ -3,7 +3,7 @@
 
 $root_dir = "$PSScriptRoot\.."
 $packages_path = "$root_dir\packages"
-$framework = "net7.0"
+$framework = "net8.0"
 
 Import-Module $PSScriptRoot\common.psm1 -Force
 

diff --git a/Scripts/run-benchmark-history.ps1 b/Scripts/run-benchmark-history.ps1
@@ -41,7 +41,7 @@ function RestoreBenchmark() {
     Invoke-Expression "sed -i 's/\\Performance.Tests.csproj/\\Microsoft.Coyote.Performance.Tests.csproj/' $RootDir\Coyote.sln"
 }
 
-$benchmarks_dir = "$RootDir/Tools/BenchmarkRunner/bin/net7.0"
+$benchmarks_dir = "$RootDir/Tools/BenchmarkRunner/bin/net8.0"
 $benchmark_runner = "BenchmarkRunner.exe"
 $index = 0
 

diff --git a/Scripts/run-benchmarks.ps1 b/Scripts/run-benchmarks.ps1
@@ -30,7 +30,7 @@ if ($local -eq ""){
 }
 
 $current_dir = (Get-Item -Path "./").FullName
-$benchmarks_dir = "$PSScriptRoot/../Tools/BenchmarkRunner/bin/net7.0"
+$benchmarks_dir = "$PSScriptRoot/../Tools/BenchmarkRunner/bin/net8.0"
 $benchmark_runner = "BenchmarkRunner.exe"
 $artifacts_dir = "$current_dir/benchmark_$commit"
 

diff --git a/Scripts/run-tests.ps1 b/Scripts/run-tests.ps1
@@ -2,8 +2,8 @@
 # Licensed under the MIT License.
 
 param(
-    [ValidateSet("net7.0", "net6.0", "netcoreapp3.1", "net462")]
-    [string]$framework = "net7.0",
+    [ValidateSet("net8.0", "net7.0", "net6.0", "netcoreapp3.1", "net462")]
+    [string]$framework = "net8.0",
     [ValidateSet("all", "runtime", "rewriting", "testing", "actors", "actors-testing", "tools")]
     [string]$test = "all",
     [string]$filter = "",
@@ -53,12 +53,12 @@ foreach ($kvp in $targets.GetEnumerator()) {
         }
 
         $target = "$PSScriptRoot/../Tests/$($kvp.Value)/$($kvp.Value).csproj"
-        if ($f -eq "net7.0") {
+        if ($f -eq "net8.0") {
             $AssemblyName = GetAssemblyName($target)
-            $command = [IO.Path]::Combine($PSScriptRoot, "..", "Tests", $($kvp.Value), "bin", "net7.0", "$AssemblyName.dll")
+            $command = [IO.Path]::Combine($PSScriptRoot, "..", "Tests", $($kvp.Value), "bin", "net8.0", "$AssemblyName.dll")
             $command = $command + ' -r "' + [IO.Path]::Combine( `
-                $PSScriptRoot, "..", "Tests", $($kvp.Value), "bin", "net7.0", "*.dll") + '"'
-            $command = $command + ' -r "' + [IO.Path]::Combine($PSScriptRoot, "..", "bin", "net7.0", "*.dll") + '"'
+                $PSScriptRoot, "..", "Tests", $($kvp.Value), "bin", "net8.0", "*.dll") + '"'
+            $command = $command + ' -r "' + [IO.Path]::Combine($PSScriptRoot, "..", "bin", "net8.0", "*.dll") + '"'
             $command = $command + ' -r "' + [IO.Path]::Combine($dotnet_runtime_path, $runtime_version, "*.dll") + '"'
             $command = $command + ' -r "' + [IO.Path]::Combine($aspnet_runtime_path, $runtime_version, "*.dll") + '"'
             Invoke-ToolCommand -tool $ilverify -cmd $command -error_msg "found corrupted assembly rewriting"

diff --git a/Source/Test/Rewriting/RewritingOptions.cs b/Source/Test/Rewriting/RewritingOptions.cs
@@ -308,7 +308,9 @@ private static bool TryResolveTargetFramework(Assembly assembly, out string reso
             {
                 if (tokens[0] == ".NETCoreApp")
                 {
-                    resolvedTargetFramework = tokens[1] is "v7.0" ? "net7.0" :
+                    resolvedTargetFramework = 
+                        tokens[1] is "v8.0" ? "net8.0" :
+                        tokens[1] is "v7.0" ? "net7.0" :
                         tokens[1] is "v6.0" ? "net6.0" :
                         tokens[1] is "v3.1" ? "netcoreapp3.1" :
                         resolvedTargetFramework;
@@ -331,10 +333,10 @@ private static bool TryResolveTargetFramework(Assembly assembly, out string reso
         /// {
         ///     // The directory with the assemblies to rewrite. This path is relative
         ///     // to this configuration file.
-        ///     "AssembliesPath": "./bin/net7.0",
+        ///     "AssembliesPath": "./bin/net8.0",
         ///     // The output directory where rewritten assemblies are placed. This path
         ///     // is relative to this configuration file.
-        ///     "OutputPath": "./bin/net7.0/RewrittenBinaries",
+        ///     "OutputPath": "./bin/net8.0/RewrittenBinaries",
         ///     // The assemblies to rewrite. The paths are relative to 'AssembliesPath'.
         ///     "Assemblies": [
         ///         "Example.exe"

diff --git a/Source/Test/Test.csproj b/Source/Test/Test.csproj
@@ -19,6 +19,9 @@
     <PackageReference Include="Mono.Cecil" Version="0.11.4" />
     <PackageReference Include="xunit.abstractions" Version="2.0.3" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
   </ItemGroup>

diff --git a/Tests/compare-rewriting-diff-logs.ps1 b/Tests/compare-rewriting-diff-logs.ps1
@@ -3,7 +3,7 @@
 
 Import-Module $PSScriptRoot/../Scripts/common.psm1 -Force
 
-$framework = "net7.0"
+$framework = "net8.0"
 $targets = [ordered]@{
     "rewriting" = "Tests.Rewriting"
     "rewriting-helpers" = "Tests.Rewriting.Helpers"

diff --git a/Tests/get-rewriting-diff-logs.ps1 b/Tests/get-rewriting-diff-logs.ps1
@@ -3,7 +3,7 @@
 
 Import-Module $PSScriptRoot/../Scripts/common.psm1 -Force
 
-$framework = "net7.0"
+$framework = "net8.0"
 $targets = [ordered]@{
     "rewriting" = "Tests.Rewriting"
     "rewriting-helpers" = "Tests.Rewriting.Helpers"

diff --git a/Tools/CLI/Coyote.CLI.csproj b/Tools/CLI/Coyote.CLI.csproj
@@ -20,13 +20,9 @@
   <ItemGroup>
     <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == 'netcoreapp3.1'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />

diff --git a/Tools/Coyote/Coyote.csproj b/Tools/Coyote/Coyote.csproj
@@ -22,17 +22,10 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
     <FrameworkReference Include="Microsoft.AspNetCore.App" />
     <FrameworkReference Include="Microsoft.NETCore.App" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" >
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
-    <FrameworkReference Include="Microsoft.AspNetCore.App" />
-    <FrameworkReference Include="Microsoft.NETCore.App" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="7.0.0" >
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" >
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
   </ItemGroup>
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dotnet %~dp0\..\bin\net7.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5
		dotnet %~dp0\..\bin\net8.0\Raft.Azure.dll --connection-string %CONNECTION_STRING% --topic-name rafttopic --num-requests 5 --local-cluster-size 5