diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ff7cb7a830..37895a4b42 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,21 +1,21 @@ - + https://github.com/dotnet/arcade - dd6311861abf91f883a5f6aa3b13ff095ed44179 + 8adf115288fa51feaa30d063b946478054c7f7b4 - + https://github.com/dotnet/arcade - dd6311861abf91f883a5f6aa3b13ff095ed44179 + 8adf115288fa51feaa30d063b946478054c7f7b4 - + https://github.com/dotnet/arcade - dd6311861abf91f883a5f6aa3b13ff095ed44179 + 8adf115288fa51feaa30d063b946478054c7f7b4 - + https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage - a0b885149f99dcd0e7d859f1b431a4fe7bd0c7ca + a604ab642a5d008903941948f7d56cea9285613d https://github.com/microsoft/testfx diff --git a/eng/Versions.props b/eng/Versions.props index 2c5f11499e..abb42fcfcf 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -7,8 +7,8 @@ preview - 11.0.0-beta.25611.5 - 18.3.0-preview.25611.1 + 11.0.0-beta.25612.6 + 18.3.0-preview.25612.1 4.1.0-preview.25611.7 2.1.0-preview.25611.7 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index e8e9f7615f..f6bde26837 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -556,19 +556,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 9e5d4775a1..ed4fc93f6e 100644 --- a/global.json +++ b/global.json @@ -37,7 +37,7 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.5", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25612.6", "MSBuild.Sdk.Extras": "3.0.44" } }