Commit 8b243e8
committed
Simplify build script further
1 parent 28920c7 commit 8b243e8
2 files changed
Lines changed: 12 additions & 41 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -10,24 +10,11 @@ | |||
| 10 | 10 | "author": "Microsoft", | |
| 11 | 11 | "license": "Apache-2.0", | |
| 12 | 12 | "dependencies": { | |
| 13 | - "@types/chalk": "^0.4.31", | ||
| 14 | - "@types/semver": "^5.3.30", | ||
| 15 | - "diff": "^2.2.2", | ||
| 16 | - "gitignore-parser": "0.0.2", | ||
| 17 | - "glob": "^7.0.3", | ||
| 18 | - "lodash": "^4.11.1", | ||
| 19 | - "mkdirp": "^0.5.1", | ||
| 20 | - "rimraf": "^2.5.2", | ||
| 21 | - "semver": "^5.3.0", | ||
| 22 | - "tar.gz": "^1.0.5" | ||
| 13 | + "mkdirp": "^0.5.1" | ||
| 23 | 14 | }, | |
| 24 | 15 | "devDependencies": { | |
| 25 | - "@types/glob": "^5.0.30", | ||
| 26 | - "@types/lodash": "^4.14.37", | ||
| 27 | 16 | "@types/mkdirp": "^0.3.29", | |
| 28 | 17 | "@types/node": "^6.0.45", | |
| 29 | - "@types/node-uuid": "0.0.28", | ||
| 30 | - "@types/rimraf": "0.0.28", | ||
| 31 | 18 | "typescript": "^2.0.0" | |
| 32 | 19 | } | |
| 33 | 20 | } | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,19 +1,14 @@ | |||
| 1 | - import * as glob from 'glob'; | ||
| 2 | - import * as gitignore from 'gitignore-parser'; | ||
| 3 | 1 | import * as fs from 'fs'; | |
| 4 | 2 | import * as path from 'path'; | |
| 5 | - import * as _ from 'lodash'; | ||
| 6 | 3 | import * as mkdirp from 'mkdirp'; | |
| 7 | - import * as rimraf from 'rimraf'; | ||
| 8 | 4 | import * as childProcess from 'child_process'; | |
| 9 | - import * as targz from 'tar.gz'; | ||
| 10 | 5 | ||
| 11 | 6 | const isWindows = /^win/.test(process.platform); | |
| 12 | - | ||
| 13 | - const dotNetPackages = [ | ||
| 7 | + const packageIds = [ | ||
| 14 | 8 | 'Microsoft.DotNet.Web.Spa.ProjectTemplates', | |
| 15 | 9 | 'Microsoft.AspNetCore.SpaTemplates' | |
| 16 | 10 | ]; | |
| 11 | + const packageVersion = `1.0.${ getBuildNumber() }`; | ||
| 17 | 12 | ||
| 18 | 13 | function getBuildNumber(): string { | |
| 19 | 14 | if (process.env.APPVEYOR_BUILD_NUMBER) { | |
@@ -24,25 +19,18 @@ function getBuildNumber(): string { | |||
| 24 | 19 | return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local'; | |
| 25 | 20 | } | |
| 26 | 21 | ||
| 27 | - function buildDotNetNewNuGetPackages(outputDir: string) { | ||
| 28 | - const dotNetPackageIds = _.values(dotNetPackages); | ||
| 29 | - dotNetPackageIds.forEach(packageId => { | ||
| 30 | - const dotNetNewNupkgPath = buildDotNetNewNuGetPackage(packageId); | ||
| 31 | - | ||
| 32 | - // Move the .nupkg file to the output dir | ||
| 33 | - mkdirp.sync(outputDir); | ||
| 34 | - fs.renameSync(dotNetNewNupkgPath, path.join(outputDir, path.basename(dotNetNewNupkgPath))); | ||
| 35 | - }); | ||
| 36 | - } | ||
| 37 | - | ||
| 38 | - function buildDotNetNewNuGetPackage(packageId: string) { | ||
| 22 | + packageIds.forEach(packageId => { | ||
| 39 | 23 | // Invoke NuGet to create the final package | |
| 40 | 24 | const packageSourceRootDir = path.join('../', packageId); | |
| 41 | 25 | const nuspecFilename = `${ packageId }.nuspec`; | |
| 42 | - const nugetExe = path.join(process.cwd(), './bin/NuGet.exe'); | ||
| 26 | + const nugetExe = path.resolve('./bin/NuGet.exe'); | ||
| 43 | 27 | const nugetStartInfo = { cwd: packageSourceRootDir, stdio: 'inherit' }; | |
| 44 | - const packageVersion = `1.0.${ getBuildNumber() }`; | ||
| 45 | - const nugetArgs = ['pack', nuspecFilename, '-Version', packageVersion]; | ||
| 28 | + const nugetArgs = [ | ||
| 29 | + 'pack', nuspecFilename, | ||
| 30 | + '-Version', packageVersion, | ||
| 31 | + '-OutputDirectory', path.resolve('./artifacts') | ||
| 32 | + ]; | ||
| 33 | + | ||
| 46 | 34 | if (isWindows) { | |
| 47 | 35 | // Invoke NuGet.exe directly | |
| 48 | 36 | childProcess.spawnSync(nugetExe, nugetArgs, nugetStartInfo); | |
@@ -51,8 +39,4 @@ function buildDotNetNewNuGetPackage(packageId: string) { | |||
| 51 | 39 | nugetArgs.unshift(nugetExe); | |
| 52 | 40 | childProcess.spawnSync('mono', nugetArgs, nugetStartInfo); | |
| 53 | 41 | } | |
| 54 | - | ||
| 55 | - return glob.sync(path.join(packageSourceRootDir, './*.nupkg'))[0]; | ||
| 56 | - } | ||
| 57 | - | ||
| 58 | - buildDotNetNewNuGetPackages('./artifacts'); | ||
| 42 | + }); | ||
0 commit comments