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

Merged PR 786241: Revive Net7 support 

CaSaaS is currently on Net7 and it might need updated bxl bits while it's moving to Net8. This PR re-adds net7 qualifier. It's essentially a revert of `0a4d5b272900cfb6ad2c13795650e269500f9d17` and `5380d614bb98bfebb5a63900bb617ff51e93e56e`.

7.0.18 has a vulnerability, so this PR also includes a change that updates net7 bits to 7.0.19 to make the CG happy.

note: MsBuild is back to net7 (net7->net8 for msbuild was a part of net7 removal)
This commit is contained in:
Oleksii Kononenko 2024-05-22 19:35:13 +00:00
Родитель 250eb23e6f
Коммит fe5a6759ec
38 изменённых файлов: 666 добавлений и 81 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

1
.azdo/packages/packages.txt
Просмотреть файл

@ -1,4 +1,5 @@
BuildXL.win-x64
BuildXL.win-x64-net7
BuildXL.Cache.Hashing
BuildXL.Cache.Interfaces
BuildXL.Cache.Tools

2
.azdo/rolling/jobs/cb.yml
Просмотреть файл

@ -31,6 +31,8 @@ jobs:
/q:DebugNet472
/q:DebugDotNet6
/q:ReleaseDotNet6
/q:DebugNet7
/q:ReleaseNet7
/q:DebugNet8
/q:ReleaseNet8
/p:Build.BuildId=$(Build.BuildNumber)

2
Examples/MsBuildHelloWorld/HelloWorldCSHybrid/copy.cmd
Просмотреть файл

@ -1,4 +1,4 @@
@ECHO OFF
REM Copy the Hello.exe to Hello.copy.exe
copy bin\Debug\net8.0\Hello.exe bin\Debug\net8.0\Hello.copy.exe
copy bin\Debug\net7.0\Hello.exe bin\Debug\net7.0\Hello.copy.exe

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

