diff --git a/NuGet.config b/NuGet.config
index 28f50904940..d91199b6731 100644
--- a/NuGet.config
+++ b/NuGet.config
@@ -4,7 +4,7 @@
-
+
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
index 841f1c5c581..cf52eaf7c4f 100644
--- a/eng/Version.Details.props
+++ b/eng/Version.Details.props
@@ -6,9 +6,9 @@ This file should be imported by eng/Versions.props
- 10.0.0-beta.25628.102
- 10.0.0-beta.25628.102
- 10.0.0-beta.25628.102
+ 10.0.0-beta.25631.101
+ 10.0.0-beta.25631.101
+ 10.0.0-beta.25631.101
10.0.3
10.0.3
10.0.3
@@ -16,10 +16,10 @@ This file should be imported by eng/Versions.props
10.0.3
10.0.3
10.0.3
- 10.0.3-servicing.25628.102
+ 10.0.3-servicing.25631.101
10.0.3
10.0.3
- 10.0.3-servicing.25628.102
+ 10.0.3-servicing.25631.101
10.0.3
10.0.3
10.0.3
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dabae76bd45..3d0e78a5798 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -1,80 +1,80 @@
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
-
+
https://github.com/dotnet/dotnet
- 34ad7c3e9a107797d5005c2f12f43107a25a01a5
+ 7aa15f07c40a487d471b5df81e26e6b8c06c9461
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 db416f7c7d6..85d72deebf7 100644
--- a/global.json
+++ b/global.json
@@ -18,7 +18,7 @@
}
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25628.102",
- "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25628.102"
+ "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25631.101",
+ "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25631.101"
}
}