diff --git a/NuGet.config b/NuGet.config index 0ec82d8d8f7..fddaa7dd83e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -10,7 +10,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1284546fc9b..0839df23812 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.25612.111 - 10.0.0-beta.25612.111 - 0.11.5-alpha.25612.111 - 10.0.0-beta.25612.111 - 10.0.2-servicing.25612.111 - 10.0.2 - 10.0.2 - 10.0.102-servicing.25612.111 - 10.0.2 - 10.0.102 + 10.0.0-beta.26057.111 + 10.0.0-beta.26057.111 + 0.11.5-alpha.26057.111 + 10.0.0-beta.26057.111 + 10.0.3-servicing.26057.111 + 10.0.3 + 10.0.3 + 10.0.103-servicing.26057.111 + 10.0.3 + 10.0.103 26.0.11017 18.5.9227 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ac46590beb8..fb921bd63a6 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 @@ -95,25 +95,25 @@ - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 https://github.com/dotnet/xharness 39545dffac1cee604915785456394ef00a4a5456 - + https://github.com/dotnet/dotnet - 9441e5bb35fae9e956fdac4bd33ee537175e6d60 + 4ef9fba1ed958b047163527960c27baf2883f835 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 9634fbe97db..af5148165bf 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.102-servicing.25612.111", + "version": "10.0.103-servicing.26057.111", "paths": [ "builds/downloads/dotnet", "$host$" @@ -8,9 +8,9 @@ "errorMessage": "The .NET SDK could not be found, please run 'make dotnet -C builds'." }, "tools": { - "dotnet": "10.0.102-servicing.25612.111" + "dotnet": "10.0.103-servicing.26057.111" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25612.111" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.111" } }