diff --git a/eng/Version.Details.props b/eng/Version.Details.props index f41188737f0..e4449f595ca 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,31 +6,31 @@ This file should be imported by eng/Versions.props - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-beta.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 - 12.0.0-alpha.1.26480.102 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-beta.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 + 12.0.0-alpha.1.26506.117 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 11e50bcb922..2584e603aef 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 - + https://github.com/dotnet/dotnet - a2f466a2ccc2851d3c665f764a36b0cb59dd18b8 + c36f5f641e3dea81f9ab824316f7a2d168277ea3 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 305132a6d6d..64c5ed10263 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -181,10 +181,6 @@ try { if (-not $PSBoundParameters.ContainsKey('nodeReuse')) { $nodeReuse = $false } - # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded. - if (-not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) { - $msbuildMultiThreaded = $false - } } if (-not [string]::IsNullOrEmpty($binaryLogName)) { diff --git a/eng/common/core-templates/steps/astred-artifacts.yml b/eng/common/core-templates/steps/astred-artifacts.yml index ab01349d540..86420925b44 100644 --- a/eng/common/core-templates/steps/astred-artifacts.yml +++ b/eng/common/core-templates/steps/astred-artifacts.yml @@ -47,7 +47,6 @@ steps: env: ASTRED_BINLOG_DIR: ${{ parameters.binlogDir }} ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }} - condition: succeededOrFailed() continueOnError: true - pwsh: | @@ -94,12 +93,12 @@ steps: env: ASTRED_SOURCES_PATH: ${{ parameters.sourcesPath }} ASTRED_CAPTURE_PATH: ${{ parameters.capturePath }} - condition: succeededOrFailed() continueOnError: true - task: UploadAstred@0 displayName: Upload Digest to Astred - condition: and(succeededOrFailed(), eq(variables['ASTRED_DIGEST_READY'], 'true')) + condition: and(succeeded(), eq(variables['ASTRED_DIGEST_READY'], 'true')) + continueOnError: true inputs: SourcePath: ${{ parameters.capturePath }}/upload env: diff --git a/eng/common/cross/install-debs.py b/eng/common/cross/install-debs.py index 1d1dfabf7dc..e2d5ef4030a 100755 --- a/eng/common/cross/install-debs.py +++ b/eng/common/cross/install-debs.py @@ -36,6 +36,8 @@ async def download_file(session, url, dest_path, max_retries=3, retry_delay=2, t f.write(content) print(f"Downloaded {url} at {dest_path}") return + elif response.status >= 500 or response.status in (408, 429): + response.raise_for_status() else: raise Exception(f"Failed to download {url}, Status Code: {response.status}") except (asyncio.CancelledError, asyncio.TimeoutError, aiohttp.ClientError) as e: diff --git a/eng/common/msbuild.ps1 b/eng/common/msbuild.ps1 index 8076945064d..161f8e8077c 100644 --- a/eng/common/msbuild.ps1 +++ b/eng/common/msbuild.ps1 @@ -19,11 +19,6 @@ try { $nodeReuse = $false } - # MSBuild's multi-threaded mode isn't run on CI unless it was explicitly requested via -msbuildMultiThreaded. - if ($ci -and -not $PSBoundParameters.ContainsKey('msbuildMultiThreaded')) { - $msbuildMultiThreaded = $false - } - MSBuild @extraArgs } catch { diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index cea14279b85..9cb84a8a941 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -31,8 +31,9 @@ # Set to true to reuse msbuild nodes. Recommended to not reuse on CI. [bool]$nodeReuse = if (Test-Path variable:nodeReuse) { $nodeReuse } else { !$ci } -# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI. -[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { !$ci } +# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds. +# Not applied when building with msbuild.exe (VS MSBuild). +[bool]$msbuildMultiThreaded = if (Test-Path variable:msbuildMultiThreaded) { $msbuildMultiThreaded } else { $true } # Configures warning treatment in msbuild. [bool]$warnAsError = if (Test-Path variable:warnAsError) { $warnAsError } else { $true } @@ -812,8 +813,9 @@ function MSBuild() { $cmdArgs = "$($buildTool.Command) /m /nologo /clp:Summary /v:$verbosity /nr:$nodeReuse /p:ContinuousIntegrationBuild=$ci" - # Build with MSBuild's multi-threaded mode. - if ($msbuildMultiThreaded) { + # Build with MSBuild's multi-threaded mode, but not with msbuild.exe (VS MSBuild) for now. + # TODO: Enable for VS MSBuild as well: https://github.com/dotnet/dotnet/issues/9989 + if ($msbuildMultiThreaded -and [System.IO.Path]::GetFileName($buildTool.Path) -ne 'msbuild.exe') { $cmdArgs += ' -mt' } diff --git a/eng/common/tools.sh b/eng/common/tools.sh index fdbc19243f1..3b4a5ac5142 100755 --- a/eng/common/tools.sh +++ b/eng/common/tools.sh @@ -60,13 +60,9 @@ else node_reuse=${node_reuse:-true} fi -# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for local builds and not run on CI. +# Set to true to build with MSBuild's multi-threaded mode (-mt). Enabled by default for both local and CI builds. msbuild_multi_threaded=$(NormalizeBoolArg "${msbuild_multi_threaded:-}") -if [[ "$ci" == true ]]; then - msbuild_multi_threaded=${msbuild_multi_threaded:-false} -else - msbuild_multi_threaded=${msbuild_multi_threaded:-true} -fi +msbuild_multi_threaded=${msbuild_multi_threaded:-true} # Configures warning treatment in msbuild. warn_as_error=$(NormalizeBoolArg "${warn_as_error:-}") diff --git a/global.json b/global.json index 459823ecd23..1a73c1b4166 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "11.0.100-rc.1.26420.103", + "version": "12.0.100-alpha.1.26480.102", "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": "11.0.100-rc.1.26420.103", + "dotnet": "12.0.100-alpha.1.26480.102", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCoreAppRefPackageVersion)" @@ -24,11 +24,11 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26480.102", - "Microsoft.DotNet.CMake.Sdk": "12.0.0-beta.26480.102", - "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26480.102", + "Microsoft.DotNet.Arcade.Sdk": "12.0.0-beta.26506.117", + "Microsoft.DotNet.CMake.Sdk": "12.0.0-beta.26506.117", + "Microsoft.DotNet.Helix.Sdk": "12.0.0-beta.26506.117", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", - "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26480.102" + "Microsoft.NET.Sdk.IL": "12.0.0-alpha.1.26506.117" }, "native-tools": { "cmake": "latest" diff --git a/src/System.Windows.Forms.Analyzers/tests/UnitTests/CurrentReferences.cs b/src/System.Windows.Forms.Analyzers/tests/UnitTests/CurrentReferences.cs index 70287cc7da8..4bf002c7a82 100644 --- a/src/System.Windows.Forms.Analyzers/tests/UnitTests/CurrentReferences.cs +++ b/src/System.Windows.Forms.Analyzers/tests/UnitTests/CurrentReferences.cs @@ -44,7 +44,7 @@ static CurrentReferences() if (!TryGetNetCoreVersion(rootFolderPath, out string? tfm, out string? netCoreRefsVersion)) { - throw new InvalidOperationException("Could not resolve the configured SDK's runtime reference assemblies."); + throw new InvalidOperationException("Could not resolve the analyzer test runtime reference assemblies."); } Tfm = tfm; @@ -106,13 +106,25 @@ private static bool TryGetNetCoreVersion( tfm = default; netCoreRefsVersion = default; - if (!TryGetSdkVersion(rootFolderPath, out string? version)) + string testRuntimeConfigPath = Path.ChangeExtension( + typeof(CurrentReferences).Assembly.Location, + ".runtimeconfig.json"); + + if (!File.Exists(testRuntimeConfigPath) + || !TryGetSdkVersion(rootFolderPath, out string? sdkVersion)) { return false; } - string runtimeConfigPath = Path.Join(rootFolderPath, ".dotnet", "sdk", version, "dotnet.runtimeconfig.json"); - (tfm, netCoreRefsVersion) = ParseRuntimeConfiguration(File.ReadAllText(runtimeConfigPath)); + string sdkRuntimeConfigPath = Path.Join( + rootFolderPath, + ".dotnet", + "sdk", + sdkVersion, + "dotnet.runtimeconfig.json"); + + (tfm, _) = ParseRuntimeConfiguration(File.ReadAllText(testRuntimeConfigPath)); + (_, netCoreRefsVersion) = ParseRuntimeConfiguration(File.ReadAllText(sdkRuntimeConfigPath)); return true; }