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

Merged PR 528019: Revert "Merged PR 527387: Temporarily revert to NetCore 3.0 to work around AV 

Revert "Merged PR 527387: Temporarily revert to NetCore 3.0 to work around AV false positive"

This reverts commit d32b003217.
This commit is contained in:
Michael Pysson 2020-01-09 23:07:10 +00:00
Родитель ec3551dca3
Коммит abc057b6c0
8 изменённых файлов: 39 добавлений и 39 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
Public/Sdk/Public/Managed/Frameworks/netcoreapp3.1/netcoreapp3.1.dsc
Просмотреть файл

@ -60,7 +60,7 @@ export const framework : Shared.Framework = {
runtimeConfigStyle: "runtimeJson",
runtimeFrameworkName: "Microsoft.NETCore.App",
runtimeConfigVersion: "3.0.0",
runtimeConfigVersion: "3.1.0",
// Deployment style for .NET Core applications currently defaults to self-contained
applicationDeploymentStyle: "selfContained",

2
Public/Sdk/Public/Managed/Tools/ILCompiler/ilc.dsc
Просмотреть файл

@ -45,7 +45,7 @@ export const linkTimeLibraries: File[] =
export const compileTimeReferences: File[] = [
...pkgContents.contents.filter(f => f.name.extension === a`.dll` && f.path.parent.name !== a`tools`),
...(isMacOS ? netcoreAppPkgContents.getFiles([
r`runtimes/osx-x64/lib/netcoreapp3.0/System.Runtime.InteropServices.WindowsRuntime.dll`
r`runtimes/osx-x64/lib/netcoreapp3.1/System.Runtime.InteropServices.WindowsRuntime.dll`
]) : [
// TODO: references for Windows
])

2
Public/Sdk/SelfHost/Libraries/Dotnet-Runtime-External/DotNet-Runtime.osx-x64.dsc
Просмотреть файл

@ -4,7 +4,7 @@
import {Transformer} from "Sdk.Transformers";
import {createPublicDotNetRuntime} from "DotNet-Runtime.Common";
const v3 = <StaticDirectory>importFrom("DotNet-Runtime.osx-x64.3.0.0").extracted;
const v3 = <StaticDirectory>importFrom("DotNet-Runtime.osx-x64.3.1.0").extracted;
@@public
export const extracted = createPublicDotNetRuntime(v3, undefined);

2
Public/Sdk/SelfHost/Libraries/Dotnet-Runtime-External/DotNet-Runtime.win-x64.dsc
Просмотреть файл

@ -9,5 +9,5 @@ const isWinOs = Context.getCurrentHost().os === "win";
@@public
export const extracted = createPublicDotNetRuntime(
isWinOs ? <StaticDirectory>importFrom("DotNet-Runtime.win-x64.3.0.0").extracted : undefined,
isWinOs ? <StaticDirectory>importFrom("DotNet-Runtime.win-x64.3.1.0").extracted : undefined,
isWinOs ? <StaticDirectory>importFrom("DotNet-Runtime.win-x64.2.2.2").extracted : undefined);

2
Public/Src/Explorer/Server/BuildXL.Explorer.Server.dsc
Просмотреть файл

@ -19,7 +19,7 @@ namespace Server {
references: [
...addIf(BuildXLSdk.isFullFramework,
// TODO: revisit this!
Managed.Factory.createBinary(importFrom("Microsoft.NETCore.App.Ref").Contents.all, r`ref/netcoreapp3.0/netstandard.dll`)
Managed.Factory.createBinary(importFrom("Microsoft.NETCore.App.Ref").Contents.all, r`ref/netcoreapp3.1/netstandard.dll`)
),
importFrom("BuildXL.Pips").dll,

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

@ -177,7 +177,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Dotnet-Runtime",
"Version": "5.0.2"
"Version": "5.0.3"
}
}
},
@ -1671,7 +1671,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.osx-x64",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1680,7 +1680,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.win-x64",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1689,7 +1689,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Ref",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1698,7 +1698,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.osx-x64",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1707,7 +1707,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.win-x64",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1734,7 +1734,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetAppHost",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1743,7 +1743,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1761,7 +1761,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostResolver",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -1770,7 +1770,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.Platforms",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -4236,7 +4236,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -4254,7 +4254,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -4344,7 +4344,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},
@ -4362,7 +4362,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "3.0.0"
"Version": "3.1.0"
}
}
},

38
config.dsc
Просмотреть файл

