Skip to content

Commit 987f98d

Browse files
[main] Update dependencies from dotnet/arcade (#6774)
Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
1 parent 73a2615 commit 987f98d

File tree

9 files changed

+269
-248
lines changed

9 files changed

+269
-248
lines changed

eng/Version.Details.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ToolsetDependencies>
4-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
4+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25520.4">
55
<Uri>https://github.com/dotnet/arcade</Uri>
6-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
6+
<Sha>16f3dcc641eb529fa7324ea2d1d236bf2ca57dd0</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25509.1">
8+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25520.4">
99
<Uri>https://github.com/dotnet/arcade</Uri>
10-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
10+
<Sha>16f3dcc641eb529fa7324ea2d1d236bf2ca57dd0</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25509.1">
12+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25520.4">
1313
<Uri>https://github.com/dotnet/arcade</Uri>
14-
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
14+
<Sha>16f3dcc641eb529fa7324ea2d1d236bf2ca57dd0</Sha>
1515
</Dependency>
1616
<Dependency Name="Microsoft.Testing.Extensions.CodeCoverage" Version="18.1.0-preview.25507.2">
1717
<Uri>https://dev.azure.com/devdiv/DevDiv/_git/vs-code-coverage</Uri>

eng/Versions.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PreReleaseVersionLabel>preview</PreReleaseVersionLabel>
88
</PropertyGroup>
99
<PropertyGroup Label="MSTest prod dependencies - darc updated">
10-
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25509.1</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
10+
<MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25520.4</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
1111
<MicrosoftTestingExtensionsCodeCoverageVersion>18.1.0-preview.25507.2</MicrosoftTestingExtensionsCodeCoverageVersion>
1212
<!-- empty line to avoid merge conflicts for darc PRs to update CC and MSTest+MTP -->
1313
<MSTestVersion>4.1.0-preview.25520.2</MSTestVersion>

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)