Skip to content

Commit e69a94b

Browse files
maumarmaumar
committed
Revert preview3 dependency updates before branching to preview 3
Revert "Update dependencies from https://github.com/dotnet/runtime build 20250223.2 (#35673)" This reverts commit e2a5f01. Revert "Update dependencies from https://github.com/dotnet/arcade build 20250220.6 (#35672)" This reverts commit 1f3e50c.
1 parent e2a5f01 commit e69a94b

File tree

6 files changed

+64
-63
lines changed

6 files changed

+64
-63
lines changed

Diff for: ‎eng/Version.Details.xml

+36-36
Original file line numberDiff line numberDiff line change
@@ -1,83 +1,83 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Dependencies>
33
<ProductDependencies>
4-
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.3.25123.2">
4+
<Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-preview.2.25114.1">
55
<Uri>https://github.com/dotnet/runtime</Uri>
6-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
6+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
77
</Dependency>
8-
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.3.25123.2">
8+
<Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-preview.2.25114.1">
99
<Uri>https://github.com/dotnet/runtime</Uri>
10-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
10+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
1111
</Dependency>
12-
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.3.25123.2">
12+
<Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-preview.2.25114.1">
1313
<Uri>https://github.com/dotnet/runtime</Uri>
14-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
14+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
1515
</Dependency>
16-
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.3.25123.2">
16+
<Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-preview.2.25114.1">
1717
<Uri>https://github.com/dotnet/runtime</Uri>
18-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
18+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
1919
</Dependency>
20-
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.3.25123.2">
20+
<Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-preview.2.25114.1">
2121
<Uri>https://github.com/dotnet/runtime</Uri>
22-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
22+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
2323
</Dependency>
24-
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.3.25123.2">
24+
<Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-preview.2.25114.1">
2525
<Uri>https://github.com/dotnet/runtime</Uri>
26-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
26+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
2727
</Dependency>
28-
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.3.25123.2">
28+
<Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-preview.2.25114.1">
2929
<Uri>https://github.com/dotnet/runtime</Uri>
30-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
30+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
3131
</Dependency>
32-
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.3.25123.2">
32+
<Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-preview.2.25114.1">
3333
<Uri>https://github.com/dotnet/runtime</Uri>
34-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
34+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
3535
</Dependency>
36-
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.3.25123.2">
36+
<Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-preview.2.25114.1">
3737
<Uri>https://github.com/dotnet/runtime</Uri>
38-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
38+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
3939
</Dependency>
40-
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.3.25123.2">
40+
<Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-preview.2.25114.1">
4141
<Uri>https://github.com/dotnet/runtime</Uri>
42-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
42+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
4343
</Dependency>
4444
<!--
4545
Win-x64 is used here because we have picked an arbitrary runtime identifier to flow the version of the latest NETCore.App runtime.
4646
All Runtime.$rid packages should have the same version.
4747
-->
48-
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.3.25123.2">
48+
<Dependency Name="Microsoft.NETCore.App.Runtime.win-x64" Version="10.0.0-preview.2.25114.1">
4949
<Uri>https://github.com/dotnet/runtime</Uri>
50-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
50+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
5151
</Dependency>
52-
<Dependency Name="System.Text.Json" Version="10.0.0-preview.3.25123.2">
52+
<Dependency Name="System.Text.Json" Version="10.0.0-preview.2.25114.1">
5353
<Uri>https://github.com/dotnet/runtime</Uri>
54-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
54+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
5555
</Dependency>
56-
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.3.25123.2">
56+
<Dependency Name="System.Text.Encodings.Web" Version="10.0.0-preview.2.25114.1">
5757
<Uri>https://github.com/dotnet/runtime</Uri>
58-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
58+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
5959
</Dependency>
60-
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.3.25123.2">
60+
<Dependency Name="System.Formats.Asn1" Version="10.0.0-preview.2.25114.1">
6161
<Uri>https://github.com/dotnet/runtime</Uri>
62-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
62+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
6363
</Dependency>
64-
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.3.25123.2">
64+
<Dependency Name="System.Runtime.Caching" Version="10.0.0-preview.2.25114.1">
6565
<Uri>https://github.com/dotnet/runtime</Uri>
66-
<Sha>2a51ee3fd10c2a5af5d44e710ef804813f73bf75</Sha>
66+
<Sha>42423ef91c9f23381d99dee708fa55336318debc</Sha>
6767
</Dependency>
6868
</ProductDependencies>
6969
<ToolsetDependencies>
70-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25120.6">
70+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.25113.2">
7171
<Uri>https://github.com/dotnet/arcade</Uri>
72-
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
72+
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
7373
</Dependency>
74-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25120.6">
74+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="10.0.0-beta.25113.2">
7575
<Uri>https://github.com/dotnet/arcade</Uri>
76-
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
76+
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
7777
</Dependency>
78-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25120.6">
78+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.25113.2">
7979
<Uri>https://github.com/dotnet/arcade</Uri>
80-
<Sha>ecdb2f499cb5f5c99b58fba1a14fdf977c56e1ac</Sha>
80+
<Sha>ea0a0a28cccd4b63a9ec40df53ef2df260ffa5b1</Sha>
8181
</Dependency>
8282
</ToolsetDependencies>
8383
</Dependencies>