@ -235,36 +235,36 @@ config({
{ id: "Validation", version: "2.3.7"},
// .NET Core Dependencies
{ id: "Microsoft.NETCore.App.Ref", version: "3.0.0" },
{ id: "Microsoft.NETCore.App.Ref", version: "3.1.0" },
{ id: "NETStandard.Library", version: "2.0.3", tfm: ".NETStandard2.0" },
{ id: "Microsoft.NETCore.Platforms", version: "3.0.0" },
{ id: "Microsoft.NETCore.Platforms", version: "3.1.0" },
{ id: "System.Security.Claims", version: "4.3.0" },
// .NET Core Self-Contained Deployment
{ id: "Microsoft.NETCore.DotNetHostResolver", version: "3.0.0" },
{ id: "Microsoft.NETCore.DotNetHostResolver", version: "3.1.0" },
{ id: "Microsoft.NETCore.DotNetHostResolver", version: "2.2.0", alias: "Microsoft.NETCore.DotNetHostResolver.220" },
{ id: "Microsoft.NETCore.DotNetHostPolicy", version: "3.0.0" },
{ id: "Microsoft.NETCore.DotNetHostPolicy", version: "3.1.0" },
{ id: "Microsoft.NETCore.DotNetAppHost", version: "3.0.0" },
{ id: "Microsoft.NETCore.DotNetAppHost", version: "3.1.0" },
{ id: "Microsoft.NETCore.DotNetAppHost", version: "2.2.0", alias: "Microsoft.NETCore.DotNetAppHost.220" },
// .NET Core win-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.win-x64", version: "3.0.0", osSkip: [ "macOS" ] },
{ id: "Microsoft.NETCore.App.Runtime.win-x64", version: "3.0.0", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: "3.0.0", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: "3.0.0", osSkip: [ "macOS" ] },
{ id: "Microsoft.NETCore.App.Host.win-x64", version: "3.1.0", osSkip: [ "macOS" ] },
{ id: "Microsoft.NETCore.App.Runtime.win-x64", version: "3.1.0", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: "3.1.0", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: "3.1.0", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetAppHost", version: "2.2.0", alias: "runtime.win-x64.Microsoft.NETCore.DotNetAppHost.220", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: "2.2.0", alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver.220", osSkip: [ "macOS" ] },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: "2.2.0", alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy.220", osSkip: [ "macOS" ] },
// .NET Core osx-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.osx-x64", version: "3.0.0" },
{ id: "Microsoft.NETCore.App.Runtime.osx-x64", version: "3.0.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: "3.0.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", version: "3.0.0" },
{ id: "Microsoft.NETCore.App.Host.osx-x64", version: "3.1.0" },
{ id: "Microsoft.NETCore.App.Runtime.osx-x64", version: "3.1.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: "3.1.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", version: "3.1.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost", version: "2.2.0", alias: "runtime.osx-x64.Microsoft.NETCore.DotNetAppHost.220" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: "2.2.0", alias: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver.220" },
@ -526,15 +526,15 @@ config({
// DotNet Core Runtime
{
moduleName: "DotNet-Runtime.win-x64.3.0.0",
url: "https://download.visualstudio.microsoft.com/download/pr/f15b7c04-2900-4a14-9c01-ccd66a4323cc/17a6bbd44f0d0a85d219dd9e166a89ca/dotnet-runtime-3.0.0-win-x64.zip",
hash: "VSO0:FDECDEE5841EC76EFCAF739A33C14CA3E56DFED17E6C40D5841CD8FAE476736300",
moduleName: "DotNet-Runtime.win-x64.3.1.0",
url: "https://download.visualstudio.microsoft.com/download/pr/5e1c20ea-113f-47fd-9702-22a8bf1e3974/16bf234b587064709d8e7b58439022d4/dotnet-runtime-3.1.0-win-x64.zip",
hash: "VSO0:EE359BDFFFED53EF3C5E76C1716AADD1567447B12A37292C075D6A26F1138C0700",
archiveType: "zip",
},
{
moduleName: "DotNet-Runtime.osx-x64.3.0.0",
url: "https://download.visualstudio.microsoft.com/download/pr/68123d89-73c0-40b0-ba9b-93667c25663b/001f66f8ec4666421acc16f74209aa99/dotnet-runtime-3.0.0-osx-x64.tar.gz",
hash: "VSO0:C26993E7020F4CA1398EB813C02B2F276AD74BADE7AA71D9B842462C1BAB7F7E00",
moduleName: "DotNet-Runtime.osx-x64.3.1.0",
url: "https://download.visualstudio.microsoft.com/download/pr/454ca582-64f7-4817-bbb0-34a7fb831499/1d2d5613a2d2ebb26da04471e97cb539/dotnet-runtime-3.1.0-osx-x64.tar.gz",
hash: "VSO0:FCB44A9D07D3923DB197C05A710FEBBB060649555418A067E04EAE1A06CBCE4400",
archiveType: "tgz",
},
// The following are needed for dotnet core MSBuild test deployments

2
config.microsoftInternal.dsc
Просмотреть файл

@ -49,7 +49,7 @@ export const pkgs = isMicrosoftInternal ? [
{ id: "PowerShell.Core", version: "6.1.0", osSkip: [ "macOS" ] },
// Combined runtimes
{ id: "Dotnet-Runtime", version: "5.0.2", osSkip: ["macOS"] },
{ id: "Dotnet-Runtime", version: "5.0.3", osSkip: ["macOS"] },
] : [