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

Merged PR 526965: Name netcoreapp qualifier to the proper version we use 3.1 not 3.0 

Name netcoreapp qualifier to the proper version we use 3.1 not 3.0
This commit is contained in:
Danny van Velzen 2020-01-08 00:32:29 +00:00
Родитель 8ed5de403f
Коммит b20542e498
29 изменённых файлов: 63 добавлений и 63 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

4
Public/Sdk/Public/Managed/Frameworks/frameworks.dsc
Просмотреть файл

@ -15,8 +15,8 @@ export const framework : Shared.Framework = (() => {
return importFrom("Sdk.Managed.Frameworks.Net461").framework;
case "net472":
return importFrom("Sdk.Managed.Frameworks.Net472").framework;
case "netcoreapp3.0":
return importFrom("Sdk.Managed.Frameworks.NetCoreApp3.0").framework;
case "netcoreapp3.1":
return importFrom("Sdk.Managed.Frameworks.NetCoreApp3.1").framework;
case "netstandard2.0":
return importFrom("Sdk.Managed.Frameworks.NetStandard2.0").framework;
default:

4
Public/Sdk/Public/Managed/Frameworks/netcoreapp3.0/module.config.dsc → Public/Sdk/Public/Managed/Frameworks/netcoreapp3.1/module.config.dsc
Просмотреть файл

@ -2,9 +2,9 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
module({
name: "Sdk.Managed.Frameworks.NetCoreApp3.0",
name: "Sdk.Managed.Frameworks.NetCoreApp3.1",
nameResolutionSemantics: NameResolutionSemantics.implicitProjectReferences,
projects: [
f`netcoreapp3.0.dsc`,
f`netcoreapp3.1.dsc`,
]
});

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

@ -6,7 +6,7 @@ import * as Shared from "Sdk.Managed.Shared";
import * as Deployment from "Sdk.Deployment";
import * as MacOS from "Sdk.MacOS";
export declare const qualifier: {targetFramework: "netcoreapp3.0"};
export declare const qualifier: {targetFramework: "netcoreapp3.1"};
const defaultAssemblies: Shared.Assembly[] = createDefaultAssemblies();
@ -77,5 +77,5 @@ function createDefaultAssemblies() : Shared.Assembly[] {
const pkgContents = importFrom("Microsoft.NETCore.App.Ref").Contents.all;
const netcoreAppPackageContents = pkgContents.contents;
const dlls = netcoreAppPackageContents.filter(file => file.hasExtension && file.extension === a`.dll`);
return dlls.map(file => Shared.Factory.createAssembly(pkgContents, file, "netcoreapp3.0", [], true));
return dlls.map(file => Shared.Factory.createAssembly(pkgContents, file, "netcoreapp3.1", [], true));
}

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

@ -58,7 +58,7 @@ namespace TargetFrameworks {
export type DesktopTargetFrameworks = "net451" | "net461" | "net472";
@@public
export type CoreClrTargetFrameworks = "netcoreapp2.2" | "netcoreapp3.0";
export type CoreClrTargetFrameworks = "netcoreapp2.2" | "netcoreapp3.1";
@@public
export type StandardTargetFrameworks = "netstandard2.0";
@ -87,14 +87,14 @@ namespace TargetFrameworks {
@@public
export interface CurrentMachineQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64" | "osx-x64",
}
@@public
export const currentMachineQualifier : CurrentMachineQualifier = {
configuration: "release",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: Context.getCurrentHost().os === "win" ? "win-x64" : "osx-x64",
};
}

4
Public/Sdk/Public/Managed/Testing/XUnit/xunit.dsc
Просмотреть файл

@ -28,7 +28,7 @@ export function runConsoleTest(args: TestRunArguments): Result {
let testDeployment = args.testDeployment;
const tool : Transformer.ToolDefinition = Managed.Factory.createTool({
exe: qualifier.targetFramework === "netcoreapp3.0"
exe: qualifier.targetFramework === "netcoreapp3.1"
? testDeployment.contents.getFile(r`xunit.console.dll`)
// Using xunit executable from different folders depending on the target framework.
// This allow us to actually to run tests targeting different frameworks.
@ -88,7 +88,7 @@ export function runConsoleTest(args: TestRunArguments): Result {
});
}
if (qualifier.targetFramework === "netcoreapp3.0") {
if (qualifier.targetFramework === "netcoreapp3.1") {
execArguments = importFrom("Sdk.Managed.Frameworks").Helpers.wrapInDotNetExeForCurrentOs(execArguments);
}

4
Public/Sdk/Public/Managed/Testing/XUnit/xunitframework.dsc
Просмотреть файл

@ -33,7 +33,7 @@ function processArguments(args: Managed.TestArguments): Managed.TestArguments {
args);
}
const netStandardFramework = importFrom("Sdk.Managed.Frameworks.NetCoreApp3.0").withQualifier({targetFramework: "netcoreapp3.0"}).framework;
const netStandardFramework = importFrom("Sdk.Managed.Frameworks.NetCoreApp3.1").withQualifier({targetFramework: "netcoreapp3.1"}).framework;
const xunitNetStandardRuntimeConfigFiles: File[] = Managed.RuntimeConfigFiles.createFiles(
netStandardFramework,
"xunit.console",
@ -45,7 +45,7 @@ const xunitNetStandardRuntimeConfigFiles: File[] = Managed.RuntimeConfigFiles.cr
// For the DotNetCore run we need to copy a bunch more files:
function additionalRuntimeContent(args: Managed.TestArguments) : Deployment.DeployableItem[] {
return qualifier.targetFramework !== "netcoreapp3.0" ? [] : [
return qualifier.targetFramework !== "netcoreapp3.1" ? [] : [
// Unfortunately xUnit console runner comes as a precompiled assembly for .NET Core, we could either go and pacakge it
// into a self-contained deployment or treat it as a framework-dependent deployment as intended, let's do the latter
...(args.framework === netStandardFramework

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

@ -173,7 +173,7 @@ namespace Helpers {
case "net461":
case "net472":
return"net46";
case "netcoreapp3.0":
case "netcoreapp3.1":
case "netstandard2.0":
default:
return "netstandard1.3";

6
Public/Sdk/SelfHost/BuildXL/BuildXLSdk.dsc
Просмотреть файл

@ -85,7 +85,7 @@ export interface TestResult extends Managed.TestResult {
* Returns if the current qualifier is targeting .NET Core
*/
@@public
export const isDotNetCoreBuild : boolean = qualifier.targetFramework === "netcoreapp3.0" || qualifier.targetFramework === "netstandard2.0";
export const isDotNetCoreBuild : boolean = qualifier.targetFramework === "netcoreapp3.1" || qualifier.targetFramework === "netstandard2.0";
@@public
export const isFullFramework : boolean = qualifier.targetFramework === "net472";
@ -102,7 +102,7 @@ export const isHostOsOsx : boolean = Context.getCurrentHost().os === "macOS";
export const restrictTestRunToSomeQualifiers =
qualifier.configuration !== "debug" ||
// Running tests for .NET Core App 3.0 and 4.7.2 frameworks only.
(qualifier.targetFramework !== "netcoreapp3.0" && qualifier.targetFramework !== "net472") ||
(qualifier.targetFramework !== "netcoreapp3.1" && qualifier.targetFramework !== "net472") ||
(Context.isWindowsOS() && qualifier.targetRuntime === "osx-x64");
@@public
@ -529,7 +529,7 @@ const testFrameworkOverrideAttribute = Transformer.writeAllLines({
/** Returns true if test should use QTest framework. */
function shouldUseQTest(runTestArgs: Managed.TestRunArguments) {
return Flags.isQTestEnabled // Flag to use QTest is enabled.
&& qualifier.targetFramework !== "netcoreapp3.0" // QTest does not support .net core apps
&& qualifier.targetFramework !== "netcoreapp3.1" // QTest does not support .net core apps
&& !(runTestArgs && runTestArgs.parallelBucketCount); // QTest does not support passing environment variables to the underlying process
}

10
Public/Sdk/SelfHost/BuildXL/Qualifiers.dsc
Просмотреть файл

@ -19,7 +19,7 @@ export interface FullFrameworkQualifier extends Qualifier {
@@public
export interface DefaultQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "netcoreapp3.0";
targetFramework: "netcoreapp3.1";
targetRuntime: "win-x64" | "osx-x64";
}
@ -29,7 +29,7 @@ export interface DefaultQualifier extends Qualifier {
@@public
export interface DefaultQualifierWithNet472 extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net472" | "netcoreapp3.0";
targetFramework: "net472" | "netcoreapp3.1";
targetRuntime: "win-x64" | "osx-x64";
}
@ -39,13 +39,13 @@ export interface DefaultQualifierWithNet472 extends Qualifier {
@@public
export interface DefaultQualifierWithNetStandard20 extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net472" | "netcoreapp3.0" | "netstandard2.0";
targetFramework: "net472" | "netcoreapp3.1" | "netstandard2.0";
targetRuntime: "win-x64" | "osx-x64";
}
export interface AllSupportedQualifiers extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net472" | "netcoreapp3.0" | "netstandard2.0";
targetFramework: "net472" | "netcoreapp3.1" | "netstandard2.0";
targetRuntime: "win-x64" | "osx-x64";
}
@ -61,7 +61,7 @@ export interface PlatformDependentQualifier extends Qualifier {
@@public
export interface NetCoreAppQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "netcoreapp3.0";
targetFramework: "netcoreapp3.1";
targetRuntime: "win-x64" | "osx-x64";
}

2
Public/Sdk/SelfHost/BuildXL/Testing/QTest/qtestFramework.dsc
Просмотреть файл

@ -70,7 +70,7 @@ function getQTestDotNetFramework() : Qtest.QTestDotNetFramework {
case "net472":
return Qtest.QTestDotNetFramework.framework46;
case "netstandard2.0":
case "netcoreapp3.0":
case "netcoreapp3.1":
return Qtest.QTestDotNetFramework.frameworkCore30;
default:
Contract.fail("QTest does not support " + qualifier.targetFramework);

2
Public/Sdk/SelfHost/BuildXL/Tools/LogGenerator/LogGenerator.dsc
Просмотреть файл

@ -40,7 +40,7 @@ export const defaultArgs: Arguments = {
outputFile: undefined,
references: [],
sources: [],
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64",
};

2
Public/Sdk/SelfHost/Libraries/RocksDbSharp/rocksDbSharp.dsc
Просмотреть файл

@ -5,7 +5,7 @@ import * as Managed from "Sdk.Managed";
import * as Deployment from "Sdk.Deployment";
export declare const qualifier: {
targetFramework: "netcoreapp3.0" | "net472";
targetFramework: "netcoreapp3.1" | "net472";
targetRuntime: "win-x64" | "osx-x64";
};

4
Public/Sdk/SelfHost/Libraries/Sqlite/sqlite.dsc
Просмотреть файл

@ -4,7 +4,7 @@
import * as Deployment from "Sdk.Deployment";
export declare const qualifier : {
targetFramework: "netcoreapp3.0" | "netstandard2.0" | "net472" ,
targetFramework: "netcoreapp3.1" | "netstandard2.0" | "net472" ,
targetRuntime: "osx-x64" | "win-x64"
};
@ -14,7 +14,7 @@ const pkgContents = importFrom("System.Data.SQLite.Core").Contents.all;
function getInteropFile() : File {
switch (qualifier.targetFramework)
{
case "netcoreapp3.0":
case "netcoreapp3.1":
case "netstandard2.0":
return pkgContents.getFile(r`runtimes/${qualifier.targetRuntime}/native/netstandard2.0/SQLite.Interop.dll`);
case "net472":

2
Public/Sdk/SelfHost/RuntimeContracts/RuntimeContracts.dsc
Просмотреть файл

@ -5,7 +5,7 @@ import * as Managed from "Sdk.Managed";
export declare const qualifier: {
configuration: "debug" | "release";
targetFramework: "netcoreapp3.0" | "netstandard2.0" | "net472";
targetFramework: "netcoreapp3.1" | "netstandard2.0" | "net472";
targetRuntime: "win-x64" | "osx-x64";
};

2
Public/Src/App/UnitTests/IntegrationTest.BuildXL.Executable/IntegrationTest.BuildXL.Executable.dsc
Просмотреть файл

@ -11,7 +11,7 @@ namespace IntegrationTest.BuildXL.Executable {
export declare const qualifier : {
configuration: "debug" | "release",
targetFramework: "netcoreapp3.0" | "netstandard2.0",
targetFramework: "netcoreapp3.1" | "netstandard2.0",
targetRuntime: "win-x64"
};

2
Public/Src/Cache/ContentStore/Interfaces/BuildXL.Cache.ContentStore.Interfaces.dsc
Просмотреть файл

@ -4,7 +4,7 @@
import * as Deployment from "Sdk.Deployment";
import * as ILRepack from "Sdk.Managed.Tools.ILRepack";
import * as Shared from "Sdk.Managed.Shared";
import * as NetCoreApp from "Sdk.Managed.Frameworks.NetCoreApp3.0";
import * as NetCoreApp from "Sdk.Managed.Frameworks.NetCoreApp3.1";
namespace Interfaces {
export declare const qualifier : BuildXLSdk.DefaultQualifierWithNetStandard20;

4
Public/Src/Deployment/Ide.dsc
Просмотреть файл

@ -18,14 +18,14 @@ namespace Ide {
},
{
file: importFrom("BuildXL.Ide").withQualifier({
targetFramework:"netcoreapp3.0",
targetFramework:"netcoreapp3.1",
targetRuntime: "win-x64"}
).LanguageService.Server.vsix,
targetFileName: a`BuildXL.vscode.win.vsix`,
}]),
{
file: importFrom("BuildXL.Ide").withQualifier({
targetFramework:"netcoreapp3.0",
targetFramework:"netcoreapp3.1",
targetRuntime: "osx-x64"}
).LanguageService.Server.vsix,
targetFileName: a`BuildXL.vscode.osx.vsix`,

10
Public/Src/Deployment/NugetPackages.dsc
Просмотреть файл

@ -33,7 +33,7 @@ namespace NugetPackages {
const winX64 = !canBuildAllPackagesOnThisHost ? undefined : pack({
id: `${packageNamePrefix}.win-x64`,
deployment: BuildXL.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64"
}).deployment,
deploymentOptions: reducedDeploymentOptions
@ -42,7 +42,7 @@ namespace NugetPackages {
const osxX64 = pack({
id: `${packageNamePrefix}.osx-x64`,
deployment: BuildXL.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64"
}).deployment,
deploymentOptions: reducedDeploymentOptions
@ -95,7 +95,7 @@ namespace NugetPackages {
const toolsSandBoxExec = pack({
id: `${packageNamePrefix}.Tools.SandboxExec.osx-x64`,
deployment: Tools.SandboxExec.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64"
}).deployment
});
@ -104,13 +104,13 @@ namespace NugetPackages {
const toolsOrchestrator = pack({
id: `${packageNamePrefix}.Tools.Orchestrator.osx-x64`,
deployment: Tools.Orchestrator.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64"
}).deployment
});
const xldbnetcorequalifier : BuildXLSdk.DefaultQualifierWithNet472 = {
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
configuration: qualifier.configuration,
targetRuntime: "win-x64"
};

2
Public/Src/Deployment/buildXL.dsc
Просмотреть файл

@ -37,7 +37,7 @@ namespace BuildXL {
// {
// subfolder: r`bxp-server`,
// contents: [
// importFrom("BuildXL.Explorer").Server.withQualifier({targetFramework: "netcoreapp3.0"}).exe
// importFrom("BuildXL.Explorer").Server.withQualifier({targetFramework: "netcoreapp3.1"}).exe
// ]
// }
// ),

12
Public/Src/Deployment/cache.NugetPackages.dsc
Просмотреть файл

@ -9,16 +9,16 @@ namespace Cache.NugetPackages {
export declare const qualifier : { configuration: "debug" | "release"};
const Net472ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "net472", targetRuntime: "win-x64" });
const WinX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "win-x64" });
const OsxX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "osx-x64" });
const WinX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "win-x64" });
const OsxX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "osx-x64" });
const Net472MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "net472", targetRuntime: "win-x64" });
const WinX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "win-x64" });
const OsxX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "osx-x64" });
const WinX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "win-x64" });
const OsxX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "osx-x64" });
const Net472DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net472", targetRuntime: "win-x64" });
const WinX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "win-x64" });
const OsxX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "netcoreapp3.0", targetRuntime: "osx-x64" });
const WinX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "win-x64" });
const OsxX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "netcoreapp3.1", targetRuntime: "osx-x64" });
export const tools : Deployment.Definition = {
contents: [

10
Public/Src/Deployment/privatePackages.dsc
Просмотреть файл

@ -15,8 +15,8 @@ namespace PrivatePackages {
};
const net472Qualifier : BuildXLSdk.DefaultQualifierWithNet472 = { configuration: qualifier.configuration, targetFramework: "net472", targetRuntime: "win-x64" };
const winx64Qualifier : BuildXLSdk.DefaultQualifierWithNet472 = { configuration: qualifier.configuration, targetFramework: "netcoreapp3.0", targetRuntime: "win-x64" };
const osxx64Qualifier : BuildXLSdk.DefaultQualifierWithNet472 = { configuration: qualifier.configuration, targetFramework: "netcoreapp3.0", targetRuntime: "osx-x64" };
const winx64Qualifier : BuildXLSdk.DefaultQualifierWithNet472 = { configuration: qualifier.configuration, targetFramework: "netcoreapp3.1", targetRuntime: "win-x64" };
const osxx64Qualifier : BuildXLSdk.DefaultQualifierWithNet472 = { configuration: qualifier.configuration, targetFramework: "netcoreapp3.1", targetRuntime: "osx-x64" };
const cloudBuildlibrary = NugetPackages.pack({
id: "BuildXL.library.forCloudBuild",
@ -88,7 +88,7 @@ namespace PrivatePackages {
Nuget.createAssemblyLayout(importFrom("BuildXL.Utilities").withQualifier(winx64Qualifier).Storage.dll),
Nuget.createAssemblyLayout(importFrom("BuildXL.Tools").withQualifier(winx64Qualifier).VBCSCompilerLogger.dll),
...importFrom("RuntimeContracts").withQualifier({ targetFramework: "netcoreapp3.0" }).pkg.runtime
...importFrom("RuntimeContracts").withQualifier({ targetFramework: "netcoreapp3.1" }).pkg.runtime
]
},
});
@ -98,7 +98,7 @@ namespace PrivatePackages {
deployment: {
contents: [
{
subfolder: r`runtimes/win-x64/lib/netcoreapp3.0`,
subfolder: r`runtimes/win-x64/lib/netcoreapp3.1`,
contents: [
importFrom("BuildXL.Utilities").withQualifier(winx64Qualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(winx64Qualifier).Collections.dll,
@ -115,7 +115,7 @@ namespace PrivatePackages {
],
},
{
subfolder: r`runtimes/osx-x64/lib/netcoreapp3.0/`,
subfolder: r`runtimes/osx-x64/lib/netcoreapp3.1/`,
contents: [
importFrom("BuildXL.Utilities").withQualifier(osxx64Qualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(osxx64Qualifier).Collections.dll,

2
Public/Src/Deployment/tools.dsc
Просмотреть файл

@ -54,7 +54,7 @@ namespace Tools {
export const deployment : Deployment.Definition = {
contents: [
importFrom("BuildXL.Tools").withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
}).Orchestrator.exe
],
};

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

@ -45,7 +45,7 @@ namespace MsBuild {
{
subfolder: r`tools/vbcslogger/dotnetcore`,
contents: [importFrom("BuildXL.Tools").VBCSCompilerLogger
.withQualifier({ targetFramework: "netcoreapp3.0" }).dll]
.withQualifier({ targetFramework: "netcoreapp3.1" }).dll]
}
]
});

2
Public/Src/FrontEnd/SdkTesting/TestGenerator/BuildXL.FrontEnd.Script.Testing.TestGenerator.dsc
Просмотреть файл

@ -20,7 +20,7 @@ namespace TestGeneratorDeployment {
{
subfolder: a`MacOs`,
contents: $.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64"
}).TestGenerator.deploymentContents
}

2
Public/Src/FrontEnd/UnitTests/MsBuild/Test.BuildXL.FrontEnd.MsBuild.dsc
Просмотреть файл

@ -41,7 +41,7 @@ namespace Test.MsBuild {
runtimeContent: [
// We need both the full framework and dotnet core versions of MSBuild, plus dotnet.exe for the dotnet core case
...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "net472"}).deployment,
...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "netcoreapp3.0"}).deployment,
...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "netcoreapp3.1"}).deployment,
{
subfolder: "dotnet",
contents: Frameworks.Helpers.getDotNetToolTemplate().dependencies

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

@ -10,7 +10,7 @@ export {BuildXLSdk, NetFx};
export interface VsCodeExtensionQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "netcoreapp3.0";
targetFramework: "netcoreapp3.1";
targetRuntime: "win-x64" | "osx-x64";
}

