Include getCsharpTempDependencyDir in C# caches if FF is enabled

This commit is contained in:
Michael B. Gale
2025-11-13 13:40:36 +00:00
parent a47d04cf9b
commit ecaa6db95a
4 changed files with 90 additions and 6 deletions

15
lib/analyze-action.js generated
View File

@@ -91074,8 +91074,18 @@ async function getJavaDependencyDirs() {
getJavaTempDependencyDir()
];
}
async function getCsharpDependencyDirs() {
return [(0, import_path.join)(os3.homedir(), ".nuget", "packages")];
function getCsharpTempDependencyDir() {
return (0, import_path.join)(getTemporaryDirectory(), "codeql_csharp", "repository");
}
async function getCsharpDependencyDirs(codeql, features) {
const dirs = [
// Nuget
(0, import_path.join)(os3.homedir(), ".nuget", "packages")
];
if (await features.getValue("csharp_cache_bmn" /* CsharpCacheBuildModeNone */, codeql)) {
dirs.push(getCsharpTempDependencyDir());
}
return dirs;
}
async function makePatternCheck(patterns) {
const globber = await makeGlobber(patterns);
@@ -91227,6 +91237,7 @@ async function getFeaturePrefix(codeql, features, language) {
}
} else if (language === "csharp" /* csharp */) {
await addFeatureIfEnabled("csharp_new_cache_key" /* CsharpNewCacheKey */);
await addFeatureIfEnabled("csharp_cache_bmn" /* CsharpCacheBuildModeNone */);
}
if (enabledFeatures.length > 0) {
return `${createCacheKeyHash(enabledFeatures)}-`;

15
lib/init-action.js generated
View File

@@ -87261,8 +87261,18 @@ async function getJavaDependencyDirs() {
getJavaTempDependencyDir()
];
}
async function getCsharpDependencyDirs() {
return [(0, import_path.join)(os2.homedir(), ".nuget", "packages")];
function getCsharpTempDependencyDir() {
return (0, import_path.join)(getTemporaryDirectory(), "codeql_csharp", "repository");
}
async function getCsharpDependencyDirs(codeql, features) {
const dirs = [
// Nuget
(0, import_path.join)(os2.homedir(), ".nuget", "packages")
];
if (await features.getValue("csharp_cache_bmn" /* CsharpCacheBuildModeNone */, codeql)) {
dirs.push(getCsharpTempDependencyDir());
}
return dirs;
}
async function makePatternCheck(patterns) {
const globber = await makeGlobber(patterns);
@@ -87398,6 +87408,7 @@ async function getFeaturePrefix(codeql, features, language) {
}
} else if (language === "csharp" /* csharp */) {
await addFeatureIfEnabled("csharp_new_cache_key" /* CsharpNewCacheKey */);
await addFeatureIfEnabled("csharp_cache_bmn" /* CsharpCacheBuildModeNone */);
}
if (enabledFeatures.length > 0) {
return `${createCacheKeyHash(enabledFeatures)}-`;