@nx/dotnet 24.0.0-beta.2 → 24.0.0-beta.4

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

@@ -1,4 +1,4 @@
-import { CreateNodes, TargetConfiguration } from '@nx/devkit';
+import { CreateNodes, ProjectConfiguration, TargetConfiguration } from '@nx/devkit';
 export type TargetConfigurationWithName = Partial<TargetConfiguration> & {
     /**
      * The name of the target. Defaults to the target type (e.g., 'build', 'test', etc.)
@@ -54,10 +54,12 @@ export interface DotNetPluginOptions {
      */
     clean?: TargetConfigurationWithName | false;
     /**
-     * Configuration for the restore target.
-     * Use `targetName` to rename the target, and provide additional options/configurations to merge with the generated target.
+     * Configuration for the restore target, which is not created by default.
+     * Set to `true`, or provide a configuration object, to opt in. `restore` is
+     * neither cached nor part of the task chain, so running it through Nx behaves
+     * the same as running `dotnet restore` directly.
      */
-    restore?: TargetConfigurationWithName | false;
+    restore?: TargetConfigurationWithName | boolean;
     /**
      * Configuration for the publish target.
      * Use `targetName` to rename the target, and provide additional options/configurations to merge with the generated target.
@@ -79,6 +81,10 @@ export interface DotNetPluginOptions {
      */
     run?: TargetConfigurationWithName | false;
 }
