Skip to content

Commit

Permalink
Upgraded Abp nuget packages.
Browse files Browse the repository at this point in the history
  • Loading branch information
hikalkan committed Jan 15, 2016
1 parent 0710007 commit d0023e7
Show file tree
Hide file tree
Showing 18 changed files with 124 additions and 94 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
4 changes: 2 additions & 2 deletions src/AbpCompanyName.AbpProjectName.Application/packages.config
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/AbpCompanyName.AbpProjectName.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
<package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,12 +33,12 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.EntityFramework, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll</HintPath>
<Reference Include="Abp.EntityFramework, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.EntityFramework" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.EntityFramework" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="Abp.Zero.EntityFramework" version="0.7.7.0" targetFramework="net452" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,16 +33,16 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.FluentMigrator, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.FluentMigrator.0.7.7.2\lib\net452\Abp.FluentMigrator.dll</HintPath>
<Reference Include="Abp.FluentMigrator, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.FluentMigrator.0.7.8.0\lib\net452\Abp.FluentMigrator.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.NHibernate, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.NHibernate.0.7.7.2\lib\net452\Abp.NHibernate.dll</HintPath>
<Reference Include="Abp.NHibernate, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.NHibernate.0.7.8.0\lib\net452\Abp.NHibernate.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
6 changes: 3 additions & 3 deletions src/AbpCompanyName.AbpProjectName.NHibernate/packages.config
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.FluentMigrator" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.NHibernate" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.FluentMigrator" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.NHibernate" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="Abp.Zero.NHibernate" version="0.7.7.0" targetFramework="net452" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -33,20 +33,20 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll</HintPath>
<Reference Include="Abp.Web, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Api, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll</HintPath>
<Reference Include="Abp.Web.Api, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
8 changes: 4 additions & 4 deletions src/AbpCompanyName.AbpProjectName.WebApi/packages.config
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web.Api" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web.Api" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="AutoMapper" version="4.1.1" targetFramework="net451" />
<package id="Castle.Core" version="3.3.3" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,31 +70,46 @@

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;
}
}

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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,28 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.EntityFramework, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll</HintPath>
<Reference Include="Abp.EntityFramework, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll</HintPath>
<Reference Include="Abp.Web, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Api, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll</HintPath>
<Reference Include="Abp.Web.Api, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Mvc, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Mvc.0.7.7.2\lib\net452\Abp.Web.Mvc.dll</HintPath>
<Reference Include="Abp.Web.Mvc, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Mvc.0.7.8.0\lib\net452\Abp.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
14 changes: 7 additions & 7 deletions src/AbpCompanyName.AbpProjectName.WebMpa/packages.config
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Abp" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.EntityFramework" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web.Api" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web.Mvc" version="0.7.7.2" targetFramework="net452" />
<package id="Abp.Web.Resources" version="0.7.7.2" targetFramework="net452" />
<package id="Abp" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.AutoMapper" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.EntityFramework" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web.Api" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web.Mvc" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Web.Resources" version="0.7.8.0" targetFramework="net452" />
<package id="Abp.Zero" version="0.7.7.0" targetFramework="net452" />
<package id="Abp.Zero.EntityFramework" version="0.7.7.0" targetFramework="net452" />
<package id="Antlr" version="3.5.0.2" targetFramework="net451" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -70,31 +70,46 @@

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;
}
}

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;
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,28 +42,28 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="Abp, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.7.2\lib\net452\Abp.dll</HintPath>
<Reference Include="Abp, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.0.7.8.0\lib\net452\Abp.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.AutoMapper, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.7.2\lib\net452\Abp.AutoMapper.dll</HintPath>
<Reference Include="Abp.AutoMapper, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.AutoMapper.0.7.8.0\lib\net452\Abp.AutoMapper.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.EntityFramework, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.7.2\lib\net452\Abp.EntityFramework.dll</HintPath>
<Reference Include="Abp.EntityFramework, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.EntityFramework.0.7.8.0\lib\net452\Abp.EntityFramework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.7.2\lib\net452\Abp.Web.dll</HintPath>
<Reference Include="Abp.Web, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.0.7.8.0\lib\net452\Abp.Web.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Api, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.7.2\lib\net452\Abp.Web.Api.dll</HintPath>
<Reference Include="Abp.Web.Api, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Api.0.7.8.0\lib\net452\Abp.Web.Api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Web.Mvc, Version=0.7.7.2, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Mvc.0.7.7.2\lib\net452\Abp.Web.Mvc.dll</HintPath>
<Reference Include="Abp.Web.Mvc, Version=0.7.8.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\Abp.Web.Mvc.0.7.8.0\lib\net452\Abp.Web.Mvc.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Abp.Zero, Version=0.7.7.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
Loading

0 comments on commit d0023e7

Please sign in to comment.