Skip to content

Commit 345af98

Browse files
committed
Upgraded to ABP v2.1.1.
1 parent 96c8b8d commit 345af98

File tree

20 files changed

+41
-38
lines changed

20 files changed

+41
-38
lines changed

angular/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131
"@types/node": "^6.0.42",
3232
"@types/signalr": "^2.2.33",
3333
"@types/toastr": "^2.1.33",
34-
"abp-ng2-module": "^1.0.0",
35-
"abp-web-resources": "^1.3.0",
34+
"abp-ng2-module": "^1.1.1",
35+
"abp-web-resources": "^2.1.2",
3636
"animate.css": "^3.5.2",
3737
"block-ui": "^2.70.1",
3838
"bootstrap": "^3.3.7",

angular/src/AppPreBootstrap.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import * as moment from 'moment';
22
import { AppConsts } from '@shared/AppConsts';
3-
import { UrlHelper } from './shared/helpers/UrlHelper';
4-
import * as _ from 'lodash';
53
import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
64
import { Type, CompilerOptions, NgModuleRef } from '@angular/core';
7-
import { UtilsService } from '@abp/utils/utils.service';
85

96
export class AppPreBootstrap {
107

@@ -51,7 +48,7 @@ export class AppPreBootstrap {
5148
method: 'GET',
5249
headers: {
5350
Authorization: 'Bearer ' + abp.auth.getToken(),
54-
'Accept-Language': abp.utils.getCookieValue("Abp.Localization.CultureName"),
51+
'.AspNetCore.Culture': abp.utils.getCookieValue("Abp.Localization.CultureName"),
5552
'Abp.TenantId': abp.multiTenancy.getTenantIdCookie()
5653
}
5754
}).done(result => {

angular/yarn.lock

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -201,9 +201,9 @@ abbrev@~1.0.9:
201201
version "1.0.9"
202202
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
203203

204-
abp-ng2-module@^1.0.0:
205-
version "1.0.0"
206-
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.0.0.tgz#704173e14a601b551cae797586f0f370d6d3b672"
204+
abp-ng2-module@^1.1.1:
205+
version "1.1.1"
206+
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.1.1.tgz#b47847a24e2dd932e8fe0b119610bb866fd86ef0"
207207
dependencies:
208208
"@angular/core" "^4.0.0"
209209
"@angular/http" "^4.0.0"
@@ -213,6 +213,10 @@ abp-web-resources@^1.3.0:
213213
version "1.3.0"
214214
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-1.3.0.tgz#1021111913541e4f26874400bd9c1a6bb716e49b"
215215

216+
abp-web-resources@^2.1.2:
217+
version "2.1.2"
218+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.1.2.tgz#5c329eb0c0d63662f69096aba36d3bb2de76c631"
219+
216220
[email protected], accepts@~1.3.3:
217221
version "1.3.3"
218222
resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca"

aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="2.1.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="2.1.1" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.1" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />

aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.2" />
3636
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.2" />
3737
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
38-
<PackageReference Include="Abp.AspNetCore" Version="2.1.0" />
39-
<PackageReference Include="Abp.ZeroCore" Version="2.1.0" />
38+
<PackageReference Include="Abp.AspNetCore" Version="2.1.1" />
39+
<PackageReference Include="Abp.ZeroCore" Version="2.1.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4343
<Reference Include="System" />
4444
<Reference Include="Microsoft.CSharp" />
4545

46-
<PackageReference Include="Abp.Web.SignalR" Version="2.1.0" />
47-
<PackageReference Include="Abp.Owin" Version="2.1.0" />
46+
<PackageReference Include="Abp.Web.SignalR" Version="2.1.1" />
47+
<PackageReference Include="Abp.Owin" Version="2.1.1" />
4848
</ItemGroup>
4949

5050
</Project>

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@
5454
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
5555
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
5656
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
57-
<PackageReference Include="Abp.HangFire" Version="2.1.0" />
58-
<PackageReference Include="Abp.RedisCache" Version="2.1.0" />
59-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
57+
<PackageReference Include="Abp.HangFire" Version="2.1.1" />
58+
<PackageReference Include="Abp.RedisCache" Version="2.1.1" />
59+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
6060
</ItemGroup>
6161

6262
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/Views/Shared/Components/AccountLanguages/AccountLanguagesViewComponent.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ public Task<IViewComponentResult> InvokeAsync()
2020
{
2121
CurrentLanguage = _languageManager.CurrentLanguage,
2222
Languages = _languageManager.GetLanguages()
23-
//.Where(l => !l.IsDisabled) //TODO: Will be supported after Abp.ZeroCore 2.1.
23+
.Where(l => !l.IsDisabled)
2424
.ToList(),
2525
CurrentUrl = Request.Path
2626
};

aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
"blockUI": "jquery.blockUI#*",
1616
"spin.js": "^2.3.2",
1717
"signalr": "^2.2.1",
18-
"abp-web-resources": "^1.2.1",
1918
"push.js": "v0.0.12",
2019
"Waves": "waves#^0.7.5",
2120
"animate.css": "^3.5.2",
@@ -26,6 +25,7 @@
2625
"morris.js": "morrisjs#^0.5.1",
2726
"chart.js": "chartjs#^2.6.0",
2827
"jquery-sparkline": "^2.1.3",
29-
"Flot": "jquery-flot#^0.8.3"
28+
"Flot": "jquery-flot#^0.8.3",
29+
"abp-web-resources": "^2.1.2"
3030
}
3131
}

0 commit comments

Comments
 (0)