diff --git a/eng/Version.Details.props b/eng/Version.Details.props index d6fb60c845d..b18d615e7c4 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 + 11.0.0-beta.25613.101 + 11.0.0-beta.25613.101 + 11.0.0-beta.25613.101 + 11.0.0-beta.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 + 11.0.0-alpha.1.25613.101 10.0.0-rc.1.25609.7 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3cc6f28a563..c2dfae3a030 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 7b194d1da9c86db654df89ab762a07ac714a95ba - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + dc803dea8a5917a87a812a05bae596c299368a43 diff --git a/eng/Versions.props b/eng/Versions.props index 3e1c63ebf21..b5b608fc520 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -3,11 +3,11 @@ - 10 + 11 0 0 - rc - 3 + alpha + 1 $(MajorVersion).$(MinorVersion).$(PatchVersion) diff --git a/eng/common/core-templates/job/job.yml b/eng/common/core-templates/job/job.yml index cb4ccc023a3..748c4f07a64 100644 --- a/eng/common/core-templates/job/job.yml +++ b/eng/common/core-templates/job/job.yml @@ -73,6 +73,8 @@ jobs: templateContext: ${{ parameters.templateContext }} variables: + - name: AllowPtrToDetectTestRunRetryFiles + value: true - ${{ if ne(parameters.enableTelemetry, 'false') }}: - name: DOTNET_CLI_TELEMETRY_PROFILE value: '$(Build.Repository.Uri)' diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d..76baf5c2725 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -3,7 +3,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: '' @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: @@ -41,4 +41,4 @@ jobs: - template: /eng/common/core-templates/steps/source-index-stage1-publish.yml parameters: - binLogPath: ${{ parameters.binLogPath }} \ No newline at end of file + binLogPath: ${{ parameters.binLogPath }} diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 6f0929c039b..06864cd1feb 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: 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/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36..b64b66a6275 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4bc50bd568c..f6bde268379 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -157,9 +157,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { return $global:_DotNetInstallDir } - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - $env:DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we do not need all ASP.NET packages restored. $env:DOTNET_NOLOGO=1 @@ -225,7 +222,6 @@ function InitializeDotNetCli([bool]$install, [bool]$createSdkLocationFile) { # Make Sure that our bootstrapped dotnet cli is available in future steps of the Azure Pipelines build Write-PipelinePrependPath -Path $dotnetRoot - Write-PipelineSetVariable -Name 'DOTNET_MULTILEVEL_LOOKUP' -Value '0' Write-PipelineSetVariable -Name 'DOTNET_NOLOGO' -Value '1' return $global:_DotNetInstallDir = $dotnetRoot @@ -277,7 +273,7 @@ function GetDotNetInstallScript([string] $dotnetRoot) { Retry({ Write-Host "GET $uri" - Invoke-WebRequest $uri -OutFile $installScript + Invoke-WebRequest $uri -UseBasicParsing -OutFile $installScript }) } @@ -394,8 +390,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { @@ -510,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)) { @@ -556,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/eng/common/tools.sh b/eng/common/tools.sh index c1841c9dfd0..6c121300ac7 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -115,9 +115,6 @@ function InitializeDotNetCli { local install=$1 - # Don't resolve runtime, shared framework, or SDK from other locations to ensure build determinism - export DOTNET_MULTILEVEL_LOOKUP=0 - # Disable first run since we want to control all package sources export DOTNET_NOLOGO=1 @@ -166,7 +163,6 @@ function InitializeDotNetCli { # build steps from using anything other than what we've downloaded. Write-PipelinePrependPath -path "$dotnet_root" - Write-PipelineSetVariable -name "DOTNET_MULTILEVEL_LOOKUP" -value "0" Write-PipelineSetVariable -name "DOTNET_NOLOGO" -value "1" # return value diff --git a/eng/copy-wpf.ps1 b/eng/copy-wpf.ps1 index 51d55c06eba..bcab07db763 100644 --- a/eng/copy-wpf.ps1 +++ b/eng/copy-wpf.ps1 @@ -159,7 +159,7 @@ elseif($testhost) if (LocationIsSharedInstall $destination $arch) { # There is nothing fundamentally different about a test host installation versus trying to copy - # into program files. We just won't set the DOTNET_ROOT or DOTNET_MULTILEVEL_LOOKUP. + # into program files. We just won't set the DOTNET_ROOT. Write-Host "Copying to Program Files, skipping setting environment variables." } else @@ -168,9 +168,6 @@ elseif($testhost) $dotnetVariableToSet = if ($arch -eq "x86") { "env:DOTNET_ROOT(x86)"} else { "env:DOTNET_ROOT"} Write-Host "** Setting $dotnetVariableToSet to $destination **" Set-Item -Path $dotnetVariableToSet -Value $destination - - Write-Host "** Setting env:DOTNET_MULTILEVEL_LOOKUP to 0 **" - $env:DOTNET_MULTILEVEL_LOOKUP=0 } } else diff --git a/global.json b/global.json index 64871291cf8..4ff5f50f7ea 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107", + "dotnet": "10.0.100", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25574.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25613.101", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25613.101", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": { diff --git a/start-vs.cmd b/start-vs.cmd index fd1f22fa298..9560f09eac9 100644 --- a/start-vs.cmd +++ b/start-vs.cmd @@ -7,9 +7,6 @@ setlocal enabledelayedexpansion set DOTNET_ROOT=%~dp0.dotnet set DOTNET_ROOT(x86)=%~dp0.dotnet\x86 -:: This tells .NET Core not to go looking for .NET Core in other places -set DOTNET_MULTILEVEL_LOOKUP=0 - :: Put our local dotnet.exe on PATH first so Visual Studio knows which one to use set PATH=%DOTNET_ROOT%;%PATH%