Skip to content

Commit 82a1da9

Browse files
committed
resolved #198: Upgraded ABP to v3.5 including abp-web-resources npm package
1 parent bcdaec2 commit 82a1da9

File tree

15 files changed

+1410
-31
lines changed

15 files changed

+1410
-31
lines changed

angular/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"@types/signalr": "^2.2.33",
3434
"@types/toastr": "^2.1.33",
3535
"abp-ng2-module": "^2.0.0",
36-
"abp-web-resources": "^3.3.0",
36+
"abp-web-resources": "^3.5.0",
3737
"animate.css": "^3.5.2",
3838
"block-ui": "^2.70.1",
3939
"bootstrap": "^3.3.7",

angular/src/shared/helpers/SignalRAspNetCoreHelper.ts

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,9 @@ export class SignalRAspNetCoreHelper {
1111
connect: undefined,
1212
hubs: undefined,
1313
qs: AppConsts.authorization.encrptedAuthTokenName + "=" + encodeURIComponent(encryptedAuthToken),
14-
url: AppConsts.remoteServiceBaseUrl + '/signalr'
14+
remoteServiceBaseUrl: AppConsts.remoteServiceBaseUrl,
15+
startConnection: undefined,
16+
url: '/signalr'
1517
};
1618

1719
jQuery.getScript(AppConsts.appBaseUrl + '/assets/abp/abp.signalr-client.js');

angular/yarn.lock

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -267,10 +267,14 @@ abp-ng2-module@^2.0.0:
267267
"@angular/http" "^5.0.0"
268268
abp-web-resources "^3.1.0"
269269

270-
abp-web-resources@^3.1.0, abp-web-resources@^3.3.0:
270+
abp-web-resources@^3.1.0:
271271
version "3.3.0"
272272
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.3.0.tgz#ff09008326f90b6e1734b7c23cd9dd5d3f89ad81"
273273

274+
abp-web-resources@^3.5.0:
275+
version "3.5.0"
276+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.5.0.tgz#bfad1eb60597e37ebfdd025bfb7d843bdabf17f8"
277+
274278
275279
version "1.3.3"
276280
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="3.4.0" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.4.0" />
21+
<PackageReference Include="Abp.AutoMapper" Version="3.5.0" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="3.5.0" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.0.0" />

0 commit comments

Comments
 (0)