github/JavaScriptServices
1
1
Fork 0
mirror of https://github.com/aspnet/JavaScriptServices.git synced 2025-12-22 17:47:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix "dotnet new" postAction issues (and disable the "npm install" action)

Browse Source
This commit is contained in:
Steve Sanderson
2017-05-23 11:18:51 +01:00
parent ad9cfbb176
commit b9e62cd4c9
1 changed files with 34 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
templates/package-builder/src/build/build.ts
View File

@@ -164,27 +164,46 @@ function buildDotNetNewNuGetPackage() {
} }
], ],
defaultValue: 'netcoreapp1.1' defaultValue: 'netcoreapp1.1'
},
skipRestore: {
type: 'parameter',
datatype: 'bool',
description: 'If specified, skips the automatic restore of packages on project creation.',
defaultValue: 'false'
} }
}, },
tags: { language: 'C#', type: 'project' }, tags: { language: 'C#', type: 'project' },
postActions: [{ postActions: [
condition: '(!skipRestore)', {
description: 'Restores NuGet packages required by this project.', condition: '(!skipRestore)',
manualInstructions: [{ text: 'Run \'dotnet restore\'' }], description: 'Restores NuGet packages required by this project.',
actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025', manualInstructions: [{ text: 'Run \'dotnet restore\'' }],
continueOnError: true actionId: '210D431B-A78B-4D2F-B762-4ED3E3EA9025',
}, { continueOnError: true
condition: '(!skipRestore)', },
description: 'Restores NPM packages required by this project.', /*
manualInstructions: [{ text: 'Run \'npm install\'' }], // Currently it doesn't appear to be possible to run `npm install` from a
actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2', // postAction, due to https://github.com/dotnet/templating/issues/849
args: { executable: 'npm', args: 'install' }, // We will re-enable this when that bug is fixed.
continueOnError: false {
}], condition: '(!skipRestore)',
description: 'Restores NPM packages required by this project.',
manualInstructions: [{ text: 'Run \'npm install\'' }],
actionId: '3A7C4B45-1F5D-4A30-959A-51B88E82B5D2',
args: { executable: 'npm', args: 'install' },
continueOnError: false
}
*/
],
}, null, 2)); }, null, 2));
fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({ fs.writeFileSync(path.join(templateConfigDir, 'dotnetcli.host.json'), JSON.stringify({
symbolInfo: {} symbolInfo: {
skipRestore: {
longName: 'no-restore',
shortName: ''
}
}
}, null, 2)); }, null, 2));
fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({ fs.writeFileSync(path.join(templateConfigDir, 'vs-2017.3.host.json'), JSON.stringify({