Update Yeoman generator references to aspnet to aspnetcore

SteveSandersonMS · SteveSandersonMS · commit 9cb6d5d2b6cb · 2016-05-02T13:14:27.000-07:00
diff --git a/templates/yeoman/.gitignore b/templates/yeoman/.gitignore
@@ -1,3 +1,3 @@
 /node_modules/
 /built/
-/generator-aspnet-spa/
+/generator-aspnetcore-spa/
diff --git a/templates/yeoman/README.md b/templates/yeoman/README.md
@@ -2,4 +2,4 @@ To generator the Yeoman generator, execute:
 
     npm run build
 
-Output will appear in the `generator-aspnet-spa` directory.
+Output will appear in the `generator-aspnetcore-spa` directory.
diff --git a/templates/yeoman/package.json b/templates/yeoman/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "generator-aspnetspa-generator",
+  "name": "generator-aspnetcore-spa-generator",
   "version": "1.0.0",
   "description": "Creates the Yeoman generator for ASP.NET Core SPA templates",
   "main": "index.js",
diff --git a/templates/yeoman/src/build/build.ts b/templates/yeoman/src/build/build.ts
@@ -77,7 +77,7 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string)
         });
 }
 
-const outputRoot = './generator-aspnet-spa';
+const outputRoot = './generator-aspnetcore-spa';
 const outputTemplatesRoot = path.join(outputRoot, 'app/templates'); 
 rimraf.sync(outputTemplatesRoot);
 
diff --git a/templates/yeoman/src/generator/app/index.ts b/templates/yeoman/src/generator/app/index.ts
@@ -56,20 +56,12 @@ class MyGenerator extends yeoman.Base {
     }
     
     installingDeps() {
-        // Strictly speaking, with DNX, the 'prepare' script runs 'npm install' anyway so we don't really need
-        // to run it from here. But it will be needed with RC2, and it doesn't make the setup take much longer
-        // because the second run is almost a no-op, so it's OK to leave it here for now.
         this.installDependencies({
             npm: true,
             bower: false,
             callback: () => {
-                this.spawnCommandSync('dnu', ['restore']);
-
-                // With DNX, the 'prepare' script builds the vendor files automatically so the following is not
-                // required. With RC2 and the 'dotnet' tooling, that won't happen automatically, so the following
-                // will be required:
-                // this.spawnCommandSync('./node_modules/.bin/webpack', ['--config', 'webpack.config.vendor.js']);
-
+                this.spawnCommandSync('dotnet', ['restore']);
+                this.spawnCommandSync('./node_modules/.bin/webpack', ['--config', 'webpack.config.vendor.js']);
                 this.spawnCommandSync('./node_modules/.bin/webpack');                
             }
         });
diff --git a/templates/yeoman/src/generator/package.json b/templates/yeoman/src/generator/package.json
@@ -1,5 +1,5 @@
 {
-  "name": "generator-aspnet-spa",
+  "name": "generator-aspnetcore-spa",
   "version": "0.1.3",
   "description": "Single-Page App templates for ASP.NET Core",
   "author": "Microsoft",
diff --git a/templates/yeoman/tsconfig.json b/templates/yeoman/tsconfig.json
@@ -7,6 +7,6 @@
   },
   "exclude": [
       "node_modules",
-      "generator-aspnet-spa"
+      "generator-aspnetcore-spa"
   ]
 }

Original file line number	Diff line number	Diff line change
`@@ -2,4 +2,4 @@ To generator the Yeoman generator, execute:`
`2`	`2`
`3`	`3`	`npm run build`
`4`	`4`
`5`		-Output will appear in the `generator-aspnet-spa` directory.
	`5`	+Output will appear in the `generator-aspnetcore-spa` directory.
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "generator-aspnetspa-generator",`
	`2`	`+ "name": "generator-aspnetcore-spa-generator",`
`3`	`3`	`"version": "1.0.0",`
`4`	`4`	`"description": "Creates the Yeoman generator for ASP.NET Core SPA templates",`
`5`	`5`	`"main": "index.js",`
Original file line number	Diff line number	Diff line change
`@@ -77,7 +77,7 @@ function copyRecursive(sourceRoot: string, destRoot: string, matchGlob: string)`
`77`	`77`	`});`
`78`	`78`	`}`
`79`	`79`
`80`		`-const outputRoot = './generator-aspnet-spa';`
	`80`	`+const outputRoot = './generator-aspnetcore-spa';`
`81`	`81`	`const outputTemplatesRoot = path.join(outputRoot, 'app/templates');`
`82`	`82`	`rimraf.sync(outputTemplatesRoot);`
`83`	`83`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "name": "generator-aspnet-spa",`
	`2`	`+ "name": "generator-aspnetcore-spa",`
`3`	`3`	`"version": "0.1.3",`
`4`	`4`	`"description": "Single-Page App templates for ASP.NET Core",`
`5`	`5`	`"author": "Microsoft",`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,6 @@`
`7`	`7`	`},`
`8`	`8`	`"exclude": [`
`9`	`9`	`"node_modules",`
`10`		`- "generator-aspnet-spa"`
	`10`	`+ "generator-aspnetcore-spa"`
`11`	`11`	`]`
`12`	`12`	`}`