Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update the sdk target to net10.0 #43015

Merged
merged 71 commits into from
Nov 5, 2024
Merged
Show file tree
Hide file tree
Changes from 32 commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
8480f31
Update the sdk target to net10.0
v-wuzhai Aug 27, 2024
10d8ad6
Merge branch 'main' of https://github.com/dotnet/sdk into dev/Jason/U…
v-wuzhai Aug 27, 2024
6003d81
Merge branch 'main' of https://github.com/dotnet/sdk into dev/Jason/U…
v-wuzhai Oct 8, 2024
ba19dd8
Unlock the build
v-wuzhai Oct 8, 2024
d69e52c
Add an empty Directory.Build.targets
mmitche Oct 10, 2024
eb0cd8a
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
mmitche Oct 10, 2024
c4d1281
Switch the resolvers and test project to net10.0
marcpopMSFT Oct 10, 2024
7d18b09
Move dotnet-format to use SdkTargetFramework
mmitche Oct 10, 2024
62d7486
Fix the template tests but we need to check on this as the current ou…
marcpopMSFT Oct 10, 2024
58ce796
Update source build global.json
marcpopMSFT Oct 10, 2024
27881c4
Update the current target to 10.0 as some tests automatically update …
marcpopMSFT Oct 11, 2024
7c671f9
Fix the formatting of some of the templating tests
marcpopMSFT Oct 11, 2024
83b8fdc
Web templates have moved to target net10.0 already
marcpopMSFT Oct 11, 2024
b18d98f
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
marcpopMSFT Oct 11, 2024
b715ece
Update according to the comments
v-wuzhai Oct 12, 2024
d40538b
Fix version
v-wuzhai Oct 12, 2024
a951a65
The current .NET SDK does not support targeting .NET 11.0
v-wuzhai Oct 12, 2024
742a88d
Attempting to unlock a bunch of test failures
v-wuzhai Oct 14, 2024
bd1d57a
Temporarily disable a test as we can't reference across TFMs. This ca…
marcpopMSFT Oct 14, 2024
9ae75b6
Update the regex to handle 5+
marcpopMSFT Oct 14, 2024
b676bbb
After talking to baronfel, disabling some container tests for now unt…
marcpopMSFT Oct 14, 2024
505ea26
Disable a couple more container tests
marcpopMSFT Oct 16, 2024
3133bcf
Add ignoredPatterns in NotHaveStdOutContaining
am11 Oct 21, 2024
6a07932
Ignore __compact_unwind warnings
am11 Oct 21, 2024
e6c3248
Ignore clang-16 warning as well
am11 Oct 21, 2024
252429d
Add temp logging
jkotas Oct 24, 2024
7f1ec30
Add .NET 9.0 TFM to PublishTestUtils
jkotas Oct 24, 2024
284e14c
Revert "Add temp logging"
jkotas Oct 27, 2024
9c9f903
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
jkotas Oct 27, 2024
1bd7bd2
Avoid test directory name collisions
jkotas Oct 28, 2024
95f5fa9
Merge remote-tracking branch 'am11/ignore-ld-warning' into dev/Jason/…
jkotas Oct 28, 2024
50b52b1
Add comments
jkotas Oct 28, 2024
2833c53
Set NetCurrent accordingly and downgrade VMR SDK
ViktorHofer Oct 28, 2024
d99e5d0
Set NetCoreAppToolCurrent to SDK value
ViktorHofer Oct 29, 2024
24c81d3
Forward NetCoreAppToolCurrentVersion
ViktorHofer Oct 29, 2024
5298648
Update 0001-Forward-NetCoreAppToolCurrent-switch.patch
ViktorHofer Oct 29, 2024
89790ca
Fix patch
ViktorHofer Oct 29, 2024
556992a
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Oct 29, 2024
309f381
Add patch for hardcoded LinkTask TFM
ViktorHofer Oct 29, 2024
73fa346
update patches because of sync failure
ViktorHofer Oct 29, 2024
8f1f484
CLRF -> LF in patch
ViktorHofer Oct 29, 2024
a41669d
Update hardcoded tareting and runtime pack versions
ViktorHofer Oct 29, 2024
7909f2d
TestCLI package is net9.0
ViktorHofer Oct 29, 2024
98bd6dd
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Oct 29, 2024
8091644
Apply suggestions from code review
jkotas Oct 29, 2024
f61431e
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Oct 30, 2024
7cdb0cb
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Oct 31, 2024
7933a2c
Update and rename 0001-Forward-NetCoreAppToolCurrentVersion-property-…
ViktorHofer Oct 31, 2024
ff69d51
Update patches
ViktorHofer Oct 31, 2024
bdd67a2
Update patch again...
ViktorHofer Oct 31, 2024
6f4353a
Add another runtime patch
ViktorHofer Oct 31, 2024
4c08007
damn... update patches again
ViktorHofer Oct 31, 2024
4693dfd
and again...
ViktorHofer Oct 31, 2024
5c810ad
Update SDKs
ViktorHofer Oct 31, 2024
e64a7b3
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Oct 31, 2024
012bedb
Remove now unnecessary patch
ViktorHofer Oct 31, 2024
6441219
Update to new prebuilts tarball version
ellahathaway Oct 31, 2024
7bc9f92
Apply suggestions from code review
jkoritzinsky Nov 1, 2024
18659d8
Update prebuilts tarball
ellahathaway Nov 1, 2024
27a0734
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Nov 2, 2024
d6ad34d
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
ViktorHofer Nov 3, 2024
4aa59bd
Set rollforward policy for VMR test projects
ViktorHofer Nov 3, 2024
5456196
Disable Publish60Hosted_Works until 8.0.5 is available on .NET Framework
ViktorHofer Nov 4, 2024
bfa607a
Update prebuilts tarball
mthalman Nov 4, 2024
8f28cbc
switch to the windows only msbuild fact
marcpopMSFT Nov 4, 2024
6d2c4eb
Merge branch 'main' into dev/Jason/Update-the-sdk-target-to-net10.0
nagilson Nov 5, 2024
7a3c6e7
Add Reason property to and update baselines
v-wuzhai Nov 5, 2024
482ad03
Add wpf patch
ViktorHofer Nov 5, 2024
c0cdf43
Add Arcade patch
ViktorHofer Nov 5, 2024
575036c
Damn, I hate patches
ViktorHofer Nov 5, 2024
3820c21
Add windowsdesktop patch
ViktorHofer Nov 5, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
<!-- Default to all packages generating a corresponding symbol package -->
<IncludeSymbols>true</IncludeSymbols>
<IsShippingPackage>false</IsShippingPackage>
<SdkTargetFramework>net9.0</SdkTargetFramework>
<SdkTargetFramework>net10.0</SdkTargetFramework>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
<ToolsetTargetFramework>$(SdkTargetFramework)</ToolsetTargetFramework>
<VisualStudioServiceTargetFramework>net8.0</VisualStudioServiceTargetFramework>

