Skip to content

Commit 7713c41

Browse files
committed
Install 9.0 runtime to use 9.0 TFM
1 parent 7de969a commit 7713c41

2 files changed

Lines changed: 7 additions & 2 deletions

File tree

src/ImageBuilder.Tests/Microsoft.DotNet.ImageBuilder.Tests.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net11.0</TargetFramework>
4+
<TargetFramework>net9.0</TargetFramework>
55
<IsPackable>false</IsPackable>
66
<SuppressNETCoreSdkPreviewMessage>true</SuppressNETCoreSdkPreviewMessage>
77
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>

src/run-tests.ps1

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,19 @@ try {
2828
# On Linux, use the bash tools.sh (tools.ps1 uses dotnet-install.ps1
2929
# which doesn't work reliably on Linux)
3030
$engCommonDir = (Resolve-Path "$PSScriptRoot/../eng/common").Path
31-
$initScript = "source '$engCommonDir/tools.sh'; InitializeDotNetCli true; echo `$_InitializeDotNetCli"
31+
# InitializeToolset triggers Arcade's InstallDotNetCore target which installs
32+
# additional runtimes defined in global.json's tools.runtimes section.
33+
$initScript = "source '$engCommonDir/tools.sh'; InitializeDotNetCli true; InitializeToolset; echo `$_InitializeDotNetCli"
3234
$dotnetInstallDir = (& bash -c $initScript | Select-Object -Last 1).Trim()
3335
if ($LASTEXITCODE -ne 0) {
3436
throw "Failed to initialize .NET SDK via tools.sh"
3537
}
3638
} else {
3739
. $PSScriptRoot/../eng/common/tools.ps1
3840
$dotnetInstallDir = InitializeDotNetCli $true
41+
# Triggers Arcade's InstallDotNetCore target to install additional runtimes
42+
# defined in global.json's tools.runtimes section.
43+
InitializeToolset
3944
}
4045

4146
$cmd = "$dotnetInstallDir/dotnet test $PSScriptRoot/ImageBuilder.Tests/Microsoft.DotNet.ImageBuilder.Tests.csproj --logger:trx"

0 commit comments

Comments
 (0)