Skip to content

Commit 187fe8a

Browse files
authored
Update to .NET 10 SDK and TFM to net10.0 in arcade
1 parent c3a704e commit 187fe8a

File tree

5 files changed

+13
-8
lines changed

5 files changed

+13
-8
lines changed

Directory.Build.props

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@
1616
<RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl>
1717
<!-- Only upgrade NuGetAudit warnings to errors for official builds. -->
1818
<WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors>
19+
<!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. -->
20+
<NetCurrent>net10.0</NetCurrent>
21+
<NetPrevious>net9.0</NetPrevious>
22+
<NetToolCurrent>$(NetCurrent))</NetToolCurrent>
23+
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum>
1924
</PropertyGroup>
2025

2126
</Project>

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"sdk": {
3-
"version": "9.0.100-rc.2.24474.11",
3+
"version": "10.0.100-alpha.1.24551.9",
44
"rollForward": "latestFeature"
55
},
66
"tools": {
7-
"dotnet": "9.0.100-rc.2.24474.11"
7+
"dotnet": "10.0.100-alpha.1.24551.9"
88
},
99
"msbuild-sdks": {
1010
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1",

src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -954,6 +954,10 @@
954954
<DefaultValidateFramework Include="net9.0">
955955
<RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs>
956956
</DefaultValidateFramework>
957+
<NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" />
958+
<DefaultValidateFramework Include="net10.0">
959+
<RuntimeIDs>@(NETCoreApp100RIDs)</RuntimeIDs>
960+
</DefaultValidateFramework>
957961

958962
<NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" />
959963
<DefaultValidateFramework Include="netcore50">

src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project>
33

44
<PropertyGroup>
5-
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework>
5+
<XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework>
66
<XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework>
77

88
<XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion>

src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<!--
5-
We need to target net8.0 while Arcade SDK 8 is being used.
6-
Xliff tasks were moved from dotnet/xliff-tasks to Arcade in V9, so they are not available in release/8.0 branch.
7-
-->
8-
<TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks>
4+
<TargetFrameworks>$(NetToolCurrent);$(NetFrameworkToolCurrent)</TargetFrameworks>
95
<IsPackable>true</IsPackable>
106
<IsBuildTaskProject>true</IsBuildTaskProject>
117
<RootNamespace>XliffTasks</RootNamespace>

0 commit comments

Comments
 (0)