Skip to content

Commit 2985511

Browse files
xabikosxabikos
committed
#24 Upgrade samples to asp.net core 1.0 and reference the new version of webpack nuget package. Update all node modules for the samples
1 parent 54f482b commit 2985511

File tree

6 files changed

+67
-67
lines changed

6 files changed

+67
-67
lines changed

‎samples/Aspnet.Webpack/package.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@
88
"lorem-ipsum": "^1.0.3"
99
},
1010
"devDependencies": {
11-
"autoprefixer": "^6.3.3",
12-
"babel-core": "^6.5.2",
11+
"autoprefixer": "^6.3.7",
12+
"babel-core": "^6.11.4",
1313
"babel-loader": "^6.2.3",
14-
"babel-preset-es2015": "^6.5.0",
14+
"babel-preset-es2015": "^6.9.0",
1515
"css-loader": "^0.23.1",
1616
"extract-text-webpack-plugin": "^1.0.1",
1717
"less": "^2.6.0",
1818
"less-loader": "^2.2.2",
19-
"node-sass": "^3.4.2",
19+
"node-sass": "^3.8.0",
2020
"postcss-loader": "^0.9.1",
21-
"sass-loader": "^3.1.2",
21+
"sass-loader": "^4.0.0",
2222
"style-loader": "^0.13.0",
23-
"webpack": "^1.13.0",
23+
"webpack": "^1.13.1",
2424
"webpack-dev-server": "^1.14.1"
2525
}
2626
}

‎samples/Aspnet.Webpack/project.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"preserveCompilationContext": true
66
},
77
"runtimeOptions": {
8-
"gcServer": true
8+
"configProperties": {
9+
"System.GC.Server": true
10+
}
911
},
1012
"publishOptions": {
1113
"include": [
@@ -14,29 +16,27 @@
1416
},
1517
"dependencies": {
1618
"Microsoft.NETCore.App": {
17-
"version": "1.0.0-rc2-3002702",
19+
"version": "1.0.0",
1820
"type": "platform"
1921
},
20-
"Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
21-
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
22+
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
23+
"Microsoft.AspNetCore.Mvc": "1.0.0",
2224
"Microsoft.AspNetCore.Razor.Tools": {
23-
"version": "1.0.0-preview1-final",
25+
"version": "1.0.0-preview2-final",
2426
"type": "build"
2527
},
26-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
27-
"Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
28-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
29-
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
30-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
31-
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
32-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
33-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
34-
"Webpack": "2.0.0"
28+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
29+
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
30+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
31+
"Microsoft.Extensions.Configuration.Json": "1.0.0",
32+
"Microsoft.Extensions.Logging": "1.0.0",
33+
"Microsoft.Extensions.Logging.Console": "1.0.0",
34+
"Microsoft.Extensions.Logging.Debug": "1.0.0",
35+
"Webpack": "3.0.0"
3536
},
3637

3738
"frameworks": {
3839
"netcoreapp1.0": {
39-
"imports": ["dnxcore50"]
4040
}
4141
}
4242
}

‎samples/AspnetAngular1.Webpack/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33
"version": "0.0.0",
44
"devDependencies": {
55
"css-loader": "^0.23.1",
6-
"node-sass": "^3.7.0",
6+
"node-sass": "^3.8.0",
77
"raw-loader": "^0.5.1",
8-
"sass-loader": "^3.2.0",
8+
"sass-loader": "^4.0.0",
99
"style-loader": "^0.13.1",
10-
"webpack": "^1.13.0",
10+
"webpack": "^1.13.1",
1111
"webpack-dev-server": "^1.14.1"
1212
},
1313
"dependencies": {
14-
"angular": "^1.5.5"
14+
"angular": "^1.5.8"
1515
}
1616
}

