зеркало из https://github.com/microsoft/BuildXL.git
Merged PR 794829: Limit set of files sent for symbol indexing and re-enable nuget signing
Limit set of files sent for symbol indexing and re-enable nuget signing Related work items: #2125959, #2125963
This commit is contained in:
Родитель
794d3cfbc2
Коммит
bfc974716a
|
@ -124,6 +124,31 @@ namespace DeploymentHelpers {
|
|||
/** The symbol create result */
|
||||
export const createResult = enabled ? runner.createSymbol(settings) : undefined;
|
||||
|
||||
/** List of filename prefixes that define files that should be sent for symbol publishing. */
|
||||
function includeInSymbolRequest(fileName: string) : boolean {
|
||||
return fileName.startsWith("bxl")
|
||||
|| fileName.startsWith("Bxl")
|
||||
|| fileName.startsWith("BuildXL")
|
||||
|| fileName.startsWith("AdoBuildRunner")
|
||||
|| fileName.startsWith("CacheService")
|
||||
|| fileName.startsWith("ContentStoreApp")
|
||||
|| fileName.startsWith("DetoursServices")
|
||||
|| fileName.startsWith("DistributedBuildRunner")
|
||||
|| fileName.startsWith("Downloader")
|
||||
|| fileName.startsWith("DropDaemon")
|
||||
|| fileName.startsWith("Extractor")
|
||||
|| fileName.startsWith("MaterializationDaemon")
|
||||
|| fileName.startsWith("NinjaGraphBuilder")
|
||||
|| fileName.startsWith("NugetDownloader")
|
||||
|| fileName.startsWith("ReportAccesses")
|
||||
|| fileName.startsWith("ReportProcesses")
|
||||
|| fileName.startsWith("RunInSubst")
|
||||
|| fileName.startsWith("SandboxedProcessExecutor")
|
||||
|| fileName.startsWith("SymbolDaemon")
|
||||
|| fileName.startsWith("Tool.ServicePipDaemon")
|
||||
;
|
||||
}
|
||||
|
||||
export function indexAndPublishSymbols(
|
||||
runner : SymbolDaemon.SymbolRunner,
|
||||
createResult : SymbolDaemon.SymbolCreateResult,
|
||||
|
@ -133,7 +158,7 @@ namespace DeploymentHelpers {
|
|||
{
|
||||
const flattenedResult = Deployment.flatten(deployment, undefined, deploymentOptions);
|
||||
|
||||
const filesToAdd = flattenedResult.flattenedFiles.forEach(kvp => kvp[1].file);
|
||||
const filesToAdd = flattenedResult.flattenedFiles.forEach(kvp => kvp[1].file).filter(f => includeInSymbolRequest(f.name.toString()));;
|
||||
const result = runner.addFilesToSymbol(createResult, args, filesToAdd);
|
||||
}
|
||||
}
|
||||
|
|
|
@ -43,7 +43,8 @@ namespace AriaNative {
|
|||
};
|
||||
|
||||
@@public
|
||||
export const dll = !needNativeAria ? undefined : native.Dll.build(nativeDllBuilderDefaultValue.merge<Native.Dll.Arguments>({
|
||||
export const dll = !needNativeAria ? undefined : BuildXLSdk.Native.withQualifier({platform: platform}).library(
|
||||
nativeDllBuilderDefaultValue.merge<Native.Dll.Arguments>({
|
||||
outputFileName: a`BuildXLAria.dll`,
|
||||
preprocessorSymbols: [
|
||||
...addIf(BuildXLSdk.Flags.isMicrosoftInternal,
|
||||
|
@ -78,7 +79,8 @@ namespace AriaNative {
|
|||
WindowsSdk.Ucrt.lib,
|
||||
...WindowsSdk.UM.standardLibs,
|
||||
],
|
||||
}));
|
||||
})
|
||||
);
|
||||
|
||||
@@public
|
||||
export const deployment: Deployment.Definition = !needNativeAria ? undefined : {
|
||||
|
|
14
config.dsc
14
config.dsc
|
@ -36,14 +36,12 @@ config({
|
|||
// The credential provider should be set by defining the env variable NUGET_CREDENTIALPROVIDERS_PATH.
|
||||
kind: "Nuget",
|
||||
|
||||
// Temporarily skip sign nuget packages.
|
||||
// Todo: Enable sign after adding configuration to selectively sign nuget packages
|
||||
// esrpSignConfiguration : Context.getCurrentHost().os === "win" && Environment.getFlag("ENABLE_ESRP") ? {
|
||||
// signToolPath: p`${Environment.expandEnvironmentVariablesInString(Environment.getStringValue("SIGN_TOOL_PATH"))}`,
|
||||
// signToolConfiguration: Environment.getPathValue("ESRP_SESSION_CONFIG"),
|
||||
// signToolEsrpPolicy: Environment.getPathValue("ESRP_POLICY_CONFIG"),
|
||||
// signToolAadAuth: p`${Context.getMount("SourceRoot").path}/Secrets/CodeSign/EsrpAuthentication.json`,
|
||||
// } : undefined,
|
||||
esrpSignConfiguration : Context.getCurrentHost().os === "win" && Environment.getFlag("ENABLE_ESRP") ? {
|
||||
signToolPath: p`${Environment.expandEnvironmentVariablesInString(Environment.getStringValue("SIGN_TOOL_PATH"))}`,
|
||||
signToolConfiguration: Environment.getPathValue("ESRP_SESSION_CONFIG"),
|
||||
signToolEsrpPolicy: Environment.getPathValue("ESRP_POLICY_CONFIG"),
|
||||
signToolAadAuth: p`${Context.getMount("SourceRoot").path}/Secrets/CodeSign/EsrpAuthentication.json`,
|
||||
} : undefined,
|
||||
|
||||
repositories: importFile(f`config.microsoftInternal.dsc`).isMicrosoftInternal
|
||||
? {
|
||||
|
|
Загрузка…
Ссылка в новой задаче