diff --git a/angular/package.json b/angular/package.json index a35c75927..9e57a816d 100644 --- a/angular/package.json +++ b/angular/package.json @@ -31,8 +31,8 @@ "@types/moment-timezone": "^0.2.34", "@types/signalr": "^2.2.33", "@types/toastr": "^2.1.33", - "abp-ng2-module": "^1.2.0", - "abp-web-resources": "^2.2.1", + "abp-ng2-module": "^1.2.4", + "abp-web-resources": "^3.1.0", "animate.css": "^3.5.2", "block-ui": "^2.70.1", "bootstrap": "^3.3.7", diff --git a/angular/yarn.lock b/angular/yarn.lock index 8cc64fa1d..d4a8a38e5 100644 --- a/angular/yarn.lock +++ b/angular/yarn.lock @@ -253,9 +253,9 @@ abbrev@~1.0.9: version "1.0.9" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135" -abp-ng2-module@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.0.tgz#9f4c70453e18d777bdffe3d6510522110a4e3587" +abp-ng2-module@^1.2.4: + version "1.2.4" + resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.4.tgz#74fa5f082f74d6cfbc39003f73da41869f33a567" dependencies: "@angular/core" "^4.0.0" "@angular/http" "^4.0.0" @@ -265,6 +265,10 @@ abp-web-resources@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.2.1.tgz#0877e7743a99b2de8fca8d4476517b48db2bda87" +abp-web-resources@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-3.1.0.tgz#3df4f89e4e8eff62059eb7399db021fb16331230" + accepts@1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/accepts/-/accepts-1.3.3.tgz#c3ca7434938648c3e0d9c1e328dd68b622c284ca" diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index 48c6ab7bc..0df8ee6fd 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj index d5d2c1f4f..6e4abd7a8 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj @@ -18,7 +18,7 @@ - + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj index 589081d45..c53592793 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj @@ -32,8 +32,8 @@ - - + + @@ -41,8 +41,8 @@ - - + + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj index 30d092c10..eff19589a 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj @@ -45,7 +45,7 @@ - + diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj index e0073c8f3..1c1754f42 100644 --- a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj +++ b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj @@ -51,9 +51,9 @@ - - - + + + diff --git a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj index f3223b64d..4c8a8a9e8 100644 --- a/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj +++ b/aspnet-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj @@ -24,7 +24,7 @@ - +