2
Public/Src/Tools/Tool.MsBuildGraphBuilder/Tool.MsBuildGraphBuilder.dsc
Просмотреть файл

@ -55,7 +55,7 @@ namespace MsBuildGraphBuilder {
{
subfolder: r`dotnetcore`,
contents: [
$.withQualifier({ targetFramework: "netcoreapp3.0" })
$.withQualifier({ targetFramework: "netcoreapp3.1" })
.MsBuildGraphBuilder.exe
]
}

2
Public/Src/Utilities/UnitTests/Executables/TestProcess/Test.BuildXL.Executables.TestProcess.dsc
Просмотреть файл

@ -34,7 +34,7 @@ namespace TestProcess {
subfolder: r`TestProcess/MacOs`,
contents: [
$.withQualifier({
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64"
}).testProcessExe,

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

@ -572,13 +572,13 @@ config({
qualifiers: {
defaultQualifier: {
configuration: "debug",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: Context.getCurrentHost().os === "win" ? "win-x64" : "osx-x64",
},
namedQualifiers: {
Debug: {
configuration: "debug",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64",
},
DebugNet472: {
@ -588,19 +588,19 @@ config({
},
DebugDotNetCore: {
configuration: "debug",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64",
},
DebugDotNetCoreMac: {
configuration: "debug",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64",
},
// Release
Release: {
configuration: "release",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64",
},
ReleaseNet472: {
@ -611,12 +611,12 @@ config({
ReleaseDotNetCore: {
configuration: "release",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "win-x64",
},
ReleaseDotNetCoreMac: {
configuration: "release",
targetFramework: "netcoreapp3.0",
targetFramework: "netcoreapp3.1",
targetRuntime: "osx-x64",
},
}