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

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
msbuild patch
  • Loading branch information
@mthalman
mthalman committed Dec 18, 2024
commit 12c338b21a4cfc03a22d78cbf7bce063b01f2818
35 changes: 35 additions & 0 deletions ...ourceBuild/patches/msbuild/0001-Fix-ambiguous-reference-for-ExceptionHandling-class.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
From cb75812d7f5c0860824b86f7a22bf99bee564959 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 18 Dec 2024 15:46:24 -0600
Subject: [PATCH] Fix ambiguous reference for ExceptionHandling class

Backport: https://github.com/dotnet/msbuild/pull/11173
---
src/Build/BackEnd/BuildManager/BuildManager.cs | 1 +
src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs | 1 +
2 files changed, 2 insertions(+)

diff --git a/src/Build/BackEnd/BuildManager/BuildManager.cs b/src/Build/BackEnd/BuildManager/BuildManager.cs
index e3aa23a478..c4a13d02dc 100644
--- a/src/Build/BackEnd/BuildManager/BuildManager.cs
+++ b/src/Build/BackEnd/BuildManager/BuildManager.cs
@@ -37,6 +37,7 @@ using Microsoft.Build.Logging;
using Microsoft.Build.Shared;
using Microsoft.Build.Shared.Debugging;
using Microsoft.NET.StringTools;
+using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling;
using ForwardingLoggerRecord = Microsoft.Build.Logging.ForwardingLoggerRecord;
using LoggerDescription = Microsoft.Build.Logging.LoggerDescription;

diff --git a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs
index 446f5ef644..bd1cb0fd8d 100644
--- a/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs
+++ b/src/Build/BackEnd/Components/ProjectCache/ProjectCacheService.cs
@@ -22,6 +22,7 @@ using Microsoft.Build.Framework;
using Microsoft.Build.Graph;
using Microsoft.Build.Internal;
using Microsoft.Build.Shared;
+using ExceptionHandling = Microsoft.Build.Shared.ExceptionHandling;

namespace Microsoft.Build.Experimental.ProjectCache
{