Skip to content

Commit ffd7663

Browse files
v-wuzhaimmitchemarcpopMSFTam11jkotas
authored
Update the sdk target to net10.0 (#43015)
Co-authored-by: Matt Mitchell (.NET) <[email protected]> Co-authored-by: Marc Paine <[email protected]> Co-authored-by: Adeel Mujahid <[email protected]> Co-authored-by: Jan Kotas <[email protected]> Co-authored-by: Viktor Hofer <[email protected]> Co-authored-by: Ella Hathaway <[email protected]> Co-authored-by: Jeremy Koritzinsky <[email protected]> Co-authored-by: Matt Thalman <[email protected]> Co-authored-by: Noah Gilson <[email protected]>
1 parent 14417f1 commit ffd7663

File tree

73 files changed

+808
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

73 files changed

+808
-489
lines changed

‎Directory.Build.props‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,9 @@
3434
<!-- Default to all packages generating a corresponding symbol package -->
3535
<IncludeSymbols>true</IncludeSymbols>
3636
<IsShippingPackage>false</IsShippingPackage>
37-
<SdkTargetFramework>net9.0</SdkTargetFramework>
37+
<SdkTargetFramework>net10.0</SdkTargetFramework>
38+
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
39+
<NetCurrent>net10.0</NetCurrent>
3840
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
3941
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>
4042

‎eng/restore-toolset.ps1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ function InitializeCustomSDKToolset {
1818
InstallDotNetSharedFramework "6.0.0"
1919
InstallDotNetSharedFramework "7.0.0"
2020
InstallDotNetSharedFramework "8.0.0"
21+
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"
2122

2223
CreateBuildEnvScripts
2324
CreateVSShortcut

‎eng/restore-toolset.sh‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ function InitializeCustomSDKToolset {
2424
InstallDotNetSharedFramework "6.0.0"
2525
InstallDotNetSharedFramework "7.0.0"
2626
InstallDotNetSharedFramework "8.0.0"
27+
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"
2728

2829
CreateBuildEnvScript
2930
}

‎global.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"tools": {
3-
"dotnet": "9.0.100-rc.2.24474.11",
3+
"dotnet": "10.0.100-alpha.1.24551.9",
44
"runtimes": {
55
"dotnet": [
66
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.5_0.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Copyright (c) .NET Foundation. All rights reserved.
2727
<PropertyGroup>
2828
<!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
2929
<BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
30-
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_BlazorWebAssemblySdkTasksTFM>
30+
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_BlazorWebAssemblySdkTasksTFM>
3131
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_BlazorWebAssemblySdkTasksTFM>
3232
<_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
33-
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net9.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
33+
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
3434
</PropertyGroup>
3535

3636
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson50" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />

‎src/BlazorWasmSdk/Targets/Microsoft.NET.Sdk.BlazorWebAssembly.6_0.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,10 @@ Copyright (c) .NET Foundation. All rights reserved.
2727
<PropertyGroup>
2828
<!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
2929
<BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
30-
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_BlazorWebAssemblySdkTasksTFM>
30+
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_BlazorWebAssemblySdkTasksTFM>
3131
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_BlazorWebAssemblySdkTasksTFM>
3232
<_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
33-
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net9.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
33+
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
3434
</PropertyGroup>
3535

3636
<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.CreateBlazorTrimmerRootDescriptorFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />

‎src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net9.0/PublicAPI.Shipped.txt‎ renamed to ‎src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net10.0/PublicAPI.Shipped.txt‎

File renamed without changes.

‎src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net9.0/PublicAPI.Unshipped.txt‎ renamed to ‎src/Containers/Microsoft.NET.Build.Containers/PublicAPI/net10.0/PublicAPI.Unshipped.txt‎

File renamed without changes.

‎src/Containers/packaging/build/Microsoft.NET.Build.Containers.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<!-- A flag representing this package existing in a project. -->
44
<SDKContainerSupportEnabled>true</SDKContainerSupportEnabled>
55
<ContainerTaskFolderName>tasks</ContainerTaskFolderName>
6-
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net9.0</ContainerTaskFramework>
6+
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net10.0</ContainerTaskFramework>
77
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Full'">net472</ContainerTaskFramework>
88
<ContainerizeFolderName>containerize</ContainerizeFolderName>
99
<!--The folder where the custom task will be present. It points to inside the nuget package. -->

‎src/Installer/redist-installer/targets/Crossgen.targets‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@
3434
no that we do not silently miss cross-genning some bits. When a TFM for a tool is updated,
3535
update its path explicitly. If all TFMs match, update DefaultToolTfm -->
3636
<PropertyGroup>
37-
<DefaultToolTfm>net9.0</DefaultToolTfm>
37+
<DefaultToolTfm>net10.0</DefaultToolTfm>
3838

3939
<NetSdkTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\</NetSdkTools>
4040
<BlazorWasmTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\</BlazorWasmTools>
4141
<NuGetPackTools>$(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\</NuGetPackTools>
4242
<RazorTasks>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\</RazorTasks>
43-
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\</WindowsDesktopTools>
43+
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\net9.0\</WindowsDesktopTools>
4444
<PublishTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\</PublishTools>
4545
<WebTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\</WebTools>
4646
<ProjectSystemTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\</ProjectSystemTools>

0 commit comments

Comments
 (0)