-
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.24612.1 (#45435)
- Loading branch information
1 parent
111a397
commit c9c5e11
Showing
7 changed files
with
92 additions
and
8 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,10 +1,10 @@ | ||
{ | ||
"tools": { | ||
"dotnet": "10.0.100-alpha.1.24555.54" | ||
"dotnet": "10.0.100-alpha.1.24611.6" | ||
}, | ||
"msbuild-sdks": { | ||
"Microsoft.Build.NoTargets": "3.7.0", | ||
"Microsoft.Build.Traversal": "3.4.0", | ||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24551.1" | ||
"Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24604.4" | ||
} | ||
} |
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
24 changes: 24 additions & 0 deletions
24
src/SourceBuild/patches/arcade/0002-Upgrade-System.Memory-to-4.6.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,24 @@ | ||
From da982568108371f51afb30cc8c32eab01653bd62 Mon Sep 17 00:00:00 2001 | ||
From: Matt Thalman <[email protected]> | ||
Date: Fri, 20 Dec 2024 12:40:34 -0600 | ||
Subject: [PATCH] Upgrade System.Memory to 4.6.0 | ||
|
||
Backport: https://github.com/dotnet/arcade/pull/15353 | ||
--- | ||
eng/Versions.props | 3 ++- | ||
1 file changed, 2 insertions(+), 1 deletion(-) | ||
|
||
diff --git a/eng/Versions.props b/eng/Versions.props | ||
index a00db9a77..ad3e2a9f9 100644 | ||
--- a/eng/Versions.props | ||
+++ b/eng/Versions.props | ||
@@ -18,7 +18,8 @@ | ||
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion> | ||
<!-- corefx --> | ||
<MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion> | ||
- <SystemMemoryVersion>4.5.5</SystemMemoryVersion> | ||
+ <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' == 'true'">4.6.0</SystemMemoryVersion> | ||
+ <SystemMemoryVersion Condition="'$(DotNetBuildSourceOnly)' != 'true'">4.5.5</SystemMemoryVersion> | ||
<SystemRuntimeInteropServicesRuntimeInformation>4.3.0</SystemRuntimeInteropServicesRuntimeInformation> | ||
<!-- deployment-tools --> | ||
<MicrosoftDeploymentDotNetReleasesVersion>2.0.0-preview.1.24305.1</MicrosoftDeploymentDotNetReleasesVersion> |
33 changes: 33 additions & 0 deletions
33
src/SourceBuild/patches/fsharp/0001-Upgrade-some-runtime-packages.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,33 @@ | ||
From 192a16dca94744c82ca456d6cfb7a2a30be1d84f Mon Sep 17 00:00:00 2001 | ||
From: Matt Thalman <[email protected]> | ||
Date: Thu, 19 Dec 2024 11:00:01 -0600 | ||
Subject: [PATCH] Upgrade some runtime packages | ||
|
||
Backport: https://github.com/dotnet/fsharp/pull/18166 | ||
--- | ||
eng/Versions.props | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/eng/Versions.props b/eng/Versions.props | ||
index cd72f8599..1f711df8f 100644 | ||
--- a/eng/Versions.props | ||
+++ b/eng/Versions.props | ||
@@ -76,15 +76,15 @@ | ||
<!-- If a System.* package is stuck on version 4.3.x, targets .NET Standard 1.x and hasn't been | ||
updated in years, you most likely DON'T need it, please exercise caution when adding it to the list. --> | ||
<SystemPackageVersionVersion>8.0.0</SystemPackageVersionVersion> | ||
- <SystemBuffersVersion>4.5.1</SystemBuffersVersion> | ||
+ <SystemBuffersVersion>4.6.0</SystemBuffersVersion> | ||
<SystemCollectionsImmutableVersion>$(SystemPackageVersionVersion)</SystemCollectionsImmutableVersion> | ||
<SystemComponentModelCompositionVersion>$(SystemPackageVersionVersion)</SystemComponentModelCompositionVersion> | ||
<SystemCompositionVersion>$(SystemPackageVersionVersion)</SystemCompositionVersion> | ||
<SystemDiagnosticsDiagnosticSourceVersion>$(SystemPackageVersionVersion)</SystemDiagnosticsDiagnosticSourceVersion> | ||
- <SystemMemoryVersion>4.5.5</SystemMemoryVersion> | ||
+ <SystemMemoryVersion>4.6.0</SystemMemoryVersion> | ||
<SystemReflectionEmitVersion>4.7.0</SystemReflectionEmitVersion> | ||
<SystemReflectionMetadataVersion>$(SystemPackageVersionVersion)</SystemReflectionMetadataVersion> | ||
- <SystemRuntimeCompilerServicesUnsafeVersion>6.0.0</SystemRuntimeCompilerServicesUnsafeVersion> | ||
+ <SystemRuntimeCompilerServicesUnsafeVersion>6.1.0</SystemRuntimeCompilerServicesUnsafeVersion> | ||
<SystemThreadingTasksDataflow>$(SystemPackageVersionVersion)</SystemThreadingTasksDataflow> | ||
<SystemValueTupleVersion>4.5.0</SystemValueTupleVersion> | ||
<MicrosoftDiaSymReaderPortablePdbVersion>1.6.0</MicrosoftDiaSymReaderPortablePdbVersion> |
27 changes: 27 additions & 0 deletions
27
src/SourceBuild/patches/roslyn/0002-Only-target-NetCurrent-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,27 @@ | ||
From 3e23c76f9f26e0b559096d9349d0abadb092d704 Mon Sep 17 00:00:00 2001 | ||
From: Matt Thalman <[email protected]> | ||
Date: Fri, 20 Dec 2024 08:28:35 -0600 | ||
Subject: [PATCH] Only target NetCurrent for source build | ||
|
||
Backport: https://github.com/dotnet/roslyn/pull/76505 | ||
--- | ||
eng/targets/TargetFrameworks.props | 6 +++--- | ||
1 file changed, 3 insertions(+), 3 deletions(-) | ||
|
||
diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props | ||
index 2dddaff1560..04eecc62df9 100644 | ||
--- a/eng/targets/TargetFrameworks.props | ||
+++ b/eng/targets/TargetFrameworks.props | ||
@@ -53,9 +53,9 @@ | ||
<When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'"> | ||
<PropertyGroup> | ||
<NetRoslyn>$(NetCurrent)</NetRoslyn> | ||
- <NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild> | ||
- <NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll> | ||
- <NetRoslynBuildHostNetCoreVersion>$(NetPrevious)</NetRoslynBuildHostNetCoreVersion> | ||
+ <NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild> | ||
+ <NetRoslynAll>$(NetCurrent)</NetRoslynAll> | ||
+ <NetRoslynBuildHostNetCoreVersion>$(NetCurrent)</NetRoslynBuildHostNetCoreVersion> | ||
<NetRoslynNext>$(NetCurrent)</NetRoslynNext> | ||
</PropertyGroup> | ||
</When> |