Upgraded to ABP v2.1.1.

aspnetboilerplate · Jun 8, 2017 · 345af98 · 345af98
1 parent 96c8b8d
commit 345af98
Show file tree

Hide file tree

Showing 20 changed files with 41 additions and 38 deletions.
diff --git a/angular/package.json b/angular/package.json
@@ -31,8 +31,8 @@
     "@types/node": "^6.0.42",
     "@types/signalr": "^2.2.33",
     "@types/toastr": "^2.1.33",
-    "abp-ng2-module": "^1.0.0",
-    "abp-web-resources": "^1.3.0",
+    "abp-ng2-module": "^1.1.1",
+    "abp-web-resources": "^2.1.2",
     "animate.css": "^3.5.2",
     "block-ui": "^2.70.1",
     "bootstrap": "^3.3.7",

diff --git a/angular/src/AppPreBootstrap.ts b/angular/src/AppPreBootstrap.ts
@@ -1,10 +1,7 @@
 import * as moment from 'moment';
 import { AppConsts } from '@shared/AppConsts';
-import { UrlHelper } from './shared/helpers/UrlHelper';
-import * as _ from 'lodash';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 import { Type, CompilerOptions, NgModuleRef } from '@angular/core';
-import { UtilsService } from '@abp/utils/utils.service';
 
 export class AppPreBootstrap {
 
@@ -51,7 +48,7 @@ export class AppPreBootstrap {
             method: 'GET',
             headers: {
                 Authorization: 'Bearer ' + abp.auth.getToken(),
-                'Accept-Language': abp.utils.getCookieValue("Abp.Localization.CultureName"),
+                '.AspNetCore.Culture': abp.utils.getCookieValue("Abp.Localization.CultureName"),
                 'Abp.TenantId': abp.multiTenancy.getTenantIdCookie()
             }
         }).done(result => {

diff --git a/angular/yarn.lock b/angular/yarn.lock
@@ -201,9 +201,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.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.0.0.tgz#704173e14a601b551cae797586f0f370d6d3b672"
+abp-ng2-module@^1.1.1:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.1.1.tgz#b47847a24e2dd932e8fe0b119610bb866fd86ef0"
   dependencies:
     "@angular/core" "^4.0.0"
     "@angular/http" "^4.0.0"
@@ -213,6 +213,10 @@ abp-web-resources@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-1.3.0.tgz#1021111913541e4f26874400bd9c1a6bb716e49b"
 
+abp-web-resources@^2.1.2:
+  version "2.1.2"
+  resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.1.2.tgz#5c329eb0c0d63662f69096aba36d3bb2de76c631"
+
 [email protected], 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
@@ -18,8 +18,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.AutoMapper" Version="2.1.0" />
-    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.0" />
+    <PackageReference Include="Abp.AutoMapper" Version="2.1.1" />
+    <PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.1" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />

diff --git a/.../src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj b/.../src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/.../src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj b/.../src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj
@@ -35,16 +35,16 @@
     <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.2" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
-    <PackageReference Include="Abp.AspNetCore" Version="2.1.0" />
-    <PackageReference Include="Abp.ZeroCore" Version="2.1.0" />
+    <PackageReference Include="Abp.AspNetCore" Version="2.1.1" />
+    <PackageReference Include="Abp.ZeroCore" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
 
-    <PackageReference Include="Abp.Web.SignalR" Version="2.1.0" />
-    <PackageReference Include="Abp.Owin" Version="2.1.0" />
+    <PackageReference Include="Abp.Web.SignalR" Version="2.1.1" />
+    <PackageReference Include="Abp.Owin" Version="2.1.1" />
   </ItemGroup>
 
 </Project>
diff --git a/.../src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj b/.../src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj
@@ -45,7 +45,7 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/...re/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj b/...re/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj
@@ -54,9 +54,9 @@
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
     <PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
-    <PackageReference Include="Abp.HangFire" Version="2.1.0" />
-    <PackageReference Include="Abp.RedisCache" Version="2.1.0" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.0" />
+    <PackageReference Include="Abp.HangFire" Version="2.1.1" />
+    <PackageReference Include="Abp.RedisCache" Version="2.1.1" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="2.1.1" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/...ectName.Web.Mvc/Views/Shared/Components/AccountLanguages/AccountLanguagesViewComponent.cs b/...ectName.Web.Mvc/Views/Shared/Components/AccountLanguages/AccountLanguagesViewComponent.cs
@@ -20,7 +20,7 @@ public Task<IViewComponentResult> InvokeAsync()
             {
                 CurrentLanguage = _languageManager.CurrentLanguage,
                 Languages = _languageManager.GetLanguages()
-                //.Where(l => !l.IsDisabled) //TODO: Will be supported after Abp.ZeroCore 2.1.
+                .Where(l => !l.IsDisabled)
                 .ToList(),
                 CurrentUrl = Request.Path
             };

diff --git a/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json b/aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json
@@ -15,7 +15,6 @@
     "blockUI": "jquery.blockUI#*",
     "spin.js": "^2.3.2",
     "signalr": "^2.2.1",
-    "abp-web-resources": "^1.2.1",
     "push.js": "v0.0.12",
     "Waves": "waves#^0.7.5",
     "animate.css": "^3.5.2",
@@ -26,6 +25,7 @@
     "morris.js": "morrisjs#^0.5.1",
     "chart.js": "chartjs#^2.6.0",
     "jquery-sparkline": "^2.1.3",
-    "Flot": "jquery-flot#^0.8.3"
+    "Flot": "jquery-flot#^0.8.3",
+    "abp-web-resources": "^2.1.2"
   }
 }
