Skip to content

Commit cf4a5fc

Browse files
committed
Upgraded to ABP v1.2.
1 parent f7ac7ab commit cf4a5fc

File tree

18 files changed

+672
-55
lines changed

18 files changed

+672
-55
lines changed

src/AbpCompanyName.AbpProjectName.Application/project.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
"dependencies": {
55
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
6-
"Abp.EntityFrameworkCore": "1.1.3",
7-
"Abp.AutoMapper": "1.1.3"
6+
"Abp.EntityFrameworkCore": "1.2.0",
7+
"Abp.AutoMapper": "1.2.0"
88
},
99

1010
"frameworks": {

src/AbpCompanyName.AbpProjectName.Core/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp": "1.1.3",
5+
"Abp": "1.2.0",
66
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
77
"Microsoft.Extensions.Configuration.Json": "1.1.0"
88
},

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,18 @@
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp.EntityFrameworkCore": "1.1.3",
5+
"Abp.EntityFrameworkCore": "1.2.0",
66
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
77
"Microsoft.EntityFrameworkCore.SqlServer": "1.1.0",
88
"Microsoft.EntityFrameworkCore.SqlServer.Design": "1.1.0",
99
"Microsoft.EntityFrameworkCore.Tools": {
10-
"version": "1.0.0-preview2-final",
10+
"version": "1.1.0-preview4-final",
1111
"type": "build"
1212
}
1313
},
1414

1515
"tools": {
16-
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
16+
"Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final"
1717
},
1818

1919
"buildOptions": {
@@ -22,7 +22,7 @@
2222

2323
"frameworks": {
2424
"net461": {
25-
"Microsoft.NETCore.App": "1.0.0-rc2-3002702"
25+
2626
}
2727
}
2828
}

src/AbpCompanyName.AbpProjectName.Web/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
"dependencies": {
55
"bootstrap": "3.3.6",
66
"jquery": "2.2.0",
7-
"abp-web-resources": "^0.10.0",
87
"toastr": "^2.1.2",
98
"sweetalert": "^1.1.3",
109
"famfamfam-flags": "^1.0.0",
@@ -13,7 +12,8 @@
1312
"moment": "^2.14.1",
1413
"jquery-validation": "^1.15.0",
1514
"blockUI": "jquery.blockUI#*",
16-
"spin.js": "^2.3.2"
15+
"spin.js": "^2.3.2",
16+
"abp-web-resources": "^1.2.1"
1717
},
1818
"resolutions": {
1919
"abp-web-resources": "^0.11.1"

src/AbpCompanyName.AbpProjectName.Web/project.json

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,6 @@
22
"dependencies": {
33
"AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
44
"AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
5-
"Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
6-
"Microsoft.EntityFrameworkCore.Tools": {
7-
"version": "1.0.0-preview2-final",
8-
"type": "build"
9-
},
10-
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": "1.0.0-preview2-update1",
11-
"Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.0.0-preview2-update1",
12-
"Abp.AspNetCore": "1.1.3",
13-
"Abp.Castle.Log4Net": "1.1.3",
145
"Castle.LoggingFacility.MsLogging": "1.1.0",
156
"Microsoft.AspNetCore.Diagnostics": "1.1.0",
167
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.1.0",
@@ -22,13 +13,29 @@
2213
"Microsoft.EntityFrameworkCore.SqlServer.Design": "1.1.0",
2314
"Microsoft.Extensions.Logging": "1.1.0",
2415
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
25-
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0"
16+
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0",
17+
"Abp.AspNetCore": "1.2.0",
18+
"Abp.Castle.Log4Net": "1.2.0",
19+
20+
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
21+
"version": "1.1.0-preview4-final",
22+
"type": "build"
23+
},
24+
"Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.1.0-preview4-final",
25+
"Microsoft.AspNetCore.Razor.Tools": {
26+
"version": "1.1.0-preview4-final",
27+
"type": "build"
28+
},
29+
"Microsoft.EntityFrameworkCore.Tools": {
30+
"version": "1.1.0-preview4-final",
31+
"type": "build"
32+
}
2633
},
2734

2835
"tools": {
29-
"Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
30-
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
31-
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
36+
"Microsoft.AspNetCore.Razor.Tools": "1.1.0-preview4-final",
37+
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.1.0-preview4-final",
38+
"Microsoft.EntityFrameworkCore.Tools": "1.1.0-preview4-final"
3239
},
3340

3441
"frameworks": {

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "0.11.1",
7+
"version": "1.2.1",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,14 +25,14 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "0.11.1",
28+
"_release": "1.2.1",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v0.11.1",
32-
"commit": "a7d6729adf20dbaada1b271f73c4c6e97ab52cc0"
31+
"tag": "v1.2.1",
32+
"commit": "97439f0677644983851a77560d79627fb3453a55"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^0.11.1",
35+
"_target": "^1.2.1",
3636
"_originalSource": "abp-web-resources",
3737
"_direct": true
3838
}

0 commit comments

Comments
 (0)