@nx/dotnet 23.0.0-beta.2 → 23.0.0-beta.21

package/dist/analyzer/analyzer-client.d.ts

@@ -27,7 +27,7 @@ export interface DotNetAnalyzerOptions {
  * Results are cached based on the content hash of all project files.
  * This should be called by createNodes to populate the cache.
  */
-export declare function analyzeProjects(projectFiles: string[], options?: DotNetAnalyzerOptions): Promise<AnalysisResult>;
+export declare function analyzeProjects(files: string[], options?: DotNetAnalyzerOptions): Promise<AnalysisResult>;
 /**
  * Read the cached analysis results without running the analyzer.
  * This should be called by createDependencies, which always runs after createNodes.

package/dist/analyzer/analyzer-client.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"analyzer-client.d.ts","sourceRoot":"","sources":["../../src/analyzer/analyzer-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMzE,MAAM,WAAW,qBAAqB;IAEpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAElD,gBAAgB,EAAE,MAAM,CACtB,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAC7C,CAAC;CACH;AACD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AA2BzE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAgJD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,YAAY,EAAE,MAAM,EAAE,EACtB,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CAyDzB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CASzD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,mBAAmB,CAE/B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,qBAAqB,CAEjC"}
+{"version":3,"file":"analyzer-client.d.ts","sourceRoot":"","sources":["../../src/analyzer/analyzer-client.ts"],"names":[],"mappings":"AAIA,OAAO,EAAyB,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMzE,MAAM,WAAW,qBAAqB;IAEpC,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,oBAAoB,CAAC,CAAC;IAElD,gBAAgB,EAAE,MAAM,CACtB,MAAM,EACN;QAAE,IAAI,EAAE,MAAM,EAAE,CAAC;QAAC,gBAAgB,EAAE,MAAM,CAAA;KAAE,CAC7C,CAAC;CACH;AACD,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,KAAK,CAAC;CACd;AACD,MAAM,MAAM,cAAc,GAAG,qBAAqB,GAAG,mBAAmB,CAAC;AAEzE;;;GAGG;AACH,MAAM,WAAW,qBAAqB;IACpC,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,iBAAiB,CAAC,EAAE,MAAM,CAAC;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AA4ID;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CA2DzB;AAED;;;;GAIG;AACH,wBAAgB,wBAAwB,IAAI,cAAc,CASzD;AAED;;GAEG;AACH,wBAAgB,UAAU,IAAI,IAAI,CAEjC;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,mBAAmB,CAE/B;AAED,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,cAAc,GACrB,MAAM,IAAI,qBAAqB,CAEjC"}

package/dist/analyzer/analyzer-client.js

@@ -13,22 +13,6 @@ const workspace_context_1 = require("nx/src/utils/workspace-context");
 const cache_directory_1 = require("nx/src/utils/cache-directory");
 const file_hasher_1 = require("nx/src/hasher/file-hasher");
 const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
-const analyzerCaches = new Map();
-function getCachePathForOptionsHash(optionsHash) {
-    return (0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `dotnet-${optionsHash}.hash`);
-}
-function readAnalyzerCache(optionsHash) {
-    if (analyzerCaches.has(optionsHash)) {
-        return analyzerCaches.get(optionsHash);
-    }
-    const cacheFilePath = getCachePathForOptionsHash(optionsHash);
-    return new plugin_cache_utils_1.PluginCache(cacheFilePath);
-}
-function writeAnalyzerCache(optionsHash, cache) {
-    analyzerCaches.set(optionsHash, cache);
-    const cacheFilePath = getCachePathForOptionsHash(optionsHash);
-    cache.writeToDisk(cacheFilePath);
-}
 let cache = null;
 /**
  * Get the path to the msbuild-analyzer executable
@@ -46,21 +30,22 @@ function getAnalyzerPath() {
             return path;
         }
     }
-    throw new Error(`msbuild-analyzer not found at any expected location. Please build it first with: nx run dotnet:build-analyzer`);
+    throw new Error(`msbuild-analyzer not found at any expected location. Please build it first with: nx run dotnet:copy-assets`);
 }
 /**
- * Calculate a hash of all project files and Directory.Build.* files to determine if we need to re-analyze
+ * Hash every file that affects MSBuild evaluation — project files plus the Directory.*
+ * matches surfaced by the createNodesV2 glob. The analyzer partitions the same list on
+ * its side, so we don't classify it here.
  */
-async function calculateProjectFilesHash(projectFiles) {
-    const hash = await (0, workspace_context_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, projectFiles.concat('Directory.Build.*', '**/Directory.Build.*'));
-    return hash;
+async function calculateProjectFilesHash(files) {
+    return await (0, workspace_context_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, files);
 }
 /**
  * Run the msbuild-analyzer and return the results.
  * Uses stdin for large file lists to avoid ARG_MAX issues.
  */
-function runAnalyzer(projectFiles, options) {
-    if (projectFiles.length === 0) {
+function runAnalyzer(files, options) {
+    if (files.length === 0) {
         return { nodesByFile: {}, referencesByRoot: {} };
     }
     const analyzerPath = getAnalyzerPath();
@@ -98,8 +83,9 @@ function runAnalyzer(projectFiles, options) {
         if (options) {
             args.push(JSON.stringify(options));
         }
-        // Use stdin mode for large file lists to avoid ARG_MAX issues
-        const input = projectFiles.join('\n');
+        // Use stdin mode for large file lists to avoid ARG_MAX issues. The analyzer
+        // partitions paths by filename, so we just stream everything in one block.
+        const input = files.join('\n');
         const result = (0, node_child_process_1.spawnSync)('dotnet', args, {
             input,
             encoding: 'utf-8',
@@ -134,8 +120,8 @@ function runAnalyzer(projectFiles, options) {
  * Results are cached based on the content hash of all project files.
  * This should be called by createNodes to populate the cache.
  */
-async function analyzeProjects(projectFiles, options) {
-    const filesHash = await calculateProjectFilesHash(projectFiles);
+async function analyzeProjects(files, options) {
+    const filesHash = await calculateProjectFilesHash(files);
     // Return cached results if the hash matches
     if (cache &&
         cache.hash === filesHash &&
@@ -146,7 +132,7 @@ async function analyzeProjects(projectFiles, options) {
         return cache.result;
     }
     const optionsHash = (0, file_hasher_1.hashObject)(options);
-    const analyzerCache = readAnalyzerCache(optionsHash);
+    const analyzerCache = new plugin_cache_utils_1.PluginCache((0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `dotnet-${optionsHash}.hash`));
     const cachedResult = analyzerCache.get(filesHash);
     if (cachedResult) {
         // Update cache
@@ -158,7 +144,7 @@ async function analyzeProjects(projectFiles, options) {
     }
     // Run the analyzer
     try {
-        const result = runAnalyzer(projectFiles, options);
+        const result = runAnalyzer(files, options);
         // Update local cache
         cache = {
             hash: filesHash,
@@ -166,7 +152,7 @@ async function analyzeProjects(projectFiles, options) {
         };
         // Update persistent cache
         analyzerCache.set(filesHash, result);
-        writeAnalyzerCache(optionsHash, analyzerCache);
+        analyzerCache.writeToDisk();
         return result;
     }
     catch (error) {

package/dist/lib/MsbuildAnalyzer.deps.json

@@ -6,7 +6,7 @@
   "compilationOptions": {},
   "targets": {
     ".NETCoreApp,Version=v8.0": {
-      "MsbuildAnalyzer/1.0.0": {
+      "MsbuildAnalyzer/23.0.0-beta.21": {
         "dependencies": {
           "Microsoft.Build": "17.0.0",
           "Microsoft.Build.Framework": "17.0.0",
@@ -222,7 +222,7 @@
     }
   },
   "libraries": {
-    "MsbuildAnalyzer/1.0.0": {
+    "MsbuildAnalyzer/23.0.0-beta.21": {
       "type": "project",
       "serviceable": false,
       "sha512": ""

package/dist/plugins/create-nodes.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/create-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAOpB,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG;IACvE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,GAAG,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;CAC3C;AA4ED,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA0E5D,CAAC"}
+{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/create-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,aAAa,EAGb,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAOpB,MAAM,MAAM,2BAA2B,GAAG,OAAO,CAAC,mBAAmB,CAAC,GAAG;IACvE;;OAEG;IACH,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAEF;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GA+BG;AACH,MAAM,WAAW,mBAAmB;IAClC;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC9C;;;OAGG;IACH,IAAI,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC3C;;;OAGG;IACH,KAAK,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;IAC5C;;;OAGG;IACH,GAAG,CAAC,EAAE,2BAA2B,GAAG,KAAK,CAAC;CAC3C;AAqFD,eAAO,MAAM,aAAa,EAAE,aAAa,CAAC,mBAAmB,CA6E5D,CAAC"}

package/dist/plugins/create-nodes.js

@@ -4,7 +4,15 @@ exports.createNodesV2 = void 0;
 const devkit_1 = require("@nx/devkit");
 const analyzer_client_1 = require("../analyzer/analyzer-client");
 const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
-const dotnetProjectGlob = '**/*.{csproj,fsproj,vbproj}';
+// MSBuild auto-imports Directory.Build.props/.targets from each ancestor of a project file,
+// reads Directory.Build.rsp from ancestors during CLI builds, applies Directory.Solution.*
+// when building a .sln, and reads Directory.Packages.props from the nearest ancestor when
+// Central Package Management is in use. Matching them here causes createNodesV2 to re-run
+// (and the analyzer's cache to invalidate) when any of them change, and gives us the file
+// list to hand to the analyzer so it can declare per-project ancestor inputs.
+// The analyzer partitions matched paths into project vs directory files by filename, so we
+// don't have to repeat that classification on this side.
+const dotnetProjectGlob = '**/{*.{csproj,fsproj,vbproj},Directory.Build.{props,targets,rsp},Directory.Solution.{props,targets},Directory.Packages.props}';
 /**
  * Merge user-specified target configurations with the generated targets from the analyzer
  */
@@ -91,9 +99,12 @@ exports.createNodesV2 = [
             return configFilePaths.map((configFile) => {
                 const node = nodesByFile[configFile];
                 if (!node) {
+                    // Directory.Build.* / Directory.Solution.* files contribute no projects of
+                    // their own; returning an empty config is the conventional "skip" response.
                     return [configFile, {}];
                 }
-                // Merge user-specified target configurations with generated targets
+                // Merge user-specified target configurations with generated targets. The analyzer
+                // has already written the Directory.* inputs onto each cacheable target's Inputs.
                 const mergedNode = mergeUserTargetConfigurations(node, normalizedOptions);
                 return [
                     configFile,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/dotnet",
-  "version": "23.0.0-beta.2",
+  "version": "23.0.0-beta.21",
   "private": false,
   "description": "The Nx Plugin for .NET containing graph support for working with .NET projects in an Nx workspace.",
   "keywords": [
@@ -50,16 +50,16 @@
     "!dist/tsconfig.lib.tsbuildinfo"
   ],
   "dependencies": {
-    "@nx/devkit": "23.0.0-beta.2",
+    "@nx/devkit": "23.0.0-beta.21",
     "tslib": "^2.3.0",
     "ignore": "^7.0.5"
   },
   "devDependencies": {
     "@types/jest": "30.0.0",
-    "@types/node": "^20.19.10",
-    "jest": "^30.0.2",
+    "@types/node": "^24.11.0",
+    "jest": "30.3.0",
     "memfs": "^4.9.2",
-    "nx": "23.0.0-beta.2",
+    "nx": "23.0.0-beta.21",
     "ts-jest": "^29.4.0",
     "typescript": "~5.9.2"
   },

package/dist/utils/cache.d.ts

@@ -1,5 +0,0 @@
-import { ProjectConfiguration } from '@nx/devkit';
-export type DotNetTargets = Pick<ProjectConfiguration, 'targets' | 'metadata'>;
-export declare function readTargetsCache(cachePath: string): Record<string, DotNetTargets>;
-export declare function writeTargetsToCache(cachePath: string, results: Record<string, DotNetTargets>): void;
-//# sourceMappingURL=cache.d.ts.map

package/dist/utils/cache.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"cache.d.ts","sourceRoot":"","sources":["../../src/utils/cache.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,oBAAoB,EAA+B,MAAM,YAAY,CAAC;AAG/E,MAAM,MAAM,aAAa,GAAG,IAAI,CAAC,oBAAoB,EAAE,SAAS,GAAG,UAAU,CAAC,CAAC;AAE/E,wBAAgB,gBAAgB,CAC9B,SAAS,EAAE,MAAM,GAChB,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAI/B;AAED,wBAAgB,mBAAmB,CACjC,SAAS,EAAE,MAAM,EACjB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,QAGvC"}

package/dist/utils/cache.js

@@ -1,14 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.readTargetsCache = readTargetsCache;
-exports.writeTargetsToCache = writeTargetsToCache;
-const devkit_1 = require("@nx/devkit");
-const fs_1 = require("fs");
-function readTargetsCache(cachePath) {
-    return process.env.NX_CACHE_PROJECT_GRAPH !== 'false' && (0, fs_1.existsSync)(cachePath)
-        ? (0, devkit_1.readJsonFile)(cachePath)
-        : {};
-}
-function writeTargetsToCache(cachePath, results) {
-    (0, devkit_1.writeJsonFile)(cachePath, results);
-}