Expand Down
1 change: 1 addition & 0 deletions eng/restore-toolset.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "6.0.0"
InstallDotNetSharedFramework "7.0.0"
InstallDotNetSharedFramework "8.0.0"
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"

CreateBuildEnvScripts
CreateVSShortcut
Expand Down
1 change: 1 addition & 0 deletions eng/restore-toolset.sh
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ function InitializeCustomSDKToolset {
InstallDotNetSharedFramework "6.0.0"
InstallDotNetSharedFramework "7.0.0"
InstallDotNetSharedFramework "8.0.0"
InstallDotNetSharedFramework "9.0.0-rc.2.24473.5"

CreateBuildEnvScript
}
Expand Down
2 changes: 1 addition & 1 deletion global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-rc.2.24474.11",
"dotnet": "10.0.100-alpha.1.24507.21",
jkotas marked this conversation as resolved.
Show resolved Hide resolved
"runtimes": {
"dotnet": [
"$(VSRedistCommonNetCoreSharedFrameworkx64100PackageVersion)"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
<BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net9.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
</PropertyGroup>

<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.GenerateBlazorWebAssemblyBootJson50" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<!-- Paths to tools, tasks, and extensions are calculated relative to the BlazorWebAssemblySdkDirectoryRoot. This can be modified to test a local build. -->
<BlazorWebAssemblySdkDirectoryRoot Condition="'$(BlazorWebAssemblySdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</BlazorWebAssemblySdkDirectoryRoot>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksTFM Condition=" '$(MSBuildRuntimeType)' != 'Core'">net472</_BlazorWebAssemblySdkTasksTFM>
<_BlazorWebAssemblySdkTasksAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\$(_BlazorWebAssemblySdkTasksTFM)\Microsoft.NET.Sdk.BlazorWebAssembly.Tasks.dll</_BlazorWebAssemblySdkTasksAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net9.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
<_BlazorWebAssemblySdkToolAssembly>$(BlazorWebAssemblySdkDirectoryRoot)tools\net10.0\Microsoft.NET.Sdk.BlazorWebAssembly.Tool.dll</_BlazorWebAssemblySdkToolAssembly>
</PropertyGroup>

<UsingTask TaskName="Microsoft.NET.Sdk.BlazorWebAssembly.CreateBlazorTrimmerRootDescriptorFile" AssemblyFile="$(_BlazorWebAssemblySdkTasksAssembly)" />
Expand Down
2 changes: 1 addition & 1 deletion src/BuiltInTools/dotnet-format/dotnet-format.csproj
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFramework>$(NetCurrent)</TargetFramework>
<TargetFramework>$(SdkTargetFramework)</TargetFramework>
<OutputType>Exe</OutputType>
<RootNamespace>Microsoft.CodeAnalysis.Tools</RootNamespace>
<ServerGarbageCollection>true</ServerGarbageCollection>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- A flag representing this package existing in a project. -->
<SDKContainerSupportEnabled>true</SDKContainerSupportEnabled>
<ContainerTaskFolderName>tasks</ContainerTaskFolderName>
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net9.0</ContainerTaskFramework>
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Core'">net10.0</ContainerTaskFramework>
<ContainerTaskFramework Condition="'$(MSBuildRuntimeType)' == 'Full'">net472</ContainerTaskFramework>
<ContainerizeFolderName>containerize</ContainerizeFolderName>
<!--The folder where the custom task will be present. It points to inside the nuget package. -->
Expand Down
4 changes: 2 additions & 2 deletions src/Installer/redist-installer/targets/Crossgen.targets
Original file line number Diff line number Diff line change
Expand Up @@ -34,13 +34,13 @@
no that we do not silently miss cross-genning some bits. When a TFM for a tool is updated,
update its path explicitly. If all TFMs match, update DefaultToolTfm -->
<PropertyGroup>
<DefaultToolTfm>net9.0</DefaultToolTfm>
<DefaultToolTfm>net10.0</DefaultToolTfm>

<NetSdkTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk\tools\$(DefaultToolTfm)\</NetSdkTools>
<BlazorWasmTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.BlazorWebAssembly\tools\$(DefaultToolTfm)\</BlazorWasmTools>
<NuGetPackTools>$(SdkOutputDirectory)Sdks\NuGet.Build.Tasks.Pack\CoreCLR\</NuGetPackTools>
<RazorTasks>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Razor\tasks\$(DefaultToolTfm)\</RazorTasks>
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\$(DefaultToolTfm)\</WindowsDesktopTools>
<WindowsDesktopTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.WindowsDesktop\tools\net9.0\</WindowsDesktopTools>
<PublishTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Publish\tools\$(DefaultToolTfm)\</PublishTools>
<WebTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web\tools\$(DefaultToolTfm)\</WebTools>
<ProjectSystemTools>$(SdkOutputDirectory)Sdks\Microsoft.NET.Sdk.Web.ProjectSystem\tools\$(DefaultToolTfm)\</ProjectSystemTools>
Expand Down
8 changes: 4 additions & 4 deletions src/Layout/redist/targets/GenerateLayout.targets
Original file line number Diff line number Diff line change
Expand Up @@ -113,9 +113,9 @@
</PropertyGroup>

<ItemGroup>
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)//$(NetCurrent)/**/*.dll" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.json" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(NetCurrent)/**/*.config" />
<DotnetFormatDllFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)//$(SdkTargetFramework)/**/*.dll" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(SdkTargetFramework)/**/*.json" />
<DotnetFormatConfigFiles Include="$(ArtifactsBinDir)/dotnet-format/$(Configuration)/$(SdkTargetFramework)/**/*.config" />
</ItemGroup>

