Skip to content

Commit 8e0b398

Browse files
author
Craigory Coppola
committed
fix(core): #35 dry run is not passed to dotnet new
1 parent f075046 commit 8e0b398

File tree

4 files changed

+47
-9
lines changed

4 files changed

+47
-9
lines changed

packages/core/src/generators/utils/generate-project.ts

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -117,9 +117,7 @@ async function GenerateTestProject(
117117
];
118118

119119
if (isDryRun()) {
120-
newParams.push({
121-
flag: 'dryRun',
122-
});
120+
addDryRunParameter(newParams);
123121
}
124122

125123
dotnetClient.new(schema.testTemplate, newParams);
@@ -220,9 +218,7 @@ export async function GenerateProject(
220218
];
221219

222220
if (isDryRun()) {
223-
newParams.push({
224-
flag: 'dryRun',
225-
});
221+
addDryRunParameter(newParams);
226222
}
227223

228224
dotnetClient.new(normalizedOptions.template, newParams);
@@ -244,3 +240,10 @@ export async function GenerateProject(
244240

245241
await formatFiles(host);
246242
}
243+
244+
function addDryRunParameter(parameters: dotnetNewOptions): void {
245+
parameters.push({
246+
flag: 'dryRun',
247+
value: true,
248+
});
249+
}

packages/dotnet/src/lib/core/dotnet.client.ts

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ import {
1414
dotnetRunOptions,
1515
dotnetTemplate,
1616
dotnetTestOptions,
17+
newKeyMap,
1718
testKeyMap,
1819
} from '../models';
1920
import { LoadedCLI } from './dotnet.factory';
@@ -24,7 +25,7 @@ export class DotNetClient {
2425
new(template: dotnetTemplate, parameters?: dotnetNewOptions): Buffer {
2526
let cmd = `${this.cliCommand.command} new ${template}`;
2627
if (parameters) {
27-
parameters = swapArrayFieldValueUsingMap(parameters, 'flag', testKeyMap);
28+
parameters = swapArrayFieldValueUsingMap(parameters, 'flag', newKeyMap);
2829
const paramString = parameters ? getParameterString(parameters) : '';
2930
cmd = `${cmd} ${paramString}`;
3031
}

packages/utils/src/lib/utility-functions/args.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,6 @@ export function swapArrayFieldValueUsingMap<T>(
2222
) {
2323
return array.map((x) => ({
2424
...x,
25-
field: map[x[field]] ?? x[field],
25+
[field]: map[x[field]] ?? x[field],
2626
}));
2727
}

yarn.lock

Lines changed: 35 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -838,6 +838,17 @@
838838
node-gyp "^7.1.0"
839839
read-package-json-fast "^2.0.1"
840840

841+
"@nrwl/cli@*":
842+
version "12.1.1"
843+
resolved "https://registry.yarnpkg.com/@nrwl/cli/-/cli-12.1.1.tgz#853f04314b584173e54ad427770731da2e74a029"
844+
integrity sha512-Svsq0qFu6RnP8piVS69mxgQCYKLvhhCLVVa9/mGLY6guXApk2pc6fHQMmB2HgYZuAUtwDADw/qe8LBh4Hr4PRQ==
845+
dependencies:
846+
"@nrwl/tao" "12.1.1"
847+
chalk "4.1.0"
848+
v8-compile-cache "2.3.0"
849+
yargs "15.4.1"
850+
yargs-parser "20.0.0"
851+
841852
"@nrwl/cli@12.0.8":
842853
version "12.0.8"
843854
resolved "https://registry.npmjs.org/@nrwl/cli/-/cli-12.0.8.tgz"
@@ -965,6 +976,22 @@
965976
tslib "^2.0.0"
966977
yargs-parser "20.0.0"
967978

979+
"@nrwl/tao@12.1.1":
980+
version "12.1.1"
981+
resolved "https://registry.yarnpkg.com/@nrwl/tao/-/tao-12.1.1.tgz#b00273390a1f7dc136954328bb76a94cd95a4e6d"
982+
integrity sha512-qzJpQ6YAmAEy1toYM1JPZtNMo+GFNnly53FV4j1c/1gnQpmpT3PU3gFwEx/tzseafX6DKlxF/KSAbPdhsNnkdw==
983+
dependencies:
984+
chalk "4.1.0"
985+
enquirer "~2.3.6"
986+
fs-extra "^9.1.0"
987+
rxjs "^6.5.4"
988+
rxjs-for-await "0.0.2"
989+
semver "7.3.4"
990+
strip-json-comments "^3.1.1"
991+
tmp "~0.2.1"
992+
tslib "^2.0.0"
993+
yargs-parser "20.0.0"
994+
968995
"@nrwl/workspace@12.0.8":
969996
version "12.0.8"
970997
resolved "https://registry.npmjs.org/@nrwl/workspace/-/workspace-12.0.8.tgz"
@@ -4454,7 +4481,7 @@ fs-extra@7.0.1:
44544481
jsonfile "^4.0.0"
44554482
universalify "^0.1.0"
44564483

4457-
fs-extra@^9.0.0:
4484+
fs-extra@^9.0.0, fs-extra@^9.1.0:
44584485
version "9.1.0"
44594486
resolved "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz"
44604487
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -7497,6 +7524,13 @@ nwsapi@^2.2.0:
74977524
resolved "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.0.tgz"
74987525
integrity sha512-h2AatdwYH+JHiZpv7pt/gSX1XoRGb7L/qSIeuqA6GwYoF9w1vP1cw42TO0aI2pNyshRK5893hNSl+1//vHK7hQ==
74997526

7527+
nx@^12.1.1:
7528+
version "12.1.1"
7529+
resolved "https://registry.yarnpkg.com/nx/-/nx-12.1.1.tgz#86f07c2cd1edf1ee4ba5b3f4337055c7ba29ff39"
7530+
integrity sha512-RLMlWwMw+JyKL+rxhRpx0NHCIZWtdP16Kv8eNA0p4X6aMnoI6wxrZBjFxLterg9CoHyY6fMnDXo6VCTMjFEiLw==
7531+
dependencies:
7532+
"@nrwl/cli" "*"
7533+
75007534
oauth-sign@~0.9.0:
75017535
version "0.9.0"
75027536
resolved "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.9.0.tgz"

0 commit comments

Comments
 (0)