Skip to content

Commit 9812c38

Browse files
committed
Upgraded to ABP v1.2.
1 parent 8dd8b3a commit 9812c38

File tree

18 files changed

+658
-55
lines changed

18 files changed

+658
-55
lines changed

src/AbpCompanyName.AbpProjectName.Application/project.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,11 @@
99
"Microsoft.AspNet.Identity.Core": "2.2.1",
1010
"Newtonsoft.Json": "9.0.1",
1111
"Nito.AsyncEx": "3.0.1",
12-
"Abp.AutoMapper": "1.1.3",
13-
"Abp.EntityFramework": "1.1.3",
14-
"Abp.Zero": "1.1.0",
1512
"AutoMapper": "5.2.0",
16-
"System.Collections.Immutable": "1.3.0"
13+
"System.Collections.Immutable": "1.3.0",
14+
"Abp.AutoMapper": "1.2.0",
15+
"Abp.EntityFramework": "1.2.0",
16+
"Abp.Zero": "1.2.0"
1717
},
1818

1919
"frameworks": {

src/AbpCompanyName.AbpProjectName.Core/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@
88
"Microsoft.AspNet.Identity.Core": "2.2.1",
99
"Newtonsoft.Json": "9.0.1",
1010
"Nito.AsyncEx": "3.0.1",
11-
"Abp": "1.1.3",
12-
"Abp.Zero": "1.1.0",
1311
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
1412
"Microsoft.Extensions.Configuration.Json": "1.1.0",
1513
"Microsoft.Extensions.Configuration.UserSecrets": "1.1.0",
16-
"System.Collections.Immutable": "1.3.0"
14+
"System.Collections.Immutable": "1.3.0",
15+
"Abp": "1.2.0",
16+
"Abp.Zero": "1.2.0"
1717
},
1818

1919
"frameworks": {

src/AbpCompanyName.AbpProjectName.EntityFramework/project.json

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

44
"dependencies": {
55
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
6-
"Abp.EntityFramework": "1.1.3",
7-
"Abp.Zero.EntityFramework": "1.1.0",
86
"Migrator.EF6.Tools": {
97
"type": "build",
108
"version": "1.0.8"
11-
}
9+
},
10+
"Abp.EntityFramework": "1.2.0",
11+
"Abp.Zero.EntityFramework": "1.2.0"
1212
},
1313

1414
"tools": {
@@ -24,7 +24,7 @@
2424

2525
"frameworks": {
2626
"net461": {
27-
"Microsoft.NETCore.App": "1.0.0-rc2-3002702"
27+
2828
}
2929
}
3030
}

src/AbpCompanyName.AbpProjectName.Migrator/project.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
},
1111

1212
"dependencies": {
13-
"Abp.Castle.Log4Net": "1.1.3",
13+
"Abp.Castle.Log4Net": "1.2.0",
1414
"AbpCompanyName.AbpProjectName.EntityFramework": "1.0.0.0-*"
1515
},
1616

src/AbpCompanyName.AbpProjectName.Web/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
"bootstrap-theme-cosmo": "3.1.1",
77
"jquery": "2.2.0",
88
"jquery-ui": "1.12.0",
9-
"abp-web-resources": "^0.11.3",
109
"toastr": "^2.1.2",
1110
"sweetalert": "^1.1.3",
1211
"famfamfam-flags": "^1.0.0",
@@ -17,6 +16,7 @@
1716
"jquery-validation": "^1.15.0",
1817
"blockUI": "jquery.blockUI#*",
1918
"spin.js": "^2.3.2",
20-
"signalr": "^2.2.1"
19+
"signalr": "^2.2.1",
20+
"abp-web-resources": "^1.2.1"
2121
}
2222
}

src/AbpCompanyName.AbpProjectName.Web/project.json

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,12 +16,6 @@
1616
"Swashbuckle": "6.0.0-beta902",
1717
"AspNet.Security.OpenIdConnect.Server": "1.0.0-beta6-final",
1818
"PaulMiami.AspNetCore.Mvc.Recaptcha": "1.1.1",
19-
"Abp.AspNetCore": "1.1.3",
20-
"Abp.Castle.Log4Net": "1.1.3",
21-
"Abp.HangFire": "1.1.3",
22-
"Abp.Owin": "1.1.3",
23-
"Abp.RedisCache": "1.1.3",
24-
"Abp.Web.SignalR": "1.1.3",
2519
"Castle.LoggingFacility.MsLogging": "1.1.0",
2620
"Microsoft.AspNetCore.Authentication.Cookies": "1.1.0",
2721
"Microsoft.AspNetCore.Authentication.Facebook": "1.1.0",
@@ -37,7 +31,13 @@
3731
"Microsoft.AspNetCore.StaticFiles": "1.1.0",
3832
"Microsoft.Extensions.Logging": "1.1.0",
3933
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.1.0",
40-
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0"
34+
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.1.0",
35+
"Abp.AspNetCore": "1.2.0",
36+
"Abp.Castle.Log4Net": "1.2.0",
37+
"Abp.HangFire": "1.2.0",
38+
"Abp.Owin": "1.2.0",
39+
"Abp.RedisCache": "1.2.0",
40+
"Abp.Web.SignalR": "1.2.0"
4141
},
4242

4343
"tools": {

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

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "0.11.3",
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,13 +25,14 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "0.11.3",
28+
"_release": "1.2.1",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v0.11.3",
32-
"commit": "5aeac62e288b494728a699c37fd30a012cf2082a"
31+
"tag": "v1.2.1",
32+
"commit": "97439f0677644983851a77560d79627fb3453a55"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^0.11.3",
36-
"_originalSource": "abp-web-resources"
35+
"_target": "^1.2.1",
36+
"_originalSource": "abp-web-resources",
37+
"_direct": true
3738
}

0 commit comments

Comments
 (0)