Skip to content

Commit 41a139f

Browse files
alirizaadiyahsialirizaadiyahsi
committed
Resolved #114 - Upgrade ABP to 3.3.0
1 parent 08f6e91 commit 41a139f

File tree

25 files changed

+471
-203
lines changed

25 files changed

+471
-203
lines changed

‎src/AbpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,17 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.2.4\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.2.4\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.3.2.4\lib\net461\Abp.Zero.dll</HintPath>
44+
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.Common.3.2.4\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
47+
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4949
</Reference>
5050
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
5151
<HintPath>..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Application/packages.config‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.2.4" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.2.4" targetFramework="net461" />
5-
<package id="Abp.Zero" version="3.2.4" targetFramework="net461" />
6-
<package id="Abp.Zero.Common" version="3.2.4" targetFramework="net461" />
3+
<package id="Abp" version="3.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
6+
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
77
<package id="AutoMapper" version="6.2.1" targetFramework="net461" />
88
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
99
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -35,14 +35,14 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.2.4\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.Zero, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.Zero.3.2.4\lib\net461\Abp.Zero.dll</HintPath>
41+
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Zero.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Zero.Common.3.2.4\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
44+
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
4646
</Reference>
4747
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
4848
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.Core/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.2.4" targetFramework="net461" />
4-
<package id="Abp.Zero" version="3.2.4" targetFramework="net461" />
5-
<package id="Abp.Zero.Common" version="3.2.4" targetFramework="net461" />
3+
<package id="Abp" version="3.3.0" targetFramework="net461" />
4+
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
5+
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
66
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
77
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
88
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.EntityFramework/AbpCompanyName.AbpProjectName.EntityFramework.csproj‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -35,23 +35,23 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.2.4\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.EntityFramework, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.EntityFramework.3.2.4\lib\net461\Abp.EntityFramework.dll</HintPath>
41+
<Reference Include="Abp.EntityFramework, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.EntityFramework.3.3.0\lib\net461\Abp.EntityFramework.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.EntityFramework.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.EntityFramework.Common.3.2.4\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
44+
<Reference Include="Abp.EntityFramework.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.EntityFramework.Common.3.3.0\lib\netstandard2.0\Abp.EntityFramework.Common.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Zero, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Zero.3.2.4\lib\net461\Abp.Zero.dll</HintPath>
47+
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Abp.Zero.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Zero.Common.3.2.4\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
50+
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Abp.Zero.EntityFramework, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.Zero.EntityFramework.3.2.4\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
53+
<Reference Include="Abp.Zero.EntityFramework, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Zero.EntityFramework.3.3.0\lib\net461\Abp.Zero.EntityFramework.dll</HintPath>
5555
</Reference>
5656
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
5757
<HintPath>..\packages\Castle.Core.4.2.1\lib\net45\Castle.Core.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.EntityFramework/packages.config‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.2.4" targetFramework="net461" />
4-
<package id="Abp.EntityFramework" version="3.2.4" targetFramework="net461" />
5-
<package id="Abp.EntityFramework.Common" version="3.2.4" targetFramework="net461" />
6-
<package id="Abp.Zero" version="3.2.4" targetFramework="net461" />
7-
<package id="Abp.Zero.Common" version="3.2.4" targetFramework="net461" />
8-
<package id="Abp.Zero.EntityFramework" version="3.2.4" targetFramework="net461" />
3+
<package id="Abp" version="3.3.0" targetFramework="net461" />
4+
<package id="Abp.EntityFramework" version="3.3.0" targetFramework="net461" />
5+
<package id="Abp.EntityFramework.Common" version="3.3.0" targetFramework="net461" />
6+
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
7+
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
8+
<package id="Abp.Zero.EntityFramework" version="3.3.0" targetFramework="net461" />
99
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
1010
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />
1111
<package id="Castle.Windsor" version="4.1.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.WebApi/AbpCompanyName.AbpProjectName.WebApi.csproj‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -35,26 +35,26 @@
3535
<WarningLevel>4</WarningLevel>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="Abp, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\Abp.3.2.4\lib\netstandard2.0\Abp.dll</HintPath>
38+
<Reference Include="Abp, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\Abp.3.3.0\lib\netstandard2.0\Abp.dll</HintPath>
4040
</Reference>
41-
<Reference Include="Abp.AutoMapper, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
42-
<HintPath>..\packages\Abp.AutoMapper.3.2.4\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
41+
<Reference Include="Abp.AutoMapper, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
42+
<HintPath>..\packages\Abp.AutoMapper.3.3.0\lib\netstandard2.0\Abp.AutoMapper.dll</HintPath>
4343
</Reference>
44-
<Reference Include="Abp.Web, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\Abp.Web.3.2.4\lib\net461\Abp.Web.dll</HintPath>
44+
<Reference Include="Abp.Web, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\Abp.Web.3.3.0\lib\net461\Abp.Web.dll</HintPath>
4646
</Reference>
47-
<Reference Include="Abp.Web.Api, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
48-
<HintPath>..\packages\Abp.Web.Api.3.2.4\lib\net461\Abp.Web.Api.dll</HintPath>
47+
<Reference Include="Abp.Web.Api, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
48+
<HintPath>..\packages\Abp.Web.Api.3.3.0\lib\net461\Abp.Web.Api.dll</HintPath>
4949
</Reference>
50-
<Reference Include="Abp.Web.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
51-
<HintPath>..\packages\Abp.Web.Common.3.2.4\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
50+
<Reference Include="Abp.Web.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
51+
<HintPath>..\packages\Abp.Web.Common.3.3.0\lib\netstandard2.0\Abp.Web.Common.dll</HintPath>
5252
</Reference>
53-
<Reference Include="Abp.Zero, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
54-
<HintPath>..\packages\Abp.Zero.3.2.4\lib\net461\Abp.Zero.dll</HintPath>
53+
<Reference Include="Abp.Zero, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
54+
<HintPath>..\packages\Abp.Zero.3.3.0\lib\net461\Abp.Zero.dll</HintPath>
5555
</Reference>
56-
<Reference Include="Abp.Zero.Common, Version=3.2.4.0, Culture=neutral, processorArchitecture=MSIL">
57-
<HintPath>..\packages\Abp.Zero.Common.3.2.4\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
56+
<Reference Include="Abp.Zero.Common, Version=3.3.0.0, Culture=neutral, processorArchitecture=MSIL">
57+
<HintPath>..\packages\Abp.Zero.Common.3.3.0\lib\netstandard2.0\Abp.Zero.Common.dll</HintPath>
5858
</Reference>
5959
<Reference Include="AutoMapper, Version=6.2.1.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">
6060
<HintPath>..\packages\AutoMapper.6.2.1\lib\net45\AutoMapper.dll</HintPath>

