diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 20c47e0cba57..fb7f487ad2e3 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 048a8c0ba5b72234301a3605c424ee9f9ff99772 + e8483fe03c7d3257c68f6013441da5d72eeb8392 - + https://github.com/dotnet/arcade - 048a8c0ba5b72234301a3605c424ee9f9ff99772 + e8483fe03c7d3257c68f6013441da5d72eeb8392 - + https://github.com/dotnet/arcade - 048a8c0ba5b72234301a3605c424ee9f9ff99772 + e8483fe03c7d3257c68f6013441da5d72eeb8392 - + https://github.com/dotnet/arcade - 048a8c0ba5b72234301a3605c424ee9f9ff99772 + e8483fe03c7d3257c68f6013441da5d72eeb8392 https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index ea3562731da4..a6ad0f9a9f05 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -35,7 +35,7 @@ 8.0.0 4.0.0 8.0.1 - 8.0.0-beta.25555.2 + 8.0.0-beta.25562.3 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -212,7 +212,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25555.2 + 8.0.0-beta.25562.3 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 0213bf2c40f9..bb048ad125a8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -296,7 +296,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) { @@ -545,25 +545,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 diff --git a/global.json b/global.json index 01df768ddc8c..1717b19c18fe 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "8.0.121", + "dotnet": "8.0.122", "runtimes": { "dotnet": [ "$(VSRedistCommonNetCoreSharedFrameworkx6480PackageVersion)" @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25555.2", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25555.2" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25562.3", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25562.3" } }