Skip to content

Commit f5be69e

Browse files
committed
Revert "Update dependencies from https://github.com/dotnet/arcade build 20251031.1 (#12622)"
This reverts commit 50d0b52.
1 parent b9ad3dd commit f5be69e

File tree

12 files changed

+336
-361
lines changed

12 files changed

+336
-361
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.25531.1">
162+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25509.1">
163163
<Uri>https://github.com/dotnet/arcade</Uri>
164-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
164+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
165165
</Dependency>
166-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25531.1">
166+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Archives" Version="11.0.0-beta.25509.1">
167167
<Uri>https://github.com/dotnet/arcade</Uri>
168-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
168+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
169169
</Dependency>
170-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25531.1">
170+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25509.1">
171171
<Uri>https://github.com/dotnet/arcade</Uri>
172-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
172+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
173173
</Dependency>
174-
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25531.1">
174+
<Dependency Name="Microsoft.DotNet.SharedFramework.Sdk" Version="11.0.0-beta.25509.1">
175175
<Uri>https://github.com/dotnet/arcade</Uri>
176-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
176+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
177177
</Dependency>
178-
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25531.1">
178+
<Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="11.0.0-beta.25509.1">
179179
<Uri>https://github.com/dotnet/arcade</Uri>
180-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
180+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
181181
</Dependency>
182-
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25531.1">
182+
<Dependency Name="Microsoft.DotNet.XUnitV3Extensions" Version="11.0.0-beta.25509.1">
183183
<Uri>https://github.com/dotnet/arcade</Uri>
184-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
184+
<Sha>488413fe104056170673a048a07906314e101e5d</Sha>
185185
</Dependency>
186-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25531.1">
186+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="11.0.0-beta.25509.1">
187187
<Uri>https://github.com/dotnet/arcade</Uri>
188-
<Sha>d8816877a6b0e6cb39cb57d92557ad4952715a2e</Sha>
188+
<Sha>488413fe104056170673a048a07906314e101e5d</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.12</MicrosoftDeveloperControlPlanewindowsamd64Version>
3838
<MicrosoftDeveloperControlPlanewindowsarm64Version>0.18.12</MicrosoftDeveloperControlPlanewindowsarm64Version>
3939
<!-- Other -->
40-
<MicrosoftDotNetRemoteExecutorVersion>11.0.0-beta.25531.1</MicrosoftDotNetRemoteExecutorVersion>
41-
<MicrosoftDotNetXUnitV3ExtensionsVersion>11.0.0-beta.25531.1</MicrosoftDotNetXUnitV3ExtensionsVersion>
42-
<MicrosoftDotNetBuildTasksArchivesVersion>11.0.0-beta.25531.1</MicrosoftDotNetBuildTasksArchivesVersion>
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>
4343
<!-- dotnet/extensions -->
4444
<MicrosoftExtensionsAIVersion>9.10.1</MicrosoftExtensionsAIVersion>
4545
<MicrosoftExtensionsAIPreviewVersion>9.10.0-preview.1.25513.3</MicrosoftExtensionsAIPreviewVersion>

eng/common/SetupNugetSources.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -66,8 +66,10 @@ 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 (including any surrounding comments or whitespace on the same line)
70-
sed -i.bak "/<add key=\"$PackageSourceName\" value=\"true\" \/>/d" "$ConfigFile"
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"
7173

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

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

Lines changed: 6 additions & 18 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,16 +117,9 @@ 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-
130123
- task: AzureCLI@2
131124
displayName: Publish Build Assets
132125
inputs:
@@ -139,12 +132,9 @@ jobs:
139132
/p:IsAssetlessBuild=${{ parameters.isAssetlessBuild }}
140133
/p:MaestroApiEndpoint=https://maestro.dot.net
141134
/p:OfficialBuildId=$(OfficialBuildId)
142-
-runtimeSourceFeed https://ci.dot.net/internal
143-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
144-
145135
condition: ${{ parameters.condition }}
146136
continueOnError: ${{ parameters.continueOnError }}
147-
137+
148138
- task: powershell@2
149139
displayName: Create ReleaseConfigs Artifact
150140
inputs:
@@ -172,7 +162,7 @@ jobs:
172162
artifactName: AssetManifests
173163
displayName: 'Publish Merged Manifest'
174164
retryCountOnTaskFailure: 10 # for any logs being locked
175-
sbomEnabled: false # we don't need SBOM for logs
165+
sbomEnabled: false # we don't need SBOM for logs
176166

177167
- template: /eng/common/core-templates/steps/publish-build-artifacts.yml
178168
parameters:
@@ -205,11 +195,9 @@ jobs:
205195
-ArtifactsPublishingAdditionalParameters '${{ parameters.artifactsPublishingAdditionalParameters }}'
206196
-SymbolPublishingAdditionalParameters '${{ parameters.symbolPublishingAdditionalParameters }}'
207197
-SkipAssetsPublishing '${{ parameters.isAssetlessBuild }}'
208-
-runtimeSourceFeed https://ci.dot.net/internal
209-
-runtimeSourceFeedKey $(dotnetbuilds-internal-container-read-token-base64)
210198
211199
- ${{ if eq(parameters.enablePublishBuildArtifacts, 'true') }}:
212200
- template: /eng/common/core-templates/steps/publish-logs.yml
213201
parameters:
214202
is1ESPipeline: ${{ parameters.is1ESPipeline }}
215-
JobLabel: 'Publish_Artifacts_Logs'
203+
JobLabel: 'Publish_Artifacts_Logs'

0 commit comments

Comments
 (0)