Skip to content

Commit 3ac409d

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
committed
Update dependencies from https://github.com/dotnet/dotnet build 20260826.2
On relative base path root Microsoft.NET.Runtime.MonoTargets.Sdk , Microsoft.NET.ILLink , Microsoft.NET.ILLink.Tasks , Microsoft.NETCore.App.Ref From Version 11.0.0-preview.7.26365.101 -> To Version 11.0.0-rc.2.26426.102 Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Feed , Microsoft.DotNet.SharedFramework.Sdk From Version 11.0.0-beta.26365.101 -> To Version 11.0.0-beta.26426.102 Microsoft.DotNet.Cecil From Version 0.11.5-preview.26365.101 -> To Version 0.11.5-preview.26426.102 Microsoft.NET.Sdk , Microsoft.TemplateEngine.Authoring.Tasks From Version 11.0.100-preview.7.26365.101 -> To Version 11.0.100-rc.2.26426.102
1 parent 976c0be commit 3ac409d

8 files changed

Lines changed: 87 additions & 51 deletions

File tree

‎eng/Version.Details.props‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,16 @@ This file should be imported by eng/Versions.props
66
<Project>
77
<PropertyGroup>
88
<!-- dotnet-dotnet dependencies -->
9-
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetArcadeSdkPackageVersion>
10-
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetBuildTasksFeedPackageVersion>
11-
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26411.119</MicrosoftDotNetCecilPackageVersion>
12-
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26411.119</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13-
<MicrosoftNETILLinkPackageVersion>11.0.0-rc.1.26411.119</MicrosoftNETILLinkPackageVersion>
14-
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-rc.1.26411.119</MicrosoftNETILLinkTasksPackageVersion>
15-
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-rc.1.26411.119</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16-
<MicrosoftNETSdkPackageVersion>11.0.100-rc.1.26411.119</MicrosoftNETSdkPackageVersion>
17-
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.1.26411.119</MicrosoftNETCoreAppRefPackageVersion>
18-
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-rc.1.26411.119</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
9+
<MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetArcadeSdkPackageVersion>
10+
<MicrosoftDotNetBuildTasksFeedPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetBuildTasksFeedPackageVersion>
11+
<MicrosoftDotNetCecilPackageVersion>0.11.5-preview.26426.102</MicrosoftDotNetCecilPackageVersion>
12+
<MicrosoftDotNetSharedFrameworkSdkPackageVersion>11.0.0-beta.26426.102</MicrosoftDotNetSharedFrameworkSdkPackageVersion>
13+
<MicrosoftNETILLinkPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETILLinkPackageVersion>
14+
<MicrosoftNETILLinkTasksPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETILLinkTasksPackageVersion>
15+
<MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETRuntimeMonoTargetsSdkPackageVersion>
16+
<MicrosoftNETSdkPackageVersion>11.0.100-rc.2.26426.102</MicrosoftNETSdkPackageVersion>
17+
<MicrosoftNETCoreAppRefPackageVersion>11.0.0-rc.2.26426.102</MicrosoftNETCoreAppRefPackageVersion>
18+
<MicrosoftTemplateEngineAuthoringTasksPackageVersion>11.0.100-rc.2.26426.102</MicrosoftTemplateEngineAuthoringTasksPackageVersion>
1919
<!-- dotnet-macios dependencies -->
2020
<MicrosoftiOSSdknet100_260PackageVersion>26.0.11017</MicrosoftiOSSdknet100_260PackageVersion>
2121
<MicrosoftiOSSdknet100_265PackageVersion>26.5.10315</MicrosoftiOSSdknet100_265PackageVersion>

‎eng/Version.Details.xml‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,29 @@
11
<Dependencies>
22
<ProductDependencies>
3-
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-rc.1.26411.119">
3+
<Dependency Name="Microsoft.NET.Sdk" Version="11.0.100-rc.2.26426.102">
44
<Uri>https://github.com/dotnet/dotnet</Uri>
5-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
5+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
66
</Dependency>
7-
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-rc.1.26411.119">
7+
<Dependency Name="Microsoft.NET.ILLink" Version="11.0.0-rc.2.26426.102">
88
<Uri>https://github.com/dotnet/dotnet</Uri>
9-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
9+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
1010
</Dependency>
11-
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-rc.1.26411.119">
11+
<Dependency Name="Microsoft.NET.ILLink.Tasks" Version="11.0.0-rc.2.26426.102">
1212
<Uri>https://github.com/dotnet/dotnet</Uri>
13-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
13+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
1414
</Dependency>
15-
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-rc.1.26411.119">
15+
<Dependency Name="Microsoft.NET.Runtime.MonoTargets.Sdk" Version="11.0.0-rc.2.26426.102">
1616
<Uri>https://github.com/dotnet/dotnet</Uri>
17-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
17+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
1818
</Dependency>
1919
<!-- Set TRACKING_DOTNET_RUNTIME_SEPARATELY to something in Make.config if changing the version outside of dependency flow -->
20-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.1.26411.119">
20+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="11.0.0-rc.2.26426.102">
2121
<Uri>https://github.com/dotnet/dotnet</Uri>
22-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
22+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26411.119">
24+
<Dependency Name="Microsoft.DotNet.Cecil" Version="0.11.5-preview.26426.102">
2525
<Uri>https://github.com/dotnet/dotnet</Uri>
26-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
26+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
2727
</Dependency>
2828
<!-- This is a subscription of the .NET 10/Xcode 26.0 versions of our packages -->
2929
<Dependency Name="Microsoft.MacCatalyst.Sdk.net10.0_26.0" Version="26.0.11017">
@@ -78,25 +78,25 @@
7878
</Dependency>
7979
</ProductDependencies>
8080
<ToolsetDependencies>
81-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26411.119">
81+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Feed" Version="11.0.0-beta.26426.102">
8282
<Uri>https://github.com/dotnet/dotnet</Uri>
83-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
83+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
8484
</Dependency>
85-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26411.119">
85+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.26426.102">
8686
<Uri>https://github.com/dotnet/dotnet</Uri>
87-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
87+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
8888
</Dependency>
89-
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-rc.1.26411.119">
89+
<Dependency Name="Microsoft.TemplateEngine.Authoring.Tasks" Version="11.0.100-rc.2.26426.102">
9090
<Uri>https://github.com/dotnet/dotnet</Uri>
91-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
91+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
9292
</Dependency>
9393
<Dependency Name="Microsoft.DotNet.XHarness.iOS.Shared" Version="11.0.0-prerelease.26217.1">
9494
<Uri>https://github.com/dotnet/xharness</Uri>
9595
<Sha>866707736d49c2323628744716cda2475b3af9ee</Sha>
9696
</Dependency>
97-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26411.119">
97+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.26426.102">
9898
<Uri>https://github.com/dotnet/dotnet</Uri>
99-
<Sha>7cdb217445905f3342bbb0266a4497b9a014389a</Sha>
99+
<Sha>da377e2093fdde18a0d36429a2644638d07685f6</Sha>
100100
<SourceBuild RepoName="arcade" ManagedOnly="true" />
101101
</Dependency>
102102
</ToolsetDependencies>

