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.

Sign up for GitHub

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

Rebootstrap draft #45591

Closed
wants to merge 26 commits into from
Closed

Rebootstrap draft #45591

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 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
c81d74b
Update SDK build
mthalman Dec 20, 2024
b478629
Remove vertical manifest workaround
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
Prev Previous commit
Next Next commit
Update layout
  • Loading branch information
@mthalman
mthalman committed Dec 19, 2024
commit de45ae35333d6bcc902ce4655d7168ec448e2171
3 changes: 2 additions & 1 deletion src/Layout/redist/targets/GenerateLayout.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,8 @@
BeforeTargets="Build">
<PropertyGroup>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' != 'true'" >netcoreapp3.1</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true'" >$(NetCurrent)</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'" >$(NetCurrent)</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectoryTargetFramework Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildOrchestrator)' != 'true'" >net9.0</TestCliNuGetDirectoryTargetFramework>
<TestCliNuGetDirectory>$(NuGetPackageRoot)/microsoft.testplatform.cli/$(MicrosoftTestPlatformCLIPackageVersion)/contentFiles/any/$(TestCliNuGetDirectoryTargetFramework)/</TestCliNuGetDirectory>
</PropertyGroup>
<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Layout/tool_fsharp/tool_fsc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'!='release'">Shipping</FSharpCorePath>
<FSharpCorePath Condition="'$(DotNetFinalVersionKind)'=='release'">Release</FSharpCorePath>
<FSharpTfm>net9.0</FSharpTfm>
<FSharpTfm Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(NetCurrent)</FSharpTfm>
<FSharpTfm Condition="'$(DotNetBuildSourceOnly)' == 'true' and '$(DotNetBuildOrchestrator)' == 'true'">$(NetCurrent)</FSharpTfm>
</PropertyGroup>
<ItemGroup>
<ResolvedFileToPublish
Expand Down
Loading