diff --git a/NuGet.config b/NuGet.config index 25c3f0ca817..c9fd900d30b 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 4ef2c7e93d4..698befd0eeb 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,7 +6,7 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25628.102 + 10.0.0-beta.25630.104 2.0.3 10.0.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index cd1e26c99d2..711f952f5dc 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,16 +1,16 @@ - + https://github.com/dotnet/dotnet - 34ad7c3e9a107797d5005c2f12f43107a25a01a5 + 7bf30a3f522e388733a32206091af603b7272557 - + https://github.com/dotnet/dotnet - 34ad7c3e9a107797d5005c2f12f43107a25a01a5 + 7bf30a3f522e388733a32206091af603b7272557 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index bef4affa4a4..049fe6db994 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -560,19 +560,26 @@ function LocateVisualStudio([object]$vsRequirements = $null){ }) } - if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } + if (!$vsRequirements) { + if (Get-Member -InputObject $GlobalJson.tools -Name 'vs' -ErrorAction SilentlyContinue) { + $vsRequirements = $GlobalJson.tools.vs + } else { + $vsRequirements = $null + } + } + $args = @('-latest', '-format', 'json', '-requires', 'Microsoft.Component.MSBuild', '-products', '*') if (!$excludePrereleaseVS) { $args += '-prerelease' } - if (Get-Member -InputObject $vsRequirements -Name 'version') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'version' -ErrorAction SilentlyContinue)) { $args += '-version' $args += $vsRequirements.version } - if (Get-Member -InputObject $vsRequirements -Name 'components') { + if ($vsRequirements -and (Get-Member -InputObject $vsRequirements -Name 'components' -ErrorAction SilentlyContinue)) { foreach ($component in $vsRequirements.components) { $args += '-requires' $args += $component diff --git a/global.json b/global.json index 23fdda13d1e..ec7fac472d5 100644 --- a/global.json +++ b/global.json @@ -13,6 +13,6 @@ "dotnet": "10.0.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25628.102" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25630.104" } }