Skip to content

Commit 225ece2

Browse files
dotnet-maestro[bot]wtgodbeCopilot
authored
[main] Source code updates from dotnet/dotnet (#68791)
* Backflow from https://github.com/dotnet/dotnet / 18aca85 build 328502 Diff: https://github.com/dotnet/dotnet/compare/e9284d0ab05f34fc05536ef7889108f8acda4ca6..18aca855818ca5e09075637626229cd6d73011b9 From: dotnet/dotnet@e9284d0 To: dotnet/dotnet@18aca85 [[ commit created by automation ]] * Update dependencies from build 328502 Updated Dependencies: Microsoft.NET.Runtime.WebAssembly.Sdk, Microsoft.NETCore.BrowserDebugHost.Transport, Microsoft.NET.Runtime.MonoAOTCompiler.Task, dotnet-ef, Microsoft.Bcl.AsyncInterfaces, Microsoft.Bcl.Cryptography, Microsoft.Bcl.TimeProvider, Microsoft.EntityFrameworkCore, Microsoft.EntityFrameworkCore.Design, Microsoft.EntityFrameworkCore.InMemory, Microsoft.EntityFrameworkCore.Relational, Microsoft.EntityFrameworkCore.Sqlite, Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools, Microsoft.Extensions.Caching.Abstractions, Microsoft.Extensions.Caching.Memory, Microsoft.Extensions.Configuration, Microsoft.Extensions.Configuration.Abstractions, Microsoft.Extensions.Configuration.Binder, Microsoft.Extensions.Configuration.CommandLine, Microsoft.Extensions.Configuration.EnvironmentVariables, Microsoft.Extensions.Configuration.FileExtensions, Microsoft.Extensions.Configuration.Ini, Microsoft.Extensions.Configuration.Json, Microsoft.Extensions.Configuration.UserSecrets, Microsoft.Extensions.Configuration.Xml, Microsoft.Extensions.DependencyInjection, Microsoft.Extensions.DependencyInjection.Abstractions, Microsoft.Extensions.DependencyModel, Microsoft.Extensions.Diagnostics, Microsoft.Extensions.Diagnostics.Abstractions, Microsoft.Extensions.FileProviders.Abstractions, Microsoft.Extensions.FileProviders.Composite, Microsoft.Extensions.FileProviders.Physical, Microsoft.Extensions.FileSystemGlobbing, Microsoft.Extensions.HostFactoryResolver.Sources, Microsoft.Extensions.Hosting, Microsoft.Extensions.Hosting.Abstractions, Microsoft.Extensions.Http, Microsoft.Extensions.Logging, Microsoft.Extensions.Logging.Abstractions, Microsoft.Extensions.Logging.Configuration, Microsoft.Extensions.Logging.Console, Microsoft.Extensions.Logging.Debug, Microsoft.Extensions.Logging.EventLog, Microsoft.Extensions.Logging.EventSource, Microsoft.Extensions.Logging.TraceSource, Microsoft.Extensions.Options, Microsoft.Extensions.Options.ConfigurationExtensions, Microsoft.Extensions.Options.DataAnnotations, Microsoft.Extensions.Primitives, Microsoft.Internal.Runtime.AspNetCore.Transport, Microsoft.NETCore.App.Ref, Microsoft.NETCore.Platforms, System.Collections.Immutable, System.Composition, System.Configuration.ConfigurationManager, System.Diagnostics.DiagnosticSource, System.Diagnostics.EventLog, System.Diagnostics.PerformanceCounter, System.DirectoryServices.Protocols, System.Formats.Asn1, System.Formats.Cbor, System.IO.Hashing, System.IO.Pipelines, System.Memory.Data, System.Net.Http.Json, System.Net.Http.WinHttpHandler, System.Net.ServerSentEvents, System.Numerics.Tensors, System.Reflection.Metadata, System.Resources.Extensions, System.Runtime.Caching, System.Security.Cryptography.Pkcs, System.Security.Cryptography.Xml, System.Security.Permissions, System.ServiceProcess.ServiceController, System.Text.Encodings.Web, System.Text.Json, System.Threading.AccessControl, System.Threading.Channels, System.Threading.RateLimiting (Version 11.0.0-rc.1.26411.119 -> 11.0.0-rc.1.26424.125) Microsoft.DotNet.Arcade.Sdk, Microsoft.DotNet.Build.Tasks.Archives, Microsoft.DotNet.Build.Tasks.Installers, Microsoft.DotNet.Build.Tasks.Templating, Microsoft.DotNet.Helix.Sdk, Microsoft.DotNet.RemoteExecutor, Microsoft.DotNet.SharedFramework.Sdk (Version 11.0.0-beta.26411.119 -> 11.0.0-beta.26424.125) Microsoft.DotNet.Helix.JobMonitor (Version 11.0.0-beta.26412.5 -> 11.0.0-beta.26424.125) Microsoft.Web.Xdt (Version 3.3.0-rc.1.26411.119 -> 3.3.0-rc.1.26424.125) NuGet.Frameworks, NuGet.Packaging, NuGet.Versioning (Version 7.11.0-rc.65534 -> 7.11.0-rc.42525) [[ commit created by automation ]] * Add dotnet12 and dotnet12-transport package sources Added new package sources for dotnet12 and dotnet12-transport. * Update MicrosoftBuildLocatorVersion Updated MicrosoftBuildLocatorVersion from 1.2.6 to 1.11.2. * Fix OpenAPI tests with NativeAOT CLI Suppress the locator assembly copy check for the existing NuGet.Frameworks reference. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: William Godbe <wigodbe@microsoft.com> Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 5824abf commit 225ece2

15 files changed

Lines changed: 341 additions & 315 deletions

.config/dotnet-tools.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
]
1010
},
1111
"dotnet-ef": {
12-
"version": "11.0.0-rc.1.26411.119",
12+
"version": "11.0.0-rc.1.26424.125",
1313
"commands": [
1414
"dotnet-ef"
1515
]
@@ -27,7 +27,7 @@
2727
]
2828
},
2929
"microsoft.dotnet.helix.jobmonitor": {
30-
"version": "11.0.0-beta.26424.2",
30+
"version": "11.0.0-beta.26424.125",
3131
"commands": [
3232
"dotnet-helix-job-monitor"
3333
]

NuGet.config

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,8 @@
99
<!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
1010
<add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
1111
<add key="dotnet-tools" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json" />
12+
<add key="dotnet12" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet12/nuget/v3/index.json" />
13+
<add key="dotnet12-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet12-transport/nuget/v3/index.json" />
1214
<add key="dotnet11" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11/nuget/v3/index.json" />
1315
<add key="dotnet11-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet11-transport/nuget/v3/index.json" />
1416
<add key="dotnet10" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet10/nuget/v3/index.json" />

eng/Version.Details.props

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

eng/Version.Details.xml

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

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@
106106
<MicrosoftCodeAnalysisRazorVersion>6.0.0</MicrosoftCodeAnalysisRazorVersion>
107107
<!-- Partner teams -->
108108
<MicrosoftAzureSignalRVersion>1.2.0</MicrosoftAzureSignalRVersion>
109-
<MicrosoftBuildLocatorVersion>1.2.6</MicrosoftBuildLocatorVersion>
109+
<MicrosoftBuildLocatorVersion>1.11.2</MicrosoftBuildLocatorVersion>
110110
<!--
111111
Versions of Microsoft.CodeAnalysis packages referenced by analyzers shipped in the SDK.
112112
This need to be pinned since they're used in 3.1 apps and need to be loadable in VS 2019.

eng/common/SetupNugetSources.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ if ($disabledSources -ne $null) {
173173
Write-Host "Checking for any darc-int disabled package sources in the disabledPackageSources node"
174174
EnableMaestroInternalPackageSources -DisabledPackageSources $disabledSources -Creds $creds -Credential $feedCredential
175175
}
176-
$dotnetVersions = @('5','6','7','8','9','10')
176+
$dotnetVersions = @('5','6','7','8','9','10','11')
177177

178178
foreach ($dotnetVersion in $dotnetVersions) {
179179
$feedPrefix = "dotnet" + $dotnetVersion;

eng/common/SetupNugetSources.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ if [ "$?" == "0" ]; then
169169
EnableMaestroInternalPackageSources
170170
fi
171171

172-
DotNetVersions=('5' '6' '7' '8' '9' '10')
172+
DotNetVersions=('5' '6' '7' '8' '9' '10' '11')
173173

174174
for DotNetVersion in ${DotNetVersions[@]} ; do
175175
FeedPrefix="dotnet${DotNetVersion}";

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

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -84,6 +84,15 @@ parameters:
8484
type: boolean
8585
default: false
8686

87+
# Controls per-test output attachments. Defaults to Failed.
88+
- name: testResultAttachmentMode
89+
type: string
90+
default: Failed
91+
values:
92+
- Failed
93+
- All
94+
- None
95+
8796
# Advanced: optional pipeline artifact (produced earlier in this run) that contains the tool
8897
# nupkg. When set, the artifact is downloaded and the tool is installed from the nupkg into
8998
# a local tool-path; this bypasses the repo's .config/dotnet-tools.json manifest and is
@@ -210,6 +219,7 @@ jobs:
210219
211220
organization='${{ parameters.organization }}'
212221
repository='${{ parameters.repository }}'
222+
testResultAttachmentMode='${{ parameters.testResultAttachmentMode }}'
213223
214224
# Fall back to Azure DevOps-provided environment variables when the caller did not
215225
# supply organization / repository explicitly. BUILD_REPOSITORY_NAME is typically
@@ -232,6 +242,9 @@ jobs:
232242
233243
if [ -n "$organization" ]; then toolArgs+=( --organization "$organization" ); fi
234244
if [ -n "$repository" ]; then toolArgs+=( --repository "$repository" ); fi
245+
if [ -n "$testResultAttachmentMode" ]; then
246+
toolArgs+=( --test-result-attachment-mode "$testResultAttachmentMode" )
247+
fi
235248
236249
# Build.Reason and Build.SourceBranch are required to derive the Helix source filter
237250
# the same way the Helix SDK submitter does (PR -> 'pr', internal -> 'official',

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

Lines changed: 13 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,11 @@ parameters:
1414
# exist, and any pipeline that sets this to '' fall back to PAT-based auth via the CeapexPat parameter.
1515
CeapexServiceConnection: 'dnceng-onelocbuild-ceapex'
1616

17-
# GitHub App authentication for the OneLoc check-in PR (dnceng/internal only).
18-
# The infrastructure identifiers are centralized here and the App path is enabled by default.
19-
# DevDiv requires its own project-scoped service connection before this path can be enabled there.
17+
# GitHub App authentication for the OneLoc check-in PR.
18+
# dnceng/internal and DevDiv/DevDiv are enabled by default with their project-scoped service
19+
# connections. Other projects must explicitly opt in after provisioning equivalent infrastructure.
2020
UseGitHubAppAuthentication: true
21+
UseGitHubAppAuthenticationInOtherProjects: false
2122
GitHubAppServiceConnection: 'dnceng-oneloc-githubapp'
2223
GitHubAppClientId: 'Iv23lijBU8x3gc9lDOc9'
2324
GitHubAppKeyVaultName: 'EngKeyVault'
@@ -98,13 +99,16 @@ jobs:
9899
outputVariableName: 'CeapexEntraToken'
99100
condition: ${{ parameters.condition }}
100101

101-
# Mint a short-lived GitHub App installation token for the loc check-in PR (dnceng/internal only).
102-
# All other projects fall back to PAT-based auth, since the app service connection is scoped to dnceng/internal.
103-
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}:
102+
# Mint a short-lived GitHub App installation token for the loc check-in PR. Use the connection
103+
# provisioned in each supported project; other projects must explicitly opt in and override it.
104+
- ${{ if and(eq(parameters.RepoType, 'gitHub'), eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
104105
- template: /eng/common/core-templates/steps/get-github-app-token.yml
105106
parameters:
106107
is1ESPipeline: ${{ parameters.is1ESPipeline }}
107-
azureSubscription: ${{ parameters.GitHubAppServiceConnection }}
108+
${{ if and(eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.GitHubAppServiceConnection, 'dnceng-oneloc-githubapp')) }}:
109+
azureSubscription: 'devdiv-oneloc-githubapp'
110+
${{ else }}:
111+
azureSubscription: ${{ parameters.GitHubAppServiceConnection }}
108112
keyVaultName: ${{ parameters.GitHubAppKeyVaultName }}
109113
keyName: ${{ parameters.GitHubAppKeyName }}
110114
appClientId: ${{ parameters.GitHubAppClientId }}
@@ -133,9 +137,9 @@ jobs:
133137
patVariable: ${{ parameters.CeapexPat }}
134138
${{ if eq(parameters.RepoType, 'gitHub') }}:
135139
repoType: ${{ parameters.RepoType }}
136-
${{ if and(eq(parameters.UseGitHubAppAuthentication, true), eq(variables['System.TeamProject'], 'internal')) }}:
140+
${{ if and(eq(parameters.UseGitHubAppAuthentication, true), or(eq(variables['System.TeamProject'], 'internal'), eq(variables['System.TeamProject'], 'DevDiv'), eq(parameters.UseGitHubAppAuthenticationInOtherProjects, true))) }}:
137141
gitHubPatVariable: "$(GitHubAppInstallationToken)"
138-
${{ if or(eq(parameters.UseGitHubAppAuthentication, false), ne(variables['System.TeamProject'], 'internal')) }}:
142+
${{ else }}:
139143
gitHubPatVariable: "${{ parameters.GithubPat }}"
140144
${{ if ne(parameters.MirrorRepo, '') }}:
141145
isMirrorRepoSelected: true

eng/common/core-templates/post-build/post-build.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -236,6 +236,7 @@ stages:
236236
StageLabel: 'Validation'
237237
JobLabel: 'Signing'
238238
BinlogToolVersion: $(BinlogToolVersion)
239+
enableInternalRuntimes: false
239240

240241
# SourceLink validation has been removed — the underlying CLI tool
241242
# (targeting netcoreapp2.1) has not functioned for years.

0 commit comments

Comments
 (0)