@nx/dotnet 23.2.0-beta.4 → 23.2.0-beta.5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1 +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;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"}
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;AAQzE,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"}
@@ -9,10 +9,7 @@ const node_child_process_1 = require("node:child_process");
9
9
  const node_fs_1 = require("node:fs");
10
10
  const node_path_1 = require("node:path");
11
11
  const devkit_1 = require("@nx/devkit");
12
- const workspace_context_1 = require("nx/src/utils/workspace-context");
13
- const cache_directory_1 = require("nx/src/utils/cache-directory");
14
- const file_hasher_1 = require("nx/src/hasher/file-hasher");
15
- const plugin_cache_utils_1 = require("nx/src/utils/plugin-cache-utils");
12
+ const internal_1 = require("@nx/devkit/internal");
16
13
  let cache = null;
17
14
  /**
18
15
  * Get the path to the msbuild-analyzer executable
@@ -38,7 +35,7 @@ function getAnalyzerPath() {
38
35
  * its side, so we don't classify it here.
39
36
  */
40
37
  async function calculateProjectFilesHash(files) {
41
- return await (0, workspace_context_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, files);
38
+ return await (0, internal_1.hashWithWorkspaceContext)(devkit_1.workspaceRoot, files);
42
39
  }
43
40
  /**
44
41
  * Run the msbuild-analyzer and return the results.
@@ -131,8 +128,8 @@ async function analyzeProjects(files, options) {
131
128
  isAnalysisSuccessResult(cache.result)) {
132
129
  return cache.result;
133
130
  }
134
- const optionsHash = (0, file_hasher_1.hashObject)(options);
135
- const analyzerCache = new plugin_cache_utils_1.PluginCache((0, node_path_1.join)(cache_directory_1.workspaceDataDirectory, `dotnet-${optionsHash}.hash`));
131
+ const optionsHash = (0, internal_1.hashObject)(options);
132
+ const analyzerCache = new internal_1.PluginCache((0, node_path_1.join)(internal_1.workspaceDataDirectory, `dotnet-${optionsHash}.hash`));
136
133
  const cachedResult = analyzerCache.get(filesHash);
137
134
  if (cachedResult) {
138
135
  // Update cache
@@ -1 +1 @@
1
- {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/generators/ci-workflow/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AA0CpB,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAMnE;eAsCc,mBAAmB"}
1
+ {"version":3,"file":"generator.d.ts","sourceRoot":"","sources":["../../../src/generators/ci-workflow/generator.ts"],"names":[],"mappings":"AAAA,OAAO,EAKL,IAAI,EACL,MAAM,YAAY,CAAC;AA6CpB,MAAM,MAAM,OAAO,GAAG;IACpB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;IACpB,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB,CAAC;AAEF,MAAM,WAAW,MAAM;IACrB,IAAI,EAAE,MAAM,CAAC;IACb,EAAE,EAAE,QAAQ,GAAG,UAAU,CAAC;IAC1B;;;OAGG;IACH,QAAQ,CAAC,EAAE,OAAO,EAAE,CAAC;CACtB;AAED,wBAAsB,mBAAmB,CAAC,IAAI,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,iBAMnE;eAsCc,mBAAmB"}
@@ -3,8 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.ciWorkflowGenerator = ciWorkflowGenerator;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const path_1 = require("path");
6
- const nx_cloud_utils_1 = require("nx/src/utils/nx-cloud-utils");
7
- const default_base_1 = require("nx/src/utils/default-base");
6
+ const internal_1 = require("@nx/devkit/internal");
8
7
  const NX_AFFECTED_COMMENT = `# Nx Affected runs only tasks affected by the changes in this PR/commit. Learn more: https://nx.dev/ci/features/affected.`;
9
8
  function getCiCommands(ci) {
10
9
  switch (ci) {
@@ -49,13 +48,13 @@ function getTemplateData(tree, options) {
49
48
  const { name: workflowName, fileName: workflowFileName } = (0, devkit_1.names)(options.name);
50
49
  let nxCloudHost = 'nx.app';
51
50
  try {
52
- const nxCloudUrl = (0, nx_cloud_utils_1.getNxCloudUrl)((0, devkit_1.readNxJson)(tree));
51
+ const nxCloudUrl = (0, internal_1.getNxCloudUrl)((0, devkit_1.readNxJson)(tree));
53
52
  nxCloudHost = new URL(nxCloudUrl).host;
54
53
  }
55
54
  catch { }
56
- const mainBranch = (0, default_base_1.deduceDefaultBase)();
55
+ const mainBranch = (0, internal_1.deduceDefaultBase)();
57
56
  const commands = options.commands ?? getCiCommands(options.ci);
58
- const connectedToCloud = (0, nx_cloud_utils_1.isNxCloudUsed)((0, devkit_1.readNxJson)(tree));
57
+ const connectedToCloud = (0, internal_1.isNxCloudUsed)((0, devkit_1.readNxJson)(tree));
59
58
  return {
60
59
  workflowName,
61
60
  workflowFileName,
Binary file
Binary file
@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.createNodesV2 = exports.createNodes = void 0;
4
4
  const devkit_1 = require("@nx/devkit");
5
5
  const analyzer_client_1 = require("../analyzer/analyzer-client");
6
- const project_configuration_utils_1 = require("nx/src/project-graph/utils/project-configuration-utils");
6
+ const internal_1 = require("@nx/devkit/internal");
7
7
  // MSBuild auto-imports Directory.Build.props/.targets from each ancestor of a project file,
8
8
  // reads Directory.Build.rsp from ancestors during CLI builds, applies Directory.Solution.*
9
9
  // when building a .sln, and reads Directory.Packages.props from the nearest ancestor when
@@ -49,7 +49,7 @@ function mergeUserTargetConfigurations(node, options) {
49
49
  const isRenamed = actualTargetName !== defaultTargetName;
50
50
  // Merge user config with generated target if user config is provided
51
51
  if (hasUserConfig) {
52
- mergedTargets[actualTargetName] = (0, project_configuration_utils_1.mergeTargetConfigurations)(userSpecifiedConfig, generatedTarget);
52
+ mergedTargets[actualTargetName] = (0, internal_1.mergeTargetConfigurations)(userSpecifiedConfig, generatedTarget);
53
53
  }
54
54
  else if (isRenamed) {
55
55
  // If only renaming (no config to merge), just copy the target to the new name
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@nx/dotnet",
3
- "version": "23.2.0-beta.4",
3
+ "version": "23.2.0-beta.5",
4
4
  "private": false,
5
5
  "description": "The Nx Plugin for .NET containing graph support for working with .NET projects in an Nx workspace.",
6
6
  "keywords": [
@@ -49,7 +49,7 @@
49
49
  "dependencies": {
50
50
  "tslib": "^2.3.0",
51
51
  "ignore": "^7.0.5",
52
- "@nx/devkit": "23.2.0-beta.4"
52
+ "@nx/devkit": "23.2.0-beta.5"
53
53
  },
54
54
  "devDependencies": {
55
55
  "@types/jest": "30.0.0",
@@ -58,7 +58,7 @@
58
58
  "memfs": "^4.9.2",
59
59
  "ts-jest": "^29.4.7",
60
60
  "typescript": "~6.0.3",
61
- "nx": "23.2.0-beta.4"
61
+ "nx": "23.2.0-beta.5"
62
62
  },
63
63
  "publishConfig": {
64
64
  "access": "public"