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

Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24556.1 #44685

Merged
merged 12 commits into from
Nov 7, 2024
22 changes: 8 additions & 14 deletions eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -254,11 +254,9 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9c1f53e39f48b09be71097f1b7a47e45331e4906</Sha>
</Dependency>
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
See https://github.com/dotnet/sdk/issues/42920. -->
<Dependency Name="System.Resources.Extensions" Version="9.0.0-rc.2.24473.5" Pinned="True">
<Dependency Name="System.Resources.Extensions" Version="10.0.0-alpha.1.24557.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
</Dependency>
<Dependency Name="Microsoft.WindowsDesktop.App.Runtime.win-x64" Version="10.0.0-alpha.1.24556.1">
<Uri>https://github.com/dotnet/windowsdesktop</Uri>
Expand Down Expand Up @@ -585,15 +583,13 @@
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>9c1f53e39f48b09be71097f1b7a47e45331e4906</Sha>
</Dependency>
<Dependency Name="System.Security.Permissions" Version="9.0.0-rc.2.24473.5" Pinned="True">
<Dependency Name="System.Security.Permissions" Version="10.0.0-alpha.1.24557.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
</Dependency>
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
See https://github.com/dotnet/sdk/issues/42920. -->
<Dependency Name="System.Windows.Extensions" Version="9.0.0-rc.2.24473.5" Pinned="True">
<Dependency Name="System.Windows.Extensions" Version="10.0.0-alpha.1.24557.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
</Dependency>
</ProductDependencies>
<ToolsetDependencies>
Expand Down Expand Up @@ -627,11 +623,9 @@
<Sha>78eb939933628c20c88ddd88536a70f02ecc2945</Sha>
<SourceBuild RepoName="arcade" ManagedOnly="true" />
</Dependency>
<!-- Temporarily pinned to a net9 supporting version until the SDK can target net10.
See https://github.com/dotnet/sdk/issues/42920. -->
<Dependency Name="System.Reflection.MetadataLoadContext" Version="9.0.0-rc.2.24473.5" Pinned="True">
<Dependency Name="System.Reflection.MetadataLoadContext" Version="10.0.0-alpha.1.24557.1">
<Uri>https://github.com/dotnet/runtime</Uri>
<Sha>c4d7f7c6f2e2f34f07e64c6caa3bf9b2ce915cc1</Sha>
<Sha>5b56f15ef5ac5ded75b342d31759d22d2202764d</Sha>
</Dependency>
<Dependency Name="Microsoft.DotNet.Darc" Version="1.1.0-beta.24554.3">
<Uri>https://github.com/dotnet/arcade-services</Uri>
Expand Down
8 changes: 4 additions & 4 deletions eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -134,15 +134,15 @@
<SystemCompositionRuntimePackageVersion>10.0.0-alpha.1.24557.1</SystemCompositionRuntimePackageVersion>
<SystemCompositionTypedPartsPackageVersion>10.0.0-alpha.1.24557.1</SystemCompositionTypedPartsPackageVersion>
<SystemConfigurationConfigurationManagerPackageVersion>10.0.0-alpha.1.24557.1</SystemConfigurationConfigurationManagerPackageVersion>
<SystemReflectionMetadataLoadContextVersion>9.0.0-rc.2.24473.5</SystemReflectionMetadataLoadContextVersion>
<SystemResourcesExtensionsPackageVersion>9.0.0-rc.2.24473.5</SystemResourcesExtensionsPackageVersion>
<SystemReflectionMetadataLoadContextVersion>10.0.0-alpha.1.24557.1</SystemReflectionMetadataLoadContextVersion>
<SystemResourcesExtensionsPackageVersion>10.0.0-alpha.1.24557.1</SystemResourcesExtensionsPackageVersion>
<SystemSecurityCryptographyPkcsPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyPkcsPackageVersion>
<SystemSecurityCryptographyProtectedDataPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyProtectedDataPackageVersion>
<SystemSecurityCryptographyXmlPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityCryptographyXmlPackageVersion>
<SystemSecurityPermissionsPackageVersion>9.0.0-rc.2.24473.5</SystemSecurityPermissionsPackageVersion>
<SystemSecurityPermissionsPackageVersion>10.0.0-alpha.1.24557.1</SystemSecurityPermissionsPackageVersion>
<SystemTextEncodingCodePagesPackageVersion>10.0.0-alpha.1.24557.1</SystemTextEncodingCodePagesPackageVersion>
<SystemTextJsonPackageVersion>10.0.0-alpha.1.24557.1</SystemTextJsonPackageVersion>
<SystemWindowsExtensionsPackageVersion>9.0.0-rc.2.24473.5</SystemWindowsExtensionsPackageVersion>
<SystemWindowsExtensionsPackageVersion>10.0.0-alpha.1.24557.1</SystemWindowsExtensionsPackageVersion>
<SystemIOHashingPackageVersion>10.0.0-alpha.1.24557.1</SystemIOHashingPackageVersion>
<SystemFormatsAsn1Version>10.0.0-alpha.1.24557.1</SystemFormatsAsn1Version>
<!-- These are minimum versions used for netfx-targeted components that run in Visual Studio because in those cases,
Expand Down
2 changes: 2 additions & 0 deletions src/SourceBuild/content/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,8 @@
<Import Project="$(RepositoryEngineeringDir)Versions.props" Condition="'$(SkipArcadeSdkImport)' == 'true'" />

<PropertyGroup>
<!-- TODO: Remove when Arcade updated NetCurrent to net10.0. -->
<NetCurrent>net10.0</NetCurrent>
<!-- We have no projects targeting multiple frameworks, so don't include in output path. -->
<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
<!-- This repo's projects are entirely infrastructure and do not ship. -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Version.Details.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
<ProductDependencies>
</ProductDependencies>
<ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24522.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24551.1">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1ccd352f12e845d89e5b5a9b800e2be88f8a6d98</Sha>
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
6 changes: 3 additions & 3 deletions src/SourceBuild/content/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,9 +23,9 @@
of a .NET major or minor release, prebuilts may be needed. When the release is mature, prebuilts
are not necessary, and this property is removed from the file.
-->
<PrivateSourceBuiltSdkVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>9.0.100-rc.2.24474.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-4</PrivateSourceBuiltPrebuiltsVersion>
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-5</PrivateSourceBuiltPrebuiltsVersion>
<!-- command-line-api dependencies -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
<!-- msbuild dependencies -->
Expand Down
4 changes: 2 additions & 2 deletions src/SourceBuild/content/global.json
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"
}
}
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>
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>
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-->
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>