LiRuochen_WorkFlow/Newtonsoft.Json
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update .NET 8 SDK (#2959)

Browse Source
This commit is contained in:
James Newton-King
2024-05-28 13:18:47 +08:00
committed by GitHub
parent b0d1d0b905
commit 4738a64817
6 changed files with 115 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Build/build.ps1
+7 -6
View File
@@ -13,8 +13,8 @@
$treatWarningsAsErrors = $false
$workingName = if ($workingName) {$workingName} else {"Working"}
$assemblyVersion = if ($assemblyVersion) {$assemblyVersion} else {$majorVersion + '.0.0'}
$netCliChannel = "Current"
$netCliVersion = "6.0.400"
$netCliChannel = "STS"
$netCliVersion = "8.0.300"
$nugetUrl = "https://dist.nuget.org/win-x86-commandline/latest/nuget.exe"
$ensureNetCliSdk = $true
@@ -26,7 +26,7 @@
$workingDir = "$baseDir\$workingName"
$nugetPath = "$buildDir\Temp\nuget.exe"
$vswhereVersion = "2.3.2"
$vswhereVersion = "3.1.7"
$vswherePath = "$buildDir\Temp\vswhere.$vswhereVersion"
$nunitConsoleVersion = "3.8.0"
$nunitConsolePath = "$buildDir\Temp\NUnit.ConsoleRunner.$nunitConsoleVersion"
@@ -179,8 +179,9 @@ function EnsureDotnetCli()
-OutFile "$buildDir\Temp\dotnet-install.ps1"
exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version $netCliVersion | Out-Default }
exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '6.0.400' | Out-Default }
exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '3.1.402' | Out-Default }
exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '2.1.811' | Out-Default }
exec { & $buildDir\Temp\dotnet-install.ps1 -Channel $netCliChannel -Version '2.1.818' | Out-Default }
}
function EnsureNuGetExists()
@@ -203,7 +204,7 @@ function EnsureNuGetPackage($packageName, $packagePath, $packageVersion)
function GetMsBuildPath()
{
$path = & $vswherePath\tools\vswhere.exe -latest -products * -requires Microsoft.Component.MSBuild -property installationPath
$path = & $vswherePath\tools\vswhere.exe -latest -prerelease -products * -requires Microsoft.Component.MSBuild -property installationPath
if (!($path))
{
throw "Could not find Visual Studio install path"
@@ -241,7 +242,7 @@ function NetCliTests($build)
Write-Host "Project path: $projectPath"
Write-Host
exec { dotnet test $projectPath -f $testDir -c Release -l trx -r $workingDir --no-restore --no-build | Out-Default }
exec { dotnet test $projectPath -f $testDir -c Release -l trx --results-directory $workingDir --no-restore --no-build | Out-Default }
}
finally
{