diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 1ee1b8728682..0aee2f59be33 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props - 11.0.0-beta.25611.103 - 11.0.0-beta.25611.103 - 0.11.5-alpha.25611.103 - 11.0.0-beta.25611.103 - 11.0.0-alpha.1.25611.103 - 11.0.0-alpha.1.25611.103 - 11.0.0-alpha.1.25611.103 - 11.0.100-alpha.1.25611.103 - 11.0.0-alpha.1.25611.103 - 11.0.100-alpha.25611.103 + 11.0.0-beta.25616.107 + 11.0.0-beta.25616.107 + 0.11.5-alpha.25616.107 + 11.0.0-beta.25616.107 + 11.0.0-alpha.1.25616.107 + 11.0.0-alpha.1.25616.107 + 11.0.0-alpha.1.25616.107 + 11.0.100-alpha.1.25616.107 + 11.0.0-alpha.1.25616.107 + 11.0.100-alpha.25616.107 26.0.11017 26.0.11017 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 82009fd7f809..8430c4455b13 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,29 +1,29 @@ - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 @@ -44,25 +44,25 @@ - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 https://github.com/dotnet/xharness 88399512021dfa8b5f45d91f84c8ce6f0959b127 - + https://github.com/dotnet/dotnet - a137035987f8faebec182016349982241a2eebd1 + 5059bb6c1e9449762ef058ada17e2ddbbff2ac67 diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d990..c282d3ae403a 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 ac5c69ffcac5..eea88e653c91 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 1556562c68f0..f6bde2683794 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -273,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -506,7 +506,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)) { @@ -552,23 +552,30 @@ function LocateVisualStudio([object]$vsRequirements = $null){ Write-Host "Downloading vswhere $vswhereVersion" $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit 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 35ddc59f9114..9b13019129f2 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-alpha.1.25611.103", + "version": "11.0.100-alpha.1.25616.107", "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": "11.0.100-alpha.1.25611.103" + "dotnet": "11.0.100-alpha.1.25616.107" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25611.103" + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25616.107" } }