diff --git a/Directory.Build.props b/Directory.Build.props index 9d84f1dc650..b4e468bdf2c 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -16,6 +16,11 @@ https://github.com/dotnet/arcade $(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904 + + net10.0 + net9.0 + $(NetCurrent) + $(NetToolCurrent) diff --git a/global.json b/global.json index af88ae5bfcc..be804061027 100644 --- a/global.json +++ b/global.json @@ -1,10 +1,10 @@ { "sdk": { - "version": "9.0.100", + "version": "10.0.100-alpha.1.24573.1", "rollForward": "latestFeature" }, "tools": { - "dotnet": "9.0.100" + "dotnet": "10.0.100-alpha.1.24573.1" }, "msbuild-sdks": { "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1", diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj index 619efac3306..b4c8d50a9c4 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/Sign.proj @@ -98,7 +98,7 @@ SNBinaryPath="$(SNBinaryPath)" MicroBuildCorePath="$(NuGetPackageRoot)microbuild.core\$(MicroBuildCoreVersion)" WixToolsPath="$(WixInstallPath)" - TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net9.0\any\Microsoft.Dotnet.Tar.dll" + TarToolPath="$(NuGetPackageRoot)microsoft.dotnet.tar\$(MicrosoftDotNetSignToolVersion)\tools\net10.0\any\Microsoft.Dotnet.Tar.dll" RepackParallelism="$(SignToolRepackParallelism)" MaximumParallelFileSize="$(SignToolRepackMaximumParallelFileSize)" /> diff --git a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props index bd83cda601a..33c2fea4ed1 100644 --- a/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props +++ b/src/Microsoft.DotNet.Arcade.Sdk/tools/TargetFrameworkDefaults.props @@ -11,21 +11,19 @@ - net9.0 + net10.0 - + net9.0 - + net8.0 net481 - + net462 @@ -33,7 +31,7 @@ - net9.0 + net10.0 $(NetCurrent) diff --git a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets index 0ae8d148264..9312e26723c 100644 --- a/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets +++ b/src/Microsoft.DotNet.Helix/Sdk/tools/xunit-runner/XUnitRunner.targets @@ -2,7 +2,7 @@ - net9.0 + net10.0 netcoreapp2.0 2.9.2 diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj index 1059c3bc488..165a4a7d5fd 100644 --- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj +++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj @@ -1,10 +1,6 @@ - $(NetToolMinimum);$(NetFrameworkToolCurrent) true true diff --git a/tests/UnitTests.proj b/tests/UnitTests.proj index 910ccf3b075..ad85e4bac70 100644 --- a/tests/UnitTests.proj +++ b/tests/UnitTests.proj @@ -116,9 +116,10 @@ - + +