diff --git a/...-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json b/...-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "1.2.1",
+  "version": "2.1.2",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,14 +25,14 @@
     ".nuget",
     "packages"
   ],
-  "_release": "1.2.1",
+  "_release": "2.1.2",
   "_resolution": {
     "type": "version",
-    "tag": "v1.2.1",
-    "commit": "97439f0677644983851a77560d79627fb3453a55"
+    "tag": "v2.1.2",
+    "commit": "912597876c6f853b8e969959ba7f7401e61506a3"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
-  "_target": "^1.2.1",
+  "_target": "^2.1.2",
   "_originalSource": "abp-web-resources",
   "_direct": true
 }
diff --git a/...yName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts b/...yName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/abp.d.ts
@@ -54,6 +54,8 @@
 
             isDefault: boolean;
 
+            isDisabled: boolean;
+
         }
 
         interface ILocalizationSource {

diff --git a/...ectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.d.ts b/...ectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.signalr.d.ts
@@ -4,7 +4,7 @@
 
         let autoConnect: boolean;
 
-        function connect();
+        function connect(): any;
 
         namespace hubs {
 

diff --git a/...tName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js b/...tName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js
@@ -45,7 +45,7 @@
 
         var opts = $.extend(
             {},
-            abp.libs.sweetAlert.config.default,
+            abp.libs.sweetAlert.config['default'],
             abp.libs.sweetAlert.config[type],
             {
                 title: title,
@@ -89,7 +89,7 @@
 
         var opts = $.extend(
             {},
-            abp.libs.sweetAlert.config.default,
+            abp.libs.sweetAlert.config['default'],
             abp.libs.sweetAlert.config.confirm,
             userOpts
         );
@@ -108,4 +108,4 @@
         abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
     });
 
-})(jQuery);
+})(jQuery);
diff --git a/...t-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/bower.json b/...t-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "v1.2.1",
+  "version": "v2.1.2",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],

diff --git a/...core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/package.json b/...core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abp-web-resources",
-  "version": "1.2.1",
+  "version": "2.1.2",
   "description": "ASP.NET Boilerplate web resources",
   "main": "Abp/Framework/scripts/abp.js",
   "dependencies": {},

diff --git a/...e/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/packages.config b/...e/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp.Web.Resources" version="1.2.0.0" targetFramework="net452" />
+  <package id="Abp.Web.Resources" version="2.1.2" targetFramework="net46" />
 </packages>
diff --git a/...nyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/account-layout.min.js b/...nyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/account-layout.min.js
diff --git a/...anyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/shared-layout.min.js b/...anyName.AbpProjectName.Web.Mvc/wwwroot/view-resources/Views/_Bundles/shared-layout.min.js
diff --git a/...-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/...-core/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -24,7 +24,7 @@
     <PackageReference Include="xunit" Version="2.2.0" />
     <PackageReference Include="xunit.extensibility.execution" Version="2.2.0" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.2.0" />
-    <PackageReference Include="Abp.TestBase" Version="2.1.0" />
+    <PackageReference Include="Abp.TestBase" Version="2.1.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.1.2" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -54,6 +54,8 @@ @@
                 isDefault: boolean;
+                isDisabled: boolean;
             }
             interface ILocalizationSource {
@@ Expand Down @@