diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ea9946cc3fd..1fe89f14051b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -589,34 +589,34 @@ - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + bcc287603101fa751ff666f17b661c5e40fef60f diff --git a/eng/Versions.props b/eng/Versions.props index 9dad7200e4d9..0b1f122957cc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -270,10 +270,10 @@ - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 + 9.0.0-beta.25561.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 01481d6e12cf..9b3ad8840fdb 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -295,7 +295,7 @@ function InstallDotNet([string] $dotnetRoot, if ($runtime -eq "aspnetcore") { $runtimePath = $runtimePath + "\Microsoft.AspNetCore.App" } if ($runtime -eq "windowsdesktop") { $runtimePath = $runtimePath + "\Microsoft.WindowsDesktop.App" } $runtimePath = $runtimePath + "\" + $version - + $dotnetVersionLabel = "runtime toolset '$runtime/$architecture v$version'" if (Test-Path $runtimePath) { @@ -547,25 +547,19 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { - if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { - $vsRequirements = $GlobalJson.tools.vs - } else { - $vsRequirements = $null - } - } + if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'version') { $args += '-version' $args += $vsRequirements.version } - if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { + if (Get-Member -InputObject $vsRequirements -Name 'components') { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component @@ -616,7 +610,7 @@ function InitializeBuildTool() { } else { $initializeBuildToolFramework=$env:_OverrideArcadeInitializeBuildToolFramework } - + $buildTool = @{ Path = $dotnetPath; Command = 'msbuild'; Tool = 'dotnet'; Framework = $initializeBuildToolFramework } } elseif ($msbuildEngine -eq "vs") { try { diff --git a/global.json b/global.json index 4b1ad82235ff..f6484e480c28 100644 --- a/global.json +++ b/global.json @@ -17,8 +17,8 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25561.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25561.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1" }