@ -12,6 +12,8 @@ export const framework : Shared.Framework = (() => {
return importFrom("Sdk.Managed.Frameworks.Net472").framework;
case "net6.0":
return importFrom("Sdk.Managed.Frameworks.Net6.0").framework;
case "net7.0":
return importFrom("Sdk.Managed.Frameworks.Net7.0").framework;
case "net8.0":
return importFrom("Sdk.Managed.Frameworks.Net8.0").framework;
case "netstandard2.0":

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

@ -90,6 +90,19 @@ namespace Helpers {
Contract.fail(`The current DotNetCore Runtime package doesn't support the current target runtime: ${host.os}. Ensure you run on a supported OS -or- update the DotNet-Runtime package to have the version embdded.`);
}
}
else if (version === 'net7.0')
{
switch (host.os) {
case "win":
return importFrom("DotNet-Runtime-7.win-x64").extracted;
case "macOS":
return importFrom("DotNet-Runtime-7.osx-x64").extracted;
case "unix":
return importFrom("DotNet-Runtime-7.linux-x64").extracted;
default:
Contract.fail(`The current DotNetCore Runtime package doesn't support the current target runtime: ${host.os}. Ensure you run on a supported OS -or- update the DotNet-Runtime package to have the version embdded.`);
}
}
else if (version === 'net8.0')
{
switch (host.os) {
@ -113,11 +126,13 @@ namespace Helpers {
}
const tool6Template = getDotNetCoreToolTemplate("net6.0");
const tool7Template = getDotNetCoreToolTemplate("net7.0");
const tool8Template = getDotNetCoreToolTemplate("net8.0");
function getCachedDotNetCoreToolTemplate(dotNetCoreVersion: DotNetCoreVersion) {
switch (dotNetCoreVersion) {
case "net6.0": return tool6Template;
case "net7.0": return tool7Template;
case "net8.0": return tool8Template;
default: Contract.fail(`Unknown .NET Core version '${dotNetCoreVersion}'.`);
}

9
Public/Sdk/Public/Managed/Frameworks/net7/module.config.dsc Normal file
Просмотреть файл

@ -0,0 +1,9 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
module({
name: "Sdk.Managed.Frameworks.Net7.0",
projects: [
f`net7.0.dsc`,
]
});

106
Public/Sdk/Public/Managed/Frameworks/net7/net7.0.dsc Normal file
Просмотреть файл

@ -0,0 +1,106 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {Artifact, Cmd, Transformer} from "Sdk.Transformers";
import * as Shared from "Sdk.Managed.Shared";
import * as Deployment from "Sdk.Deployment";
import * as MacOS from "Sdk.MacOS";
import {Helpers} from "Sdk.Managed.Frameworks";
export declare const qualifier: {targetFramework: "net7.0"};
const defaultAssemblies: Shared.Assembly[] = createDefaultAssemblies();
const windowsRuntimeFiles = [
// Don't need to exclude assemblies for net7 because they're higher versions.
...importFrom("Microsoft.NETCore.App.Runtime.win-x64.7.0").Contents.all.getContent().filter(f => f.extension === a`.dll`),
...importFrom("runtime.win-x64.Microsoft.NETCore.DotNetHostResolver.7.0").Contents.all.getContent().filter(f => f.extension === a`.dll`),
...importFrom("runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy.7.0").Contents.all.getContent().filter(f => f.extension === a`.dll`),
];
const osxRuntimeFiles = [
...importFrom("Microsoft.NETCore.App.Runtime.osx-x64.7.0").Contents.all.getContent().filter(f => Helpers.macOSRuntimeExtensions(f)),
...importFrom("runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver.7.0").Contents.all.getContent().filter(f => Helpers.macOSRuntimeExtensions(f)),
...importFrom("runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy.7.0").Contents.all.getContent().filter(f => Helpers.macOSRuntimeExtensions(f)),
];
const linuxRuntimeFiles = [
...importFrom("Microsoft.NETCore.App.Runtime.linux-x64.7.0").Contents.all.getContent().filter(f => Helpers.linuxRuntimeExtensions(f)),
...importFrom("runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver.7.0").Contents.all.getContent().filter(f => Helpers.linuxRuntimeExtensions(f)),
...importFrom("runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy.7.0").Contents.all.getContent().filter(f => Helpers.linuxRuntimeExtensions(f)),
];
@@public
export function runtimeContentProvider(runtimeVersion: Shared.RuntimeVersion): File[] {
switch (runtimeVersion)
{
case "osx-x64":
return osxRuntimeFiles;
case "win-x64":
return windowsRuntimeFiles;
case "linux-x64":
return linuxRuntimeFiles;
default:
Contract.fail(`Unsupported runtime encountered: ${runtimeVersion}`);
}
}
export function crossgenProvider(runtimeVersion: Shared.RuntimeVersion): Shared.CrossgenFiles {
switch (runtimeVersion)
{
case "osx-x64":
const osxFiles = importFrom("Microsoft.NETCore.App.Runtime.osx-x64.7.0").Contents.all;
return {
crossgenExe: osxFiles.getFile(r`tools/crossgen`),
JITPath: osxFiles.getFile(r`runtimes/osx-x64/native/libclrjit.dylib`)
};
case "win-x64":
const winFiles = importFrom("Microsoft.NETCore.App.Runtime.win-x64.7.0").Contents.all;
return {
crossgenExe: winFiles.getFile(r`tools/crossgen.exe`),
JITPath: winFiles.getFile(r`runtimes/win-x64/native/clrjit.dll`)
};
default:
return undefined;
}
}
@@public
export const framework : Shared.Framework = {
targetFramework: qualifier.targetFramework,
supportedRuntimeVersion: "v7.0",
assemblyInfoTargetFramework: ".NETCoreApp,Version=v7.0",
assemblyInfoFrameworkDisplayName: ".NET App",
standardReferences: defaultAssemblies,
requiresPortablePdb: true,
runtimeConfigStyle: "runtimeJson",
runtimeFrameworkName: "Microsoft.NETCore.App",
runtimeConfigVersion: "7.0.0-rc.1.22426.10",
// Deployment style for .NET Core applications currently defaults to self-contained
defaultApplicationDeploymentStyle: "selfContained",
runtimeContentProvider: runtimeContentProvider,
crossgenProvider: crossgenProvider,
conditionalCompileDefines: [
"NET",
"NETCOREAPP",
"NETCOREAPP3_1_OR_GREATER",
"NET5_0_OR_GREATER",
"NET6_0",
"NET6_0_OR_GREATER",
"NET7_0",
"NET7_0_OR_GREATER"
],
};
function createDefaultAssemblies() : Shared.Assembly[] {
const pkgContents = importFrom("Microsoft.NETCore.App.Ref70").Contents.all;
// Don't need to exclude assemblies for net7 because they're higher versions.
return Helpers.createDefaultAssemblies(pkgContents, "net7.0", /*includeAllAssemblies*/ true);
}

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

@ -74,11 +74,11 @@ export type ApplicationDeploymentStyle = "frameworkDependent" | "selfContained";
export type RuntimeVersion = "win-x64" | "osx-x64" | "linux-x64";
@@public
export type DotNetCoreVersion = "net6.0" | "net8.0";
export type DotNetCoreVersion = "net6.0" | "net7.0" | "net8.0";
@@public
export function isDotNetCore(targetFramework: TargetFrameworks.AllFrameworks) : targetFramework is DotNetCoreVersion {
return targetFramework === 'net6.0' || targetFramework === 'net8.0';
return targetFramework === 'net6.0' || targetFramework === 'net7.0' || targetFramework === 'net8.0';
}
namespace TargetFrameworks {
@ -89,7 +89,7 @@ namespace TargetFrameworks {
export type DesktopTargetFrameworks = "net472";
@@public
export type CoreClrTargetFrameworks = "net6.0" | "net8.0";
export type CoreClrTargetFrameworks = "net6.0" | "net7.0" | "net8.0";
@@public
export type StandardTargetFrameworks = "netstandard2.0";

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

@ -58,6 +58,7 @@ function getXunitConsoleRuntimeConfigNetCoreAppFiles(): File[] {
function getTargetFramework(): Framework {
switch (qualifier.targetFramework) {
case "net6.0": return importFrom("Sdk.Managed.Frameworks.Net6.0").withQualifier({targetFramework: "net6.0"}).framework;
case "net7.0": return importFrom("Sdk.Managed.Frameworks.Net7.0").withQualifier({targetFramework: "net7.0"}).framework;
case "net8.0": return importFrom("Sdk.Managed.Frameworks.Net8.0").withQualifier({targetFramework: "net8.0"}).framework;
default: Contract.fail(`Unknown targetFramework version '${qualifier.targetFramework}'.`);
}

5
Public/Sdk/Public/Managed/Tools/Csc/csc.dsc
Просмотреть файл

@ -274,6 +274,11 @@ export function getDotNetCoreVersion(cscArguments: Arguments): Shared.DotNetCore
return "net8.0";
}
// Now we can check whether net7 symbol is present.
if (cscArguments.defines.some(e => e === "NET7_0")) {
return "net7.0";
}
return "net8.0";
}

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

@ -80,6 +80,7 @@ export function assembly(args: Arguments, targetType: Csc.TargetType) : Result {
...addIf(qualifier.targetRuntime === "win-x64" && qualifier.targetFramework === "net472" && qualifier.configuration === "debug", "CompileDebugNet472", "CompileWin"),
...addIf(qualifier.targetRuntime === "win-x64" && qualifier.targetFramework === "netstandard2.0" && qualifier.configuration === "debug", "CompileNetStandard20", "CompileWin"),
...addIf(qualifier.targetRuntime === "win-x64" && qualifier.targetFramework === "net6.0" && qualifier.configuration === "debug", "CompileDebugNet6Win", "CompileWin"),
...addIf(qualifier.targetRuntime === "win-x64" && qualifier.targetFramework === "net7.0" && qualifier.configuration === "debug", "CompileDebugNet7Win", "CompileWin"),
...addIf(qualifier.targetRuntime === "win-x64" && qualifier.targetFramework === "net8.0" && qualifier.configuration === "debug", "CompileDebugNet8Win", "CompileWin"),
...addIf(qualifier.targetRuntime === "osx-x64" && qualifier.targetFramework === "net6.0" && qualifier.configuration === "debug", "CompileNet6Osx", "CompileOsx"),

2
Public/Sdk/Public/Tools/Guardian/Tool.Guardian.CredScan.dsc
Просмотреть файл

@ -19,7 +19,7 @@ export function addCredScanCalls(rootDirectory : Directory, guardianToolRoot : S
// Since "latest" is used as the version for the credscan tool, we will not know which directory to untrack ahead of time
const credScanToolDirectories = globFolders(d`${packageDirectory.path}/nuget`, "Microsoft.Security.CredScan.Client*");
const credScanTfms = ["netcoreapp2.1", "netcoreapp3.1", "net6.0", "net8.0"];
const credScanTfms = ["netcoreapp2.1", "netcoreapp3.1", "net6.0", "net7.0", "net8.0"];
const srmDirectories = credScanToolDirectories.mapMany(d => credScanTfms.map(tfm => Directory.fromPath(d.path.combine(r`lib/${tfm}/SRM`))));
for (let i = 0; i < numCredScanCalls; i++) {

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

@ -133,13 +133,13 @@ export interface InternalsVisibleToArguments {
* Returns true if the current qualifier is targeting .NET Core or .NET Standard
*/
@@public
export const isDotNetCoreOrStandard : boolean = qualifier.targetFramework === "netstandard2.0" || qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net8.0";
export const isDotNetCoreOrStandard : boolean = qualifier.targetFramework === "netstandard2.0" || qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net7.0" || qualifier.targetFramework === "net8.0";
/**
* Returns true if the current qualifier is targeting .NET Core
*/
@@public
export const isDotNetCore : boolean = qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net8.0";
export const isDotNetCore : boolean = qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net7.0" || qualifier.targetFramework === "net8.0";
@@public
export const isFullFramework : boolean = qualifier.targetFramework === "net472";
@ -170,7 +170,7 @@ export const targetFrameworkMatchesCurrentHost =
export const restrictTestRunToSomeQualifiers =
qualifier.configuration !== "debug" ||
// Running tests for .NET Core App 3.0, .NET 5 and 4.7.2 frameworks only.
(qualifier.targetFramework !== "net6.0" && qualifier.targetFramework !== "net8.0" && qualifier.targetFramework !== "net472") ||
(qualifier.targetFramework !== "net6.0" && qualifier.targetFramework !== "net7.0" && qualifier.targetFramework !== "net8.0" && qualifier.targetFramework !== "net472") ||
!targetFrameworkMatchesCurrentHost;
/***
@ -908,8 +908,9 @@ function processArguments(args: Arguments, targetType: Csc.TargetType) : Argumen
polySharpAttributeFiles = polySharpAttributeFiles.concat([polySharpAttributes.isExternalInit]);
}
// Required members are needed for all target frameworks prior net7.
if (qualifier.targetFramework !== "net8.0" && args.addPolySharpAttributes !== false) {
// Required members is needed for non .net7 target frameworks.
// Uncomment once the .net7 PR is in.
if (qualifier.targetFramework !== "net7.0" && qualifier.targetFramework !== "net8.0" && args.addPolySharpAttributes !== false) {
polySharpAttributeFiles = polySharpAttributeFiles.concat([polySharpAttributes.required, polySharpAttributes.setsRequiredMembers, polySharpAttributes.compilerFeatureRequired, polySharpAttributes.stringSyntax]);
}

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

@ -29,7 +29,7 @@ export interface NetStandardQualifier extends Qualifier {
@@public
export interface DefaultQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0"; // Temporarily having 2 target frameworks until the migration to the new one is fully done.
targetFramework: "net6.0" | "net7.0" | "net8.0"; // Temporarily having 3 target frameworks until the migration to the new one is fully done.
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@ -39,7 +39,7 @@ export interface DefaultQualifier extends Qualifier {
@@public
export interface DefaultQualifierWithNet472 extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0" | "net472";
targetFramework: "net6.0" | "net7.0" | "net8.0" | "net472";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@ -49,7 +49,7 @@ export interface DefaultQualifierWithNet472 extends Qualifier {
@@public
export interface DefaultQualifierWithNet472AndNetStandard20 extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0" | "net472" | "netstandard2.0";
targetFramework: "net6.0" | "net7.0" | "net8.0" | "net472" | "netstandard2.0";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@ -59,7 +59,7 @@ export interface DefaultQualifierWithNet472AndNetStandard20 extends Qualifier {
@@public
export interface AllSupportedQualifiers extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0" | "net472" | "netstandard2.0";
targetFramework: "net6.0" | "net7.0" | "net8.0" | "net472" | "netstandard2.0";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@ -75,14 +75,14 @@ export interface PlatformDependentQualifier extends Qualifier {
@@public
export interface NetCoreAppQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0";
targetFramework: "net6.0" | "net7.0" | "net8.0";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@@public
export interface NetCoreQualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net6.0" | "net8.0";
targetFramework: "net6.0" | "net7.0" | "net8.0";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@ -93,6 +93,13 @@ export interface Net6Qualifier extends Qualifier {
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@@public
export interface Net7Qualifier extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net7.0";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}
@@public
export interface Net8Qualifier extends Qualifier {
configuration: "debug" | "release";
@ -101,14 +108,14 @@ export interface Net8Qualifier extends Qualifier {
}
/**
* Having a net8 specific qualifier (without net 6) for some specific tests that only
* work in net 8.
* TODO: This should be consolidated with DefaultQualifier when we stop compiling for net6.
* Having a net7 specific qualifier (without net 6) for some specific tests that only
* work in net 7.
* TODO: This should be consolidated with DefaultQualifier when we stop compiling for net6
*/
@@public
export interface Net8QualifierWithNet472 extends Qualifier {
export interface Net7QualifierWithNet472 extends Qualifier {
configuration: "debug" | "release";
targetFramework: "net8.0" | "net472";
targetFramework: "net7.0" | "net472";
targetRuntime: "win-x64" | "osx-x64" | "linux-x64";
}

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

@ -98,6 +98,7 @@ function getQTestDotNetFramework() : Qtest.QTestDotNetFramework {
case "net472":
return Qtest.QTestDotNetFramework.framework46;
case "net6.0":
case "net7.0":
case "net8.0":
return Qtest.QTestDotNetFramework.frameworkCore30;
default:

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

@ -10,6 +10,7 @@ namespace WebFramework {
return Shared.Factory.createFrameworkPackage(
importPackage(
() => importFrom("Microsoft.AspNetCore.App.Ref.6.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Ref.7.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Ref.8.0.0").pkg),
getRuntimePackage(),
a`${qualifier.targetRuntime}`,
@ -22,23 +23,27 @@ namespace WebFramework {
case "win-x64":
return importPackage(
() => importFrom("Microsoft.AspNetCore.App.Runtime.win-x64.6.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.win-x64.7.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.win-x64.8.0.0").pkg);
case "osx-x64":
return importPackage(
() => importFrom("Microsoft.AspNetCore.App.Runtime.osx-x64.6.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.osx-x64.7.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.osx-x64.8.0.0").pkg);
case "linux-x64":
return importPackage(
() => importFrom("Microsoft.AspNetCore.App.Runtime.linux-x64.6.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.linux-x64.7.0.0").pkg,
() => importFrom("Microsoft.AspNetCore.App.Runtime.linux-x64.8.0.0").pkg);
default:
Contract.fail("Unsupported target framework");
}
}
function importPackage(net60: () => Shared.ManagedNugetPackage, net80: () => Shared.ManagedNugetPackage) : Shared.ManagedNugetPackage {
function importPackage(net60: () => Shared.ManagedNugetPackage, net70: () => Shared.ManagedNugetPackage, net80: () => Shared.ManagedNugetPackage) : Shared.ManagedNugetPackage {
switch (qualifier.targetFramework) {
case "net6.0": return net60();
case "net7.0": return net70();
case "net8.0": return net80();
default: Contract.fail(`Unsupported target framework ${qualifier.targetFramework}.`);
}

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

@ -0,0 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {createPublicDotNetRuntime} from "DotNet-Runtime.Common";
@@public
export const extracted = createPublicDotNetRuntime(importFrom("DotNet-Runtime.linux-x64.7.0").extracted, undefined);

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

@ -0,0 +1,7 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {createPublicDotNetRuntime} from "DotNet-Runtime.Common";
@@public
export const extracted = createPublicDotNetRuntime(importFrom("DotNet-Runtime.osx-x64.7.0").extracted, undefined);

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

@ -0,0 +1,10 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import {createPublicDotNetRuntime} from "DotNet-Runtime.Common";
const isWinOs = Context.getCurrentHost().os === "win";
@@public
export const extracted = createPublicDotNetRuntime(
isWinOs ? <StaticDirectory>importFrom("DotNet-Runtime.win-x64.7.0").extracted : undefined, undefined);

19
Public/Sdk/SelfHost/Libraries/Dotnet-Runtime-7-External/module.config.dsc Normal file
Просмотреть файл

@ -0,0 +1,19 @@
// Copyright (c) Microsoft. All rights reserved.
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
// These are the external versions of the architecture-specific DotNet-Runtime packages.
module({
name: "DotNet-Runtime-7.win-x64",
projects: [f`DotNet-Runtime.win-x64.dsc`]
});
module({
name: "DotNet-Runtime-7.osx-x64",
projects: [f`DotNet-Runtime.osx-x64.dsc`]
});
module({
name: "DotNet-Runtime-7.linux-x64",
projects: [f`DotNet-Runtime.linux-x64.dsc`]
});

8
Public/Sdk/SelfHost/Libraries/MSBuild/msbuild.dsc
Просмотреть файл

@ -4,7 +4,7 @@
import * as Managed from "Sdk.Managed";
import * as BuildXLSdk from "Sdk.BuildXL";
export declare const qualifier: BuildXLSdk.Net8QualifierWithNet472;
export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
@@public
export const msbuildReferences: Managed.ManagedNugetPackage[] = [
@ -18,7 +18,7 @@ export const msbuildReferences: Managed.ManagedNugetPackage[] = [
/**
* Runtime content for tests
* Observe that we use a net8-specific version of msbuild.
* Observe that we use a net7-specific version of msbuild.
**/
@@public
export const msbuildRuntimeContent = [
@ -33,8 +33,8 @@ export const msbuildRuntimeContent = [
...BuildXLSdk.isDotNetCoreOrStandard ? [
importFrom("System.Text.Encoding.CodePages").pkg,
importFrom("Microsoft.Build.Tasks.Core").pkg,
importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net8.0/MSBuild.dll`),
importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net8.0/MSBuild.runtimeconfig.json`),
importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net7.0/MSBuild.dll`),
importFrom("Microsoft.Build.Runtime").Contents.all.getFile(r`contentFiles/any/net7.0/MSBuild.runtimeconfig.json`),
importFrom("Microsoft.NET.StringTools").pkg
]
: [

15
Public/Src/App/Deployment.InBoxSdks.dsc
Просмотреть файл

@ -2,7 +2,6 @@
// Licensed under the MIT license. See LICENSE file in the project root for full license information.
import * as Managed from "Sdk.Managed";
import {isDotNetCore} from "Sdk.Managed.Shared";
const sdkRoot = Context.getMount("SdkRoot").path;
@ -60,9 +59,9 @@ function createSdkDeploymentDefinition(serverDeployment: boolean, minimalDeploym
...addIf(!minimalDeployment,
{
subfolder: "Sdk.Drop",
contents: [
contents: [
importFrom("BuildXL.Tools.DropDaemon").withQualifier({
targetFramework: isDotNetCore(qualifier.targetFramework) ? qualifier.targetFramework : "net8.0",
targetFramework: "net7.0",
targetRuntime: "win-x64"
}).selectDeployment(evaluationOnly)
]
@ -70,17 +69,17 @@ function createSdkDeploymentDefinition(serverDeployment: boolean, minimalDeploym
{
subfolder: "Sdk.Symbols",
contents: [
importFrom("BuildXL.Tools.SymbolDaemon").withQualifier({
targetFramework: isDotNetCore(qualifier.targetFramework) ? qualifier.targetFramework : "net8.0",
targetRuntime: "win-x64"
}).selectDeployment(evaluationOnly)
importFrom("BuildXL.Tools.SymbolDaemon").withQualifier({
targetFramework: "net7.0",
targetRuntime: "win-x64"
}).selectDeployment(evaluationOnly)
]
},
{
subfolder: "Sdk.Materialization",
contents: [
importFrom("BuildXL.Tools.MaterializationDaemon").withQualifier({
targetFramework: isDotNetCore(qualifier.targetFramework) ? qualifier.targetFramework : "net8.0",
targetFramework: "net7.0",
targetRuntime: "win-x64"
}).selectDeployment(evaluationOnly)
]

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

@ -32,6 +32,11 @@ namespace NugetPackages {
targetRuntime: "win-x64"
};
const net7PackageQualifier = {
targetFramework: "net7.0",
targetRuntime: "win-x64"
};
const net8PackageQualifier = {
targetFramework: "net8.0",
targetRuntime: "win-x64"
@ -56,6 +61,11 @@ namespace NugetPackages {
targetRuntime: "linux-x64"
};
const net7LinuxPackageQualifier = {
targetFramework: "net7.0",
targetRuntime: "linux-x64"
};
const net8LinuxPackageQualifier = {
targetFramework: "net8.0",
targetRuntime: "linux-x64"
@ -66,6 +76,7 @@ namespace NugetPackages {
const packageNamePrefix = BuildXLSdk.Flags.isMicrosoftInternal
? "BuildXL"
: "Microsoft.BuildXL";
/**
* The notice file compiles the license and copyright information for any code or other materials under open source licenses that we distribute in a Microsoft Offering.
@ -132,6 +143,15 @@ namespace NugetPackages {
filterFiles: [a`DetoursServices.pdb`, a`BuildXLAria.pdb`, a`BuildXLNatives.pdb`]
});
const winX64Net7 = !canBuildAllPackagesOnThisHost ? undefined : pack({
id: `${packageNamePrefix}.win-x64-net7`,
deployment: BuildXL.withQualifier(net7PackageQualifier).deployment,
deploymentOptions: reducedDeploymentOptions,
// The following PDBs are quite big and copied many times. Remove them from the nuget
// package to save some space.
filterFiles: [a`DetoursServices.pdb`, a`BuildXLAria.pdb`, a`BuildXLNatives.pdb`]
});
const osxX64 = pack({
id: `${packageNamePrefix}.osx-x64`,
deployment: BuildXL.withQualifier({
@ -150,6 +170,12 @@ namespace NugetPackages {
deploymentOptions: reducedDeploymentOptions
});
const linuxX64Net7 = pack({
id: `${packageNamePrefix}.linux-x64-net7`,
deployment: BuildXL.withQualifier(net7LinuxPackageQualifier).deployment,
deploymentOptions: reducedDeploymentOptions
});
const sdks = pack({
id: `${packageNamePrefix}.Sdks`,
deployment: Sdks.deployment,
@ -161,6 +187,7 @@ namespace NugetPackages {
assemblies: [
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.withQualifier(net472packageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.withQualifier(net6PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.withQualifier(net7PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.withQualifier(net8PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").AriaCommon.withQualifier(netstandard20PackageQualifier).dll,
]
@ -172,42 +199,49 @@ namespace NugetPackages {
// BuildXL.Utilities
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).dll,
// BuildXL.Utilities.Branding
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Branding.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Branding.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Branding.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Branding.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Branding.dll,
// BuildXL.KeyValueStore
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).KeyValueStore.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).KeyValueStore.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).KeyValueStore.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).KeyValueStore.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).KeyValueStore.dll,
// BuildXL.Native.Extensions
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Native.Extensions.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Native.Extensions.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Native.Extensions.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Native.Extensions.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Native.Extensions.dll,
// BuildXL.Configuration
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Configuration.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Configuration.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Configuration.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Configuration.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Configuration.dll,
// BuildXL.SBOMUtilities
...addIf(BuildXLSdk.Flags.isMicrosoftInternal,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).SBOMUtilities.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).SBOMUtilities.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).SBOMUtilities.dll
),
// BuildXL.Instrumentation.Tracing
importFrom("BuildXL.Utilities.Instrumentation").Tracing.withQualifier(net472packageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.withQualifier(net6PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.withQualifier(net7PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.withQualifier(net8PackageQualifier).dll,
importFrom("BuildXL.Utilities.Instrumentation").Tracing.withQualifier(netstandard20PackageQualifier).dll,
@ -216,6 +250,7 @@ namespace NugetPackages {
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Authentication.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Authentication.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Authentication.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Authentication.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Authentication.dll
),
],
@ -251,6 +286,7 @@ namespace NugetPackages {
// BuildXL.Utilities.Core
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Utilities.Core.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Utilities.Core.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Utilities.Core.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Utilities.Core.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Utilities.Core.dll,
],
@ -263,6 +299,7 @@ namespace NugetPackages {
// BuildXL.Native
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Native.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Native.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Native.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Native.dll,
importFrom("BuildXL.Utilities").withQualifier(netstandard20PackageQualifier).Native.dll,
],
@ -280,16 +317,19 @@ namespace NugetPackages {
// BuildXL.Utilities
importFrom("BuildXL.Pips").withQualifier(net472packageQualifier).dll,
importFrom("BuildXL.Pips").withQualifier(net6PackageQualifier).dll,
importFrom("BuildXL.Pips").withQualifier(net7PackageQualifier).dll,
importFrom("BuildXL.Pips").withQualifier(net8PackageQualifier).dll,
// BuildXL.Ipc
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Ipc.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Ipc.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Ipc.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Ipc.dll,
// BuildXL.Storage
importFrom("BuildXL.Utilities").withQualifier(net472packageQualifier).Storage.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Storage.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Storage.dll,
importFrom("BuildXL.Utilities").withQualifier(net8PackageQualifier).Storage.dll,
],
dependencies: [
@ -316,6 +356,7 @@ namespace NugetPackages {
// BuildXL.Processes
importFrom("BuildXL.Engine").withQualifier(net472packageQualifier).Processes.dll,
importFrom("BuildXL.Engine").withQualifier(net6PackageQualifier).Processes.dll,
importFrom("BuildXL.Engine").withQualifier(net7PackageQualifier).Processes.dll,
importFrom("BuildXL.Engine").withQualifier(net8PackageQualifier).Processes.dll,
],
dependencies: [
@ -331,6 +372,7 @@ namespace NugetPackages {
id: { id: `${packageNamePrefix}.Processes.linux-x64`, version: Branding.Nuget.packageVersion },
assemblies: [
importFrom("BuildXL.Engine").withQualifier(net6LinuxPackageQualifier).Processes.dll,
importFrom("BuildXL.Engine").withQualifier(net7LinuxPackageQualifier).Processes.dll,
importFrom("BuildXL.Engine").withQualifier(net8LinuxPackageQualifier).Processes.dll,
],
dependencies: [
@ -363,6 +405,15 @@ namespace NugetPackages {
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net6PackageQualifier).ImplementationSupport.dll,
importFrom("BuildXL.Utilities").withQualifier(net6PackageQualifier).Storage.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).InMemory.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).Interfaces.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).BasicFilesystem.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).BuildCacheAdapter.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).MemoizationStoreAdapter.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).VerticalAggregator.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net7PackageQualifier).ImplementationSupport.dll,
importFrom("BuildXL.Utilities").withQualifier(net7PackageQualifier).Storage.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net8PackageQualifier).InMemory.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net8PackageQualifier).Interfaces.dll,
importFrom("BuildXL.Cache.VerticalStore").withQualifier(net8PackageQualifier).BasicFilesystem.dll,
@ -416,6 +467,10 @@ namespace NugetPackages {
subfolder: r`net6.0`,
contents: [importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net6.0", targetRuntime: "win-x64" }).LauncherServer.exe]
},
{
subfolder: r`net7.0`,
contents: [importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net7.0", targetRuntime: "win-x64" }).LauncherServer.exe]
},
{
subfolder: r`net8.0`,
contents: [importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net8.0", targetRuntime: "win-x64" }).LauncherServer.exe]
@ -718,7 +773,7 @@ namespace NugetPackages {
contents: [
...addIfLazy(canBuildAllPackagesOnThisHost, () => [
...addIf(!BuildXLSdk.Flags.genVSSolution,
winX64
winX64, winX64Net7
),
cacheTools,
cacheLibraries,
@ -742,6 +797,7 @@ namespace NugetPackages {
]),
...addIfLazy(!BuildXLSdk.Flags.genVSSolution && Context.getCurrentHost().os === "unix", () => [
linuxX64,
linuxX64Net7,
processesLinux
]),
]

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

@ -29,6 +29,16 @@ namespace Cache.NugetPackages {
const net6WinX64CacheLogging = importFrom("BuildXL.Cache.Logging").Library.withQualifier({ targetFramework: "net6.0", targetRuntime: "win-x64" });
const net6OsxX64CacheLogging = importFrom("BuildXL.Cache.Logging").Library.withQualifier({ targetFramework: "net6.0", targetRuntime: "osx-x64" });
// Net7
const net7WinX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "net7.0", targetRuntime: "win-x64" });
const net7OsxX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "net7.0", targetRuntime: "osx-x64" });
const net7WinX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "net7.0", targetRuntime: "win-x64" });
const net7OsxX64MemoizationStore = importFrom("BuildXL.Cache.MemoizationStore").withQualifier({ targetFramework: "net7.0", targetRuntime: "osx-x64" });
const net7WinX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net7.0", targetRuntime: "win-x64" });
const net7OsxX64DistributedCacheHost = importFrom("BuildXL.Cache.DistributedCache.Host").withQualifier({ targetFramework: "net7.0", targetRuntime: "osx-x64" });
const net7WinX64CacheLogging = importFrom("BuildXL.Cache.Logging").Library.withQualifier({ targetFramework: "net7.0", targetRuntime: "win-x64" });
const net7OsxX64CacheLogging = importFrom("BuildXL.Cache.Logging").Library.withQualifier({ targetFramework: "net7.0", targetRuntime: "osx-x64" });
// Net8
const net8WinX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "net8.0", targetRuntime: "win-x64" });
const net8OsxX64ContentStore = importFrom("BuildXL.Cache.ContentStore").withQualifier({ targetFramework: "net8.0", targetRuntime: "osx-x64" });
@ -57,6 +67,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Distributed.dll,
netStandardContentStore.Distributed.dll,
net6WinX64ContentStore.Distributed.dll,
net7WinX64ContentStore.Distributed.dll,
net8WinX64ContentStore.Distributed.dll,
];
@ -65,6 +76,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Library.dll,
netStandardContentStore.Library.dll,
net6WinX64ContentStore.Library.dll,
net7WinX64ContentStore.Library.dll,
net8WinX64ContentStore.Library.dll,
];
@ -73,6 +85,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Grpc.dll,
netStandardContentStore.Grpc.dll,
net6WinX64ContentStore.Grpc.dll,
net7WinX64ContentStore.Grpc.dll,
net8WinX64ContentStore.Grpc.dll,
];
@ -81,6 +94,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Vsts.dll,
netStandardContentStore.Vsts.dll,
net6WinX64ContentStore.Vsts.dll,
net7WinX64ContentStore.Vsts.dll,
net8WinX64ContentStore.Vsts.dll,
];
@ -89,6 +103,7 @@ namespace Cache.NugetPackages {
net472ContentStore.VstsInterfaces.dll,
netStandardContentStore.VstsInterfaces.dll,
net6WinX64ContentStore.VstsInterfaces.dll,
net7WinX64ContentStore.VstsInterfaces.dll,
net8WinX64ContentStore.VstsInterfaces.dll,
];
@ -97,6 +112,7 @@ namespace Cache.NugetPackages {
net472MemoizationStore.Distributed.dll,
netStandardMemoizationStore.Distributed.dll,
net6WinX64MemoizationStore.Distributed.dll,
net7WinX64MemoizationStore.Distributed.dll,
net8WinX64MemoizationStore.Distributed.dll,
];
@ -105,6 +121,7 @@ namespace Cache.NugetPackages {
net472MemoizationStore.Library.dll,
netStandardMemoizationStore.Library.dll,
net6WinX64MemoizationStore.Library.dll,
net7WinX64MemoizationStore.Library.dll,
net8WinX64MemoizationStore.Library.dll,
];
@ -113,6 +130,7 @@ namespace Cache.NugetPackages {
net472MemoizationStore.Vsts.dll,
netStandardMemoizationStore.Vsts.dll,
net6WinX64MemoizationStore.Vsts.dll,
net7WinX64MemoizationStore.Vsts.dll,
net8WinX64MemoizationStore.Vsts.dll,
];
@ -121,6 +139,7 @@ namespace Cache.NugetPackages {
net472MemoizationStore.VstsInterfaces.dll,
netStandardMemoizationStore.VstsInterfaces.dll,
net6WinX64MemoizationStore.VstsInterfaces.dll,
net7WinX64MemoizationStore.VstsInterfaces.dll,
net8WinX64MemoizationStore.VstsInterfaces.dll,
];
@ -129,6 +148,7 @@ namespace Cache.NugetPackages {
net472DistributedCacheHost.Service.dll,
netStandardDistributedCacheHost.Service.dll,
net6WinX64DistributedCacheHost.Service.dll,
net7WinX64DistributedCacheHost.Service.dll,
net8WinX64DistributedCacheHost.Service.dll,
];
@ -137,6 +157,7 @@ namespace Cache.NugetPackages {
net472DistributedCacheHost.Configuration.dll,
netStandardDistributedCacheHost.Configuration.dll,
net6WinX64DistributedCacheHost.Configuration.dll,
net7WinX64DistributedCacheHost.Configuration.dll,
net8WinX64DistributedCacheHost.Configuration.dll,
];
@ -145,6 +166,7 @@ namespace Cache.NugetPackages {
net472CacheLogging.dll,
netStandardCacheLogging.dll,
net6WinX64CacheLogging.dll,
net7WinX64CacheLogging.dll,
net8WinX64CacheLogging.dll,
];
@ -153,6 +175,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Interfaces.dll,
netStandardContentStore.Interfaces.dll,
net6WinX64ContentStore.Interfaces.dll,
net7WinX64ContentStore.Interfaces.dll,
net8WinX64ContentStore.Interfaces.dll,
];
@ -161,6 +184,7 @@ namespace Cache.NugetPackages {
net472MemoizationStore.Interfaces.dll,
netStandardMemoizationStore.Interfaces.dll,
net6WinX64MemoizationStore.Interfaces.dll,
net7WinX64MemoizationStore.Interfaces.dll,
net8WinX64MemoizationStore.Interfaces.dll,
];
@ -169,6 +193,7 @@ namespace Cache.NugetPackages {
net472ContentStore.Hashing.dll,
netStandardContentStore.Hashing.dll,
net6WinX64ContentStore.Hashing.dll,
net7WinX64ContentStore.Hashing.dll,
net8WinX64ContentStore.Hashing.dll,
];
@ -177,6 +202,7 @@ namespace Cache.NugetPackages {
net472ContentStore.UtilitiesCore.dll,
netStandardContentStore.UtilitiesCore.dll,
net6WinX64ContentStore.UtilitiesCore.dll,
net7WinX64ContentStore.UtilitiesCore.dll,
net8WinX64ContentStore.UtilitiesCore.dll,
];
@ -193,6 +219,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Distributed.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Distributed.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Distributed.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Distributed.dll, "osx-x64", false),
@ -201,6 +229,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Library.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Library.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Library.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Library.dll, "osx-x64", false),
@ -209,6 +239,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Grpc.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Grpc.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Grpc.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Grpc.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Grpc.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Grpc.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Grpc.dll, "osx-x64", false),
@ -218,6 +250,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Vsts.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Vsts.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Vsts.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Vsts.dll, "osx-x64", false),
]),
@ -227,6 +261,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.VstsInterfaces.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.VstsInterfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.VstsInterfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.VstsInterfaces.dll, "osx-x64", false),
@ -235,6 +271,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardMemoizationStore.Distributed.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64MemoizationStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64MemoizationStore.Distributed.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64MemoizationStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64MemoizationStore.Distributed.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64MemoizationStore.Distributed.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64MemoizationStore.Distributed.dll, "osx-x64", false),
@ -243,6 +281,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardMemoizationStore.Library.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64MemoizationStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64MemoizationStore.Library.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64MemoizationStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64MemoizationStore.Library.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64MemoizationStore.Library.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64MemoizationStore.Library.dll, "osx-x64", false),
@ -252,6 +292,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardMemoizationStore.Vsts.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64MemoizationStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64MemoizationStore.Vsts.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64MemoizationStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64MemoizationStore.Vsts.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64MemoizationStore.Vsts.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64MemoizationStore.Vsts.dll, "osx-x64", false),
]),
@ -261,6 +303,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardMemoizationStore.VstsInterfaces.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64MemoizationStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64MemoizationStore.VstsInterfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64MemoizationStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64MemoizationStore.VstsInterfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64MemoizationStore.VstsInterfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64MemoizationStore.VstsInterfaces.dll, "osx-x64", false),
@ -269,6 +313,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardDistributedCacheHost.Service.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64DistributedCacheHost.Service.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64DistributedCacheHost.Service.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64DistributedCacheHost.Service.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64DistributedCacheHost.Service.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64DistributedCacheHost.Service.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64DistributedCacheHost.Service.dll, "osx-x64", false),
@ -277,6 +323,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardDistributedCacheHost.Configuration.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64DistributedCacheHost.Configuration.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64DistributedCacheHost.Configuration.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64DistributedCacheHost.Configuration.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64DistributedCacheHost.Configuration.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64DistributedCacheHost.Configuration.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64DistributedCacheHost.Configuration.dll, "osx-x64", false),
@ -285,6 +333,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardCacheLogging.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64CacheLogging.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64CacheLogging.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64CacheLogging.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64CacheLogging.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64CacheLogging.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64CacheLogging.dll, "osx-x64", false),
]
@ -297,6 +347,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Interfaces.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Interfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Interfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Interfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayout(importFrom("BuildXL.Cache.ContentStore").Interfaces.withQualifier(
@ -308,6 +360,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardMemoizationStore.Interfaces.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64MemoizationStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64MemoizationStore.Interfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64MemoizationStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64MemoizationStore.Interfaces.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64MemoizationStore.Interfaces.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64MemoizationStore.Interfaces.dll, "osx-x64", false),
]
@ -320,6 +374,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.Hashing.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.Hashing.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.Hashing.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.Hashing.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.Hashing.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.Hashing.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.Hashing.dll, "osx-x64", false),
Nuget.createAssemblyLayout(importFrom("BuildXL.Cache.ContentStore").Hashing.withQualifier(
@ -331,6 +387,8 @@ namespace Cache.NugetPackages {
Nuget.createAssemblyLayout(netStandardContentStore.UtilitiesCore.dll),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6WinX64ContentStore.UtilitiesCore.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net6OsxX64ContentStore.UtilitiesCore.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7WinX64ContentStore.UtilitiesCore.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net7OsxX64ContentStore.UtilitiesCore.dll, "osx-x64", false),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8WinX64ContentStore.UtilitiesCore.dll, "win-x64", true),
Nuget.createAssemblyLayoutWithSpecificRuntime(net8OsxX64ContentStore.UtilitiesCore.dll, "osx-x64", false),
Nuget.createAssemblyLayout(importFrom("BuildXL.Cache.ContentStore").UtilitiesCore.withQualifier(

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

@ -48,16 +48,16 @@ namespace MsBuild {
{
subfolder: r`tools/vbcslogger/dotnetcore`,
// CODESYNC: qualifier in Public\Src\Tools\VBCSCompilerLogger\VBCSCompilerLogger.dsc
// TODO: Remove qualifier override once Net8QualifierWithNet472 is dealt with.
// TODO: Remove qualifier override once Net7QualifierWithNet472 is dealt with.
contents: [importFrom("BuildXL.Tools").VBCSCompilerLogger
.withQualifier({ targetFramework: "net8.0" }).dll]
.withQualifier({ targetFramework: "net7.0" }).dll]
},
{
subfolder: r`tools`,
// For the dotnet case, we are only deploying the tool for net8
// For the dotnet case, we are only deploying the tool for net7
// TODO: Remove condition when we stop building for net6.0
contents: [qualifier.targetFramework === "net6.0"
? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: "net8.0"}).deployment
contents: [qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net8.0"
? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: "net7.0"}).deployment
: importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment],
}
]

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

@ -49,18 +49,18 @@ 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,
// TODO: Use Managed.TargetFrameworks.DefaultTargetFramework once Net8QualifierWithNet472 is dealt with.
...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "net8.0"}).deployment,
// TODO: Use Managed.TargetFrameworks.DefaultTargetFramework once Net7QualifierWithNet472 is dealt with.
...importFrom("Sdk.Selfhost.MSBuild").withQualifier({targetFramework: "net7.0"}).deployment,
{
subfolder: "dotnet",
contents: Frameworks.Helpers.getDotNetToolTemplate('net8.0').dependencies
contents: Frameworks.Helpers.getDotNetToolTemplate('net7.0').dependencies
},
{
subfolder: a`tools`,
// For the dotnet case, we are only deploying the tool for net8
// For the dotnet case, we are only deploying the tool for net7
// TODO: Remove condition when we stop building for net6.0
contents: [qualifier.targetFramework === "net6.0"
? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: "net8.0"}).deployment
contents: [qualifier.targetFramework === "net6.0" || qualifier.targetFramework === "net8.0"
? importFrom("BuildXL.Tools").MsBuildGraphBuilder.withQualifier({targetFramework: "net7.0"}).deployment
: importFrom("BuildXL.Tools").MsBuildGraphBuilder.deployment]
},
{

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

@ -59,7 +59,7 @@ namespace LanguageService.Server {
// The list of excluded items should match the qualifier declared in Public\Src\Tools\VBCSCompilerLogger\VBCSCompilerLogger.dsc.
excludedDeployableItems: [
importFrom("BuildXL.Tools").VBCSCompilerLogger.withQualifier({ targetFramework: "net472" }).dll,
importFrom("BuildXL.Tools").VBCSCompilerLogger.withQualifier({ targetFramework: "net8.0" }).dll,
importFrom("BuildXL.Tools").VBCSCompilerLogger.withQualifier({ targetFramework: "net7.0" }).dll,
]
}),
});

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

@ -64,6 +64,7 @@ function getSymstoreX64Libs() : File[] {
switch (qualifier.targetFramework)
{
case "net6.0":
case "net7.0":
case "net8.0":
return importFrom("Microsoft.Windows.Debuggers.SymstoreInterop").Contents.all.getFiles(
[

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

@ -11,7 +11,7 @@ import * as Shared from "Sdk.Managed.Shared";
namespace MsBuildGraphBuilder {
export declare const qualifier: BuildXLSdk.Net8QualifierWithNet472;
export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
@@public
export const exe = BuildXLSdk.executable({

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

@ -6,7 +6,7 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
namespace Test.Tool.MsBuildGraphBuilder {
export declare const qualifier: BuildXLSdk.Net8QualifierWithNet472;
export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
@@public
export const dll = BuildXLSdk.test({

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

@ -6,7 +6,7 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
namespace Test.Tool.VBCSCompilerLogger {
export declare const qualifier: BuildXLSdk.Net8Qualifier;
export declare const qualifier: BuildXLSdk.Net7Qualifier;
@@public
export const dll = BuildXLSdk.test({

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

@ -6,7 +6,7 @@ import * as MSBuild from "Sdk.Selfhost.MSBuild";
namespace VBCSCompilerLogger {
export declare const qualifier: BuildXLSdk.Net8QualifierWithNet472;
export declare const qualifier: BuildXLSdk.Net7QualifierWithNet472;
@@public
export const dll = BuildXLSdk.library({

6
Shared/Scripts/bxl.ps1
Просмотреть файл

@ -42,9 +42,9 @@ Uses the LKG deployment to update the Dev deployment with Debug binaries
.EXAMPLE
.\bxl -DeployDev -DeployConfig "release" -DeployRuntime "net8.0"
.\bxl -DeployDev -DeployConfig "release" -DeployRuntime "net7.0"
Uses the LKG deployment to update the Dev deployment with net8.0 release binaries
Uses the LKG deployment to update the Dev deployment with net7.0 release binaries
.EXAMPLE
@ -322,7 +322,7 @@ if ($Vs -or $VsAll) {
}
else {
# by default (-vs) we build only .NET Core and only projects targeting one of the .NET Core frameworks
$AdditionalBuildXLArguments += "/q:Debug /vsTargetFramework:netstandard2.0 /vsTargetFramework:netstandard2.1 /vsTargetFramework:net8.0";
$AdditionalBuildXLArguments += "/q:Debug /vsTargetFramework:netstandard2.0 /vsTargetFramework:netstandard2.1 /vsTargetFramework:net7.0 /vsTargetFramework:net8.0";
}
}

2
bxl.sh
Просмотреть файл

@ -167,7 +167,7 @@ function parseArgs() {
"/vs"
"/vsNew"
"/vsTargetFramework:net6.0"
"/vsTargetFramework:net8.0"
"/vsTargetFramework:net7.0"
"/vsTargetFramework:netstandard2.0"
"/vsTargetFramework:netstandard2.1")
shift

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

@ -586,6 +586,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.AspNetCore.App.Ref",
"Version": "7.0.17"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -604,6 +613,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.AspNetCore.App.Runtime.linux-x64",
"Version": "7.0.17"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -622,6 +640,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.AspNetCore.App.Runtime.osx-x64",
"Version": "7.0.17"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -640,6 +667,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.AspNetCore.App.Runtime.win-x64",
"Version": "7.0.17"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -726,7 +762,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Bcl.AsyncInterfaces",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -753,7 +789,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Build",
"Version": "17.9.5"
"Version": "17.7.2"
}
}
},
@ -762,7 +798,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Build.Framework",
"Version": "17.9.5"
"Version": "17.7.2"
}
}
},
@ -789,7 +825,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Build.Runtime",
"Version": "17.9.5"
"Version": "17.7.2"
}
}
},
@ -798,7 +834,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Build.Tasks.Core",
"Version": "17.9.5"
"Version": "17.7.2"
}
}
},
@ -807,7 +843,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.Build.Utilities.Core",
"Version": "17.9.5"
"Version": "17.0.0"
}
}
},
@ -1311,7 +1347,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NET.StringTools",
"Version": "17.9.5"
"Version": "1.0.0"
}
}
},
@ -1333,6 +1369,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.linux-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1351,6 +1396,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.osx-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1369,6 +1423,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Host.win-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1396,6 +1459,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Ref",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1414,6 +1486,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.linux-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1432,6 +1513,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.osx-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1450,6 +1540,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.App.Runtime.win-x64",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1486,6 +1585,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetAppHost",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1513,6 +1621,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostPolicy",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1540,6 +1657,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.DotNetHostResolver",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -1558,6 +1684,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "Microsoft.NETCore.Platforms",
"Version": "7.0.4"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -2661,7 +2796,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Collections.Immutable",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -3426,7 +3561,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Reflection.Metadata",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -3435,7 +3570,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Reflection.MetadataLoadContext",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -3858,7 +3993,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Text.Encodings.Web",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -3867,7 +4002,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Text.Json",
"Version": "8.0.3"
"Version": "7.0.3"
}
}
},
@ -3930,7 +4065,7 @@
"Type": "NuGet",
"NuGet": {
"Name": "System.Threading.Tasks.Dataflow",
"Version": "8.0.0"
"Version": "7.0.0"
}
}
},
@ -4204,6 +4339,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4222,6 +4366,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4330,6 +4483,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4348,6 +4510,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4420,6 +4591,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",
@ -4438,6 +4618,15 @@
}
}
},
{
"Component": {
"Type": "NuGet",
"NuGet": {
"Name": "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver",
"Version": "7.0.19"
}
}
},
{
"Component": {
"Type": "NuGet",

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

@ -149,12 +149,12 @@ config({
{ id: "Microsoft.WindowsAzure.ConfigurationManager", version: "1.8.0.0" },
{ id: "Newtonsoft.Json", version: "13.0.3" },
{ id: "Newtonsoft.Json.Bson", version: "1.0.1" },
{ id: "System.Reflection.Metadata", version: "8.0.0" },
{ id: "System.Reflection.Metadata", version: "7.0.0" },
// The VBCS logger is used by QuickBuild and runs in the context of old VS installations, so it cannot use a higher version
// Please do not upgrade this dll (or if you do, make sure this happens in coordination with the QuickBuild team)
{ id: "System.Reflection.Metadata", version: "5.0.0", alias: "System.Reflection.Metadata.ForVBCS" },
{ id: "System.Threading.Tasks.Dataflow", version: "8.0.0" },
{ id: "System.Threading.Tasks.Dataflow", version: "7.0.0" },
// Nuget
{ id: "NuGet.Packaging", version: "6.9.1" },
@ -236,7 +236,7 @@ config({
{ id: "DeduplicationSigned", version: "1.0.14" },
{ id: "Microsoft.Bcl", version: "1.1.10" },
{ id: "Microsoft.Bcl.Async", version: "1.0.168" },
{ id: "Microsoft.Bcl.AsyncInterfaces", version: "8.0.0" },
{ id: "Microsoft.Bcl.AsyncInterfaces", version: "7.0.0" },
{ id: "Microsoft.Bcl.Build", version: "1.0.14" },
{ id: "Pipelines.Sockets.Unofficial", version: "2.2.0" },
@ -267,7 +267,7 @@ config({
{ id: "Microsoft.ApplicationInsights.WindowsServer", version: "2.3.0" },
{ id: "Microsoft.ApplicationInsights.WindowsServer.TelemetryChannel", version: "2.3.0" },
{ id: "System.Security.Cryptography.Xml", version: "4.7.1" },
{ id: "System.Text.Encodings.Web", version: "8.0.0" },
{ id: "System.Text.Encodings.Web", version: "7.0.0" },
{ id: "System.Security.Permissions", version: "7.0.0" },
{ id: "System.Windows.Extensions", version: "7.0.0" },
{ id: "System.Drawing.Common", version: "7.0.0" },
@ -289,14 +289,14 @@ config({
{ id: "Microsoft.TeamFoundation.DistributedTask.Common.Contracts", version: "16.170.0"},
// MSBuild. These should be used for compile references only, as at runtime one can only practically use MSBuilds from Visual Studio / dotnet CLI
{ id: "Microsoft.Build", version: "17.9.5" },
{ id: "Microsoft.Build.Runtime", version: "17.9.5" },
{ id: "Microsoft.Build.Tasks.Core", version: "17.9.5" },
{ id: "Microsoft.Build.Utilities.Core", version: "17.9.5" },
{ id: "Microsoft.Build.Framework", version: "17.9.5" },
{ id: "Microsoft.NET.StringTools", version: "17.9.5" },
{ id: "Microsoft.Build", version: "17.7.2" },
{ id: "Microsoft.Build.Runtime", version: "17.7.2" },
{ id: "Microsoft.Build.Tasks.Core", version: "17.7.2" },
{ id: "Microsoft.Build.Utilities.Core", version: "17.0.0" },
{ id: "Microsoft.Build.Framework", version: "17.7.2" },
{ id: "Microsoft.NET.StringTools", version: "1.0.0" },
{ id: "Microsoft.Build.Locator", version: "1.5.5" },
{ id: "System.Reflection.MetadataLoadContext", version: "8.0.0"},
{ id: "System.Reflection.MetadataLoadContext", version: "7.0.0"},
{ id: "System.Resources.Extensions", version: "4.6.0-preview9.19411.4",
dependentPackageIdsToSkip: ["System.Memory"]},
@ -362,6 +362,7 @@ config({
// .NET Runtimes.
{ kind: "SourceResolver", modules: [f`Public\Sdk\SelfHost\Libraries\Dotnet-Runtime-6-External\module.config.dsc`] },
{ kind: "SourceResolver", modules: [f`Public\Sdk\SelfHost\Libraries\Dotnet-Runtime-7-External\module.config.dsc`] },
{ kind: "SourceResolver", modules: [f`Public\Sdk\SelfHost\Libraries\Dotnet-Runtime-8-External\module.config.dsc`] },
{
@ -396,6 +397,26 @@ config({
archiveType: "tgz",
},
// DotNet Core Runtime 7.0.19
{
moduleName: "DotNet-Runtime.win-x64.7.0",
url: "https://download.visualstudio.microsoft.com/download/pr/32f909df-fc73-439b-a8e1-55f18bfac3fb/e071d418324b9083629379f3ac6fd07a/dotnet-runtime-7.0.19-win-x64.zip",
hash: "VSO0:E4EC76FCB875EAA156A7A81EB59BE3AC06D7A766B079707C40A29EF75A4563E100",
archiveType: "zip",
},
{
moduleName: "DotNet-Runtime.osx-x64.7.0",
url: "https://download.visualstudio.microsoft.com/download/pr/92c2b6d8-783f-4a48-8575-e001296d4a54/c11d13f994d5016fc13d5c9a81e394f0/dotnet-runtime-7.0.19-osx-x64.tar.gz",
hash: "VSO0:62021BDB718C0C82F0F4361142EA0B43F0B2D9ACCE20A9B7DB9C8651C155A18F00",
archiveType: "tgz",
},
{
moduleName: "DotNet-Runtime.linux-x64.7.0",
url: "https://download.visualstudio.microsoft.com/download/pr/09ab2389-5bab-4d45-9a91-a56ff322e83c/2f8192a98b6887c7f12b0d2dc4a06247/dotnet-runtime-7.0.19-linux-x64.tar.gz",
hash: "VSO0:F9268D23C35BE8DC97B4603CFF405EAE84D421817FADA72D5ACB1E9BAC4EC2AC00",
archiveType: "tgz",
},
// DotNet Core Runtime 6.0.30
{
moduleName: "DotNet-Runtime.win-x64.6.0.201",
@ -482,6 +503,11 @@ config({
targetFramework: "net8.0",
targetRuntime: "win-x64",
},
DebugNet7: {
configuration: "debug",
targetFramework: "net7.0",
targetRuntime: "win-x64",
},
DebugDotNet6: {
configuration: "debug",
targetFramework: "net6.0",
@ -523,6 +549,11 @@ config({
targetFramework: "net8.0",
targetRuntime: "win-x64",
},
ReleaseNet7: {
configuration: "release",
targetFramework: "net7.0",
targetRuntime: "win-x64",
},
ReleaseDotNet6: {
configuration: "release",
targetFramework: "net6.0",

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

@ -8,6 +8,9 @@ const aspVersion = "8.0.0";
const asp6RefVersion = "6.0.28";
const asp6RuntimeVersion = "6.0.28";
const asp7RefVersion = "7.0.17";
const asp7RuntimeVersion = "7.0.17";
const asp8RefVersion = "8.0.3";
const asp8RuntimeVersion = "8.0.3";
@ -40,6 +43,14 @@ export const pkgs = [
{ id: "Microsoft.AspNetCore.App.Runtime.osx-x64", version: asp6RuntimeVersion, alias: "Microsoft.AspNetCore.App.Runtime.osx-x64.6.0.0",
filesToExclude: [r`runtimes/osx-x64/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll`, r`runtimes/osx-x64/lib/net6.0/Microsoft.Extensions.Logging.dll`] },
{ id: "Microsoft.AspNetCore.App.Ref", version: asp7RefVersion, alias: "Microsoft.AspNetCore.App.Ref.7.0.0" },
{ id: "Microsoft.AspNetCore.App.Runtime.win-x64", version: asp7RuntimeVersion, alias: "Microsoft.AspNetCore.App.Runtime.win-x64.7.0.0",
filesToExclude: [r`runtimes/win-x64/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll`, r`runtimes/win-x64/lib/net7.0/Microsoft.Extensions.Logging.dll`] },
{ id: "Microsoft.AspNetCore.App.Runtime.linux-x64", version: asp7RuntimeVersion, alias: "Microsoft.AspNetCore.App.Runtime.linux-x64.7.0.0",
filesToExclude: [r`runtimes/linux-x64/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll`, r`runtimes/linux-x64/lib/net7.0/Microsoft.Extensions.Logging.dll`] },
{ id: "Microsoft.AspNetCore.App.Runtime.osx-x64", version: asp7RuntimeVersion, alias: "Microsoft.AspNetCore.App.Runtime.osx-x64.7.0.0",
filesToExclude: [r`runtimes/osx-x64/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll`, r`runtimes/osx-x64/lib/net7.0/Microsoft.Extensions.Logging.dll`] },
{ id: "Microsoft.AspNetCore.App.Ref", version: asp8RefVersion, alias: "Microsoft.AspNetCore.App.Ref.8.0.0" },
{ id: "Microsoft.AspNetCore.App.Runtime.win-x64", version: asp8RuntimeVersion, alias: "Microsoft.AspNetCore.App.Runtime.win-x64.8.0.0",
filesToExclude: [r`runtimes/win-x64/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll`, r`runtimes/win-x64/lib/net8.0/Microsoft.Extensions.Logging.dll`] },

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

@ -4,11 +4,13 @@
const coreVersion = "3.1.0";
const core50Version = "5.0.0";
const core60Version = "6.0.30";
const core70Version = "7.0.19";
const core80Version = "8.0.5";
// Microsoft.NETCore.Platforms has become out of sync with the rest of the packages that use core60Version
// Updaters of this file might want to try to restore the sync: for now we are using the latest version we can
const core60VersionPlatforms = "6.0.11";
const core70VersionPlatforms = "7.0.4";
const core80VersionPlatforms = "8.0.0-preview.7.23375.6";
const pkgVersion = "4.3.0";
@ -16,6 +18,7 @@ const pkgVersionNext = "4.7.0";
const pkgVersion5 = "5.0.0";
const pkgVersion6 = "6.0.0";
const pkgVersion6Preview = "6.0.0-preview.5.21301.5";
const pkgVersion7 = "7.0.0";
export const pkgs = [
@ -63,6 +66,38 @@ export const pkgs = [
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", version: core60Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver.6.0" },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", version: core60Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy.6.0" },
// .NET 7
// .NET Core 7.0 Dependencies
{ id: "Microsoft.NETCore.App.Ref", version: core70Version, alias: "Microsoft.NETCore.App.Ref70" },
{ id: "Microsoft.NETCore.Platforms", version: core70VersionPlatforms, alias: "Microsoft.NETCore.Platforms.7.0" },
// .NET Core Self-Contained Deployment
{ id: "Microsoft.NETCore.DotNetHostResolver", version: core70Version, alias: "Microsoft.NETCore.DotNetHostResolver.7.0" },
{ id: "Microsoft.NETCore.DotNetHostPolicy", version: core70Version, alias: "Microsoft.NETCore.DotNetHostPolicy.7.0" },
{ id: "Microsoft.NETCore.DotNetAppHost", version: core70Version, alias: "Microsoft.NETCore.DotNetAppHost.7.0" },
// .NET Core win-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.win-x64", version: core70Version, osSkip: [ "macOS", "unix" ], alias: "Microsoft.NETCore.App.Host.win-x64.7.0" },
{ id: "Microsoft.NETCore.App.Runtime.win-x64", version: core70Version, osSkip: [ "macOS", "unix" ], alias: "Microsoft.NETCore.App.Runtime.win-x64.7.0" },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver", version: core70Version, osSkip: [ "macOS", "unix" ], alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostResolver.7.0" },
{ id: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy", version: core70Version, osSkip: [ "macOS", "unix" ], alias: "runtime.win-x64.Microsoft.NETCore.DotNetHostPolicy.7.0" },
// .NET Core osx-x64 runtime deps
{ id: "Microsoft.NETCore.App.Host.osx-x64", version: core70Version, alias: "Microsoft.NETCore.App.Host.osx-x64.7.0" },
{ id: "Microsoft.NETCore.App.Runtime.osx-x64", version: core70Version, alias: "Microsoft.NETCore.App.Runtime.osx-x64.7.0"},
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver", version: core70Version, alias: "runtime.osx-x64.Microsoft.NETCore.DotNetHostResolver.7.0" },
{ id: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy", version: core70Version, alias: "runtime.osx-x64.Microsoft.NETCore.DotNetHostPolicy.7.0" },
// .NET Core linux-x64 runtime deps
{ id: "Microsoft.NETCore.App.Runtime.linux-x64", version: core70Version, alias: "Microsoft.NETCore.App.Runtime.linux-x64.7.0" },
{ id: "Microsoft.NETCore.App.Host.linux-x64", version: core70Version, alias: "Microsoft.NETCore.App.Host.linux-x64.7.0" },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver", version: core70Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostResolver.7.0" },
{ id: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy", version: core70Version, alias: "runtime.linux-x64.Microsoft.NETCore.DotNetHostPolicy.7.0" },
// .NET 8
// .NET Core 8.0 Dependencies
@ -240,7 +275,7 @@ export const pkgs = [
{ id: "System.Security.AccessControl", version: pkgVersion6 },
{ id: "System.Security.Principal.Windows", version: pkgVersion6Preview },
{ id: "System.Text.Json", version: "8.0.3" },
{ id: "System.Text.Json", version: "7.0.3" },
{ id: "System.Threading.AccessControl", version: pkgVersionNext },
// Non-standard version ones
@ -249,5 +284,11 @@ export const pkgs = [
{ id: "System.Threading.Tasks.Extensions", version: "4.5.4" }, // If you change this version, please change cacheBindingRedirects in BuildXLSdk.dsc
{ id: "System.Security.Cryptography.OpenSsl", version: "4.4.0" },
{ id: "System.Collections.Immutable", version: "8.0.0" },
{ id: "System.Collections.Immutable", version: "7.0.0" },
];