Skip to content

Commit b98fbc8

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
Update dependencies from https://github.com/dotnet/arcade build 20251024.1 (#12399)
On relative base path root Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Archives , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor , Microsoft.DotNet.SharedFramework.Sdk , Microsoft.DotNet.XliffTasks , Microsoft.DotNet.XUnitV3Extensions From Version 11.0.0-beta.25509.1 -> To Version 11.0.0-beta.25524.1 Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent e39f33d commit b98fbc8

File tree

10 files changed

+356
-335
lines changed

10 files changed

+356
-335
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -159,33 +159,33 @@
159159
</Dependency>
160160
</ProductDependencies>
161161
<ToolsetDependencies>
162-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
162+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25524.1">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
164+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25509.1">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25524.1">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
168+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25509.1">
170+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25524.1">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
172+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25509.1">
174+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25524.1">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
176+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25509.1">
178+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25524.1">
179179
<Uri>https://github.com/dotnet/arcade</Uri>
180-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
180+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
181181
</Dependency>
182-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25509.1">
182+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25524.1">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
184+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25509.1">
186+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25524.1">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
188+
<Sha>904bfd153de2a88471c00a7cdd3450948e758db8</Sha>
189189
</Dependency>
190190
</ToolsetDependencies>
191191
</Dependencies>

‎eng/Versions.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@
3737
<MicrosoftDeveloperControlPlanewindowsamd64Version>0.18.7</MicrosoftDeveloperControlPlanewindowsamd64Version>
3838
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.18.7</MicrosoftDeveloperControlPlanewindowsarm64Version>
3939
<!-- Other -->
40-
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25509.1</MicrosoftDotNetRemoteExecutorVersion>
41-
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25509.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42-
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25509.1</MicrosoftDotNetBuildTasksArchivesVersion>
40+
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25524.1</MicrosoftDotNetRemoteExecutorVersion>
41+
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25524.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42+
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25524.1</MicrosoftDotNetBuildTasksArchivesVersion>
4343
<!-- dotnet/extensions -->
4444
<MicrosoftExtensionsAIVersion>9.9.1</MicrosoftExtensionsAIVersion>
4545
<MicrosoftExtensionsAIPreviewVersion>9.9.1-preview.1.25474.6</MicrosoftExtensionsAIPreviewVersion>

‎eng/common/SetupNugetSources.sh‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -66,10 +66,8 @@ EnableInternalPackageSource() {
6666
grep -i "<add key=\"$PackageSourceName\" value=\"true\"" "$ConfigFile" > /dev/null
6767
if [ "$?" == "0" ]; then
6868
echo "Enabling internal source '$PackageSourceName'."
69-
# Remove the disabled entry
70-
local OldDisableValue="<add key=\"$PackageSourceName\" value=\"true\" />"
71-
local NewDisableValue="<!-- Reenabled for build : $PackageSourceName -->"
72-
sed -i.bak "s|$OldDisableValue|$NewDisableValue|" "$ConfigFile"
69+
# Remove the disabled entry (including any surrounding comments or whitespace on the same line)
70+
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
7371

7472
# Add the source name to PackageSources for credential handling
7573
PackageSources+=("$PackageSourceName")

‎eng/common/core-templates/job/publish-build-assets.yml‎

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,8 @@ jobs:
9191
fetchDepth: 3
9292
clean: true
9393

94-
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95-
- ${{ if eq(parameters.publishingVersion, 3) }}:
94+
- ${{ if eq(parameters.isAssetlessBuild, 'false') }}:
95+
- ${{ if eq(parameters.publishingVersion, 3) }}:
9696
- task: DownloadPipelineArtifact@2
9797
displayName: Download Asset Manifests
9898
inputs:
@@ -117,9 +117,16 @@ jobs:
117117
flattenFolders: true
118118
condition: ${{ parameters.condition }}
119119
continueOnError: ${{ parameters.continueOnError }}
120-
120+
121121
- task: NuGetAuthenticate@1
122122

123+
# Populate internal runtime variables.
124+
- template: /eng/common/templates/steps/enable-internal-sources.yml
125+
parameters:
126+
legacyCredential: $(dn-bot-dnceng-artifact-feeds-rw)
127+
128+
- template: /eng/common/templates/steps/enable-internal-runtimes.yml
129+
123130
- task: AzureCLI@2
124131
displayName: Publish Build Assets
125132
inputs:
@@ -132,9 +139,12 @@ jobs:
132139
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
133140
/p:MaestroApiEndpoint=https://maestro.dot.net
134141
/p:OfficialBuildId=$(OfficialBuildId)
142+
-runtimeSourceFeed https://ci.dot.net/internal
143+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144+
135145
condition: ${{ parameters.condition }}
136146
continueOnError: ${{ parameters.continueOnError }}
137-
147+
138148
- task: powershell@2
139149
displayName: Create ReleaseConfigs Artifact
140150
inputs:
@@ -162,7 +172,7 @@ jobs:
162172
artifactName: AssetManifests
163173
displayName: 'Publish Merged Manifest'
164174
retryCountOnTaskFailure: 10 # for any logs being locked
165-
sbomEnabled: false # we don't need SBOM for logs
175+
sbomEnabled: false # we don't need SBOM for logs
166176

167177
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
168178
parameters:
@@ -195,9 +205,11 @@ jobs:
195205
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
196206
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
197207
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208+
-runtimeSourceFeed https://ci.dot.net/internal
209+
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
198210
199211
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
200212
- template: /eng/common/core-templates/steps/publish-logs.yml
201213
parameters:
202214
is1ESPipeline: ${{ parameters.is1ESPipeline }}
203-
JobLabel: 'Publish_Artifacts_Logs'
215+
JobLabel: 'Publish_Artifacts_Logs'

0 commit comments

Comments
 (0)