‎src/AbpCompanyName.AbpProjectName.WebApi/packages.config‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="Abp" version="3.2.4" targetFramework="net461" />
4-
<package id="Abp.AutoMapper" version="3.2.4" targetFramework="net461" />
5-
<package id="Abp.Web" version="3.2.4" targetFramework="net461" />
6-
<package id="Abp.Web.Api" version="3.2.4" targetFramework="net461" />
7-
<package id="Abp.Web.Common" version="3.2.4" targetFramework="net461" />
8-
<package id="Abp.Zero" version="3.2.4" targetFramework="net461" />
9-
<package id="Abp.Zero.Common" version="3.2.4" targetFramework="net461" />
3+
<package id="Abp" version="3.3.0" targetFramework="net461" />
4+
<package id="Abp.AutoMapper" version="3.3.0" targetFramework="net461" />
5+
<package id="Abp.Web" version="3.3.0" targetFramework="net461" />
6+
<package id="Abp.Web.Api" version="3.3.0" targetFramework="net461" />
7+
<package id="Abp.Web.Common" version="3.3.0" targetFramework="net461" />
8+
<package id="Abp.Zero" version="3.3.0" targetFramework="net461" />
9+
<package id="Abp.Zero.Common" version="3.3.0" targetFramework="net461" />
1010
<package id="AutoMapper" version="6.2.1" targetFramework="net461" />
1111
<package id="Castle.Core" version="4.2.1" targetFramework="net461" />
1212
<package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net461" />

‎src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/abp.js‎

Lines changed: 22 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,9 +55,9 @@
5555
/* SESSION */
5656

5757
abp.session = abp.session ||
58-
{
59-
multiTenancySide: abp.multiTenancy.sides.HOST
60-
};
58+
{
59+
multiTenancySide: abp.multiTenancy.sides.HOST
60+
};
6161

6262
/* LOCALIZATION ***********************************************/
6363
//Implements Localization API that simplifies usage of localization scripts generated by Abp.
@@ -775,6 +775,17 @@
775775
document.cookie = cookieValue;
776776
}
777777

778+
/**
779+
* Gets the domain of given url
780+
* @param {string} url
781+
* @returns {string}
782+
*/
783+
abp.utils.getDomain = function (url) {
784+
var domainRegex = /(https?:){0,1}\/\/((?:[\w\d-]+\.)+[\w\d]{2,})/i;
785+
var matches = domainRegex.exec(url);
786+
return (matches && matches[2]) ? matches[2] : '';
787+
}
788+
778789
/* TIMING *****************************************/
779790
abp.timing = abp.timing || {};
780791

@@ -906,4 +917,12 @@
906917
return abp.utils.getCookieValue(abp.security.antiForgery.tokenCookieName);
907918
};
908919

920+
abp.security.antiForgery.shouldSendToken = function (settings) {
921+
if (settings.crossDomain === undefined || settings.crossDomain === null) {
922+
return abp.utils.getDomain(location.href) === abp.utils.getDomain(settings.url);
923+
}
924+
925+
return !settings.crossDomain;
926+
};
927+
909928
})(jQuery);

‎src/AbpCompanyName.AbpProjectName.WebMpa/Abp/Framework/scripts/libs/abp.jquery.js‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,10 @@
195195
return;
196196
}
197197

198+
if (!abp.security.antiForgery.shouldSendToken(settings)) {
199+
return;
200+
}
201+
198202
if (!settings.headers || settings.headers[abp.security.antiForgery.tokenHeaderName] === undefined) {
199203
request.setRequestHeader(abp.security.antiForgery.tokenHeaderName, token);
200204
}

0 commit comments

Comments
 (0)