@nx/dotnet 23.3.0-beta.0 → 23.3.0-beta.1

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

@@ -11,6 +11,7 @@ export interface AnalysisSuccessResult {
         refs: string[];
         sourceConfigFile: string;
     }>;
+    evaluationInputs?: string[];
 }
 export interface AnalysisErrorResult {
     error: Error;

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":"AAEA,OAAO,EAIL,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAmBpB,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAIvE;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAK5C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAS7C;AAED,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;AA4MD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CA+DzB;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":"AAEA,OAAO,EAIL,oBAAoB,EACrB,MAAM,YAAY,CAAC;AAmBpB,eAAO,MAAM,0BAA0B,+BAA+B,CAAC;AAIvE;;GAEG;AACH,wBAAgB,qBAAqB,IAAI,IAAI,CAK5C;AAED,wBAAgB,oBAAoB,IAAI,MAAM,CAS7C;AAED,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;IAIF,gBAAgB,CAAC,EAAE,MAAM,EAAE,CAAC;CAC7B;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;AA0OD;;;;GAIG;AACH,wBAAsB,eAAe,CACnC,KAAK,EAAE,MAAM,EAAE,EACf,OAAO,CAAC,EAAE,qBAAqB,GAC9B,OAAO,CAAC,cAAc,CAAC,CAoEzB;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

@@ -66,6 +66,22 @@ function getAnalyzerPath() {
 async function calculateProjectFilesHash(files) {
     return await (0, internal_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, files);
 }
+/**
+ * Hash of the files a previous evaluation reported reading. Empty when the
+ * result carries none, so a result from an older analyzer never matches and
+ * is re-run once.
+ */
+async function calculateEvaluationInputsHash(result) {
+    const inputs = result.evaluationInputs ?? [];
+    return inputs.length === 0
+        ? ''
+        : await (0, internal_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, inputs);
+}
+async function isStillValid(entry) {
+    return (entry?.result !== undefined &&
+        isAnalysisSuccessResult(entry.result) &&
+        entry.inputsHash === (await calculateEvaluationInputsHash(entry.result)));
+}
 /**
  * Run the msbuild-analyzer and return the results.
  * Uses stdin for large file lists to avoid ARG_MAX issues.
@@ -210,36 +226,40 @@ async function runAnalyzer(files, options) {
  */
 async function analyzeProjects(files, options) {
     const filesHash = await calculateProjectFilesHash(files);
-    // Return cached results if the hash matches
+    // Return cached results if the glob-matched files and the files the
+    // previous evaluation imported are both unchanged.
     if (cache &&
         cache.hash === filesHash &&
         // NOTE: We don't read from the cache here if it's an error result,
         // to allow retrying analysis in case of transient errors or errors fixed
         // that may not be reflected in the hash (like setting an env var).
-        isAnalysisSuccessResult(cache.result)) {
+        isAnalysisSuccessResult(cache.result) &&
+        (await isStillValid({ result: cache.result, inputsHash: cache.inputsHash }))) {
         return cache.result;
     }
     const optionsHash = (0, internal_1.hashObject)(options);
     const analyzerCache = new internal_1.PluginCache((0, node_path_1.join)(internal_1.workspaceDataDirectory, `dotnet-${optionsHash}.hash`));
-    const cachedResult = analyzerCache.get(filesHash);
-    if (cachedResult) {
-        // Update cache
+    const persisted = analyzerCache.get(filesHash);
+    if (await isStillValid(persisted)) {
         cache = {
             hash: filesHash,
-            result: cachedResult,
+            inputsHash: persisted.inputsHash,
+            result: persisted.result,
         };
-        return cachedResult;
+        return persisted.result;
     }
     // Run the analyzer
     try {
         const result = await runAnalyzer(files, options);
+        const inputsHash = await calculateEvaluationInputsHash(result);
         // Update local cache
         cache = {
             hash: filesHash,
+            inputsHash,
             result,
         };
         // Update persistent cache
-        analyzerCache.set(filesHash, result);
+        analyzerCache.set(filesHash, { result, inputsHash });
         analyzerCache.writeToDisk();
         return result;
     }
@@ -258,6 +278,7 @@ async function analyzeProjects(files, options) {
         if (err.message !== exports.ANALYZER_CANCELLED_MESSAGE) {
             cache = {
                 hash: filesHash,
+                inputsHash: '',
                 result: errorResult,
             };
         }

package/dist/generators/ci-workflow/files/circleci/.circleci/config.yml.template

@@ -0,0 +1,35 @@
+version: 2.1
+
+orbs:
+  nx: nrwl/nx@1.6.2
+
+env:
+  NX_BATCH_MODE: true
+
+jobs:
+  main:
+    docker:
+      - image: mcr.microsoft.com/dotnet/sdk:10.0
+    steps:
+      - checkout
+
+      # This enables task distribution via Nx Cloud
+      # Run this command as early as possible, before dependencies are installed
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-dotnet" --stop-agents-after="build"
+
+      - nx/set-shas:
+          main-branch-name: '<%= mainBranch %>'
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: 
+          command: <%= command.command %><% if (command.alwaysRun) { %>
+          when: always<% } %><% } %><% } %>
+
+workflows:
+  version: 2
+
+  <%= workflowFileName %>:
+    jobs:
+      - main

package/dist/generators/ci-workflow/files/github/.github/workflows/__workflowFileName__.yml.template

@@ -0,0 +1,39 @@
+name: <%= workflowName %>
+
+on:
+  push:
+    branches:
+      - <%= mainBranch %>
+  pull_request:
+
+permissions:
+  actions: read
+  contents: read
+
+env:
+  NX_BATCH_MODE: true
+
+jobs:
+  main:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # This enables task distribution via Nx Cloud
+      # Run this command as early as possible, before dependencies are installed
+      # Learn more at https://nx.dev/ci/reference/nx-cloud-cli#npx-nxcloud-startcirun
+      <% if (connectedToCloud) { %># Uncomment this line to enable task distribution<% } else { %># Connect your workspace by running "nx connect" and uncomment this line to enable task distribution<% } %>
+      # - run: ./nx start-ci-run --distribute-on="3 linux-medium-dotnet" --stop-agents-after="build"
+
+      - name: Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '10.x'
+
+      - uses: nrwl/nx-set-shas@v4
+<% for (const command of commands) { %><% if (command.comments) { %><% for (const comment of command.comments) { %>
+      # <%- comment %><% } %><% } %><% if (command.command) { %>
+      - run: <%= command.command %><% if (command.alwaysRun) { %>
+        if: always()<% } %><% } %><% } %>

package/dist/lib/MsbuildAnalyzer.runtimeconfig.json

@@ -7,6 +7,7 @@
       "version": "8.0.0"
     },
     "configProperties": {
+      "System.GC.Server": true,
       "System.Reflection.Metadata.MetadataUpdater.IsSupported": false,
       "System.Runtime.Serialization.EnableUnsafeBinaryFormatterSerialization": false
     }

package/dist/plugins/create-nodes.js

@@ -4,15 +4,15 @@ exports.createNodesV2 = exports.createNodes = void 0;
 const devkit_1 = require("@nx/devkit");
 const analyzer_client_1 = require("../analyzer/analyzer-client");
 const internal_1 = require("@nx/devkit/internal");
-// 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}';
+// Every file matched here re-runs createNodes and enters the analyzer's cache key when
+// it changes. Project files and the ancestor-scoped files MSBuild, the SDK resolver, NuGet
+// and the analyzers read on their own (Directory.*, global.json, nuget.config,
+// .editorconfig) are also handed to the analyzer so it can declare per-project inputs.
+// Any other .props/.targets is matched only so an edit to a file a project imports by
+// name invalidates the graph; the analyzer discovers which ones matter by evaluating and
+// reports them back as evaluationInputs, which covers imports with other extensions.
+// The analyzer partitions matched paths by filename, so nothing is classified here.
+const dotnetProjectGlob = '**/{*.{csproj,fsproj,vbproj,props,targets},Directory.Build.rsp,global.json,nuget.config,NuGet.config,NuGet.Config,.editorconfig}';
 /**
  * Merge user-specified target configurations with the generated targets from the analyzer
  */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/dotnet",
-  "version": "23.3.0-beta.0",
+  "version": "23.3.0-beta.1",
   "private": false,
   "description": "The Nx Plugin for .NET containing graph support for working with .NET projects in an Nx workspace.",
   "keywords": [
@@ -49,7 +49,7 @@
   "dependencies": {
     "tslib": "^2.3.0",
     "ignore": "^7.0.5",
-    "@nx/devkit": "23.3.0-beta.0"
+    "@nx/devkit": "23.3.0-beta.1"
   },
   "devDependencies": {
     "@types/jest": "30.0.0",
@@ -58,7 +58,7 @@
     "memfs": "^4.9.2",
     "ts-jest": "^29.4.7",
     "typescript": "~6.0.3",
-    "nx": "23.3.0-beta.0"
+    "nx": "23.3.0-beta.1"
   },
   "publishConfig": {
     "access": "public"