Skip to content

Commit eace168

Browse files
dotnet-maestro[bot]dkurepatannergoodingmarafjkoritzinsky
authored
[main] Source code updates from dotnet/dotnet (#117845)
* Update dependencies from https://github.com/dotnet/dotnet build 275814 Updated Dependencies: System.CommandLine (Version 2.0.0-beta7.25367.101 -> 2.0.0-beta7.25368.102) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25367.101 -> 0.11.5-alpha.25368.102) Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25367.101 -> 10.0.100-preview.7.25368.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.PackageTesting (Version 10.0.0-beta.25367.101 -> 10.0.0-beta.25368.102) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25367.101 -> 2.9.3-beta.25368.102) Microsoft.NETCore.App.Ref, runtime.native.System.IO.Ports, Microsoft.NETCore.ILAsm, Microsoft.NET.Sdk.IL, System.Text.Json, System.Reflection.Metadata, System.Reflection.MetadataLoadContext (Version 10.0.0-preview.7.25367.101 -> 10.0.0-preview.7.25368.102) Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-2.25367.101 -> 5.0.0-2.25368.102) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25367.101 -> 10.0.0-preview.25368.102) * Update dependencies from https://github.com/dotnet/dotnet build 275898 Updated Dependencies: System.CommandLine (Version 2.0.0-beta7.25368.102 -> 2.0.0-beta7.25368.105) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25368.102 -> 0.11.5-alpha.25368.105) Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport, Microsoft.DotNet.ApiCompat.Task (Version 10.0.100-preview.7.25368.102 -> 10.0.100-preview.7.25368.105) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.XUnitExtensions, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.PackageTesting (Version 10.0.0-beta.25368.102 -> 10.0.0-beta.25368.105) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25368.102 -> 2.9.3-beta.25368.105) Microsoft.NETCore.App.Ref, runtime.native.System.IO.Ports, Microsoft.NETCore.ILAsm, Microsoft.NET.Sdk.IL, System.Text.Json, System.Reflection.Metadata, System.Reflection.MetadataLoadContext (Version 10.0.0-preview.7.25368.102 -> 10.0.0-preview.7.25368.105) Microsoft.Net.Compilers.Toolset, Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.CSharp, Microsoft.CodeAnalysis.Analyzers (Version 5.0.0-2.25368.102 -> 5.0.0-2.25368.105) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25368.102 -> 10.0.0-preview.25368.105) * Update dependencies from https://github.com/dotnet/dotnet build 276277 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25368.105 -> 5.0.0-2.25372.103) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25368.105 -> 10.0.0-preview.25372.103) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25368.105 -> 10.0.100-preview.7.25372.103) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25368.105 -> 10.0.0-beta.25372.103) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25368.105 -> 0.11.5-alpha.25372.103) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25368.105 -> 2.9.3-beta.25372.103) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25368.105 -> 10.0.0-preview.7.25372.103) System.CommandLine (Version 2.0.0-beta7.25368.105 -> 2.0.0-beta7.25372.103) * Update dependencies from https://github.com/dotnet/dotnet build 276450 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25372.103 -> 5.0.0-2.25373.104) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25372.103 -> 10.0.0-preview.25373.104) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25372.103 -> 10.0.100-preview.7.25373.104) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25372.103 -> 10.0.0-beta.25373.104) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25372.103 -> 0.11.5-alpha.25373.104) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25372.103 -> 2.9.3-beta.25373.104) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25372.103 -> 10.0.0-preview.7.25373.104) System.CommandLine (Version 2.0.0-beta7.25372.103 -> 2.0.0-beta7.25373.104) * Update dependencies from https://github.com/dotnet/dotnet build 276628 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25373.104 -> 5.0.0-2.25374.102) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25373.104 -> 10.0.0-preview.25374.102) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25373.104 -> 10.0.100-preview.7.25374.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25373.104 -> 10.0.0-beta.25374.102) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25373.104 -> 0.11.5-alpha.25374.102) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25373.104 -> 2.9.3-beta.25374.102) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25373.104 -> 10.0.0-preview.7.25374.102) System.CommandLine (Version 2.0.0-beta7.25373.104 -> 2.0.0-beta7.25374.102) * Update dependencies from https://github.com/dotnet/dotnet build 276797 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25374.102 -> 5.0.0-2.25375.106) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25374.102 -> 10.0.0-preview.25375.106) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25374.102 -> 10.0.100-preview.7.25375.106) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25374.102 -> 10.0.0-beta.25375.106) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25374.102 -> 0.11.5-alpha.25375.106) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25374.102 -> 2.9.3-beta.25375.106) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25374.102 -> 10.0.0-preview.7.25375.106) System.CommandLine (Version 2.0.0-beta7.25374.102 -> 2.0.0-rc.1.25375.106) * Update dependencies from https://github.com/dotnet/dotnet build 276828 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25375.106 -> 5.0.0-2.25375.119) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.106 -> 10.0.0-preview.25375.119) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25375.106 -> 10.0.100-preview.7.25375.119) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25375.106 -> 10.0.0-beta.25375.119) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25375.106 -> 0.11.5-alpha.25375.119) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25375.106 -> 2.9.3-beta.25375.119) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25375.106 -> 10.0.0-preview.7.25375.119) System.CommandLine (Version 2.0.0-rc.1.25375.106 -> 2.0.0-rc.1.25375.119) * Update dependencies from https://github.com/dotnet/dotnet build 276981 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25375.119 -> 5.0.0-2.25377.103) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25375.119 -> 10.0.0-preview.25377.103) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25375.119 -> 10.0.100-preview.7.25377.103) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25375.119 -> 10.0.0-beta.25377.103) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25375.119 -> 0.11.5-alpha.25377.103) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25375.119 -> 2.9.3-beta.25377.103) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25375.119 -> 10.0.0-preview.7.25377.103) System.CommandLine (Version 2.0.0-rc.1.25375.119 -> 2.0.0-rc.1.25377.103) * generate the Version.Details.props file * Backflow from https://github.com/dotnet/dotnet / 8b29a16 build 277635 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 277635 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25377.103 -> 5.0.0-2.25401.103) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25377.103 -> 10.0.0-preview.25401.103) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-preview.7.25377.103 -> 10.0.100-rc.1.25401.103) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25377.103 -> 10.0.0-beta.25401.103) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25377.103 -> 0.11.5-alpha.25401.103) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25377.103 -> 2.9.3-beta.25401.103) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-preview.7.25377.103 -> 10.0.0-rc.1.25401.103) System.CommandLine (Version 2.0.0-rc.1.25377.103 -> 2.0.0-rc.1.25401.103) * Disable HotReload in WBT until we have latest blazor bits * Explicitly set RuntimeIdentifier (singular) to force NativeAOT runtime pack download * Resolve the Version.props and Version.Details.props conflicts * Update expected syntax to match changed whitespace. * Disable some tests due to [ActiveIssue("#118475")] * Also mark reverse-complement-6 for [ActiveIssue("#118475")] * Backflow from https://github.com/dotnet/dotnet / 30bc8f9 build 278224 [[ commit created by automation ]] * Update dependencies from https://github.com/dotnet/dotnet build 278224 Updated Dependencies: Microsoft.CodeAnalysis, Microsoft.CodeAnalysis.Analyzers, Microsoft.CodeAnalysis.CSharp, Microsoft.Net.Compilers.Toolset (Version 5.0.0-2.25401.103 -> 5.0.0-2.25406.102) Microsoft.CodeAnalysis.NetAnalyzers (Version 10.0.0-preview.25401.103 -> 10.0.0-preview.25406.102) Microsoft.DotNet.ApiCompat.Task, Microsoft.NET.Workload.Emscripten.Current.Manifest-10.0.100.Transport (Version 10.0.100-rc.1.25401.103 -> 10.0.100-rc.1.25406.102) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Feed, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Packaging, Microsoft.DotNet.Build.Tasks.TargetFramework, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Build.Tasks.Workloads, Microsoft.DotNet.CodeAnalysis, Microsoft.DotNet.GenAPI, Microsoft.DotNet.GenFacades, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.PackageTesting, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk, Microsoft.DotNet.XliffTasks, Microsoft.DotNet.XUnitExtensions (Version 10.0.0-beta.25401.103 -> 10.0.0-beta.25406.102) Microsoft.DotNet.Cecil (Version 0.11.5-alpha.25401.103 -> 0.11.5-alpha.25406.102) Microsoft.DotNet.XUnitAssert, Microsoft.DotNet.XUnitConsoleRunner (Version 2.9.3-beta.25401.103 -> 2.9.3-beta.25406.102) Microsoft.NET.Sdk.IL, Microsoft.NETCore.App.Ref, Microsoft.NETCore.ILAsm, runtime.native.System.IO.Ports, System.Reflection.Metadata, System.Reflection.MetadataLoadContext, System.Text.Json (Version 10.0.0-rc.1.25401.103 -> 10.0.0-rc.1.25406.102) Nuget.Frameworks, Nuget.Packaging, Nuget.ProjectModel, Nuget.Versioning (Version 6.2.4 -> 7.0.0-preview.1.102) System.CommandLine (Version 2.0.0-rc.1.25401.103 -> 2.0.0-rc.1.25406.102) * Resolve existing merge conflicts --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Djuradj Kurepa <[email protected]> Co-authored-by: Tanner Gooding <[email protected]> Co-authored-by: Marek Fišera <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]>
1 parent ac85d6f commit eace168

26 files changed

+496
-352
lines changed

eng/SignCheckExclusionsFile.txt

Lines changed: 0 additions & 15 deletions
This file was deleted.

eng/Version.Details.props

Lines changed: 237 additions & 1 deletion
Large diffs are not rendered by default.

eng/Version.Details.xml

Lines changed: 83 additions & 83 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 1 addition & 112 deletions
Large diffs are not rendered by default.

eng/common/core-templates/job/job.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ parameters:
2020
artifacts: ''
2121
enableMicrobuild: false
2222
enableMicrobuildForMacAndLinux: false
23+
microbuildUseESRP: true
2324
enablePublishBuildArtifacts: false
2425
enablePublishBuildAssets: false
2526
enablePublishTestResults: false
@@ -128,6 +129,7 @@ jobs:
128129
parameters:
129130
enableMicrobuild: ${{ parameters.enableMicrobuild }}
130131
enableMicrobuildForMacAndLinux: ${{ parameters.enableMicrobuildForMacAndLinux }}
132+
microbuildUseESRP: ${{ parameters.microbuildUseESRP }}
131133
continueOnError: ${{ parameters.continueOnError }}
132134

133135
- ${{ if and(eq(parameters.runAsPublic, 'false'), eq(variables['System.TeamProject'], 'internal')) }}:

eng/common/core-templates/jobs/jobs.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@ jobs:
8383
- template: /eng/common/core-templates/jobs/source-build.yml
8484
parameters:
8585
is1ESPipeline: ${{ parameters.is1ESPipeline }}
86-
allCompletedJobId: Source_Build_Complete
8786
${{ each parameter in parameters.sourceBuildParameters }}:
8887
${{ parameter.key }}: ${{ parameter.value }}
8988

@@ -108,8 +107,6 @@ jobs:
108107
- ${{ if eq(parameters.publishBuildAssetsDependsOn, '') }}:
109108
- ${{ each job in parameters.jobs }}:
110109
- ${{ job.job }}
111-
- ${{ if eq(parameters.enableSourceBuild, true) }}:
112-
- Source_Build_Complete
113110

114111
runAsPublic: ${{ parameters.runAsPublic }}
115112
publishAssetsImmediately: ${{ or(parameters.publishAssetsImmediately, parameters.isAssetlessBuild) }}

eng/common/core-templates/jobs/source-build.yml

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,6 @@ parameters:
22
# This template adds arcade-powered source-build to CI. A job is created for each platform, as
33
# well as an optional server job that completes when all platform jobs complete.
44

5-
# The name of the "join" job for all source-build platforms. If set to empty string, the job is
6-
# not included. Existing repo pipelines can use this job depend on all source-build jobs
7-
# completing without maintaining a separate list of every single job ID: just depend on this one
8-
# server job. By default, not included. Recommended name if used: 'Source_Build_Complete'.
9-
allCompletedJobId: ''
10-
115
# See /eng/common/core-templates/job/source-build.yml
126
jobNamePrefix: 'Source_Build'
137

@@ -31,16 +25,6 @@ parameters:
3125

3226
jobs:
3327

34-
- ${{ if ne(parameters.allCompletedJobId, '') }}:
35-
- job: ${{ parameters.allCompletedJobId }}
36-
displayName: Source-Build Complete
37-
pool: server
38-
dependsOn:
39-
- ${{ each platform in parameters.platforms }}:
40-
- ${{ parameters.jobNamePrefix }}_${{ platform.name }}
41-
- ${{ if eq(length(parameters.platforms), 0) }}:
42-
- ${{ parameters.jobNamePrefix }}_${{ parameters.defaultManagedPlatform.name }}
43-
4428
- ${{ each platform in parameters.platforms }}:
4529
- template: /eng/common/core-templates/job/source-build.yml
4630
parameters:

eng/common/core-templates/steps/install-microbuild.yml

Lines changed: 33 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,16 @@ parameters:
44
# Enable install tasks for MicroBuild on Mac and Linux
55
# Will be ignored if 'enableMicrobuild' is false or 'Agent.Os' is 'Windows_NT'
66
enableMicrobuildForMacAndLinux: false
7+
# Determines whether the ESRP service connection information should be passed to the signing plugin.
8+
# This overlaps with _SignType to some degree. We only need the service connection for real signing.
9+
# It's important that the service connection not be passed to the MicroBuildSigningPlugin task in this place.
10+
# Doing so will cause the service connection to be authorized for the pipeline, which isn't allowed and won't work for non-prod.
11+
# Unfortunately, _SignType can't be used to exclude the use of the service connection in non-real sign scenarios. The
12+
# variable is not available in template expression. _SignType has a very large proliferation across .NET, so replacing it is tough.
13+
microbuildUseESRP: true
714
# Location of the MicroBuild output folder
815
microBuildOutputFolder: '$(Build.SourcesDirectory)'
16+
917
continueOnError: false
1018

1119
steps:
@@ -21,19 +29,37 @@ steps:
2129
workingDirectory: ${{ parameters.microBuildOutputFolder }}
2230
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
2331

32+
- script: |
33+
REM Check if ESRP is disabled while SignType is real
34+
if /I "${{ parameters.microbuildUseESRP }}"=="false" if /I "$(_SignType)"=="real" (
35+
echo Error: ESRP must be enabled when SignType is real.
36+
exit /b 1
37+
)
38+
displayName: 'Validate ESRP usage (Windows)'
39+
condition: and(succeeded(), eq(variables['Agent.Os'], 'Windows_NT'))
40+
- script: |
41+
# Check if ESRP is disabled while SignType is real
42+
if [ "${{ parameters.microbuildUseESRP }}" = "false" ] && [ "$(_SignType)" = "real" ]; then
43+
echo "Error: ESRP must be enabled when SignType is real."
44+
exit 1
45+
fi
46+
displayName: 'Validate ESRP usage (Non-Windows)'
47+
condition: and(succeeded(), ne(variables['Agent.Os'], 'Windows_NT'))
48+
2449
- task: MicroBuildSigningPlugin@4
2550
displayName: Install MicroBuild plugin
2651
inputs:
2752
signType: $(_SignType)
2853
zipSources: false
2954
feedSource: https://dnceng.pkgs.visualstudio.com/_packaging/MicroBuildToolset/nuget/v3/index.json
30-
${{ if and(eq(parameters.enableMicrobuildForMacAndLinux, 'true'), ne(variables['Agent.Os'], 'Windows_NT')) }}:
31-
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
32-
useEsrpCli: true
33-
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
34-
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
35-
${{ else }}:
36-
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
55+
${{ if eq(parameters.microbuildUseESRP, true) }}:
56+
${{ if eq(parameters.enableMicrobuildForMacAndLinux, 'true') }}:
57+
azureSubscription: 'MicroBuild Signing Task (DevDiv)'
58+
useEsrpCli: true
59+
${{ elseif eq(variables['System.TeamProject'], 'DevDiv') }}:
60+
ConnectedPMEServiceName: 6cc74545-d7b9-4050-9dfa-ebefcc8961ea
61+
${{ else }}:
62+
ConnectedPMEServiceName: 248d384a-b39b-46e3-8ad5-c2c210d5e7ca
3763
env:
3864
TeamName: $(_TeamName)
3965
MicroBuildOutputFolderOverride: ${{ parameters.microBuildOutputFolder }}

eng/common/tools.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
414414

415415
# Locate Visual Studio installation or download x-copy msbuild.
416416
$vsInfo = LocateVisualStudio $vsRequirements
417-
if ($vsInfo -ne $null) {
417+
if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) {
418418
# Ensure vsInstallDir has a trailing slash
419419
$vsInstallDir = Join-Path $vsInfo.installationPath "\"
420420
$vsMajorVersion = $vsInfo.installationVersion.Split('.')[0]

global.json

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.7.25322.101",
3+
"version": "10.0.100-preview.7.25372.107",
44
"allowPrerelease": true,
55
"rollForward": "major"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-preview.7.25322.101"
8+
"dotnet": "10.0.100-preview.7.25372.107"
99
},
1010
"msbuild-sdks": {
11-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101",
12-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101",
13-
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25367.101",
11+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25406.102",
12+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25406.102",
13+
"Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25406.102",
1414
"Microsoft.Build.NoTargets": "3.7.0",
1515
"Microsoft.Build.Traversal": "3.4.0",
16-
"Microsoft.NET.Sdk.IL": "10.0.0-preview.7.25367.101"
16+
"Microsoft.NET.Sdk.IL": "10.0.0-rc.1.25406.102"
1717
}
1818
}

0 commit comments

Comments
 (0)