‎samples/AspnetAngular1.Webpack/project.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"preserveCompilationContext": true
66
},
77
"runtimeOptions": {
8-
"gcServer": true
8+
"configProperties": {
9+
"System.GC.Server": true
10+
}
911
},
1012
"publishOptions": {
1113
"include": [
@@ -15,29 +17,27 @@
1517

1618
"dependencies": {
1719
"Microsoft.NETCore.App": {
18-
"version": "1.0.0-rc2-3002702",
20+
"version": "1.0.0",
1921
"type": "platform"
2022
},
21-
"Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
22-
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
23+
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
24+
"Microsoft.AspNetCore.Mvc": "1.0.0",
2325
"Microsoft.AspNetCore.Razor.Tools": {
24-
"version": "1.0.0-preview1-final",
26+
"version": "1.0.0-preview2-final",
2527
"type": "build"
2628
},
27-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
28-
"Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
29-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
30-
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
31-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
32-
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
33-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
34-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
35-
"Webpack": "2.0.0"
29+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
30+
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
31+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
32+
"Microsoft.Extensions.Configuration.Json": "1.0.0",
33+
"Microsoft.Extensions.Logging": "1.0.0",
34+
"Microsoft.Extensions.Logging.Console": "1.0.0",
35+
"Microsoft.Extensions.Logging.Debug": "1.0.0",
36+
"Webpack": "3.0.0"
3637
},
3738

3839
"frameworks": {
3940
"netcoreapp1.0": {
40-
"imports": ["dnxcore50"]
4141
}
4242
}
4343
}

‎samples/AspnetReact.Webpack/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,27 +2,27 @@
22
"name": "aspnet-react-webpack",
33
"version": "0.0.0",
44
"devDependencies": {
5-
"babel-core": "^6.8.0",
5+
"babel-core": "^6.11.4",
66
"babel-loader": "^6.2.4",
7-
"babel-preset-es2015": "^6.6.0",
8-
"babel-preset-react": "^6.5.0",
7+
"babel-preset-es2015": "^6.9.0",
8+
"babel-preset-react": "^6.11.1",
99
"babel-preset-react-hmre": "^1.1.1",
1010
"css-loader": "^0.23.1",
11-
"file-loader": "^0.8.5",
12-
"node-sass": "^3.7.0",
13-
"sass-loader": "^3.2.0",
11+
"file-loader": "^0.9.0",
12+
"node-sass": "^3.8.0",
13+
"sass-loader": "^4.0.0",
1414
"style-loader": "^0.13.1",
1515
"url-loader": "^0.5.7",
16-
"webpack": "^1.13.0",
16+
"webpack": "^1.13.1",
1717
"webpack-dev-server": "^1.14.1"
1818
},
1919
"dependencies": {
20-
"axios": "^0.11.0",
21-
"lodash": "^4.12.0",
22-
"react": "^15.0.2",
20+
"axios": "^0.13.1",
21+
"lodash": "^4.13.1",
22+
"react": "^15.2.1",
2323
"react-bootstrap": "^0.29.4",
24-
"react-dom": "^15.0.2",
25-
"react-overlays": "^0.6.3"
24+
"react-dom": "^15.2.1",
25+
"react-overlays": "^0.6.5"
2626
},
2727
"babel": {
2828
"env": {

‎samples/AspnetReact.Webpack/project.json‎

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,9 @@
55
"preserveCompilationContext": true
66
},
77
"runtimeOptions": {
8-
"gcServer": true
8+
"configProperties": {
9+
"System.GC.Server": true
10+
}
911
},
1012
"publishOptions": {
1113
"include": [
@@ -15,29 +17,27 @@
1517

1618
"dependencies": {
1719
"Microsoft.NETCore.App": {
18-
"version": "1.0.0-rc2-3002702",
20+
"version": "1.0.0",
1921
"type": "platform"
2022
},
21-
"Microsoft.AspNetCore.Diagnostics": "1.0.0-rc2-final",
22-
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
23+
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
24+
"Microsoft.AspNetCore.Mvc": "1.0.0",
2325
"Microsoft.AspNetCore.Razor.Tools": {
24-
"version": "1.0.0-preview1-final",
26+
"version": "1.0.0-preview2-final",
2527
"type": "build"
2628
},
27-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
28-
"Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
29-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
30-
"Microsoft.Extensions.Configuration.FileProviderExtensions": "1.0.0-rc1-final",
31-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
32-
"Microsoft.Extensions.Logging": "1.0.0-rc2-final",
33-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
34-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
35-
"Webpack": "2.0.0"
29+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
30+
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
31+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
32+
"Microsoft.Extensions.Configuration.Json": "1.0.0",
33+
"Microsoft.Extensions.Logging": "1.0.0",
34+
"Microsoft.Extensions.Logging.Console": "1.0.0",
35+
"Microsoft.Extensions.Logging.Debug": "1.0.0",
36+
"Webpack": "3.0.0"
3637
},
3738

3839
"frameworks": {
3940
"netcoreapp1.0": {
40-
"imports": ["dnxcore50"]
4141
}
4242
}
4343
}

0 commit comments

Comments
 (0)