Skip to content

Commit d17bc97

Browse files
AshleyGrantAshleyGrant
committedJul 7, 2016
chore(aspenetcore): update aspnetcore projects for 1.0
·
1.1.21.0.0-beta.3.0.0
1 parent 6ba0231 commit d17bc97

File tree

25 files changed

+57
-3584
lines changed

25 files changed

+57
-3584
lines changed
 

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

-24
This file was deleted.

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

+14-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using Microsoft.AspNetCore.Builder;
1+
using System.IO;
2+
using Microsoft.AspNetCore.Builder;
23
using Microsoft.AspNetCore.Hosting;
34
using Microsoft.Extensions.Configuration;
45
using Microsoft.Extensions.DependencyInjection;
@@ -8,6 +9,18 @@ namespace skeleton
89
{
910
public class Startup
1011
{
12+
public static void Main(string[] args)
13+
{
14+
var host = new WebHostBuilder()
15+
.UseKestrel()
16+
.UseContentRoot(Directory.GetCurrentDirectory())
17+
.UseIISIntegration()
18+
.UseStartup<Startup>()
19+
.Build();
20+
21+
host.Run();
22+
}
23+
1124
public Startup(IHostingEnvironment env)
1225
{
1326
var builder = new ConfigurationBuilder()

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

-10
This file was deleted.

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = {
2929
"aurelia-logging-console",
3030
"bootstrap",
3131
"bootstrap/css/bootstrap.css!text",
32-
"jquery"
32+
"fetch"
3333
],
3434
"options": {
3535
"inject": true,

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

+1-7
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,14 @@ gulp.task('build-css', function() {
4040
.pipe(gulp.dest(paths.output))
4141
});
4242

43-
// runs jspm install from within Gulp
44-
gulp.task('build-jspm', function () {
45-
exec('jspm install', function (err, stout, stderr) {
46-
});
47-
});
48-
4943
// this task calls the clean task (located
5044
// in ./clean.js), then runs the build-system
5145
// and build-html tasks in parallel
5246
// https://www.npmjs.com/package/gulp-run-sequence
5347
gulp.task('build', function(callback) {
5448
return runSequence(
5549
'clean',
56-
['build-system', 'build-html', 'build-css', 'build-jspm'],
50+
['build-system', 'build-html', 'build-css'],
5751
callback
5852
);
5953
});

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function reportChange(event) {
1111
// to js, html, and css files and call the
1212
// reportChange method. Also, by depending on the
1313
// serve task, it will instantiate a browserSync session
14-
gulp.task('watch', ['serve'], function() {
14+
gulp.task('watch', ['build'], function() {
1515
gulp.watch(paths.source, ['build-system', browserSync.reload]).on('change', reportChange);
1616
gulp.watch(paths.html, ['build-html', browserSync.reload]).on('change', reportChange);
1717
gulp.watch(paths.css, ['build-css']).on('change', reportChange);

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

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

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

+1
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@
5959
"vscode"
6060
],
6161
"scripts": {
62+
"postinstall": "./node_modules/.bin/jspm install -y",
6263
"test": "gulp test",
6364
"e2e": "gulp serve e2e"
6465
},

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
},
106106

107107
"scripts": {
108-
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
108+
"prepublish": [ "npm install", "gulp build"],
109109
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
110110
}
111111
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//import {computedFrom} from 'aurelia-framework';
22

33
export class Welcome {
4-
heading = 'Welcome to the Aurelia Navigation App [skeleton-esnext-aspnetcore]!';
4+
heading = 'Welcome to the Aurelia Navigation App!';
55
firstName = 'John';
66
lastName = 'Doe';
77
previousValue = this.fullName;

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

+2-9
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,11 @@
11
System.config({
22
defaultJSExtensions: true,
3-
transpiler: "babel",
4-
babelOptions: {
5-
"optional": [
6-
"runtime",
7-
"optimisation.modules.system"
8-
]
9-
},
3+
transpiler: false,
104
paths: {
115
"*": "dist/*",
126
"github:*": "jspm_packages/github/*",
137
"npm:*": "jspm_packages/npm/*"
148
},
15-
169
map: {
1710
"aurelia-animator-css": "npm:aurelia-animator-css@1.0.0-rc.1.0.0",
1811
"aurelia-bootstrapper": "npm:aurelia-bootstrapper@1.0.0-rc.1.0.0",
@@ -219,4 +212,4 @@ System.config({
219212
"indexof": "npm:indexof@0.0.1"
220213
}
221214
}
222-
});
215+
});

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

-24
This file was deleted.

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

+13
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,24 @@
33
using Microsoft.Extensions.Configuration;
44
using Microsoft.Extensions.DependencyInjection;
55
using Microsoft.Extensions.Logging;
6+
using System.IO;
67

78
namespace skeleton
89
{
910
public class Startup
1011
{
12+
public static void Main(string[] args)
13+
{
14+
var host = new WebHostBuilder()
15+
.UseKestrel()
16+
.UseContentRoot(Directory.GetCurrentDirectory())
17+
.UseIISIntegration()
18+
.UseStartup<Startup>()
19+
.Build();
20+
21+
host.Run();
22+
}
23+
1124
public Startup(IHostingEnvironment env)
1225
{
1326
var builder = new ConfigurationBuilder()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ module.exports = {
2929
"aurelia-logging-console",
3030
"bootstrap",
3131
"bootstrap/css/bootstrap.css!text",
32-
"jquery"
32+
"fetch"
3333
],
3434
"options": {
3535
"inject": true,

‎skeleton-typescript-aspnetcore/src/skeleton/build/paths.js

+2-3
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@ module.exports = {
1616
e2eSpecsSrc: 'test/e2e/src/**/*.ts',
1717
e2eSpecsDist: 'test/e2e/dist/',
1818
dtsSrc: [
19-
'typings/browser/**/*.d.ts',
20-
'custom_typings/**/*.d.ts',
21-
'./wwwroot/jspm_packages/**/*.d.ts'
19+
'typings/**/*.d.ts',
20+
'custom_typings/**/*.d.ts'
2221
]
2322
}

‎skeleton-typescript-aspnetcore/src/skeleton/build/tasks/build.js

-6
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,6 @@ gulp.task('build-css', function() {
4545
.pipe(gulp.dest(paths.output));
4646
});
4747

48-
// runs jspm install from within Gulp
49-
gulp.task('build-jspm', function () {
50-
exec('jspm install', function (err, stout, stderr) {
51-
});
52-
});
53-
5448
// this task calls the clean task (located
5549
// in ./clean.js), then runs the build-system
5650
// and build-html tasks in parallel

‎skeleton-typescript-aspnetcore/src/skeleton/build/tasks/watch.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ function reportChange(event) {
1111
// to js, html, and css files and call the
1212
// reportChange method. Also, by depending on the
1313
// serve task, it will instantiate a browserSync session
14-
gulp.task('watch', ['serve'], function() {
14+
gulp.task('watch', ['build'], function() {
1515
gulp.watch(paths.source, ['build-system', browserSync.reload]).on('change', reportChange);
1616
gulp.watch(paths.html, ['build-html', browserSync.reload]).on('change', reportChange);
1717
gulp.watch(paths.css, ['build-css']).on('change', reportChange);

‎skeleton-typescript-aspnetcore/src/skeleton/custom_typings/es6.d.ts

-3,466
This file was deleted.

‎skeleton-typescript-aspnetcore/src/skeleton/gulpfile.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/// <binding BeforeBuild='build' Clean='clean' />
1+
/// <binding BeforeBuild='build' Clean='clean' ProjectOpened='watch' />
22
// all gulp tasks are located in the ./build/tasks directory
33
// gulp configuration is in files in ./build directory
44
require('require-dir')('build/tasks');

‎skeleton-typescript-aspnetcore/src/skeleton/package.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -12,16 +12,13 @@
1212
"gulp": "^3.9.1",
1313
"gulp-bump": "^2.1.0",
1414
"gulp-changed": "^1.3.0",
15-
"gulp-concat": "2.6.0",
16-
"gulp-cssmin": "0.1.7",
1715
"gulp-htmlmin": "^2.0.0",
1816
"gulp-notify": "^2.2.0",
1917
"gulp-plumber": "^1.1.0",
20-
"gulp-protractor": "^2.4.0",
18+
"gulp-protractor": "2.4.0",
2119
"gulp-sourcemaps": "^1.6.0",
22-
"gulp-typescript": "^2.13.6",
2320
"gulp-tslint": "^5.0.0",
24-
"gulp-uglify": "1.5.3",
21+
"gulp-typescript": "^2.13.6",
2522
"isparta": "^4.0.0",
2623
"jasmine-core": "^2.4.1",
2724
"jspm": "^0.16.15",
@@ -31,11 +28,11 @@
3128
"karma-systemjs": "^0.14.0",
3229
"object.assign": "^4.0.3",
3330
"require-dir": "^0.3.0",
34-
"rimraf": "2.5.2",
3531
"run-sequence": "^1.2.1",
3632
"systemjs": "0.19.31",
3733
"tslint": "^3.11.0",
3834
"typescript": ">=1.9.0-dev || ^2.0.0",
35+
"typings": "^1.3.0",
3936
"vinyl-paths": "^2.1.0",
4037
"yargs": "^4.7.1"
4138
},
@@ -47,7 +44,9 @@
4744
"vscode"
4845
],
4946
"scripts": {
50-
"postinstall": "./node_modules/.bin/typings install",
47+
"postinstall": "npm run jspm-install && npm run typings-install",
48+
"jspm-install": "./node_modules/.bin/jspm install -y",
49+
"typings-install": "./node_modules/.bin/typings install",
5150
"test": "gulp test",
5251
"e2e": "gulp serve e2e"
5352
},

‎skeleton-typescript-aspnetcore/src/skeleton/project.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@
105105
},
106106

107107
"scripts": {
108-
"prepublish": [ "npm install", "bower install", "gulp clean", "gulp min" ],
108+
"prepublish": [ "npm install", "gulp build"],
109109
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
110110
}
111111
}

‎skeleton-typescript-aspnetcore/src/skeleton/src/welcome.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
//import {computedFrom} from 'aurelia-framework';
22

33
export class Welcome {
4-
heading = 'Welcome to the Aurelia Navigation App [skeleton-typescript-aspnetcore]!';
4+
heading = 'Welcome to the Aurelia Navigation App!';
55
firstName = 'John';
66
lastName = 'Doe';
77
previousValue = this.fullName;

‎skeleton-typescript-aspnetcore/src/skeleton/tsconfig.json

+6-7
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,29 @@
11
{
2-
"version": "1.7.3",
32
"compileOnSave": false,
43
"compilerOptions": {
54
"rootDir": "src/",
5+
"outDir": "wwwroot/dist",
66
"sourceMap": true,
77
"target": "es5",
88
"module": "amd",
99
"declaration": false,
1010
"noImplicitAny": false,
11-
"noResolve": true,
1211
"removeComments": true,
13-
"noLib": false,
1412
"emitDecoratorMetadata": true,
15-
"experimentalDecorators": true
13+
"experimentalDecorators": true,
14+
"moduleResolution": "node",
15+
"lib": ["es2015", "dom"]
1616
},
1717
"filesGlob": [
1818
"./src/**/*.ts",
1919
"./test/**/*.ts",
20-
"./typings/browser.d.ts",
20+
"./typings/index.d.ts",
2121
"./custom_typings/**/*.d.ts",
2222
"./wwwroot/jspm_packages/**/*.d.ts"
2323
],
2424
"exclude": [
2525
"node_modules",
26-
"typings/main",
27-
"typings/main.d.ts"
26+
"wwwroot/jspm_packages"
2827
],
2928
"atom": {
3029
"rewriteTsconfig": false

‎skeleton-typescript-aspnetcore/src/skeleton/wwwroot/config.js

+1-7
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
System.config({
22
defaultJSExtensions: true,
3-
transpiler: "babel",
4-
babelOptions: {
5-
"optional": [
6-
"runtime",
7-
"optimisation.modules.system"
8-
]
9-
},
3+
transpiler: false,
104
paths: {
115
"*": "dist/*",
126
"github:*": "jspm_packages/github/*",

‎skeleton-typescript/config.js

+1-3
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,13 @@ System.config({
66
"github:*": "jspm_packages/github/*",
77
"npm:*": "jspm_packages/npm/*"
88
},
9-
109
meta: {
1110
"bootstrap": {
1211
"deps": [
1312
"jquery"
1413
]
1514
}
1615
},
17-
1816
map: {
1917
"aurelia-animator-css": "npm:aurelia-animator-css@1.0.0-rc.1.0.0",
2018
"aurelia-bootstrapper": "npm:aurelia-bootstrapper@1.0.0-rc.1.0.0",
@@ -206,4 +204,4 @@ System.config({
206204
"indexof": "npm:indexof@0.0.1"
207205
}
208206
}
209-
});
207+
});

0 commit comments

Comments
 (0)
Please sign in to comment.