microsoft
/
BuildXL
зеркало из https://github.com/microsoft/BuildXL.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Merged PR 685515: Remove unused netcore dependencies 

Remove unused netcore dependencies

Related work items: #2002246, #2003033, #2003032, #2003031, #2003030
This commit is contained in:
Michael Pysson 2022-10-26 22:58:39 +00:00
Родитель c40c08e6c2
Коммит 1840a081c5
3 изменённых файлов: 3 добавлений и 315 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

6
Public/Sdk/Public/Managed/Tools/AppHostPatcher/AppHostPatcher.dsc
Просмотреть файл

@ -46,13 +46,13 @@ export function patchBinary(args: Arguments) : Result {
const targetsWindows = args.targetRuntimeVersion === "win-x64";
const contents: StaticDirectory =
args.targetRuntimeVersion === "win-x64"
? importFrom("Microsoft.NETCore.App.Host.win-x64").Contents.all
? importFrom("Microsoft.NETCore.App.Host.win-x64.6.0").Contents.all
:
args.targetRuntimeVersion === "linux-x64"
? importFrom("Microsoft.NETCore.App.Host.linux-x64").Contents.all
? importFrom("Microsoft.NETCore.App.Host.linux-x64.6.0").Contents.all
:
args.targetRuntimeVersion === "osx-x64"
? importFrom("Microsoft.NETCore.App.Host.osx-x64").Contents.all
? importFrom("Microsoft.NETCore.App.Host.osx-x64.6.0").Contents.all
: Contract.fail("Unknown target runtime: " + args.targetRuntimeVersion);
// Pick the apphost based on the target OS, not the current OS

261
cg/nuget/cgmanifest.json
Просмотреть файл

@ -1612,24 +1612,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.linux-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.linux-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1639,24 +1621,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.osx-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.osx-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1666,24 +1630,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.win-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.win-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1702,15 +1648,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Ref",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1720,24 +1657,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.linux-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.linux-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1747,24 +1666,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.osx-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.osx-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1774,24 +1675,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.win-x64",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.win-x64",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1819,15 +1702,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetAppHost",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1846,15 +1720,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostPolicy",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1873,15 +1738,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostResolver",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1900,15 +1756,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.Platforms",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4546,24 +4393,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4573,24 +4402,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4690,24 +4501,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4717,24 +4510,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4798,24 +4573,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4825,24 +4582,6 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "3.1.0"
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "5.0.0"
}
}
},
{
"Component": {
"Type": "NuGet",

51
config.nuget.dotnetcore.dsc
Просмотреть файл

@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
const coreVersion = "3.1.0";
const core50Version = "5.0.0";
const core60Version = "6.0.6";
const pkgVersion = "4.3.0";
@ -26,56 +25,6 @@ export const pkgs = [
{ id: "Microsoft.NETCore.DotNetAppHost", version: coreVersion },
// .NET Core win-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.win-x64", version: coreVersion, osSkip: [ "macOS", "unix" ] },
{ id: "Microsoft.NETCore.App.Runtime.win-x64", version: coreVersion, osSkip: [ "macOS", "unix" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: coreVersion, osSkip: [ "macOS", "unix" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: coreVersion, osSkip: [ "macOS", "unix" ] },
// .NET Core osx-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.osx-x64", version: coreVersion },
{ id: "Microsoft.NETCore.App.Runtime.osx-x64", version: coreVersion },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: coreVersion },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", version: coreVersion },
// .NET Core linux-x64 runtime deps
{ id: "Microsoft.NETCore.App.Runtime.linux-x64", version: coreVersion },
{ id: "Microsoft.NETCore.App.Host.linux-x64", version: coreVersion },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", version: coreVersion },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", version: coreVersion },
// .NET 5
// .NET Core 5.0 Dependencies
{ id: "Microsoft.NETCore.App.Ref", version: core50Version, alias: "Microsoft.NETCore.App.Ref50" },
{ id: "Microsoft.NETCore.Platforms", version: core50Version, alias: "Microsoft.NETCore.Platforms.5.0" },
// .NET Core Self-Contained Deployment
{ id: "Microsoft.NETCore.DotNetHostResolver", version: core50Version, alias: "Microsoft.NETCore.DotNetHostResolver.5.0" },
{ id: "Microsoft.NETCore.DotNetHostPolicy", version: core50Version, alias: "Microsoft.NETCore.DotNetHostPolicy.5.0" },
{ id: "Microsoft.NETCore.DotNetAppHost", version: core50Version, alias: "Microsoft.NETCore.DotNetAppHost.5.0" },
// .NET Core win-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.win-x64", version: core50Version, osSkip: [ "macOS", "unix" ], alias: "Microsoft.NETCore.App.Host.win-x64.5.0" },
{ id: "Microsoft.NETCore.App.Runtime.win-x64", version: core50Version, osSkip: [ "macOS", "unix" ], alias: "Microsoft.NETCore.App.Runtime.win-x64.5.0" },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: core50Version, osSkip: [ "macOS", "unix" ], alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver.5.0" },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: core50Version, osSkip: [ "macOS", "unix" ], alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy.5.0" },
// .NET Core osx-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.osx-x64", version: core50Version, alias: "Microsoft.NETCore.App.Host.osx-x64.5.0" },
{ id: "Microsoft.NETCore.App.Runtime.osx-x64", version: core50Version, alias: "Microsoft.NETCore.App.Runtime.osx-x64.5.0"},
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: core50Version, alias: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver.5.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", version: core50Version, alias: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy.5.0" },
// .NET Core linux-x64 runtime deps
{ id: "Microsoft.NETCore.App.Runtime.linux-x64", version: core50Version, alias: "Microsoft.NETCore.App.Runtime.linux-x64.5.0" },
{ id: "Microsoft.NETCore.App.Host.linux-x64", version: core50Version, alias: "Microsoft.NETCore.App.Host.linux-x64.5.0" },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", version: core50Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver.5.0" },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", version: core50Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy.5.0" },
// .NET 6
// .NET Core 6.0 Dependencies