<Copy SourceFiles="@(DotnetFormatDllFiles)" DestinationFiles="@(DotnetFormatDllFiles->'$(DotnetFormatDestinationDirectory)/%(RecursiveDir)%(Filename)%(Extension)')" />
Expand Down Expand Up @@ -177,7 +177,7 @@
BeforeTargets="Build">
<PropertyGroup>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' != 'true'" >netcoreapp3.1</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'" >net9.0</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'" >net10.0</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectory>$(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/</TestCliNuGetDirectory>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/RazorSdk/Targets/Sdk.Razor.CurrentVersion.targets
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Paths to tools, tasks, and extensions are calculated relative to the RazorSdkDirectoryRoot. This can be modified to test a local build. -->
<RazorSdkDirectoryRoot Condition="'$(RazorSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</RazorSdkDirectoryRoot>
<RazorSdkBuildTasksDirectoryRoot Condition="'$(RazorSdkBuildTasksDirectoryRoot)'==''">$(RazorSdkDirectoryRoot)tasks\</RazorSdkBuildTasksDirectoryRoot>
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_RazorSdkTasksTFM>
<_RazorSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_RazorSdkTasksTFM>
<_RazorSdkTasksTFM Condition=" '$(_RazorSdkTasksTFM)' == ''">net472</_RazorSdkTasksTFM>
<RazorSdkBuildTasksAssembly>$(RazorSdkBuildTasksDirectoryRoot)$(_RazorSdkTasksTFM)\Microsoft.NET.Sdk.Razor.Tasks.dll</RazorSdkBuildTasksAssembly>
<_RazorSdkToolAssembly>$(RazorSdkDirectoryRoot)tools\rzc.dll</_RazorSdkToolAssembly>
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@
<IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>

<!-- TargetFrameworkDefaults.props -->
<NetCurrent>net9.0</NetCurrent>
<NetCurrent>net10.0</NetCurrent>
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
</PropertyGroup>

<!-- Manually import the Versions.props file when the Arcade SDK isn't used. -->
Expand Down
2 changes: 1 addition & 1 deletion src/SourceBuild/content/global.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"tools": {
"dotnet": "9.0.100-rc.1.24452.12"
"dotnet": "10.0.100-alpha.1.24507.21"
ViktorHofer marked this conversation as resolved.
Show resolved Hide resolved
jkotas marked this conversation as resolved.
Show resolved Hide resolved
},
"msbuild-sdks": {
"Microsoft.Build.NoTargets": "3.7.0",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,10 @@ Copyright (c) .NET Foundation. All rights reserved.
<!-- Paths to tools, tasks, and extensions are calculated relative to the StaticWebAssetsSdkDirectoryRoot. This can be modified to test a local build. -->
<StaticWebAssetsSdkDirectoryRoot Condition="'$(StaticWebAssetsSdkDirectoryRoot)'==''">$(MSBuildThisFileDirectory)..\</StaticWebAssetsSdkDirectoryRoot>
<StaticWebAssetsSdkBuildTasksDirectoryRoot Condition="'$(StaticWebAssetsSdkBuildTasksDirectoryRoot)'==''">$(StaticWebAssetsSdkDirectoryRoot)tasks\</StaticWebAssetsSdkBuildTasksDirectoryRoot>
<_StaticWebAssetsSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_StaticWebAssetsSdkTasksTFM>
<_StaticWebAssetsSdkTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_StaticWebAssetsSdkTasksTFM>
<_StaticWebAssetsSdkTasksTFM Condition=" '$(_StaticWebAssetsSdkTasksTFM)' == ''">net472</_StaticWebAssetsSdkTasksTFM>
<StaticWebAssetsSdkBuildTasksAssembly>$(StaticWebAssetsSdkBuildTasksDirectoryRoot)$(_StaticWebAssetsSdkTasksTFM)\Microsoft.NET.Sdk.StaticWebAssets.Tasks.dll</StaticWebAssetsSdkBuildTasksAssembly>
<_StaticWebAssetsSdkToolAssembly>$(StaticWebAssetsSdkDirectoryRoot)tools\net9.0\Microsoft.NET.Sdk.StaticWebAssets.Tool.dll</_StaticWebAssetsSdkToolAssembly>
<_StaticWebAssetsSdkToolAssembly>$(StaticWebAssetsSdkDirectoryRoot)tools\net10.0\Microsoft.NET.Sdk.StaticWebAssets.Tool.dll</_StaticWebAssetsSdkToolAssembly>
</PropertyGroup>

<PropertyGroup Condition="'$(DOTNET_HOST_PATH)' == ''">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<PropertyGroup>
<_TargetFrameworkVersionWithoutV>$(TargetFrameworkVersion.TrimStart('vV'))</_TargetFrameworkVersionWithoutV>

<MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\tools\net9.0\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
<MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == '' AND '$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)\tools\net10.0\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>
<MicrosoftNETBuildExtensionsTasksAssembly Condition="'$(MicrosoftNETBuildExtensionsTasksAssembly)' == ''">$(MSBuildThisFileDirectory)\tools\net472\Microsoft.NET.Build.Extensions.Tasks.dll</MicrosoftNETBuildExtensionsTasksAssembly>

<!-- Include conflict resolution targets for NETFramework and allow other frameworks to opt-in -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Copyright (c) .NET Foundation. All rights reserved.
<Project>
<PropertyGroup Condition="'$(UseApiCompatPackage)' != 'true'">
<DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
<DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net9.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
<DotNetApiCompatTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net10.0\Microsoft.DotNet.ApiCompat.Task.dll</DotNetApiCompatTaskAssembly>
</PropertyGroup>

<ItemGroup Condition="'$(EnablePackageValidation)' == 'true' and
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Copyright (c) .NET Foundation. All rights reserved.

<PropertyGroup>
<MicrosoftNETBuildTasksDirectoryRoot>$(MSBuildThisFileDirectory)..\tools\</MicrosoftNETBuildTasksDirectoryRoot>
<MicrosoftNETBuildTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</MicrosoftNETBuildTasksTFM>
<MicrosoftNETBuildTasksTFM Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</MicrosoftNETBuildTasksTFM>
<MicrosoftNETBuildTasksTFM Condition=" '$(MicrosoftNETBuildTasksTFM)' == ''">net472</MicrosoftNETBuildTasksTFM>
<MicrosoftNETBuildTasksDirectory>$(MicrosoftNETBuildTasksDirectoryRoot)$(MicrosoftNETBuildTasksTFM)\</MicrosoftNETBuildTasksDirectory>
<MicrosoftNETBuildTasksAssembly>$(MicrosoftNETBuildTasksDirectory)Microsoft.NET.Build.Tasks.dll</MicrosoftNETBuildTasksAssembly>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,10 +28,11 @@ Copyright (c) .NET Foundation. All rights reserved.
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v8.0" DisplayName=".NET 8.0" Alias="net8.0"
Condition="$([MSBuild]::VersionGreaterThanOrEquals($(MSBuildVersion), '17.8.0'))"/>
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v9.0" DisplayName=".NET 9.0" Alias="net9.0" />
<SupportedNETCoreAppTargetFramework Include=".NETCoreApp,Version=v10.0" DisplayName=".NET 10.0" Alias="net10.0" />
</ItemGroup>

<PropertyGroup>
<UnsupportedTargetFrameworkVersion>10.0</UnsupportedTargetFrameworkVersion>
<UnsupportedTargetFrameworkVersion>11.0</UnsupportedTargetFrameworkVersion>
<MinimumVisualStudioVersionForUnsupportedTargetFrameworkVersion>17.12</MinimumVisualStudioVersionForUnsupportedTargetFrameworkVersion>
</PropertyGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ Copyright (C) Microsoft Corporation. All rights reserved.
<PropertyGroup>
<!-- We want to force this property to be true, hence not adding a condition check -->
<SupportsDeployOnBuild>true</SupportsDeployOnBuild>
<_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">net9.0</_PublishTaskFramework>
<_PublishTaskFramework Condition=" '$(MSBuildRuntimeType)' == 'Core'">net10.0</_PublishTaskFramework>
<_PublishTaskFramework Condition=" '$(_PublishTaskFramework)' == ''">net472</_PublishTaskFramework>
<_PublishTasksDir Condition=" '$(_PublishTasksDir)'=='' ">$(MSBuildThisFileDirectory)..\tools\$(_PublishTaskFramework)\</_PublishTasksDir>
<_PublishTaskAssemblyFullPath Condition=" '$(_PublishTaskAssemblyFullPath)'=='' ">$(_PublishTasksDir)Microsoft.NET.Sdk.Publish.Tasks.dll</_PublishTaskAssemblyFullPath>
Expand Down
4 changes: 2 additions & 2 deletions test/EndToEnd.Tests/GivenFrameworkDependentApps.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class GivenFrameworkDependentApps(ITestOutputHelper log) : SdkTest(log)
[ClassData(typeof(SupportedNetCoreAppVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
{
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0")
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0" || minorVersion == "10.0")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
Expand All @@ -25,7 +25,7 @@ public void ItDoesNotRollForwardToTheLatestVersionOfNetCore(string minorVersion)
[ClassData(typeof(SupportedAspNetCoreVersions))]
public void ItDoesNotRollForwardToTheLatestVersionOfAspNetCoreApp(string minorVersion)
{
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0")
if (minorVersion == "3.0" || minorVersion == "3.1" || minorVersion == "5.0" || minorVersion == "6.0" || minorVersion == "7.0" || minorVersion == "8.0" || minorVersion == "9.0" || minorVersion == "10.0")
{
// https://github.com/dotnet/core-sdk/issues/621
return;
Expand Down
6 changes: 0 additions & 6 deletions test/EndToEnd.Tests/ProjectBuildTests.cs
Original file line number Diff line number Diff line change
Expand Up @@ -411,12 +411,6 @@ private static string DetectExpectedDefaultFramework(string template = "")
if (template.StartsWith("mstest")
|| template.StartsWith("winforms")
|| template.StartsWith("wpf")
|| template.StartsWith("web")
|| template.StartsWith("razor")
|| template.StartsWith("blazor")
|| template.StartsWith("mvc")
|| template.StartsWith("worker")
|| template.StartsWith("grpc")
|| template.StartsWith("classlib")
|| template.StartsWith("console")
|| template.StartsWith("nunit")
Expand Down
3 changes: 2 additions & 1 deletion test/EndToEnd.Tests/Utilities/SupportedNetCoreAppVersions.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,8 @@ public class SupportedNetCoreAppVersions : IEnumerable<object[]>
"6.0",
"7.0",
"8.0",
"9.0"
"9.0",
"10.0"
};

public static IEnumerable<string> TargetFrameworkShortFolderVersion
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ public CreateNewImageTests(ITestOutputHelper testOutput)
_testOutput = testOutput;
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public void CreateNewImage_Baseline()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -70,7 +70,7 @@ private static ImageConfig GetImageConfigFromTask(CreateNewImage task)
return new(task.GeneratedContainerConfiguration);
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public void ParseContainerProperties_EndToEnd()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -133,7 +133,7 @@ public void ParseContainerProperties_EndToEnd()
/// <summary>
/// Creates a console app that outputs the environment variable added to the image.
/// </summary>
[DockerAvailableFact()]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
{
DirectoryInfo newProjectDir = new(GetTestDirectoryName());
Expand Down Expand Up @@ -216,7 +216,7 @@ public void Tasks_EndToEnd_With_EnvironmentVariable_Validation()
.And.HaveStdOut("Foo");
}

[DockerAvailableFact]
[DockerAvailableFact(Skip = "https://github.com/dotnet/sdk/issues/42850")]
public async System.Threading.Tasks.Task CreateNewImage_RootlessBaseImage()
{
const string RootlessBase = "dotnet/rootlessbase";
Expand Down
Loading
Loading