-
Notifications
You must be signed in to change notification settings - Fork 1.1k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 (#44685)
- Loading branch information
1 parent
8a2a9d0
commit ec8c882
Showing
10 changed files
with
204 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "tools": { | ||
| "dotnet": "10.0.100-alpha.1.24551.9" | ||
| "dotnet": "10.0.100-alpha.1.24555.54" | ||
| }, | ||
| "msbuild-sdks": { | ||
| "Microsoft.Build.NoTargets": "3.7.0", | ||
| "Microsoft.Build.Traversal": "3.4.0", | ||
| "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24522.1" | ||
| "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1" | ||
| } | ||
| } |
90 changes: 90 additions & 0 deletions
90
src/SourceBuild/patches/arcade/0001-Update to .NET 10 SDK and TFM to net10.0 in arcade.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,90 @@ | ||
| From b6100609c16295746b0c875494d5d66dabe35560 Mon Sep 17 00:00:00 2001 | ||
| From: Viktor Hofer <viktor.hofer@microsoft.com> | ||
| Date: Wed, 6 Nov 2024 16:43:26 +0000 | ||
| Subject: [PATCH] Update to .NET 10 SDK and TFM to net10.0 in arcade | ||
|
|
||
| Backport: https://github.com/dotnet/arcade/pull/15221 | ||
| --- | ||
| Directory.Build.props | 5 +++++ | ||
| global.json | 4 ++-- | ||
| .../src/build/Packaging.targets | 4 ++++ | ||
| .../Sdk/tools/xunit-runner/XUnitRunner.targets | 2 +- | ||
| .../Microsoft.DotNet.XliffTasks.csproj | 4 ---- | ||
| 5 files changed, 12 insertions(+), 7 deletions(-) | ||
|
|
||
| diff --git a/Directory.Build.props b/Directory.Build.props | ||
| index 9d84f1dc6..b25de0091 100644 | ||
| --- a/Directory.Build.props | ||
| +++ b/Directory.Build.props | ||
| @@ -16,6 +16,11 @@ | ||
| <RepositoryUrl>https://github.com/dotnet/arcade</RepositoryUrl> | ||
| <!-- Only upgrade NuGetAudit warnings to errors for official builds. --> | ||
| <WarningsNotAsErrors Condition="'$(OfficialBuild)' != 'true'">$(WarningsNotAsErrors);NU1901;NU1902;NU1903;NU1904</WarningsNotAsErrors> | ||
| + <!-- TODO: Remove when Arcade SDK updated TargetFrameworkDefaults.props for .NET 10. --> | ||
| + <NetCurrent>net10.0</NetCurrent> | ||
| + <NetPrevious>net9.0</NetPrevious> | ||
| + <NetToolCurrent>$(NetCurrent)</NetToolCurrent> | ||
| + <NetToolMinimum Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetToolCurrent)</NetToolMinimum> | ||
| </PropertyGroup> | ||
|
|
||
| </Project> | ||
| diff --git a/global.json b/global.json | ||
| index 3a7409606..3054e30d7 100644 | ||
| --- a/global.json | ||
| +++ b/global.json | ||
| @@ -1,10 +1,10 @@ | ||
| { | ||
| "sdk": { | ||
| - "version": "9.0.100-rc.2.24474.11", | ||
| + "version": "10.0.100-alpha.1.24551.9", | ||
| "rollForward": "latestFeature" | ||
| }, | ||
| "tools": { | ||
| - "dotnet": "9.0.100-rc.2.24474.11" | ||
| + "dotnet": "10.0.100-alpha.1.24551.9" | ||
| }, | ||
| "msbuild-sdks": { | ||
| "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24530.1", | ||
| diff --git a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets | ||
| index b94b6736d..e0fadabb2 100644 | ||
| --- a/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets | ||
| +++ b/src/Microsoft.DotNet.Build.Tasks.Packaging/src/build/Packaging.targets | ||
| @@ -954,6 +954,10 @@ | ||
| <DefaultValidateFramework Include="net9.0"> | ||
| <RuntimeIDs>@(NETCoreApp90RIDs)</RuntimeIDs> | ||
| </DefaultValidateFramework> | ||
| + <NETCoreApp100RIDs Condition="'@(NETCoreApp100RIDs)' == ''" Include="@(NETCoreApp90RIDs)" /> | ||
| + <DefaultValidateFramework Include="net10.0"> | ||
| + <RuntimeIDs>@(NETCoreApp100RIDs)</RuntimeIDs> | ||
| + </DefaultValidateFramework> | ||
|
|
||
| <NETCore50RIDs Condition="'@(NETCore50RIDs)' == ''" Include="win10-x86;win10-x86-aot;win10-x64;win10-x64-aot;win10-arm;win10-arm-aot" /> | ||
| <DefaultValidateFramework Include="netcore50"> | ||
| 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 0ae8d1482..9312e2672 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 @@ | ||
| <Project> | ||
|
|
||
| <PropertyGroup> | ||
| - <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net9.0</XUnitPublishTargetFramework> | ||
| + <XUnitPublishTargetFramework Condition="'$(XUnitPublishTargetFramework)' == ''">net10.0</XUnitPublishTargetFramework> | ||
| <XUnitRuntimeTargetFramework Condition="'$(XUnitRuntimeTargetFramework)' == ''">netcoreapp2.0</XUnitRuntimeTargetFramework> | ||
|
|
||
| <XUnitRunnerVersion Condition="'$(XUnitRunnerVersion)' == ''">2.9.2</XUnitRunnerVersion> | ||
| diff --git a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj | ||
| index 1059c3bc4..165a4a7d5 100644 | ||
| --- a/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj | ||
| +++ b/src/Microsoft.DotNet.XliffTasks/Microsoft.DotNet.XliffTasks.csproj | ||
| @@ -1,10 +1,6 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
|
|
||
| <PropertyGroup> | ||
| - <!-- | ||
| - We need to target net8.0 while Arcade SDK 8 is being used. | ||
| - Xliff tasks were moved from dotnet/xliff-tasks to Arcade in V9, so they are not available in release/8.0 branch. | ||
| - --> | ||
| <TargetFrameworks>$(NetToolMinimum);$(NetFrameworkToolCurrent)</TargetFrameworks> | ||
| <IsPackable>true</IsPackable> | ||
| <IsBuildTaskProject>true</IsBuildTaskProject> |
44 changes: 44 additions & 0 deletions
44
src/SourceBuild/patches/aspnetcore/0001-Target net10.0 TFM in RepoTasks.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,44 @@ | ||
| From 0612070b83354c70993ca1aa7eabd2babdf8a5c5 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <mthalman@microsoft.com> | ||
| Date: Wed, 6 Nov 2024 16:08:49 -0600 | ||
| Subject: [PATCH] Target net10.0 TFM in RepoTasks | ||
|
|
||
| Backport: https://github.com/dotnet/aspnetcore/issues/58823 | ||
| --- | ||
| eng/tools/RepoTasks/RepoTasks.csproj | 4 ++-- | ||
| eng/tools/RepoTasks/RepoTasks.tasks | 2 +- | ||
| 2 files changed, 3 insertions(+), 3 deletions(-) | ||
|
|
||
| diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj | ||
| index 24f833af9b..c462a7517a 100644 | ||
| --- a/eng/tools/RepoTasks/RepoTasks.csproj | ||
| +++ b/eng/tools/RepoTasks/RepoTasks.csproj | ||
| @@ -1,6 +1,6 @@ | ||
| <Project Sdk="Microsoft.NET.Sdk"> | ||
| <PropertyGroup> | ||
| - <TargetFrameworks>net9.0</TargetFrameworks> | ||
| + <TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks> | ||
| <TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">$(TargetFrameworks);net472</TargetFrameworks> | ||
| <DefineConstants Condition="'$(TargetFramework)' == 'net472'">$(DefineConstants);BUILD_MSI_TASKS</DefineConstants> | ||
| <Optimize>false</Optimize> | ||
| @@ -31,7 +31,7 @@ | ||
| <Compile Remove="shared\CertificateGeneration\*.cs" /> | ||
| </ItemGroup> | ||
|
|
||
| - <ItemGroup Condition="'$(TargetFramework)' == 'net9.0'"> | ||
| + <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'"> | ||
| <PackageReference Include="Microsoft.Build.Framework" Version="$(MicrosoftBuildFrameworkVersion)" /> | ||
| <PackageReference Include="Microsoft.Build.Tasks.Core" Version="$(MicrosoftBuildTasksCoreVersion)" /> | ||
| <PackageReference Include="Microsoft.Build.Utilities.Core" Version="$(MicrosoftBuildUtilitiesCoreVersion)" /> | ||
| diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks | ||
| index 0ad5b3ae45..b6cd9a820d 100644 | ||
| --- a/eng/tools/RepoTasks/RepoTasks.tasks | ||
| +++ b/eng/tools/RepoTasks/RepoTasks.tasks | ||
| @@ -1,6 +1,6 @@ | ||
| <Project> | ||
| <PropertyGroup> | ||
| - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net9.0</_RepoTaskAssemblyFolder> | ||
| + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework)</_RepoTaskAssemblyFolder> | ||
| <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472</_RepoTaskAssemblyFolder> | ||
| <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll</_RepoTaskAssembly> | ||
| </PropertyGroup> |
26 changes: 26 additions & 0 deletions
26
src/SourceBuild/patches/nuget-client/0001-Use net10.0 TMF for source build.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,26 @@ | ||
| From 64331771541cc9c911a5fb1e95eb6983a5b13b94 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <mthalman@microsoft.com> | ||
| Date: Wed, 6 Nov 2024 15:29:15 -0600 | ||
| Subject: [PATCH] Use net10.0 TMF for source build | ||
|
|
||
| Backport: https://github.com/NuGet/Home/issues/13914 | ||
| --- | ||
| build/common.project.props | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/build/common.project.props b/build/common.project.props | ||
| index f65578999..7c1f04aa9 100644 | ||
| --- a/build/common.project.props | ||
| +++ b/build/common.project.props | ||
| @@ -12,9 +12,9 @@ | ||
| <NETFXTargetFramework>net472</NETFXTargetFramework> | ||
| <NetStandardVersion>netstandard2.0</NetStandardVersion> | ||
| <NETCoreTargetFramework>net8.0</NETCoreTargetFramework> | ||
| - <NETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net9.0</NETCoreTargetFramework> | ||
| + <NETCoreTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net10.0</NETCoreTargetFramework> | ||
| <NETCoreLegacyTargetFramework>netcoreapp3.1</NETCoreLegacyTargetFramework> | ||
| - <NETCoreLegacyTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net9.0</NETCoreLegacyTargetFramework> | ||
| + <NETCoreLegacyTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'">net10.0</NETCoreLegacyTargetFramework> | ||
| <NETCoreLegacyTargetFrameworkForSigning>netcoreapp5.0</NETCoreLegacyTargetFrameworkForSigning> | ||
|
|
||
| <!-- Target frameworks for class libraries--> |
23 changes: 23 additions & 0 deletions
23
src/SourceBuild/patches/runtime/0001-Runtime patch to support net10.0.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,23 @@ | ||
| From 9ec08acee2d24f45be29469635db8494c5d4046c Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <mthalman@microsoft.com> | ||
| Date: Thu, 7 Nov 2024 09:00:10 -0600 | ||
| Subject: [PATCH] Runtime patch to support net10.0 | ||
|
|
||
| Backport: https://github.com/dotnet/runtime/pull/109619 | ||
| --- | ||
| .../src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | ||
| index f624c914ea8..7db89422f2c 100644 | ||
| --- a/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | ||
| +++ b/src/tools/illink/src/ILLink.Tasks/build/Microsoft.NET.ILLink.Tasks.props | ||
| @@ -18,7 +18,7 @@ Copyright (c) .NET Foundation. All rights reserved. | ||
| <!-- Older SDKs used this property as a sentinel instead, to control the import of this file | ||
| (but not the targets, which were included with the SDK). --> | ||
| <UsingILLinkTasksSdk>true</UsingILLinkTasksSdk> | ||
| - <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net9.0\ILLink.Tasks.dll</ILLinkTasksAssembly> | ||
| + <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tools\net10.0\ILLink.Tasks.dll</ILLinkTasksAssembly> | ||
| <ILLinkTasksAssembly Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tools\net472\ILLink.Tasks.dll</ILLinkTasksAssembly> | ||
|
|
||
| <ILLinkAnalyzersPropsPath Condition="'$(ILLinkAnalyzersPropsPath)' == ''">$(MSBuildThisFileDirectory)Microsoft.NET.ILLink.Analyzers.props</ILLinkAnalyzersPropsPath> |