‎eng/common/Get-GitHubAppToken.ps1‎

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -113,10 +113,13 @@ try {
113113
$installations = @()
114114
$page = 1
115115
do {
116-
$pageInstallations = @(Invoke-RestMethod `
116+
# Assign the response before wrapping it in @(). PowerShell otherwise
117+
# preserves a top-level JSON array as one nested pipeline object.
118+
$pageResponse = Invoke-RestMethod `
117119
-Uri "https://api.github.com/app/installations?per_page=100&page=$page" `
118120
-Headers $headers `
119-
-Method Get)
121+
-Method Get
122+
$pageInstallations = @($pageResponse)
120123
$installations += $pageInstallations
121124
$page++
122125
} while ($pageInstallations.Count -eq 100)
@@ -125,12 +128,19 @@ catch {
125128
Write-PipelineTelemetryError -Category 'Build' -Message "Failed to list GitHub App installations: $_. The signed JWT may be invalid or the App's Client ID ('$AppClientId') may be incorrect."
126129
exit 1
127130
}
128-
$installation = $installations | Where-Object { $_.account.login -ieq $InstallationOwner } | Select-Object -First 1
129-
if (-not $installation) {
131+
$matchingInstallations = @($installations | Where-Object { $_.account.login -ieq $InstallationOwner })
132+
if ($matchingInstallations.Count -eq 0) {
130133
$found = ($installations | ForEach-Object { $_.account.login }) -join ', '
131134
Write-PipelineTelemetryError -Category 'Build' -Message "No installation found for '$InstallationOwner'. App is installed on: $found"
132135
exit 1
133136
}
137+
if ($matchingInstallations.Count -ne 1) {
138+
$matchingIds = ($matchingInstallations | ForEach-Object { $_.id }) -join ', '
139+
Write-PipelineTelemetryError -Category 'Build' -Message "Found multiple installations for '$InstallationOwner': $matchingIds"
140+
exit 1
141+
}
142+
$installation = $matchingInstallations[0]
143+
Write-Host "Using installation $($installation.id) for '$($installation.account.login)'."
134144

135145
try {
136146
$tokenResponse = Invoke-RestMethod `

‎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.

‎eng/common/core-templates/steps/publish-logs.yml‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ parameters:
55
# A default - in case value from eng/common/core-templates/post-build/common-variables.yml is not passed
66
BinlogToolVersion: '1.0.11'
77
is1ESPipeline: false
8+
enableInternalRuntimes: true
89

910
steps:
1011
- task: Powershell@2
@@ -25,13 +26,20 @@ steps:
2526
# Sensitive data can as well be added to $(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
2627
# If the file exists - sensitive data for redaction will be sourced from it
2728
# (single entry per line, lines starting with '# ' are considered comments and skipped)
28-
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
29-
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
30-
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
31-
-runtimeSourceFeed https://ci.dot.net/internal
32-
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
33-
'$(System.AccessToken)'
34-
${{parameters.CustomSensitiveDataList}}
29+
${{ if and(eq(parameters.enableInternalRuntimes, true), ne(variables['System.TeamProject'], 'public')) }}:
30+
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
31+
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
32+
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
33+
-runtimeSourceFeed https://ci.dot.net/internal
34+
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
35+
'$(System.AccessToken)'
36+
${{parameters.CustomSensitiveDataList}}
37+
${{ else }}:
38+
arguments: -InputPath '$(System.DefaultWorkingDirectory)/PostBuildLogs'
39+
-BinlogToolVersion '${{parameters.BinlogToolVersion}}'
40+
-TokensFilePath '$(System.DefaultWorkingDirectory)/eng/BinlogSecretsRedactionFile.txt'
41+
'$(System.AccessToken)'
42+
${{parameters.CustomSensitiveDataList}}
3543
continueOnError: true
3644
condition: always()
3745

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@
1111
"dotnet": "11.0.100-rc.1.26411.119"
1212
},
1313
"msbuild-sdks": {
14-
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26411.119"
14+
"Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.26426.102"
1515
}
1616
}

0 commit comments

Comments
 (0)