diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index fde6f7947f0..8b57861015f 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -191,29 +191,29 @@ Note: if the Uri is a new place, you will need to add a subscription from that p
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
-
+
https://github.com/dotnet/arcade
- 5dba308d00fabb7f13bb730bff7112b7ab5068c3
+ e9983e548f5b9638784f3b2696eb6cb3e7366548
diff --git a/eng/Versions.props b/eng/Versions.props
index 15e77f8a49c..4d7101f5e20 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -57,9 +57,9 @@
- 9.0.0-beta.25609.4
- 9.0.0-beta.25609.4
- 9.0.0-beta.25609.4
+ 9.0.0-beta.25611.4
+ 9.0.0-beta.25611.4
+ 9.0.0-beta.25611.4
17.4.0-preview-20220707-01
diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1
index 92b77347d99..c282d3ae403 100644
--- a/eng/common/internal-feed-operations.ps1
+++ b/eng/common/internal-feed-operations.ps1
@@ -26,7 +26,7 @@ function SetupCredProvider {
$url = 'https://raw.githubusercontent.com/microsoft/artifacts-credprovider/master/helpers/installcredprovider.ps1'
Write-Host "Writing the contents of 'installcredprovider.ps1' locally..."
- Invoke-WebRequest $url -OutFile installcredprovider.ps1
+ Invoke-WebRequest $url -UseBasicParsing -OutFile installcredprovider.ps1
Write-Host 'Installing plugin...'
.\installcredprovider.ps1 -Force
diff --git a/eng/common/post-build/nuget-verification.ps1 b/eng/common/post-build/nuget-verification.ps1
index ac5c69ffcac..eea88e653c9 100644
--- a/eng/common/post-build/nuget-verification.ps1
+++ b/eng/common/post-build/nuget-verification.ps1
@@ -65,7 +65,7 @@ if ($NuGetExePath) {
Write-Host "Downloading nuget.exe from $nugetExeUrl..."
$ProgressPreference = 'SilentlyContinue'
try {
- Invoke-WebRequest $nugetExeUrl -OutFile $downloadedNuGetExe
+ Invoke-WebRequest $nugetExeUrl -UseBasicParsing -OutFile $downloadedNuGetExe
$ProgressPreference = 'Continue'
} catch {
$ProgressPreference = 'Continue'
diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1
index 9b3ad8840fd..a06513a5940 100644
--- a/eng/common/tools.ps1
+++ b/eng/common/tools.ps1
@@ -266,7 +266,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) {
Retry({
Write-Host "GET $uri"
- Invoke-WebRequest $uri -OutFile $installScript
+ Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript
})
}
@@ -499,7 +499,7 @@ function InitializeXCopyMSBuild([string]$packageVersion, [bool]$install) {
Write-Host "Downloading $packageName $packageVersion"
$ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
Retry({
- Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -OutFile $packagePath
+ Invoke-WebRequest "https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/flat2/$packageName/$packageVersion/$packageName.$packageVersion.nupkg" -UseBasicParsing -OutFile $packagePath
})
if (!(Test-Path $packagePath)) {
@@ -543,23 +543,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){
Create-Directory $vsWhereDir
Write-Host 'Downloading vswhere'
Retry({
- Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe
+ Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -UseBasicParsing -OutFile $vswhereExe
})
}
- 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 120a5996d69..158a355568b 100644
--- a/global.json
+++ b/global.json
@@ -14,9 +14,9 @@
"version": "9.0.112"
},
"msbuild-sdks": {
- "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25609.4",
- "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25609.4",
- "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25609.4",
+ "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25611.4",
+ "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.25611.4",
+ "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25611.4",
"FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0",
"Microsoft.NET.Sdk.IL": "9.0.11"
},