Skip to content

Commit 6c850b8

Browse files
authored
chore: remove rollforward settings (#2912)
1 parent a092803 commit 6c850b8

File tree

6 files changed

+9
-23
lines changed

6 files changed

+9
-23
lines changed

build/build.ps1

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,6 @@ if ($PSVersionTable.PSEdition -ne 'Core') {
2626

2727
$env:DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
2828
$env:DOTNET_CLI_TELEMETRY_OPTOUT=1
29-
$env:DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2
3029

3130
Function Remove-PathVariable([string]$VariableToRemove)
3231
{
@@ -58,6 +57,9 @@ if (!(Test-Path $InstallPath)) {
5857
$ScriptPath = Join-Path $InstallPath 'dotnet-install.ps1'
5958
(New-Object System.Net.WebClient).DownloadFile($DotNetInstallerUri, $ScriptPath);
6059
& $ScriptPath -JSonFile $GlobalJsonPath -InstallDir $InstallPath;
60+
61+
# Install .NET 8 SDK
62+
& $ScriptPath -Channel 8.0 -InstallDir $InstallPath -NoPath;
6163
}
6264

6365
Remove-PathVariable "$InstallPath"

build/build.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,12 +10,14 @@ PROJECT_ROOT=$( cd "$( dirname "${BASH_SOURCE[0]}" )" && cd .. && pwd )
1010
export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
1111
export DOTNET_CLI_TELEMETRY_OPTOUT=1
1212
export DOTNET_SYSTEM_NET_HTTP_USESOCKETSHTTPHANDLER=0
13-
export DOTNET_ROLL_FORWARD_ON_NO_CANDIDATE_FX=2
1413

1514
if [ ! -d "$PROJECT_ROOT/.dotnet" ]; then
1615
mkdir "$PROJECT_ROOT/.dotnet"
1716
curl -Lsfo "$PROJECT_ROOT/.dotnet/dotnet-install.sh" https://dot.net/v1/dotnet-install.sh
1817
bash "$PROJECT_ROOT/.dotnet/dotnet-install.sh" --jsonfile ./build/sdk/global.json --install-dir .dotnet --no-path
18+
19+
# Install .NET 8 SDK
20+
bash "$PROJECT_ROOT/.dotnet/dotnet-install.sh" --channel 8.0 --install-dir .dotnet --no-path
1921
fi
2022

2123
export PATH="$PROJECT_ROOT/.dotnet":$PATH

tests/BenchmarkDotNet.IntegrationTests/LargeAddressAwareTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ public void BenchmarkCanAllocateMoreThan2Gb()
4747
.Any());
4848

4949
Assert.Contains(".NET Framework", summary.AllRuntimes);
50-
Assert.Contains(DotNetRuntimeHelper.GetExpectedDotNetCoreRuntimeName(), summary.AllRuntimes);
50+
Assert.Contains(".NET 8.0", summary.AllRuntimes);
5151
}
5252
}
5353

tests/BenchmarkDotNet.IntegrationTests/MultipleRuntimesTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ public void SingleBenchmarkCanBeExecutedForMultipleRuntimes()
5151
.Any());
5252

5353
Assert.Contains(".NET Framework", summary.AllRuntimes);
54-
Assert.Contains(DotNetRuntimeHelper.GetExpectedDotNetCoreRuntimeName(), summary.AllRuntimes);
54+
Assert.Contains(".NET 8.0", summary.AllRuntimes);
5555
}
5656
}
5757

tests/BenchmarkDotNet.Tests/Helpers/DotNetRuntimeHelper.cs

Lines changed: 0 additions & 15 deletions
This file was deleted.

tests/BenchmarkDotNet.Tests/RuntimeVersionDetectionTests.cs

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -120,10 +120,7 @@ public void CurrentRuntimeIsProperlyRecognized()
120120
else
121121
Assert.True(runtime is MonoRuntime, $"Actual runtime: {runtime}, tfm: {runtime.MsBuildMoniker}, moniker: {runtime.RuntimeMoniker}");
122122
#else
123-
if (DotNetRuntimeHelper.GetExpectedDotNetCoreRuntimeName() == ".NET 10.0")
124-
Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.Net10_0, $"Actual runtime: {runtime}, tfm: {runtime.MsBuildMoniker}, moniker: {runtime.RuntimeMoniker}");
125-
else
126-
Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.Net80, $"Actual runtime: {runtime}, tfm: {runtime.MsBuildMoniker}, moniker: {runtime.RuntimeMoniker}");
123+
Assert.True(runtime is CoreRuntime coreRuntime && coreRuntime.RuntimeMoniker == RuntimeMoniker.Net80, $"Actual runtime: {runtime}, tfm: {runtime.MsBuildMoniker}, moniker: {runtime.RuntimeMoniker}");
127124
#endif
128125
}
129126
}

0 commit comments

Comments
 (0)