Skip to content

Commit 0d6db56

Browse files
[main] Source code updates from dotnet/dotnet (#125419)
> [!NOTE] > This is a codeflow update. It may contain both source code changes from > [the VMR](https://github.com/dotnet/dotnet) > as well as dependency updates. Learn more [here](https://github.com/dotnet/dotnet/tree/main/docs/Codeflow-PRs.md). This pull request brings the following source code changes [marker]: <> (Begin:f7901f87-9f24-40d6-9bc1-564863937237) ## From https://github.com/dotnet/dotnet - **Subscription**: [f7901f87-9f24-40d6-9bc1-564863937237](https://maestro.dot.net/subscriptions?search=f7901f87-9f24-40d6-9bc1-564863937237) - **Build**: [20260310.7](https://dev.azure.com/dnceng/internal/_build/results?buildId=2923083) ([305514](https://maestro.dot.net/channel/8298/github:dotnet:dotnet/build/305514)) - **Date Produced**: March 10, 2026 7:16:10 PM UTC - **Commit**: [349974995b66d78aa8f24e5e9ce9fa3a3430cd05](dotnet/dotnet@3499749) - **Commit Diff**: [5507d7a...3499749](dotnet/dotnet@5507d7a...3499749) - **Branch**: [main](https://github.com/dotnet/dotnet/tree/main) **Updated Dependencies** - From [5.6.0-2.26152.106 to 5.6.0-2.26160.107][1] - Microsoft.CodeAnalysis - Microsoft.CodeAnalysis.Analyzers - Microsoft.CodeAnalysis.CSharp - Microsoft.Net.Compilers.Toolset - From [11.0.100-preview.3.26152.106 to 11.0.100-preview.3.26160.107][1] - Microsoft.CodeAnalysis.NetAnalyzers - Microsoft.DotNet.ApiCompat.Task - Microsoft.NET.Workload.Emscripten.Current.Manifest-11.0.100.Transport - From [11.0.0-beta.26152.106 to 11.0.0-beta.26160.107][1] - 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 - From [0.11.5-preview.26152.106 to 0.11.5-preview.26160.107][1] - Microsoft.DotNet.Cecil - From [2.9.3-beta.26152.106 to 2.9.3-beta.26160.107][1] - Microsoft.DotNet.XUnitAssert - Microsoft.DotNet.XUnitConsoleRunner - From [11.0.0-preview.3.26152.106 to 11.0.0-preview.3.26160.107][1] - 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 - From [7.5.0-rc.15306 to 7.5.0-rc.16107][1] - NuGet.Frameworks - NuGet.Packaging - NuGet.ProjectModel - NuGet.Versioning - From [3.0.0-preview.3.26152.106 to 3.0.0-preview.3.26160.107][1] - System.CommandLine - From [19.1.0-alpha.1.26116.1 to 19.1.0-alpha.1.26152.1](dotnet/dotnet@9b44df5...07cf3af) - runtime.linux-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.linux-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.linux-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.osx-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.osx-arm64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.osx-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.osx-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - runtime.win-arm64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.win-x64.Microsoft.NETCore.Runtime.JIT.Tools - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Libclang - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Sdk - runtime.win-x64.Microsoft.NETCore.Runtime.Mono.LLVM.Tools - From [11.0.0-alpha.1.26116.1 to 11.0.0-alpha.1.26152.1](dotnet/dotnet@7ceff14...ccd4ce0) - runtime.linux-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.linux-musl-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.linux-musl-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.linux-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.osx-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.osx-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.win-arm64.Microsoft.NETCore.Runtime.Wasm.Node.Transport - runtime.win-x64.Microsoft.NETCore.Runtime.Wasm.Node.Transport [marker]: <> (End:f7901f87-9f24-40d6-9bc1-564863937237) [1]: dotnet/dotnet@5507d7a...3499749 [marker]: <> (Start:Footer:CodeFlow PR) ## Associated changes in source repos - dotnet/arcade@38eefc1...539e874 - dotnet/aspnetcore@8dc0b08...69f3533 - dotnet/command-line-api@a3bae7d...0b720d0 - dotnet/efcore@a5a6356...3817d73 - dotnet/fsharp@6e28aa3...6479611 - dotnet/msbuild@414f0ac...ef957b7 - dotnet/razor@a1bd540...2c1a9a0 - dotnet/roslyn@6bdca1d...07e15c1 - 348ad67...cd38a58 - dotnet/sdk@e90c441...5bb7e31 - dotnet/source-build-assets@53df2d8...b83413a - microsoft/vstest@42e97b7...e315381 - dotnet/winforms@d65e8b0...6ff69e6 <details> <summary>Diff the source with this PR branch</summary> ```bash darc vmr diff --name-only https://github.com/dotnet/dotnet:349974995b66d78aa8f24e5e9ce9fa3a3430cd05..https://github.com/dotnet/runtime:darc-main-7c1fd397-8422-40d4-a35e-f1e66dd14692 ``` </details> [marker]: <> (End:Footer:CodeFlow PR) --------- Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 98e3338 commit 0d6db56

14 files changed

Lines changed: 509 additions & 252 deletions

File tree

eng/Signing.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
<FileSignInfo Condition="'$(TargetsOSX)' == 'true'" Include="dotnet;apphost;createdump;singlefilehost;crossgen2" CertificateName="MacDeveloperHarden" />
4545
<!-- Sign these Mac binaries without hardening enabled, making them compatible with hardening needs more work -->
4646
<FileSignInfo Condition="'$(TargetsOSX)' == 'true'" Include="corerun;ilc;ilasm;ildasm;mono-aot-cross;Mono;llc;opt" CertificateName="MacDeveloper" />
47+
<FileSignInfo Condition="'$(TargetsAppleMobile)' == 'true'" Include="Mono" CertificateName="MacDeveloper" />
4748
<!-- Additionally, we need to notarize any .pkg files -->
4849
<MacOSPkg Include="$(ArtifactsPackagesDir)**/dotnet-runtime*.pkg" Exclude="$(ArtifactsPackagesDir)**/dotnet-runtime-internal*.pkg" />
4950
<FileSignInfo Include="@(MacOSPkg->'%(Filename)%(Extension)')" CertificateName="MacDeveloperWithNotarization" />
@@ -53,6 +54,7 @@
5354
<FileExtensionSignInfo Update=".js" CertificateName="None" />
5455

5556
<!-- Third-party components which should be signed. -->
57+
<FileSignInfo Include="Antlr4.Runtime.Standard.dll" CertificateName="3PartySHA2" />
5658
<FileSignInfo Include="Newtonsoft.Json.dll" CertificateName="3PartySHA2" />
5759
<FileSignInfo Include="Mono.Cecil.dll" CertificateName="3PartySHA2" />
5860
<FileSignInfo Include="Mono.Cecil.Mdb.dll" CertificateName="3PartySHA2" />

eng/Subsets.props

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -485,9 +485,7 @@
485485

486486
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler_publish.csproj" Condition="'$(SdkToolsSupported)' == 'true'" Category="clr" />
487487
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2_publish.csproj" Condition="'$(SdkToolsSupported)' == 'true'" Category="clr" />
488-
489-
<!-- Build managed ilasm as part of the clr tools subset when building just dotnet/runtime as we use it in runtime testing. Don't do so for VMR builds as we aren't shipping it yet and it pulls in prebuilts that we haven't handled for source-build. -->
490-
<ProjectToBuild Include="$(ToolsProjectRoot)ilasm\src\ilasm\ilasm.csproj" Condition="'$(SdkToolsSupported)' == 'true' and '$(DotNetBuildFromVMR)' != 'true'" Category="clr" />
488+
<ProjectToBuild Include="$(ToolsProjectRoot)ilasm\src\ilasm\ilasm.csproj" Condition="'$(SdkToolsSupported)' == 'true'" Category="clr" />
491489

492490
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\ILCompiler\ILCompiler.csproj" Condition="'$(SdkToolsSupported)' == 'true'" Category="clr" />
493491
<ProjectToBuild Include="$(CoreClrProjectRoot)tools\aot\crossgen2\crossgen2.csproj" Condition="'$(SdkToolsSupported)' == 'true'" Category="clr" />

eng/Version.Details.props

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

eng/Version.Details.xml

Lines changed: 153 additions & 153 deletions
Large diffs are not rendered by default.
Lines changed: 135 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
# --------------------------------------------------------------------------------------
2+
# Renovate Bot Job Template
3+
# --------------------------------------------------------------------------------------
4+
# This Azure DevOps pipeline job template runs Renovate (https://docs.renovatebot.com/)
5+
# to automatically update dependencies in a GitHub repository.
6+
#
7+
# Renovate scans the repository for dependency files and creates pull requests to update
8+
# outdated dependencies based on the configuration specified in the renovateConfigPath
9+
# parameter.
10+
#
11+
# Usage:
12+
# For each product repo wanting to make use of Renovate, this template is called from
13+
# an internal Azure DevOps pipeline, typically with a schedule trigger, to check for
14+
# and propose dependency updates.
15+
#
16+
# For more info, see https://github.com/dotnet/arcade/blob/main/Documentation/Renovate.md
17+
# --------------------------------------------------------------------------------------
18+
19+
parameters:
20+
21+
# Path to the Renovate configuration file within the repository.
22+
- name: renovateConfigPath
23+
type: string
24+
default: 'eng/renovate.json'
25+
26+
# GitHub repository to run Renovate against, in the format 'owner/repo'.
27+
# This could technically be any repo but convention is to target the same
28+
# repo that contains the calling pipeline. The Renovate config file would
29+
# be co-located with the pipeline's repo and, in most cases, the config
30+
# file is specific to the repo being targeted.
31+
- name: gitHubRepo
32+
type: string
33+
34+
# List of base branches to target for Renovate PRs.
35+
# NOTE: The Renovate configuration file is always read from the branch where the
36+
# pipeline is run, NOT from the target branches specified here. If you need different
37+
# configurations for different branches, run the pipeline from each branch separately.
38+
- name: baseBranches
39+
type: object
40+
default:
41+
- main
42+
43+
# When true, Renovate will run in dry run mode, which previews changes without creating PRs.
44+
# See the 'Run Renovate' step log output for details of what would have been changed.
45+
- name: dryRun
46+
type: boolean
47+
default: false
48+
49+
# By default, Renovate will not recreate a PR for a given dependency/version pair that was
50+
# previously closed. This allows opting in to always recreating PRs even if they were
51+
# previously closed.
52+
- name: forceRecreatePR
53+
type: boolean
54+
default: false
55+
56+
# Pool configuration for the job.
57+
- name: pool
58+
type: object
59+
default:
60+
name: NetCore1ESPool-Internal
61+
image: build.azurelinux.3.amd64
62+
os: linux
63+
64+
jobs:
65+
- job: Renovate
66+
displayName: Run Renovate
67+
container: RenovateContainer
68+
variables:
69+
- group: dotnet-renovate-bot
70+
# The Renovate version is automatically updated by https://github.com/dotnet/arcade/blob/main/azure-pipelines-renovate.yml.
71+
# Changing the variable name here would require updating the name in https://github.com/dotnet/arcade/blob/main/eng/renovate.json as well.
72+
- name: renovateVersion
73+
value: '42'
74+
- name: dryRunArg
75+
${{ if eq(parameters.dryRun, true) }}:
76+
value: 'full'
77+
${{ else }}:
78+
value: ''
79+
- name: recreateWhenArg
80+
${{ if eq(parameters.forceRecreatePR, true) }}:
81+
value: 'always'
82+
${{ else }}:
83+
value: ''
84+
pool: ${{ parameters.pool }}
85+
86+
templateContext:
87+
outputParentDirectory: $(Build.ArtifactStagingDirectory)
88+
outputs:
89+
- output: pipelineArtifact
90+
displayName: Publish Renovate Log
91+
condition: succeededOrFailed()
92+
targetPath: $(Build.ArtifactStagingDirectory)
93+
artifactName: $(Agent.JobName)_Logs_Attempt$(System.JobAttempt)
94+
sbomEnabled: false
95+
96+
steps:
97+
- checkout: self
98+
fetchDepth: 1
99+
100+
- script: renovate-config-validator $(Build.SourcesDirectory)/${{parameters.renovateConfigPath}}
101+
displayName: Validate Renovate config
102+
env:
103+
LOG_LEVEL: info
104+
LOG_FILE_LEVEL: debug
105+
LOG_FILE: $(Build.ArtifactStagingDirectory)/renovate-config-validator.json
106+
107+
- script: |
108+
. $(Build.SourcesDirectory)/eng/common/renovate.env
109+
renovate
110+
displayName: Run Renovate
111+
env:
112+
RENOVATE_FORK_TOKEN: $(BotAccount-dotnet-renovate-bot-PAT)
113+
RENOVATE_TOKEN: $(BotAccount-dotnet-renovate-bot-PAT)
114+
RENOVATE_REPOSITORIES: ${{parameters.gitHubRepo}}
115+
RENOVATE_BASE_BRANCHES: ${{ convertToJson(parameters.baseBranches) }}
116+
RENOVATE_DRY_RUN: $(dryRunArg)
117+
RENOVATE_RECREATE_WHEN: $(recreateWhenArg)
118+
LOG_LEVEL: info
119+
LOG_FILE_LEVEL: debug
120+
LOG_FILE: $(Build.ArtifactStagingDirectory)/renovate.json
121+
RENOVATE_CONFIG_FILE: $(Build.SourcesDirectory)/${{parameters.renovateConfigPath}}
122+
123+
- script: |
124+
echo "PRs created by Renovate:"
125+
if [ -s "$(Build.ArtifactStagingDirectory)/renovate-log.json" ]; then
126+
if ! jq -r 'select(.msg == "PR created" and .pr != null) | "https://github.com/\(.repository)/pull/\(.pr)"' "$(Build.ArtifactStagingDirectory)/renovate-log.json" | sort -u; then
127+
echo "##vso[task.logissue type=warning]Failed to parse Renovate log file with jq."
128+
echo "##vso[task.complete result=SucceededWithIssues]"
129+
fi
130+
else
131+
echo "##vso[task.logissue type=warning]No Renovate log file found or file is empty."
132+
echo "##vso[task.complete result=SucceededWithIssues]"
133+
fi
134+
displayName: List created PRs
135+
condition: and(succeededOrFailed(), eq('${{ parameters.dryRun }}', false))

eng/common/core-templates/job/source-index-stage1.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
pool:
2626
${{ if eq(variables['System.TeamProject'], 'public') }}:
2727
name: $(DncEngPublicBuildPool)
28-
image: windows.vs2026preview.scout.amd64.open
28+
image: windows.vs2026.amd64.open
2929
${{ if eq(variables['System.TeamProject'], 'internal') }}:
3030
name: $(DncEngInternalBuildPool)
31-
image: windows.vs2026preview.scout.amd64
31+
image: windows.vs2026.amd64
3232

3333
steps:
3434
- ${{ if eq(parameters.is1ESPipeline, '') }}:

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -127,11 +127,11 @@ stages:
127127
${{ else }}:
128128
${{ if eq(parameters.is1ESPipeline, true) }}:
129129
name: $(DncEngInternalBuildPool)
130-
image: windows.vs2026preview.scout.amd64
130+
image: windows.vs2026.amd64
131131
os: windows
132132
${{ else }}:
133133
name: $(DncEngInternalBuildPool)
134-
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
134+
demands: ImageOverride -equals windows.vs2026.amd64
135135

136136
steps:
137137
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
@@ -175,7 +175,7 @@ stages:
175175
os: windows
176176
${{ else }}:
177177
name: $(DncEngInternalBuildPool)
178-
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
178+
demands: ImageOverride -equals windows.vs2026.amd64
179179
steps:
180180
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
181181
parameters:
@@ -206,7 +206,7 @@ stages:
206206
displayName: Validate
207207
inputs:
208208
filePath: eng\common\sdk-task.ps1
209-
arguments: -task SigningValidation -restore -msbuildEngine vs
209+
arguments: -task SigningValidation -restore
210210
/p:PackageBasePath='$(Build.ArtifactStagingDirectory)/PackageArtifacts'
211211
/p:SignCheckExclusionsFile='$(System.DefaultWorkingDirectory)/eng/SignCheckExclusionsFile.txt'
212212
${{ parameters.signingValidationAdditionalParameters }}
@@ -236,7 +236,7 @@ stages:
236236
os: windows
237237
${{ else }}:
238238
name: $(DncEngInternalBuildPool)
239-
demands: ImageOverride -equals windows.vs2026preview.scout.amd64
239+
demands: ImageOverride -equals windows.vs2026.amd64
240240
steps:
241241
- template: /eng/common/core-templates/post-build/setup-maestro-vars.yml
242242
parameters:
Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
# --------------------------------------------------------------------------------------
2+
# Renovate Pipeline Template
3+
# --------------------------------------------------------------------------------------
4+
# This template provides a complete reusable pipeline definition for running Renovate
5+
# in a 1ES Official pipeline. Pipelines can extend from this template and only need
6+
# to pass the Renovate job parameters.
7+
#
8+
# For more info, see https://github.com/dotnet/arcade/blob/main/Documentation/Renovate.md
9+
# --------------------------------------------------------------------------------------
10+
11+
parameters:
12+
13+
# Path to the Renovate configuration file within the repository.
14+
- name: renovateConfigPath
15+
type: string
16+
default: 'eng/renovate.json'
17+
18+
# GitHub repository to run Renovate against, in the format 'owner/repo'.
19+
- name: gitHubRepo
20+
type: string
21+
22+
# List of base branches to target for Renovate PRs.
23+
- name: baseBranches
24+
type: object
25+
default:
26+
- main
27+
28+
# When true, Renovate will run in dry run mode.
29+
- name: dryRun
30+
type: boolean
31+
default: false
32+
33+
# When true, Renovate will recreate PRs even if they were previously closed.
34+
- name: forceRecreatePR
35+
type: boolean
36+
default: false
37+
38+
# Pool configuration for the pipeline.
39+
- name: pool
40+
type: object
41+
default:
42+
name: NetCore1ESPool-Internal
43+
image: build.azurelinux.3.amd64
44+
os: linux
45+
46+
# Renovate version used in the container image tag.
47+
- name: renovateVersion
48+
default: 43
49+
type: number
50+
51+
# Pool configuration for SDL analysis.
52+
- name: sdlPool
53+
type: object
54+
default:
55+
name: NetCore1ESPool-Internal
56+
image: 1es-windows-2022
57+
os: windows
58+
59+
resources:
60+
repositories:
61+
- repository: 1ESPipelineTemplates
62+
type: git
63+
name: 1ESPipelineTemplates/1ESPipelineTemplates
64+
ref: refs/tags/release
65+
66+
extends:
67+
template: v1/1ES.Official.PipelineTemplate.yml@1ESPipelineTemplates
68+
parameters:
69+
pool: ${{ parameters.pool }}
70+
sdl:
71+
sourceAnalysisPool: ${{ parameters.sdlPool }}
72+
containers:
73+
RenovateContainer:
74+
image: mcr.microsoft.com/dotnet-buildtools/prereqs:azurelinux-3.0-renovate-${{ parameters.renovateVersion }}-amd64
75+
stages:
76+
- stage: Renovate
77+
displayName: Run Renovate
78+
jobs:
79+
- template: /eng/common/core-templates/job/renovate.yml@self
80+
parameters:
81+
renovateConfigPath: ${{ parameters.renovateConfigPath }}
82+
gitHubRepo: ${{ parameters.gitHubRepo }}
83+
baseBranches: ${{ parameters.baseBranches }}
84+
dryRun: ${{ parameters.dryRun }}
85+
forceRecreatePR: ${{ parameters.forceRecreatePR }}
86+
pool: ${{ parameters.pool }}

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@ steps:
3131
-runtimeSourceFeed https://ci.dot.net/internal
3232
-runtimeSourceFeedKey '$(dotnetbuilds-internal-container-read-token-base64)'
3333
'$(publishing-dnceng-devdiv-code-r-build-re)'
34-
'$(MaestroAccessToken)'
3534
'$(dn-bot-all-orgs-artifact-feeds-rw)'
3635
'$(akams-client-id)'
3736
'$(microsoft-symbol-server-pat)'

eng/common/cross/build-rootfs.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -622,9 +622,9 @@ elif [[ "$__CodeName" == "openbsd" ]]; then
622622
FILE="${set}${__OpenBSDVersion//./}.tgz"
623623
echo "Downloading $FILE..."
624624
if [[ "$__hasWget" == 1 ]]; then
625-
wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
625+
wget -O- "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf -
626626
else
627-
curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$ROOTFS" -xzpf -
627+
curl -SL "$OPENBSD_MIRROR/$FILE" | tar -C "$__RootfsDir" -xzpf -
628628
fi
629629
done
630630

@@ -638,11 +638,11 @@ elif [[ "$__CodeName" == "openbsd" ]]; then
638638
if [[ "$__hasWget" == 1 ]]; then
639639
PKG_FILE=$(wget -qO- "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
640640
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
641-
wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
641+
wget -O- "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf -
642642
else
643643
PKG_FILE=$(curl -s "$PKG_MIRROR/" | grep -Eo "${pkg}-[0-9][^\" ]*\.tgz" | head -n1)
644644
[[ -z "$PKG_FILE" ]] && { echo "ERROR: Package $pkg not found"; exit 1; }
645-
curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$ROOTFS" -xzpf -
645+
curl -SL "$PKG_MIRROR/$PKG_FILE" | tar -C "$__RootfsDir" -xzpf -
646646
fi
647647
done
648648
elif [[ "$__CodeName" == "illumos" ]]; then

0 commit comments

Comments
 (0)