+/**
+ * Merge user-specified target configurations with the generated targets from the analyzer
+ */
+export declare function mergeUserTargetConfigurations(node: ProjectConfiguration, options: DotNetPluginOptions | undefined): ProjectConfiguration;
 export declare const createNodes: CreateNodes<DotNetPluginOptions>;
 /**
  * @deprecated Use {@link createNodes} instead. This will be removed in Nx 24.

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,WAAW,EAGX,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAQpB,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,WAAW,EAAE,WAAW,CAAC,mBAAmB,CAqFxD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,kCAAc,CAAC"}
+{"version":3,"file":"create-nodes.d.ts","sourceRoot":"","sources":["../../src/plugins/create-nodes.ts"],"names":[],"mappings":"AAAA,OAAO,EACL,WAAW,EAEX,oBAAoB,EACpB,mBAAmB,EACpB,MAAM,YAAY,CAAC;AAQpB,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;;;;;OAKG;IACH,OAAO,CAAC,EAAE,2BAA2B,GAAG,OAAO,CAAC;IAChD;;;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;AAaD;;GAEG;AACH,wBAAgB,6BAA6B,CAC3C,IAAI,EAAE,oBAAoB,EAC1B,OAAO,EAAE,mBAAmB,GAAG,SAAS,GACvC,oBAAoB,CAuEtB;AA0BD,eAAO,MAAM,WAAW,EAAE,WAAW,CAAC,mBAAmB,CAsFxD,CAAC;AAEF;;GAEG;AACH,eAAO,MAAM,aAAa,kCAAc,CAAC"}

package/dist/plugins/create-nodes.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createNodesV2 = exports.createNodes = void 0;
+exports.mergeUserTargetConfigurations = mergeUserTargetConfigurations;
 const devkit_1 = require("@nx/devkit");
 const analyzer_client_1 = require("../analyzer/analyzer-client");
 const internal_1 = require("@nx/devkit/internal");
@@ -17,28 +18,33 @@ const dotnetProjectGlob = '**/{*.{csproj,fsproj,vbproj,props,targets},Directory.
  * Merge user-specified target configurations with the generated targets from the analyzer
  */
 function mergeUserTargetConfigurations(node, options) {
-    if (!node.targets || !options) {
+    if (!node.targets) {
         return node;
     }
+    const pluginOptions = options ?? {};
     const targetMappings = [
-        { targetOption: options.build, defaultTargetName: 'build' },
-        { targetOption: options.test, defaultTargetName: 'test' },
-        { targetOption: options.clean, defaultTargetName: 'clean' },
-        { targetOption: options.restore, defaultTargetName: 'restore' },
-        { targetOption: options.publish, defaultTargetName: 'publish' },
-        { targetOption: options.pack, defaultTargetName: 'pack' },
-        { targetOption: options.watch, defaultTargetName: 'watch' },
-        { targetOption: options.run, defaultTargetName: 'run' },
+        { targetOption: pluginOptions.build, defaultTargetName: 'build' },
+        { targetOption: pluginOptions.test, defaultTargetName: 'test' },
+        { targetOption: pluginOptions.clean, defaultTargetName: 'clean' },
+        {
+            targetOption: pluginOptions.restore,
+            defaultTargetName: 'restore',
+            optIn: true,
+        },
+        { targetOption: pluginOptions.publish, defaultTargetName: 'publish' },
+        { targetOption: pluginOptions.pack, defaultTargetName: 'pack' },
+        { targetOption: pluginOptions.watch, defaultTargetName: 'watch' },
+        { targetOption: pluginOptions.run, defaultTargetName: 'run' },
     ];
     const mergedTargets = { ...node.targets };
-    for (const { targetOption, defaultTargetName } of targetMappings) {
-        // Disabled target from user configuration
-        if (targetOption === false) {
+    for (const { targetOption, defaultTargetName, optIn } of targetMappings) {
+        if (targetOption === false || (optIn && targetOption === undefined)) {
             delete mergedTargets[defaultTargetName];
+            removeFromDependsOn(mergedTargets, defaultTargetName);
             continue;
         }
-        // Use empty object as default when option is not provided
-        const { targetName, ...userSpecifiedConfig } = targetOption ?? {};
+        // `true` opts a target in and carries no configuration of its own.
+        const { targetName, ...userSpecifiedConfig } = targetOption === true ? {} : (targetOption ?? {});
         const actualTargetName = targetName ?? defaultTargetName;
         // Find the generated target - it might be under the default name or the user-specified name
         const generatedTarget = mergedTargets[actualTargetName] ?? mergedTargets[defaultTargetName];
@@ -65,6 +71,24 @@ function mergeUserTargetConfigurations(node, options) {
         targets: mergedTargets,
     };
 }
+/**
+ * Drops a removed target from the remaining targets' `dependsOn`. `watch`
+ * depends on `restore`, and Nx silently skips a dependency naming a target the
+ * project does not have, so a leftover entry is inert but still advertises a
+ * target that no longer exists.
+ */
+function removeFromDependsOn(targets, removed) {
+    for (const [name, target] of Object.entries(targets)) {
+        if (!target.dependsOn)
+            continue;
+        const dependsOn = target.dependsOn.filter((dependency) => typeof dependency === 'string'
+            ? dependency !== removed && dependency !== `^${removed}`
+            : dependency.target !== removed);
+        if (dependsOn.length !== target.dependsOn.length) {
+            targets[name] = { ...target, dependsOn };
+        }
+    }
+}
 exports.createNodes = [
     dotnetProjectGlob,
     async (configFilePaths, options, context) => {
@@ -80,7 +104,8 @@ exports.createNodes = [
                     'test',
                 cleanTargetName: (normalizedOptions.clean && normalizedOptions.clean.targetName) ||
                     'clean',
-                restoreTargetName: (normalizedOptions.restore && normalizedOptions.restore.targetName) ||
+                restoreTargetName: (typeof normalizedOptions.restore === 'object' &&
+                    normalizedOptions.restore.targetName) ||
                     'restore',
                 publishTargetName: (normalizedOptions.publish && normalizedOptions.publish.targetName) ||
                     'publish',

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/dotnet",
-  "version": "24.0.0-beta.2",
+  "version": "24.0.0-beta.4",
   "private": false,
   "description": "The Nx Plugin for .NET containing graph support for working with .NET projects in an Nx workspace.",
   "keywords": [
@@ -47,7 +47,7 @@
     "!dist/tsconfig.lib.tsbuildinfo"
   ],
   "dependencies": {
-    "@nx/devkit": "24.0.0-beta.2",
+    "@nx/devkit": "24.0.0-beta.4",
     "tslib": "^2.3.0",
     "ignore": "^7.0.5"
   },
@@ -56,7 +56,7 @@
     "@types/node": "^24.11.0",
     "jest": "30.3.0",
     "memfs": "^4.9.2",
-    "nx": "24.0.0-beta.2",
+    "nx": "24.0.0-beta.4",
     "ts-jest": "^29.4.7",
     "typescript": "~6.0.3"
   },