-
Notifications
You must be signed in to change notification settings - Fork 1.1k
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.24612.1 #45435
Merged
Merged
Changes from 16 commits
Commits
Show all changes
27 commits
Select commit
Hold shift + click to select a range
9fa02e0
Re-Bootstrap Source Build to .NET 10.0.100-alpha.1.24612.1
dotnet-sb-bot 482d34e
Merge branch 'main' into dec2024-source-build-1734016173
mthalman ad020fe
Update SB prebuilts tarball reference
mthalman 2ad8387
Workaround for https://github.com/dotnet/source-build/issues/4807
mthalman f0cda56
Update arcade patch to reflect merged PR content
mthalman 12c338b
msbuild patch
mthalman 02f6436
roslyn patch
mthalman 98f2eda
Target NetCurrent for layout sources
mthalman 593fbec
symreader patch
mthalman 67c3a6c
Merge branch 'main' into dec2024-source-build-1734016173
mthalman bc33357
arcade patch
mthalman 7fa31c9
Fix fsharp layout TFM
mthalman 33716e2
fsharp patch
mthalman 1464ad9
Merge branch 'main' into dec2024-source-build-1734016173
mthalman e26d57b
Delete obsolete msbuild patch
mthalman de45ae3
Update layout
mthalman 8148e4e
scenario-tests TFM workaround
mthalman 8a3f5f4
Merge branch 'main' into dec2024-source-build-1734016173
mthalman d075a58
Merge branch 'main' into dec2024-source-build-1734016173
mthalman adc3261
Merge branch 'dec2024-source-build-1734016173' of https://github.com/…
mthalman e09dba9
Rebase roslyn patch
mthalman 086b884
try a newer build
mthalman 4a1b7ea
Revert "try a newer build"
mthalman 2af141d
Merge branch 'main' into dec2024-source-build-1734016173
mthalman 10d4741
Update Roslyn patch
mthalman fe062cf
Upgrade System.Memory to version 4.6.0
ViktorHofer 83d9229
fix corrupt arcade patch
mthalman File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
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
| 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
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
23 changes: 23 additions & 0 deletions
23
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,23 @@ | ||
| From e34d52334b4418b2229f631cc525d024e34d3e27 Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <mthalman@microsoft.com> | ||
| Date: Thu, 19 Dec 2024 08:19:09 -0600 | ||
| Subject: [PATCH] Upgrade System.Memory to 4.6.0 | ||
|
|
||
| Backport: https://github.com/dotnet/arcade/pull/15353 | ||
| --- | ||
| eng/Versions.props | 2 +- | ||
| 1 file changed, 1 insertion(+), 1 deletion(-) | ||
|
|
||
| diff --git a/eng/Versions.props b/eng/Versions.props | ||
| index 7de3fec4c..ddb6a9658 100644 | ||
| --- a/eng/Versions.props | ||
| +++ b/eng/Versions.props | ||
| @@ -18,7 +18,7 @@ | ||
| <SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion> | ||
| <!-- corefx --> | ||
| <MicrosoftBclHashCodeVersion>1.1.1</MicrosoftBclHashCodeVersion> | ||
| - <SystemMemoryVersion>4.5.5</SystemMemoryVersion> | ||
| + <SystemMemoryVersion>4.6.0</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 <mthalman@microsoft.com> | ||
| 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> |
32 changes: 32 additions & 0 deletions
32
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,32 @@ | ||
| From 37a6ada39e591ff0a96e1d3cbd0a5a0b84d56cbe Mon Sep 17 00:00:00 2001 | ||
| From: Matt Thalman <mthalman@microsoft.com> | ||
| Date: Wed, 18 Dec 2024 15:57:56 -0600 | ||
| Subject: [PATCH] Only target NetCurrent for source build | ||
|
|
||
| Backport: https://github.com/dotnet/roslyn/pull/76505 | ||
| --- | ||
| eng/targets/TargetFrameworks.props | 4 ++-- | ||
| 1 file changed, 2 insertions(+), 2 deletions(-) | ||
|
|
||
| diff --git a/eng/targets/TargetFrameworks.props b/eng/targets/TargetFrameworks.props | ||
| index 728de8b627d..f413faf43c9 100644 | ||
| --- a/eng/targets/TargetFrameworks.props | ||
| +++ b/eng/targets/TargetFrameworks.props | ||
| @@ -40,7 +40,7 @@ | ||
| <!-- TODO until we figure out what is up with NetPrevious --> | ||
| <NetPrevious>$(NetMinimum)</NetPrevious> | ||
| <NetRoslyn>$(NetPrevious)</NetRoslyn> | ||
| - <NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild> | ||
| + <NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild> | ||
| <NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll> | ||
| <NetRoslynBuildHostNetCoreVersion>$(NetPrevious)</NetRoslynBuildHostNetCoreVersion> | ||
| <NetRoslynNext>$(NetPrevious)</NetRoslynNext> | ||
| @@ -53,7 +53,7 @@ | ||
| <When Condition="'$(DotNetBuildSourceOnly)' == 'true' AND '$(DotNetBuildOrchestrator)' == 'true'"> | ||
| <PropertyGroup> | ||
| <NetRoslyn>$(NetCurrent)</NetRoslyn> | ||
| - <NetRoslynSourceBuild>$(NetCurrent);$(NetPrevious)</NetRoslynSourceBuild> | ||
| + <NetRoslynSourceBuild>$(NetCurrent)</NetRoslynSourceBuild> | ||
| <NetRoslynAll>$(NetCurrent);$(NetPrevious)</NetRoslynAll> | ||
| <NetRoslynBuildHostNetCoreVersion>$(NetCurrent)</NetRoslynBuildHostNetCoreVersion> | ||
| <NetRoslynNext>$(NetCurrent)</NetRoslynNext> |
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is temporary right and was fixed in #45554? Assuming so, when will this get reverted and what is tracking that work?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
It can be reverted upon the next rebootstrap. The artifacts we target now don't have the fixed output. I'll log an issue to follow up.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
dotnet/source-build#4808