Skip to content

Commit a32e051

Browse files
committed
Update the sdk target to net10.0
1 parent 27832aa commit a32e051

File tree

34 files changed

+46
-37
lines changed

34 files changed

+46
-37
lines changed

Directory.Build.props

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,8 @@
4444
<!-- Default to all packages generating a corresponding symbol package -->
4545
<IncludeSymbols>true</IncludeSymbols>
4646
<IsShippingPackage>false</IsShippingPackage>
47-
<SdkTargetFramework>net10.0</SdkTargetFramework>
48-
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
49-
<NetCurrent>net10.0</NetCurrent>
47+
<SdkTargetFramework>net11.0</SdkTargetFramework>
48+
<NetCurrent>net11.0</NetCurrent>
5049
<NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</NetToolMinimum>
5150
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
5251
<VisualStudioServiceTargetFramework>net9.0</VisualStudioServiceTargetFramework>

eng/restore-toolset.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ function InitializeCustomSDKToolset {
1919
InstallDotNetSharedFramework "7.0.0"
2020
InstallDotNetSharedFramework "8.0.0"
2121
InstallDotNetSharedFramework "9.0.0"
22+
InstallDotNetSharedFramework "10.0.0-rtm.25523.111"
2223

2324
CreateBuildEnvScripts
2425
CreateVSShortcut

eng/restore-toolset.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@ function InitializeCustomSDKToolset {
2525
InstallDotNetSharedFramework "7.0.0"
2626
InstallDotNetSharedFramework "8.0.0"
2727
InstallDotNetSharedFramework "9.0.0"
28+
InstallDotNetSharedFramework "10.0.0-rtm.25523.111"
2829

2930
CreateBuildEnvScript
3031
}

global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
88
},
99
"tools": {
10-
"dotnet": "10.0.100-rc.1.25451.107",
10+
"dotnet": "11.0.100-alpha.1.25614.102",
1111
"runtimes": {
1212
"dotnet": [
1313
"$(MicrosoftNETCorePlatformsPackageVersion)"

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'">net10.0</_BlazorWebAssemblySdkTasksTFM>
30+
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net11.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\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
33+
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net11.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'">net10.0</_BlazorWebAssemblySdkTasksTFM>
30+
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net11.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\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
33+
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net11.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
3434
</PropertyGroup>
3535

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

src/BuiltInTools/Watch/HotReload/HotReloadEventSource.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
namespace Microsoft.DotNet.Watch
88
{
99
[EventSource(Name = "HotReload")]
10-
internal sealed class HotReloadEventSource : EventSource
10+
internal sealed partial class HotReloadEventSource : EventSource
1111
{
1212
public enum StartType
1313
{

src/Cli/Microsoft.TemplateEngine.Cli/TabularOutput/TabularOutput.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,11 +128,11 @@ internal string Layout(int indent = 0)
128128
{
129129
for (int i = 0; i < _columns.Count; ++i)
130130
{
131-
b.Append(new string(_settings.HeaderSeparator.Value, _columns[i].CalculatedWidth));
131+
b.Append(_settings.HeaderSeparator.Value, _columns[i].CalculatedWidth);
132132

133133
if (i < _columns.Count - 1)
134134
{
135-
b.Append(new string(' ', _settings.ColumnPadding));
135+
b.Append(' ', _settings.ColumnPadding);
136136
}
137137
}
138138
b.AppendLine().Indent(indent);

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

File renamed without changes.

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

File renamed without changes.

0 commit comments

Comments
 (0)