From d0023e7b9f6e69ee0885e339235e82b1a90f8d44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sat, 16 Jan 2016 00:57:37 +0200 Subject: [PATCH] Upgraded Abp nuget packages. --- ...panyName.AbpProjectName.Application.csproj | 8 +++---- .../packages.config | 4 ++-- .../AbpCompanyName.AbpProjectName.Core.csproj | 4 ++-- .../packages.config | 2 +- ...Name.AbpProjectName.EntityFramework.csproj | 8 +++---- .../packages.config | 4 ++-- ...mpanyName.AbpProjectName.NHibernate.csproj | 12 +++++----- .../packages.config | 6 ++--- ...bpCompanyName.AbpProjectName.WebApi.csproj | 16 ++++++------- .../packages.config | 8 +++---- .../Abp/Framework/scripts/abp.js | 23 ++++++++++++++---- ...bpCompanyName.AbpProjectName.WebMpa.csproj | 24 +++++++++---------- .../packages.config | 14 +++++------ .../Abp/Framework/scripts/abp.js | 23 ++++++++++++++---- ...nyName.AbpProjectName.WebSpaAngular.csproj | 24 +++++++++---------- .../packages.config | 14 +++++------ ...AbpCompanyName.AbpProjectName.Tests.csproj | 16 ++++++------- .../packages.config | 8 +++---- 18 files changed, 124 insertions(+), 94 deletions(-) diff --git a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj index 81ab17ca..2fcf5b6d 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj +++ b/src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj @@ -33,12 +33,12 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll + + ..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll True diff --git a/src/AbpCompanyName.AbpProjectName.Application/packages.config b/src/AbpCompanyName.AbpProjectName.Application/packages.config index ff4198c9..dbbbe75a 100644 --- a/src/AbpCompanyName.AbpProjectName.Application/packages.config +++ b/src/AbpCompanyName.AbpProjectName.Application/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj index 84e1d286..78d19dd6 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj +++ b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj @@ -33,8 +33,8 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True diff --git a/src/AbpCompanyName.AbpProjectName.Core/packages.config b/src/AbpCompanyName.AbpProjectName.Core/packages.config index 7fcbe0d6..0e583656 100644 --- a/src/AbpCompanyName.AbpProjectName.Core/packages.config +++ b/src/AbpCompanyName.AbpProjectName.Core/packages.config @@ -1,6 +1,6 @@  - + diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj b/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj index c95d5000..cfeb7890 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj +++ b/src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj @@ -33,12 +33,12 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll + + ..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll True diff --git a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config index 51c03346..4743d7f2 100644 --- a/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config +++ b/src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config @@ -1,7 +1,7 @@  - - + + diff --git a/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj b/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj index 7e8c5296..5362186c 100644 --- a/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj +++ b/src/AbpCompanyName.AbpProjectName.NHibernate/AbpCompanyName.AbpProjectName.NHibernate.csproj @@ -33,16 +33,16 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.FluentMigrator.0.7.7.2\lib\net452\Abp.FluentMigrator.dll + + ..\packages\Abp.FluentMigrator.0.7.8.0\lib\net452\Abp.FluentMigrator.dll True - - ..\packages\Abp.NHibernate.0.7.7.2\lib\net452\Abp.NHibernate.dll + + ..\packages\Abp.NHibernate.0.7.8.0\lib\net452\Abp.NHibernate.dll True diff --git a/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config b/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config index f21887dd..267bdfb5 100644 --- a/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config +++ b/src/AbpCompanyName.AbpProjectName.NHibernate/packages.config @@ -1,8 +1,8 @@  - - - + + + diff --git a/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj b/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj index d56018b6..8bfd7bb1 100644 --- a/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj +++ b/src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj @@ -33,20 +33,20 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll + + ..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll True - - ..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll + + ..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll True - - ..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll + + ..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll True diff --git a/src/AbpCompanyName.AbpProjectName.WebApi/packages.config b/src/AbpCompanyName.AbpProjectName.WebApi/packages.config index ba11a2ce..abb85edb 100644 --- a/src/AbpCompanyName.AbpProjectName.WebApi/packages.config +++ b/src/AbpCompanyName.AbpProjectName.WebApi/packages.config @@ -1,9 +1,9 @@  - - - - + + + + diff --git a/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js b/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js index 64576a1c..a3774511 100644 --- a/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js +++ b/src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js @@ -70,17 +70,32 @@ abp.auth.grantedPermissions = abp.auth.grantedPermissions || {}; + //Deprecated. Use abp.auth.isGranted instead. abp.auth.hasPermission = function (permissionName) { - return abp.auth.allPermissions[permissionName] != undefined && abp.auth.grantedPermissions[permissionName] != undefined; + return abp.auth.isGranted.apply(this, arguments); }; + //Deprecated. Use abp.auth.isAnyGranted instead. abp.auth.hasAnyOfPermissions = function () { + return abp.auth.isAnyGranted.apply(this, arguments); + }; + + //Deprecated. Use abp.auth.areAllGranted instead. + abp.auth.hasAllOfPermissions = function () { + return abp.auth.areAllGranted.apply(this, arguments); + }; + + abp.auth.isGranted = function (permissionName) { + return abp.auth.allPermissions[permissionName] != undefined && abp.auth.grantedPermissions[permissionName] != undefined; + }; + + abp.auth.isAnyGranted = function () { if (!arguments || arguments.length <= 0) { return true; } for (var i = 0; i < arguments.length; i++) { - if (abp.auth.hasPermission(arguments[i])) { + if (abp.auth.isGranted(arguments[i])) { return true; } } @@ -88,13 +103,13 @@ return false; }; - abp.auth.hasAllOfPermissions = function () { + abp.auth.areAllGranted = function () { if (!arguments || arguments.length <= 0) { return true; } for (var i = 0; i < arguments.length; i++) { - if (!abp.auth.hasPermission(arguments[i])) { + if (!abp.auth.isGranted(arguments[i])) { return false; } } diff --git a/src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj b/src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj index 70df6086..74b4f151 100644 --- a/src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj +++ b/src/AbpCompanyName.AbpProjectName.WebMpa/AbpCompanyName.AbpProjectName.WebMpa.csproj @@ -42,28 +42,28 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll + + ..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll True - - ..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll + + ..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll True - - ..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll + + ..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll True - - ..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll + + ..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll True - - ..\packages\Abp.Web.Mvc.0.7.7.2\lib\net452\Abp.Web.Mvc.dll + + ..\packages\Abp.Web.Mvc.0.7.8.0\lib\net452\Abp.Web.Mvc.dll True diff --git a/src/AbpCompanyName.AbpProjectName.WebMpa/packages.config b/src/AbpCompanyName.AbpProjectName.WebMpa/packages.config index 944e44a9..00871873 100644 --- a/src/AbpCompanyName.AbpProjectName.WebMpa/packages.config +++ b/src/AbpCompanyName.AbpProjectName.WebMpa/packages.config @@ -1,12 +1,12 @@  - - - - - - - + + + + + + + diff --git a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/Abp/Framework/scripts/abp.js b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/Abp/Framework/scripts/abp.js index 64576a1c..a3774511 100644 --- a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/Abp/Framework/scripts/abp.js +++ b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/Abp/Framework/scripts/abp.js @@ -70,17 +70,32 @@ abp.auth.grantedPermissions = abp.auth.grantedPermissions || {}; + //Deprecated. Use abp.auth.isGranted instead. abp.auth.hasPermission = function (permissionName) { - return abp.auth.allPermissions[permissionName] != undefined && abp.auth.grantedPermissions[permissionName] != undefined; + return abp.auth.isGranted.apply(this, arguments); }; + //Deprecated. Use abp.auth.isAnyGranted instead. abp.auth.hasAnyOfPermissions = function () { + return abp.auth.isAnyGranted.apply(this, arguments); + }; + + //Deprecated. Use abp.auth.areAllGranted instead. + abp.auth.hasAllOfPermissions = function () { + return abp.auth.areAllGranted.apply(this, arguments); + }; + + abp.auth.isGranted = function (permissionName) { + return abp.auth.allPermissions[permissionName] != undefined && abp.auth.grantedPermissions[permissionName] != undefined; + }; + + abp.auth.isAnyGranted = function () { if (!arguments || arguments.length <= 0) { return true; } for (var i = 0; i < arguments.length; i++) { - if (abp.auth.hasPermission(arguments[i])) { + if (abp.auth.isGranted(arguments[i])) { return true; } } @@ -88,13 +103,13 @@ return false; }; - abp.auth.hasAllOfPermissions = function () { + abp.auth.areAllGranted = function () { if (!arguments || arguments.length <= 0) { return true; } for (var i = 0; i < arguments.length; i++) { - if (!abp.auth.hasPermission(arguments[i])) { + if (!abp.auth.isGranted(arguments[i])) { return false; } } diff --git a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj index 7076308b..e78dde05 100644 --- a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj +++ b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/AbpCompanyName.AbpProjectName.WebSpaAngular.csproj @@ -42,28 +42,28 @@ 4 - - ..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll + + ..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll True - - ..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll + + ..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll True - - ..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll + + ..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll True - - ..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll + + ..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll True - - ..\packages\Abp.Web.Mvc.0.7.7.2\lib\net452\Abp.Web.Mvc.dll + + ..\packages\Abp.Web.Mvc.0.7.8.0\lib\net452\Abp.Web.Mvc.dll True diff --git a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config index 682fe98b..726c74fb 100644 --- a/src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config +++ b/src/AbpCompanyName.AbpProjectName.WebSpaAngular/packages.config @@ -1,12 +1,12 @@  - - - - - - - + + + + + + + diff --git a/src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj index a88b16ab..d76637e4 100644 --- a/src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj +++ b/src/Tests/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj @@ -35,20 +35,20 @@ 4 - - ..\..\packages\Abp.0.7.7.2\lib\net452\Abp.dll + + ..\..\packages\Abp.0.7.8.0\lib\net452\Abp.dll True - - ..\..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll + + ..\..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll True - - ..\..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll + + ..\..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll True - - ..\..\packages\Abp.TestBase.0.7.7.2\lib\net452\Abp.TestBase.dll + + ..\..\packages\Abp.TestBase.0.7.8.0\lib\net452\Abp.TestBase.dll True diff --git a/src/Tests/AbpCompanyName.AbpProjectName.Tests/packages.config b/src/Tests/AbpCompanyName.AbpProjectName.Tests/packages.config index f96be214..19e17169 100644 --- a/src/Tests/AbpCompanyName.AbpProjectName.Tests/packages.config +++ b/src/Tests/AbpCompanyName.AbpProjectName.Tests/packages.config @@ -1,9 +1,9 @@  - - - - + + + +