diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a66c7e86ced491..6da9002f248f20 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 3e74b96870050adc82beed3934abf93d40716012 - + https://github.com/dotnet/arcade - 9eaf7b289d5003a94ee23658f057a6c06ddcd570 + ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 3d7aae882fa9e8..b2bd5340d3198f 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -85,22 +85,22 @@ 9.0.109 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 2.9.0-beta.25555.4 - 9.0.0-beta.25555.4 - 2.9.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 - 9.0.0-beta.25555.4 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 2.9.0-beta.25626.6 + 9.0.0-beta.25626.6 + 2.9.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 + 9.0.0-beta.25626.6 1.4.0 diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 5baedac1e03dd4..1037ccedcb556c 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -65,7 +65,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-mariner-2 + image: 1es-azurelinux-3 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 662b9fcce154fc..ddf8c2e00d8035 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: sourceIndexBuildCommand: powershell -NoLogo -NoProfile -ExecutionPolicy Bypass -Command "eng/common/build.ps1 -restore -build -binarylog -ci" preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog - condition: '' + condition: eq(variables['Build.SourceBranch'], 'refs/heads/main') dependsOn: '' pool: '' is1ESPipeline: '' diff --git a/eng/common/core-templates/steps/source-build.yml b/eng/common/core-templates/steps/source-build.yml index 0718e4ba902e8f..7846584d2a77ee 100644 --- a/eng/common/core-templates/steps/source-build.yml +++ b/eng/common/core-templates/steps/source-build.yml @@ -41,7 +41,7 @@ steps: # in the default public locations. internalRuntimeDownloadArgs= if [ '$(dotnetbuilds-internal-container-read-token-base64)' != '$''(dotnetbuilds-internal-container-read-token-base64)' ]; then - internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://dotnetbuilds.blob.core.windows.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://dotnetbuilds.blob.core.windows.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' + internalRuntimeDownloadArgs='/p:DotNetRuntimeSourceFeed=https://ci.dot.net/internal /p:DotNetRuntimeSourceFeedKey=$(dotnetbuilds-internal-container-read-token-base64) --runtimesourcefeed https://ci.dot.net/internal --runtimesourcefeedkey $(dotnetbuilds-internal-container-read-token-base64)' fi buildConfig=Release diff --git a/eng/common/internal-feed-operations.ps1 b/eng/common/internal-feed-operations.ps1 index 92b77347d9904e..c282d3ae403a09 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 ac5c69ffcac59a..eea88e653c911d 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 9b3ad8840fdb28..a06513a5940717 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 8e4f40830f5042..0c66b3f266c358 100644 --- a/global.json +++ b/global.json @@ -1,16 +1,16 @@ { "sdk": { - "version": "9.0.111", + "version": "9.0.112", "allowPrerelease": true, "rollForward": "major" }, "tools": { - "dotnet": "9.0.111" + "dotnet": "9.0.112" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25555.4", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25555.4", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25555.4", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.25626.6", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-rtm.24511.16"