-
Notifications
You must be signed in to change notification settings - Fork 446
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[automated] Merge branch 'release/8.0.3xx' => 'release/8.0.4xx' (#20204)
- Loading branch information
Showing
3 changed files
with
26 additions
and
4 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,12 +1,12 @@ | ||
{ | ||
"tools": { | ||
"dotnet": "8.0.108" | ||
"dotnet": "8.0.110" | ||
}, | ||
"msbuild-sdks": { | ||
"Microsoft.Build.CentralPackageVersions": "2.0.1", | ||
"Microsoft.Build.Traversal": "2.0.2", | ||
"Microsoft.NET.Sdk.IL": "3.0.0-preview-27107-01", | ||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24367.1", | ||
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.24463.3", | ||
"Yarn.MSBuild": "1.15.2" | ||
} | ||
} |
22 changes: 22 additions & 0 deletions
22
src/SourceBuild/patches/msbuild/0001-Remove-BuildXL-feed.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,22 @@ | ||
From 0ea8c4bf37ca4e700ed4adc9e588416dcf10f51c Mon Sep 17 00:00:00 2001 | ||
From: Matt Thalman <[email protected]> | ||
Date: Tue, 15 Oct 2024 14:24:55 -0500 | ||
Subject: [PATCH] Remove BuildXL feed | ||
|
||
Backport: https://github.com/dotnet/msbuild/pull/10765 | ||
--- | ||
NuGet.config | 1 - | ||
1 file changed, 1 deletion(-) | ||
|
||
diff --git a/NuGet.config b/NuGet.config | ||
index d7187b4d64..4e9907ea83 100644 | ||
--- a/NuGet.config | ||
+++ b/NuGet.config | ||
@@ -8,7 +8,6 @@ | ||
<add key="dotnet6" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet6/nuget/v3/index.json" /> | ||
<add key="dotnet8" value="https://dnceng.pkgs.visualstudio.com/public/_packaging/dotnet8/nuget/v3/index.json" /> | ||
<add key="dotnet8-transport" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet8-transport/nuget/v3/index.json" /> | ||
- <add key="BuildXL" value="https://pkgs.dev.azure.com/ms/BuildXL/_packaging/BuildXL/nuget/v3/index.json" /> | ||
</packageSources> | ||
<disabledPackageSources /> | ||
</configuration> |