Diff for: ‎eng/Versions.props

+16-16
Original file line numberDiff line numberDiff line change
@@ -16,24 +16,24 @@
1616
<UsingToolXliff>False</UsingToolXliff>
1717
</PropertyGroup>
1818
<PropertyGroup Label="Dependencies from dotnet/runtime">
19-
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsCachingMemoryVersion>
20-
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsConfigurationVersion>
21-
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsConfigurationAbstractionsVersion>
22-
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23-
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsConfigurationJsonVersion>
24-
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsDependencyInjectionVersion>
25-
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsDependencyModelVersion>
26-
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27-
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.3.25123.2</MicrosoftExtensionsLoggingVersion>
28-
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.3.25123.2</MicrosoftNETCoreAppRefVersion>
29-
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.3.25123.2</MicrosoftNETCoreAppRuntimewinx64Version>
30-
<SystemTextEncodingsWebVersion>10.0.0-preview.3.25123.2</SystemTextEncodingsWebVersion>
31-
<SystemTextJsonVersion>10.0.0-preview.3.25123.2</SystemTextJsonVersion>
32-
<SystemFormatsAsn1Version>10.0.0-preview.3.25123.2</SystemFormatsAsn1Version>
33-
<SystemRuntimeCachingVersion>10.0.0-preview.3.25123.2</SystemRuntimeCachingVersion>
19+
<MicrosoftExtensionsCachingMemoryVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsCachingMemoryVersion>
20+
<MicrosoftExtensionsConfigurationVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsConfigurationVersion>
21+
<MicrosoftExtensionsConfigurationAbstractionsVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsConfigurationAbstractionsVersion>
22+
<MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsConfigurationEnvironmentVariablesVersion>
23+
<MicrosoftExtensionsConfigurationJsonVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsConfigurationJsonVersion>
24+
<MicrosoftExtensionsDependencyInjectionVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsDependencyInjectionVersion>
25+
<MicrosoftExtensionsDependencyModelVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsDependencyModelVersion>
26+
<MicrosoftExtensionsHostFactoryResolverSourcesVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsHostFactoryResolverSourcesVersion>
27+
<MicrosoftExtensionsLoggingVersion>10.0.0-preview.2.25114.1</MicrosoftExtensionsLoggingVersion>
28+
<MicrosoftNETCoreAppRefVersion>10.0.0-preview.2.25114.1</MicrosoftNETCoreAppRefVersion>
29+
<MicrosoftNETCoreAppRuntimewinx64Version>10.0.0-preview.2.25114.1</MicrosoftNETCoreAppRuntimewinx64Version>
30+
<SystemTextEncodingsWebVersion>10.0.0-preview.2.25114.1</SystemTextEncodingsWebVersion>
31+
<SystemTextJsonVersion>10.0.0-preview.2.25114.1</SystemTextJsonVersion>
32+
<SystemFormatsAsn1Version>10.0.0-preview.2.25114.1</SystemFormatsAsn1Version>
33+
<SystemRuntimeCachingVersion>10.0.0-preview.2.25114.1</SystemRuntimeCachingVersion>
3434
</PropertyGroup>
3535
<PropertyGroup Label="Dependencies from dotnet/arcade">
36-
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25120.6</MicrosoftDotNetBuildTasksTemplatingVersion>
36+
<MicrosoftDotNetBuildTasksTemplatingVersion>10.0.0-beta.25113.2</MicrosoftDotNetBuildTasksTemplatingVersion>
3737
</PropertyGroup>
3838
<PropertyGroup Label="Other dependencies">
3939
<MicrosoftBuildFrameworkVersion>17.8.3</MicrosoftBuildFrameworkVersion>

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

+5-4
Original file line numberDiff line numberDiff line change
@@ -76,11 +76,12 @@ jobs:
7676
fetchDepth: 3
7777
clean: true
7878

79-
- task: DownloadPipelineArtifact@2
80-
displayName: Download Asset Manifests
79+
- task: DownloadBuildArtifacts@0
80+
displayName: Download artifact
8181
inputs:
8282
artifactName: AssetManifests
83-
targetPath: '$(Build.StagingDirectory)/AssetManifests'
83+
downloadPath: '$(Build.StagingDirectory)/Download'
84+
checkDownloadedFiles: true
8485
condition: ${{ parameters.condition }}
8586
continueOnError: ${{ parameters.continueOnError }}
8687

@@ -94,7 +95,7 @@ jobs:
9495
scriptLocation: scriptPath
9596
scriptPath: $(Build.SourcesDirectory)/eng/common/sdk-task.ps1
9697
arguments: -task PublishBuildAssets -restore -msbuildEngine dotnet
97-
/p:ManifestsPath='$(Build.StagingDirectory)/AssetManifests'
98+
/p:ManifestsPath='$(Build.StagingDirectory)/Download/AssetManifests'
9899
/p:MaestroApiEndpoint=https://maestro.dot.net
99100
/p:PublishUsingPipelines=${{ parameters.publishUsingPipelines }}
100101
/p:OfficialBuildId=$(Build.BuildNumber)

Diff for: ‎eng/common/sdk-task.ps1

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ try {
6464
$GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
6565
}
6666
if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
67-
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.13.0" -MemberType NoteProperty
67+
$GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.12.0" -MemberType NoteProperty
6868
}
6969
if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") {
7070
$xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true

Diff for: ‎eng/common/tools.ps1

+2-2
Original file line numberDiff line numberDiff line change
@@ -383,8 +383,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements =
383383

384384
# If the version of msbuild is going to be xcopied,
385385
# use this version. Version matches a package here:
386-
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.13.0
387-
$defaultXCopyMSBuildVersion = '17.13.0'
386+
# https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.12.0
387+
$defaultXCopyMSBuildVersion = '17.12.0'
388388

389389
if (!$vsRequirements) {
390390
if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') {

Diff for: ‎global.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
11
{
22
"sdk": {
3-
"version": "10.0.100-preview.2.25118.3",
3+
"version": "10.0.100-preview.2.25081.1",
44
"allowPrerelease": true,
55
"rollForward": "latestMajor"
66
},
77
"tools": {
8-
"dotnet": "10.0.100-preview.2.25118.3",
8+
"dotnet": "10.0.100-preview.2.25081.1",
99
"runtimes": {
1010
"dotnet": [
1111
"$(MicrosoftNETCoreAppRuntimewinx64Version)"
1212
]
1313
}
1414
},
1515
"msbuild-sdks": {
16-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25120.6",
17-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25120.6"
16+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25113.2",
17+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25113.2"
1818
}
1919
}

0 commit comments

Comments
 (0)