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.24612.1 #45435

Merged
merged 27 commits into from
Dec 20, 2024
Merged
Show file tree
Hide file tree
Changes from 2 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 Dec 12, 2024
482d34e
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 17, 2024
ad020fe
Update SB prebuilts tarball reference
mthalman Dec 18, 2024
2ad8387
Workaround for https://github.com/dotnet/source-build/issues/4807
mthalman Dec 18, 2024
f0cda56
Update arcade patch to reflect merged PR content
mthalman Dec 18, 2024
12c338b
msbuild patch
mthalman Dec 18, 2024
02f6436
roslyn patch
mthalman Dec 18, 2024
98f2eda
Target NetCurrent for layout sources
mthalman Dec 18, 2024
593fbec
symreader patch
mthalman Dec 18, 2024
67c3a6c
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 18, 2024
bc33357
arcade patch
mthalman Dec 19, 2024
7fa31c9
Fix fsharp layout TFM
mthalman Dec 19, 2024
33716e2
fsharp patch
mthalman Dec 19, 2024
1464ad9
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 19, 2024
e26d57b
Delete obsolete msbuild patch
mthalman Dec 19, 2024
de45ae3
Update layout
mthalman Dec 19, 2024
8148e4e
scenario-tests TFM workaround
mthalman Dec 19, 2024
8a3f5f4
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 19, 2024
d075a58
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 20, 2024
adc3261
Merge branch 'dec2024-source-build-1734016173' of https://github.com/…
mthalman Dec 20, 2024
e09dba9
Rebase roslyn patch
mthalman Dec 20, 2024
086b884
try a newer build
mthalman Dec 20, 2024
4a1b7ea
Revert "try a newer build"
mthalman Dec 20, 2024
2af141d
Merge branch 'main' into dec2024-source-build-1734016173
mthalman Dec 20, 2024
10d4741
Update Roslyn patch
mthalman Dec 20, 2024
fe062cf
Upgrade System.Memory to version 4.6.0
ViktorHofer Dec 20, 2024
83d9229
fix corrupt arcade patch
mthalman Dec 20, 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
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.24551.1">
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="10.0.0-beta.24604.4">
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>1818ed2babf890a1cd62fa96a1f03abdada2d003</Sha>
<Sha>45d845e04c05fbe5da9838c454bbc3af1df6be81</Sha>
</Dependency>
</ToolsetDependencies>
</Dependencies>
4 changes: 2 additions & 2 deletions src/SourceBuild/content/eng/Versions.props
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@
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>10.0.100-alpha.1.24556.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24556.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltSdkVersion>10.0.100-alpha.1.24612.1</PrivateSourceBuiltSdkVersion>
<PrivateSourceBuiltArtifactsVersion>10.0.100-alpha.1.24612.1</PrivateSourceBuiltArtifactsVersion>
<PrivateSourceBuiltPrebuiltsVersion>0.1.0-10.0.100-6</PrivateSourceBuiltPrebuiltsVersion>
<!-- command-line-api dependencies -->
<SystemCommandLineVersion>2.0.0-beta4.24126.1</SystemCommandLineVersion>
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.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"
}
}
Loading