From 169ef12cd80dfcc143bbc11437f3fb1bc86066dc Mon Sep 17 00:00:00 2001 From: Steve Sanderson Date: Thu, 27 Jul 2017 14:51:21 +0100 Subject: [PATCH] Change Microsoft.DotNet.Web.Spa.ProjectTemplates to use non-prerelease version number in NuGet package --- templates/package-builder/src/build/build.ts | 11 ++--------- .../Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts index 40d4fc0..fab6d48 100644 --- a/templates/package-builder/src/build/build.ts +++ b/templates/package-builder/src/build/build.ts @@ -91,20 +91,13 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) }); } -function leftPad(str: string, minLength: number, padChar: string) { - while (str.length < minLength) { - str = padChar + str; - } - return str; -} - function getBuildNumber(): string { if (process.env.APPVEYOR_BUILD_NUMBER) { - return leftPad(process.env.APPVEYOR_BUILD_NUMBER, 6, '0'); + return process.env.APPVEYOR_BUILD_NUMBER; } // For local builds, use timestamp - return 't-' + Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)); + return Math.floor((new Date().valueOf() - new Date(2017, 0, 1).valueOf()) / (60*1000)) + '-local'; } function buildYeomanNpmPackage(outputRoot: string) { diff --git a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec index 1406631..05690b8 100644 --- a/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec +++ b/templates/package-builder/src/dotnetnew/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec @@ -2,7 +2,7 @@ Microsoft.DotNet.Web.Spa.ProjectTemplates - 1.0.0-preview-{buildnumber} + 1.0.{buildnumber} Single Page Application templates for ASP.NET Core Microsoft en-US