Skip to content

Commit 41aed5a

Browse files
committed
Upgraded to ABP v1.0.
1 parent fc129c0 commit 41aed5a

File tree

7 files changed

+28
-49
lines changed

7 files changed

+28
-49
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": "0.11.0.2",
7-
"Abp.AutoMapper": "0.11.0.2"
6+
"Abp.EntityFrameworkCore": "1.0.0",
7+
"Abp.AutoMapper": "1.0.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": "0.11.0.2",
5+
"Abp": "1.0.0",
66
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
77
"Microsoft.Extensions.Configuration.Json": "1.0.0"
88
},

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/project.json

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,10 @@
22
"version": "1.0.0.0-*",
33

44
"dependencies": {
5-
"Abp.EntityFrameworkCore": "0.11.0.2",
5+
"Abp.EntityFrameworkCore": "1.0.0",
66
"AbpCompanyName.AbpProjectName.Core": "1.0.0.0-*",
7-
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
8-
"Microsoft.EntityFrameworkCore.SqlServer.Design": {
9-
"version": "1.0.0",
10-
"type": "build"
11-
},
7+
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.1",
8+
"Microsoft.EntityFrameworkCore.SqlServer.Design": "1.0.1",
129
"Microsoft.EntityFrameworkCore.Tools": {
1310
"version": "1.0.0-preview2-final",
1411
"type": "build"

src/AbpCompanyName.AbpProjectName.Web/Views/Shared/Components/LanguageSelection/LanguageSelectionViewComponent.cs

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
1+
using System.Threading.Tasks;
52
using Abp.Localization;
63
using Microsoft.AspNetCore.Mvc;
74

85
namespace AbpCompanyName.AbpProjectName.Web.Views.Shared.Components.LanguageSelection
96
{
107
public class LanguageSelectionViewComponent: ViewComponent
118
{
12-
private readonly ILocalizationManager _localizationManager;
9+
private readonly ILanguageManager _languageManager;
1310

14-
public LanguageSelectionViewComponent(ILocalizationManager localizationManager)
11+
public LanguageSelectionViewComponent(ILanguageManager languageManager)
1512
{
16-
_localizationManager = localizationManager;
13+
_languageManager = languageManager;
1714
}
1815

1916
public async Task<IViewComponentResult> InvokeAsync()
2017
{
2118
var model = new LanguageSelectionViewModel
2219
{
23-
CurrentLanguage = _localizationManager.CurrentLanguage,
24-
Languages = _localizationManager.GetAllLanguages(),
20+
CurrentLanguage = _languageManager.CurrentLanguage,
21+
Languages = _languageManager.GetLanguages(),
2522
CurrentUrl = Request.Path
2623
};
2724

src/AbpCompanyName.AbpProjectName.Web/project.json

Lines changed: 9 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,45 +5,30 @@
55
"Castle.LoggingFacility.MsLogging": "1.0.0",
66
"Microsoft.AspNetCore.Diagnostics": "1.0.0",
77
"Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "1.0.0",
8-
"Microsoft.AspNetCore.Mvc": "1.0.0",
98
"Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
109
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
11-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
1210
"Microsoft.AspNetCore.StaticFiles": "1.0.0",
13-
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.0",
14-
"Microsoft.EntityFrameworkCore.SqlServer.Design": {
15-
"version": "1.0.0",
16-
"type": "build"
17-
},
1811
"Microsoft.EntityFrameworkCore.Tools": {
1912
"version": "1.0.0-preview2-final",
2013
"type": "build"
2114
},
2215
"Microsoft.Extensions.Logging": "1.0.0",
2316
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
2417
"Microsoft.VisualStudio.Web.BrowserLink.Loader": "14.0.0",
25-
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
26-
"version": "1.0.0-preview2-final",
27-
"type": "build"
28-
},
29-
"Microsoft.VisualStudio.Web.CodeGenerators.Mvc": {
30-
"version": "1.0.0-preview2-final",
31-
"type": "build"
32-
},
33-
"Abp.AspNetCore": "0.11.0.2",
34-
"Abp.Castle.Log4Net": "0.11.0.2"
18+
"Abp.AspNetCore": "1.0.0",
19+
"Abp.Castle.Log4Net": "1.0.0",
20+
"Microsoft.AspNetCore.Mvc": "1.0.1",
21+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.1",
22+
"Microsoft.EntityFrameworkCore.SqlServer": "1.0.1",
23+
"Microsoft.EntityFrameworkCore.SqlServer.Design": "1.0.1",
24+
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": "1.0.0-preview2-update1",
25+
"Microsoft.VisualStudio.Web.CodeGenerators.Mvc": "1.0.0-preview2-update1"
3526
},
3627

3728
"tools": {
3829
"Microsoft.AspNetCore.Razor.Tools": "1.0.0-preview2-final",
3930
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final",
40-
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final",
41-
"Microsoft.VisualStudio.Web.CodeGeneration.Tools": {
42-
"version": "1.0.0-preview2-final",
43-
"imports": [
44-
"portable-net45+win8"
45-
]
46-
}
31+
"Microsoft.EntityFrameworkCore.Tools": "1.0.0-preview2-final"
4732
},
4833

4934
"frameworks": {

test/AbpCompanyName.AbpProjectName.Tests/project.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,17 +4,17 @@
44
"testRunner": "xunit",
55

66
"dependencies": {
7-
"NSubstitute": "1.10.0",
87
"AbpCompanyName.AbpProjectName.Application": "1.0.0.0-*",
98
"AbpCompanyName.AbpProjectName.EntityFrameworkCore": "1.0.0.0-*",
109
"dotnet-test-xunit": "2.2.0-preview2-build1029",
11-
"Microsoft.EntityFrameworkCore.InMemory": "1.0.0",
1210
"xunit": "2.2.0-beta2-build3300",
1311
"xunit.extensibility.execution": "2.2.0-beta2-build3300",
1412
"xunit.runner.visualstudio": "2.2.0-beta2-build1149",
1513
"Castle.Windsor.MsDependencyInjection": "1.1.0",
16-
"Abp.TestBase": "0.11.0.2",
17-
"Shouldly": "2.8.2"
14+
"Shouldly": "2.8.2",
15+
"Abp.TestBase": "1.0.0",
16+
"Microsoft.EntityFrameworkCore.InMemory": "1.0.1",
17+
"NSubstitute": "2.0.0-rc"
1818
},
1919

2020
"frameworks": {

test/AbpCompanyName.AbpProjectName.Web.Tests/project.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,9 @@
66
"dependencies": {
77
"AbpCompanyName.AbpProjectName.Tests": "1.0.0.0-*",
88
"AbpCompanyName.AbpProjectName.Web": "1.0.0-*",
9-
"Microsoft.AspNetCore.Mvc": "1.0.0",
10-
"AngleSharp": "0.9.7",
11-
"Abp.AspNetCore.TestBase": "0.11.0.2"
9+
"Abp.AspNetCore.TestBase": "1.0.0",
10+
"AngleSharp": "0.9.8.1",
11+
"Microsoft.AspNetCore.Mvc": "1.0.1"
1212
},
1313

1414
"frameworks": {

0 commit comments

Comments
 (0)