chore(aspenetcore): update aspnetcore projects for 1.0

Author: AshleyGrant

skeleton-esnext-aspnetcore/src/skeleton/Program.cs

@@ -1,4 +1,5 @@
-using Microsoft.AspNetCore.Builder;
+using System.IO;
+using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Hosting;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
@@ -8,6 +9,18 @@ namespace skeleton
 {
     public class Startup
     {
+        public static void Main(string[] args)
+        {
+            var host = new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+        }
+
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()

skeleton-esnext-aspnetcore/src/skeleton/Startup.cs

@@ -29,7 +29,7 @@ module.exports = {
         "aurelia-logging-console",
         "bootstrap",
         "bootstrap/css/bootstrap.css!text",
-        "jquery"
+        "fetch"
       ],
       "options": {
         "inject": true,

skeleton-esnext-aspnetcore/src/skeleton/bower.json

@@ -40,20 +40,14 @@ gulp.task('build-css', function() {
     .pipe(gulp.dest(paths.output))
 });
 
-// runs jspm install from within Gulp
-gulp.task('build-jspm', function () {
-    exec('jspm install', function (err, stout, stderr) {
-    });
-});
-
 // this task calls the clean task (located
 // in ./clean.js), then runs the build-system
 // and build-html tasks in parallel
 // https://www.npmjs.com/package/gulp-run-sequence
 gulp.task('build', function(callback) {
   return runSequence(
     'clean',
-    ['build-system', 'build-html', 'build-css', 'build-jspm'],
+    ['build-system', 'build-html', 'build-css'],
     callback
   );
 });

skeleton-esnext-aspnetcore/src/skeleton/build/bundles.js

@@ -11,7 +11,7 @@ function reportChange(event) {
 // to js, html, and css files and call the
 // reportChange method. Also, by depending on the
 // serve task, it will instantiate a browserSync session
-gulp.task('watch', ['serve'], function() {
+gulp.task('watch', ['build'], function() {
   gulp.watch(paths.source, ['build-system', browserSync.reload]).on('change', reportChange);
   gulp.watch(paths.html, ['build-html', browserSync.reload]).on('change', reportChange);
   gulp.watch(paths.css, ['build-css']).on('change', reportChange);

skeleton-esnext-aspnetcore/src/skeleton/build/tasks/build.js

@@ -1,4 +1,4 @@
-/// <binding BeforeBuild='clean, build-system, build-html, build-css, build-jspm' Clean='clean' ProjectOpened='watch' />
+/// <binding BeforeBuild='build' Clean='clean' ProjectOpened='watch' />
 // all gulp tasks are located in the ./build/tasks directory
 // gulp configuration is in files in ./build directory
 require('require-dir')('build/tasks');

skeleton-esnext-aspnetcore/src/skeleton/build/tasks/watch.js

@@ -59,6 +59,7 @@
     "vscode"
   ],
   "scripts": {
+    "postinstall": "./node_modules/.bin/jspm install -y",
     "test": "gulp test",
     "e2e": "gulp serve e2e"
   },

skeleton-esnext-aspnetcore/src/skeleton/gulpfile.js

@@ -105,7 +105,7 @@
     },
 
     "scripts": {
-        "prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
+        "prepublish": [ "npm install", "gulp build"],
         "postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
     }
 }

skeleton-esnext-aspnetcore/src/skeleton/package.json

@@ -1,7 +1,7 @@
 //import {computedFrom} from 'aurelia-framework';
 
 export class Welcome {
-  heading = 'Welcome to the Aurelia Navigation App [skeleton-esnext-aspnetcore]!';
+  heading = 'Welcome to the Aurelia Navigation App!';
   firstName = 'John';
   lastName = 'Doe';
   previousValue = this.fullName;

skeleton-esnext-aspnetcore/src/skeleton/project.json

@@ -1,18 +1,11 @@
 System.config({
   defaultJSExtensions: true,
-  transpiler: "babel",
-  babelOptions: {
-    "optional": [
-      "runtime",
-      "optimisation.modules.system"
-    ]
-  },
+  transpiler: false,
   paths: {
     "*": "dist/*",
     "github:*": "jspm_packages/github/*",
     "npm:*": "jspm_packages/npm/*"
   },
-
   map: {
     "aurelia-animator-css": "npm:[email protected]",
     "aurelia-bootstrapper": "npm:[email protected]",
@@ -219,4 +212,4 @@ System.config({
       "indexof": "npm:[email protected]"
     }
   }
-});
+});

skeleton-esnext-aspnetcore/src/skeleton/src/welcome.js

@@ -3,11 +3,24 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Logging;
+using System.IO;
 
 namespace skeleton
 {
     public class Startup
     {
+        public static void Main(string[] args)
+        {
+            var host = new WebHostBuilder()
+                .UseKestrel()
+                .UseContentRoot(Directory.GetCurrentDirectory())
+                .UseIISIntegration()
+                .UseStartup<Startup>()
+                .Build();
+
+            host.Run();
+        }
+
         public Startup(IHostingEnvironment env)
         {
             var builder = new ConfigurationBuilder()

skeleton-esnext-aspnetcore/src/skeleton/wwwroot/config.js

@@ -29,7 +29,7 @@ module.exports = {
         "aurelia-logging-console",
         "bootstrap",
         "bootstrap/css/bootstrap.css!text",
-        "jquery"
+        "fetch"
       ],
       "options": {
         "inject": true,

skeleton-typescript-aspnetcore/src/skeleton/Program.cs

@@ -16,8 +16,7 @@ module.exports = {
   e2eSpecsSrc: 'test/e2e/src/**/*.ts',
   e2eSpecsDist: 'test/e2e/dist/',
   dtsSrc: [
-    'typings/browser/**/*.d.ts',
-    'custom_typings/**/*.d.ts',
-    './wwwroot/jspm_packages/**/*.d.ts'
+    'typings/**/*.d.ts',
+    'custom_typings/**/*.d.ts'
   ]
 }

skeleton-typescript-aspnetcore/src/skeleton/Startup.cs

@@ -45,12 +45,6 @@ gulp.task('build-css', function() {
     .pipe(gulp.dest(paths.output));
 });
 
-// runs jspm install from within Gulp
-gulp.task('build-jspm', function () {
-    exec('jspm install', function (err, stout, stderr) {
-    });
-});
-
 // this task calls the clean task (located
 // in ./clean.js), then runs the build-system
 // and build-html tasks in parallel

skeleton-typescript-aspnetcore/src/skeleton/build/bundles.js

@@ -11,7 +11,7 @@ function reportChange(event) {
 // to js, html, and css files and call the
 // reportChange method. Also, by depending on the
 // serve task, it will instantiate a browserSync session
-gulp.task('watch', ['serve'], function() {
+gulp.task('watch', ['build'], function() {
   gulp.watch(paths.source, ['build-system', browserSync.reload]).on('change', reportChange);
   gulp.watch(paths.html, ['build-html', browserSync.reload]).on('change', reportChange);
   gulp.watch(paths.css, ['build-css']).on('change', reportChange);