Remove dynamic content replacement from nuspec files

SteveSandersonMS · SteveSandersonMS · commit 559832bb6d55 · 2017-08-23T15:41:09.000-07:00
diff --git a/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec b/templates/Microsoft.AspNetCore.SpaTemplates/Microsoft.AspNetCore.SpaTemplates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Microsoft.AspNetCore.SpaTemplates</id>
-        <version>1.0.{buildnumber}</version>
+        <version>0.0.0</version>
         <description>Single Page Application templates for ASP.NET Core</description>
         <authors>Microsoft</authors>
         <language>en-US</language>
diff --git a/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec b/templates/Microsoft.DotNet.Web.Spa.ProjectTemplates/Microsoft.DotNet.Web.Spa.ProjectTemplates.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
     <metadata>
         <id>Microsoft.DotNet.Web.Spa.ProjectTemplates</id>
-        <version>1.0.{buildnumber}</version>
+        <version>0.0.0</version>
         <description>Single Page Application templates for ASP.NET Core</description>
         <authors>Microsoft</authors>
         <language>en-US</language>
diff --git a/templates/package-builder/src/build/build.ts b/templates/package-builder/src/build/build.ts
@@ -30,30 +30,13 @@ function listFilesExcludingGitignored(root: string): string[] {
         .filter(fn => gitignoreEvaluator.accepts(fn));
 }
 
-function applyContentReplacements(sourceContent: Buffer, contentReplacements: { from: RegExp, to: string }[]) {
-    let sourceText = sourceContent.toString('utf8');
-    contentReplacements.forEach(replacement => {
-        sourceText = sourceText.replace(replacement.from, replacement.to);
-    });
-
-    return new Buffer(sourceText, 'utf8');
-}
-
 function writeTemplate(sourceRoot: string, destRoot: string) {
     listFilesExcludingGitignored(sourceRoot).forEach(fn => {
         let sourceContent = fs.readFileSync(path.join(sourceRoot, fn));
         writeFileEnsuringDirExists(destRoot, fn, sourceContent);
     });
 }
 
-function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string) {
-    glob.sync(matchGlob, { cwd: sourceRoot, dot: true, nodir: true })
-        .forEach(fn => {
-            const sourceContent = fs.readFileSync(path.join(sourceRoot, fn));
-            writeFileEnsuringDirExists(destRoot, fn, sourceContent);
-        });
-}
-
 function getBuildNumber(): string {
     if (process.env.APPVEYOR_BUILD_NUMBER) {
         return process.env.APPVEYOR_BUILD_NUMBER;
@@ -88,23 +71,25 @@ function buildDotNetNewNuGetPackage(packageId: string) {
     });
 
     // Create the .nuspec file
-    const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, `${ packageId }.nuspec`));
+    const nuspecFilename = `${ packageId }.nuspec`;
+    const nuspecContentTemplate = fs.readFileSync(path.join(packageSourceRootDir, nuspecFilename));
     writeFileEnsuringDirExists(outputRoot,
-        `${ packageId }.nuspec`,
-        applyContentReplacements(nuspecContentTemplate, [
-            { from: /\{buildnumber\}/g, to: getBuildNumber() },
-        ])
+        nuspecFilename,
+        nuspecContentTemplate
     );
 
     // Invoke NuGet to create the final package
     const nugetExe = path.join(process.cwd(), './bin/NuGet.exe');
     const nugetStartInfo = { cwd: outputRoot, stdio: 'inherit' };
+    const packageVersion = `1.0.${ getBuildNumber() }`;
+    const nugetArgs = ['pack', nuspecFilename, '-Version', packageVersion];
     if (isWindows) {
         // Invoke NuGet.exe directly
-        childProcess.spawnSync(nugetExe, ['pack'], nugetStartInfo);
+        childProcess.spawnSync(nugetExe, nugetArgs, nugetStartInfo);
     } else {
         // Invoke via Mono (relying on that being available)
-        childProcess.spawnSync('mono', [nugetExe, 'pack'], nugetStartInfo);
+        nugetArgs.unshift(nugetExe);
+        childProcess.spawnSync('mono', nugetArgs, nugetStartInfo);
     }
 
     // Clean up
