Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update the project to net8.0 #497

Merged
merged 4 commits into from
Mar 4, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .config/dotnet-tools.json
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@
"isRoot": true,
"tools": {
"dotnet-counters": {
"version": "6.0.351802",
"version": "8.0.510501",
"commands": [
"dotnet-counters"
]
},
"dotnet-dump": {
"version": "6.0.351802",
"version": "8.0.510501",
"commands": [
"dotnet-dump"
]
},
"dotnet-ilverify": {
"version": "7.0.0",
"version": "8.0.0",
"commands": [
"ilverify"
]
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
8 changes: 4 additions & 4 deletions .github/workflows/test-coyote.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,10 +30,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 .NET 6.0 SDK
uses: actions/setup-dotnet@v1
with:
Expand Down Expand Up @@ -81,10 +81,10 @@ jobs:
COYOTE_CLI_TELEMETRY_OPTOUT: 1
steps:
- uses: actions/checkout@v2
- 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: Download Coyote binaries
uses: actions/download-artifact@v3
with:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/test-performance.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions Common/build.props
Original file line number Diff line number Diff line change
Expand Up @@ -16,10 +16,10 @@
<PackageLicenseFile>LICENSE</PackageLicenseFile>
<PackageOutputPath>$(MSBuildThisFileDirectory)/../bin/nuget</PackageOutputPath>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
<PropertyGroup Condition="'$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net6.0'">
<LangVersion>10.0</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(TargetFramework)' != 'net7.0' and '$(TargetFramework)' != 'net6.0'">
<PropertyGroup Condition="'$(TargetFramework)' != 'net8.0' and '$(TargetFramework)' != 'net6.0'">
<LangVersion>8.0</LangVersion>
</PropertyGroup>
<PropertyGroup>
Expand Down Expand Up @@ -48,7 +48,7 @@
<Net6Installed>false</Net6Installed>
<Net6Installed Condition="$(GlobalVersion.StartsWith('6.0'))">true</Net6Installed>
<Net6Installed Condition="'$(BUILD_NET6)'=='yes'">true</Net6Installed>
<TargetFrameworks>net7.0</TargetFrameworks>
<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>
Expand Down
3 changes: 3 additions & 0 deletions History.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
## vNext
- Added support for the `net8.0` target framework.

## v1.7.10
- Fixed an issue with `Actor` not halting as expected in certain scenarios after explicitly raising
a `HaltEvent` event.
Expand Down
2 changes: 1 addition & 1 deletion Samples/CloudMessaging/run-mock.cmd
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Samples/CloudMessaging/run-nondeterminism.cmd
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion Samples/CloudMessaging/run.cmd
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
2 changes: 1 addition & 1 deletion Samples/Common/TestDriver/rewrite.coyote.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AssembliesPath": "../bin/net7.0",
"AssembliesPath": "../bin/net8.0",
"Assemblies": [
"AccountManager.dll",
"AccountManager.ETags.dll",
Expand Down
2 changes: 1 addition & 1 deletion Samples/Common/build.props
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<Company>Microsoft Corporation</Company>
<Copyright>Copyright © Microsoft Corporation.</Copyright>
<LangVersion>10.0</LangVersion>
<TargetFrameworks>net7.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<UseLocalCoyote>False</UseLocalCoyote>
<UseLocalNugetPackages>False</UseLocalNugetPackages>
<UseNugetPackages>True</UseNugetPackages>
Expand Down
4 changes: 2 additions & 2 deletions Samples/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@ to build reliable applications and services:

To build and run the samples, you will need to:

- Install the [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet).
- Install the [.NET 7.0 version of the coyote
- Install the [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet).
- Install the [.NET 8.0 version of the coyote
tool](https://microsoft.github.io/coyote/get-started/install/).

Once you are ready, build the samples by running the following script from the root of the
Expand Down
2 changes: 1 addition & 1 deletion Samples/Scripts/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand Down
18 changes: 9 additions & 9 deletions Samples/WebApps/ImageGalleryAspNet/ImageGallery/design.dgml
Original file line number Diff line number Diff line change
Expand Up @@ -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/8.0.200/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))" />
Expand Down Expand Up @@ -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>
2 changes: 1 addition & 1 deletion Samples/WebApps/ImageGalleryAspNet/ImageGallery/readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ This is a web client front end that uses the ImageGalleryService middle tier.

The app depends on the following:

- [.NET 7.0 SDK](https://dotnet.microsoft.com/download/dotnet) must be installed.
- [.NET 8.0 SDK](https://dotnet.microsoft.com/download/dotnet) must be installed.
- [Azure Storage Emulator](https://docs.microsoft.com/en-us/azure/storage/common/storage-use-emulator) must be hnstalled running.
- [Azure Cosmos Emulator](https://docs.microsoft.com/en-us/azure/cosmos-db/local-emulator?tabs=cli%2Cssl-netstd21) must be installed and running.
- Open Azure Cosmos Data Explorer from taskbar tray and copy the `Primary Connection String` from there into `~/ImageGalleryAspNet/ImageGalleryService/appsettings.json`.
Expand Down
2 changes: 1 addition & 1 deletion Samples/WebApps/ImageGalleryAspNet/rewrite.coyote.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AssembliesPath": "./bin/net7.0",
"AssembliesPath": "./bin/net8.0",
"OutputPath": "./bin/coyote",
"Assemblies": [
"ImageGalleryService.dll",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
<ProjectReference Include="..\PetImages\PetImages.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.1" />
<PackageReference Include="Microsoft.AspNetCore.TestHost" Version="8.0.2" />
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.2" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
<PackageReference Include="xunit" Version="2.4.2" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.5" />
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"AssembliesPath": "./bin/net7.0",
"AssembliesPath": "./bin/net8.0",
"Assemblies": [
"PetImages.dll",
"PetImages.Tests.dll"
Expand Down
8 changes: 4 additions & 4 deletions Scripts/CI/azure-nuget-sign-publish.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@ steps:
versionSpec: 6.x

- task: UseDotNet@2
displayName: 'Install .NET 7.0 SDK'
displayName: 'Install .NET 8.0 SDK'
inputs:
version: 7.0.x
version: 8.0.x

- task: UseDotNet@2
displayName: 'Install .NET 6.0 SDK'
Expand Down Expand Up @@ -39,10 +39,10 @@ steps:
pwsh: true

- task: EsrpCodeSigning@2
displayName: 'ESRP CodeSigning .NET 7.0'
displayName: 'ESRP CodeSigning .NET 8.0'
inputs:
ConnectedServiceName: CoyoteNugetSign
FolderPath: bin\net7.0
FolderPath: bin\net8.0
signConfigType: inlineSignParams
inlineOperation: |
[
Expand Down
2 changes: 1 addition & 1 deletion Scripts/common.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -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 "net8.0" -and $IsWindows) {
# NOTE: Mono.Cecil cannot sign assemblies on unix platforms.
$command = "$command -snk $key"
}
Expand Down
2 changes: 1 addition & 1 deletion Scripts/gen-docs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

$root_dir = "$PSScriptRoot\.."
$packages_path = "$root_dir\packages"
$framework = "net7.0"
$framework = "net8.0"

Import-Module $PSScriptRoot\common.psm1 -Force

Expand Down
2 changes: 1 addition & 1 deletion Scripts/run-benchmark-history.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion Scripts/run-benchmarks.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
18 changes: 12 additions & 6 deletions Scripts/run-tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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", "net6.0", "netcoreapp3.1", "net462")]
[string]$framework = "net8.0",
[ValidateSet("all", "runtime", "rewriting", "testing", "actors", "actors-testing", "tools")]
[string]$test = "all",
[string]$filter = "",
Expand Down Expand Up @@ -32,8 +32,14 @@ $dotnet_runtime_path = FindDotNetRuntimePath -dotnet $dotnet -runtime "NETCore"
$aspnet_runtime_path = FindDotNetRuntimePath -dotnet $dotnet -runtime "AspNetCore"
$runtime_version = FindDotNetRuntimeVersion -dotnet_runtime_path $dotnet_runtime_path

# NOTE: we do some hacks to get around a known issue with dotnet tool
# command being available after locally being restored.
# Example: https://github.com/dotnet/sdk/issues/11820
# Restore the local ilverify tool.
&dotnet nuget locals all --clear
&dotnet tool restore
&dotnet tool install dotnet-ilverify --version 8.0.0
&dotnet tool list
$ilverify = "dotnet ilverify"

[System.Environment]::SetEnvironmentVariable('COYOTE_CLI_TELEMETRY_OPTOUT', '1')
Expand All @@ -53,12 +59,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"
Expand Down
6 changes: 3 additions & 3 deletions Source/Test/Rewriting/RewritingOptions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -308,7 +308,7 @@ 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 "v6.0" ? "net6.0" :
tokens[1] is "v3.1" ? "netcoreapp3.1" :
resolvedTargetFramework;
Expand All @@ -331,10 +331,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"
Expand Down
4 changes: 2 additions & 2 deletions Source/Test/Rewriting/Types/Threading/Interlocked.cs
Original file line number Diff line number Diff line change
Expand Up @@ -241,7 +241,7 @@ public static IntPtr Exchange(ref IntPtr location1, IntPtr value)
return SystemInterlocked.Exchange(ref location1, value);
}

#if NET7_0_OR_GREATER
#if NET8_0_OR_GREATER
/// <summary>
/// Sets a platform-specific handle or pointer to a specified value and returns the
/// original value, as an atomic operation.
Expand Down Expand Up @@ -346,7 +346,7 @@ public static IntPtr CompareExchange(ref IntPtr location1, IntPtr value, IntPtr
return SystemInterlocked.CompareExchange(ref location1, value, comparand);
}

#if NET7_0_OR_GREATER
#if NET8_0_OR_GREATER
/// <summary>
/// Compares two platform-specific handles or pointers for equality and, if they
/// are equal, replaces the first one.
Expand Down
6 changes: 3 additions & 3 deletions Source/Test/Test.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<PackageReference Include="Mono.Cecil" Version="0.11.4" />
<PackageReference Include="xunit.abstractions" Version="2.0.3" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
Expand All @@ -30,7 +30,7 @@
<PackageReference Include="System.Text.Json" Version="6.0.0" />
</ItemGroup>
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
<PackageReference Include="System.Text.Json" Version="7.0.1" />
<PackageReference Include="System.Text.Json" Version="8.0.2" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\Source\Core\Core.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion Tests/compare-rewriting-diff-logs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
2 changes: 1 addition & 1 deletion Tests/get-rewriting-diff-logs.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading