Skip to content

Commit 8d6ae01

Browse files
dotnet-maestro[bot]dotnet-maestro[bot]
authored
[main] Update dependencies from dotnet/arcade (#45010)
[main] Update dependencies from dotnet/arcade - Update arcade patch - Use fewer context lines in patch so it doesn't conflict as often
1 parent 54d51cb commit 8d6ae01

File tree

4 files changed

+35
-47
lines changed

4 files changed

+35
-47
lines changed

‎eng/Version.Details.xml‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -589,34 +589,34 @@
589589
</Dependency>
590590
</ProductDependencies>
591591
<ToolsetDependencies>
592-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24570.1">
592+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24570.4">
593593
<Uri>https://github.com/dotnet/arcade</Uri>
594-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
594+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
595595
</Dependency>
596-
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24570.1">
596+
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="10.0.0-beta.24570.4">
597597
<Uri>https://github.com/dotnet/arcade</Uri>
598-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
598+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
599599
</Dependency>
600-
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24570.1">
600+
<Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="10.0.0-beta.24570.4">
601601
<Uri>https://github.com/dotnet/arcade</Uri>
602-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
602+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
603603
</Dependency>
604-
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24570.1">
604+
<Dependency Name="Microsoft.DotNet.SignTool" Version="10.0.0-beta.24570.4">
605605
<Uri>https://github.com/dotnet/arcade</Uri>
606-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
606+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
607607
</Dependency>
608-
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24570.1">
608+
<Dependency Name="Microsoft.DotNet.XUnitExtensions" Version="10.0.0-beta.24570.4">
609609
<Uri>https://github.com/dotnet/arcade</Uri>
610-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
610+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
611611
</Dependency>
612-
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24570.1">
612+
<Dependency Name="Microsoft.DotNet.XliffTasks" Version="10.0.0-beta.24570.4">
613613
<Uri>https://github.com/dotnet/arcade</Uri>
614-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
614+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
615615
</Dependency>
616616
<!-- Intermediate is necessary for source build. -->
617-
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24570.1">
617+
<Dependency Name="Microsoft.SourceBuild.Intermediate.arcade" Version="10.0.0-beta.24570.4">
618618
<Uri>https://github.com/dotnet/arcade</Uri>
619-
<Sha>efdc52bb77eeadae5420eb48e66722c4fdcaa3be</Sha>
619+
<Sha>0c8f4989db0251f49a4f37d1b35bf4da1e9d6415</Sha>
620620
<SourceBuild RepoName="arcade" ManagedOnly="true" />
621621
</Dependency>
622622
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24570.2">

‎eng/Versions.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -275,10 +275,10 @@
275275
</PropertyGroup>
276276
<PropertyGroup>
277277
<!-- Dependencies from https://github.com/dotnet/arcade -->
278-
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24570.1</MicrosoftDotNetBuildTasksInstallersPackageVersion>
279-
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24570.1</MicrosoftDotNetSignToolVersion>
280-
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24570.1</MicrosoftDotNetXliffTasksVersion>
281-
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.1</MicrosoftDotNetXUnitExtensionsVersion>
278+
<MicrosoftDotNetBuildTasksInstallersPackageVersion>10.0.0-beta.24570.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
279+
<MicrosoftDotNetSignToolVersion>10.0.0-beta.24570.4</MicrosoftDotNetSignToolVersion>
280+
<MicrosoftDotNetXliffTasksVersion>10.0.0-beta.24570.4</MicrosoftDotNetXliffTasksVersion>
281+
<MicrosoftDotNetXUnitExtensionsVersion>10.0.0-beta.24570.4</MicrosoftDotNetXUnitExtensionsVersion>
282282
</PropertyGroup>
283283
<PropertyGroup>
284284
<!-- Dependencies from https://github.com/dotnet/sourcelink -->

‎global.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
"cmake": "latest"
1818
},
1919
"msbuild-sdks": {
20-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.1",
21-
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.1",
20+
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24570.4",
21+
"Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24570.4",
2222
"Microsoft.Build.NoTargets": "3.7.0",
2323
"Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24217.1"
2424
}

‎src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch‎

Lines changed: 15 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,20 @@ Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade
55

66
Backport: https://github.com/dotnet/arcade/pull/15221
77
---
8-
Directory.Build.props | 5 +++++
9-
global.json | 4 ++--
10-
.../src/build/Packaging.targets | 4 ++++
11-
.../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +-
12-
.../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +-
13-
.../Microsoft.DotNet.XliffTasks.csproj | 4 ----
14-
tests/UnitTests.proj | 5 +++--
8+
Directory.Build.props | 5 +++++
9+
global.json | 4 ++--
10+
.../src/build/Packaging.targets | 4 ++++
11+
.../Sdk/tools/dotnet-cli/DotNetCli.props | 2 +-
12+
.../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +-
13+
.../Microsoft.DotNet.XliffTasks.csproj | 4 ----
14+
tests/UnitTests.proj | 5 +++--
1515
7 files changed, 16 insertions(+), 10 deletions(-)
1616

1717
diff --git a/Directory.Build.props b/Directory.Build.props
1818
index 9d84f1dc6..b25de0091 100644
1919
--- a/Directory.Build.props
2020
+++ b/Directory.Build.props
21-
@@ -16,6 +16,11 @@
22-
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
21+
@@ -17,4 +17,9 @@
2322
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
2423
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
2524
+ <!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. -->
@@ -29,12 +28,11 @@ index 9d84f1dc6..b25de0091 100644
2928
+ <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
3029
</PropertyGroup>
3130

32-
</Project>
3331
diff --git a/global.json b/global.json
34-
index 771c1a2bc..bcc101ef1 100644
32+
index af88ae5bf..904f8d03d 100644
3533
--- a/global.json
3634
+++ b/global.json
37-
@@ -1,10 +1,10 @@
35+
@@ -1,9 +1,9 @@
3836
{
3937
"sdk": {
4038
- "version": "9.0.100",
@@ -46,13 +44,11 @@ index 771c1a2bc..bcc101ef1 100644
4644
+ "dotnet": "10.0.100-alpha.1.24551.9"
4745
},
4846
"msbuild-sdks": {
49-
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24562.15",
5047
diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
5148
index b94b6736d..e0fadabb2 100644
5249
--- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
5350
+++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets
54-
@@ -954,6 +954,10 @@
55-
<DefaultValidateFramework Include="net9.0">
51+
@@ -955,4 +955,8 @@
5652
<RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
5753
</DefaultValidateFramework>
5854
+ <NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
@@ -61,39 +57,33 @@ index b94b6736d..e0fadabb2 100644
6157
+ </DefaultValidateFramework>
6258

6359
<NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
64-
<DefaultValidateFramework Include="netcore50">
6560
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
6661
index 63552b1ed..15d5a63aa 100644
6762
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
6863
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/dotnet-cli/DotNetCli.props
69-
@@ -3,7 +3,7 @@
70-
64+
@@ -4,5 +4,5 @@
7165
<PropertyGroup>
7266
<IncludeDotNetCli Condition=" '$(IncludeDotNetCli)' != 'true' ">false</IncludeDotNetCli>
7367
- <AspNetCoreRuntimeVersion>9.0.0</AspNetCoreRuntimeVersion>
7468
+ <AspNetCoreRuntimeVersion>10.0.0-alpha.2.24531.4</AspNetCoreRuntimeVersion>
7569
<DotNetCliPackageType Condition=" '$(DotNetCliPackageType)' == '' ">runtime</DotNetCliPackageType>
7670
<DotNetCliVersion Condition=" '$(DotNetCliVersion)' == '' AND '$(DotNetCliPackageType)' == 'runtime' ">$(BundledNETCoreAppPackageVersion)</DotNetCliVersion>
77-
<!-- TODO (https://github.com/dotnet/arcade/issues/7022): We are hardcoding this version to use the one tied to the SDK version from global.json -->
7871
diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
7972
index 0ae8d1482..9312e2672 100644
8073
--- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
8174
+++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets
82-
@@ -2,7 +2,7 @@
83-
<Project>
75+
@@ -3,5 +3,5 @@
8476

8577
<PropertyGroup>
8678
- <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework>
8779
+ <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework>
8880
<XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>
8981

90-
<XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion>
9182
diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
9283
index 1059c3bc4..165a4a7d5 100644
9384
--- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
9485
+++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj
95-
@@ -1,10 +1,6 @@
96-
<Project Sdk="Microsoft.NET.Sdk">
86+
@@ -2,8 +2,4 @@
9787

9888
<PropertyGroup>
9989
- <!--
@@ -102,13 +92,11 @@ index 1059c3bc4..165a4a7d5 100644
10292
- -->
10393
<TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
10494
<IsPackable>true</IsPackable>
105-
<IsBuildTaskProject>true</IsBuildTaskProject>
10695
diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj
10796
index 910ccf3b0..ad85e4bac 100644
10897
--- a/tests/UnitTests.proj
10998
+++ b/tests/UnitTests.proj
110-
@@ -116,9 +116,10 @@
111-
<Import Project="$(MSBuildThisFileDirectory)\..\src\Microsoft.DotNet.Helix\Sdk\sdk\Sdk.targets"/>
99+
@@ -117,8 +117,9 @@
112100

113101
<ItemGroup>
114102
- <HelixWorkItem Condition="$(HelixTargetQueue.StartsWith('Windows'))" Include="AspNetCoreTest">

0 commit comments

Comments
 (0)