Skip to content

Commit f68f708

Browse files
hikalkanhikalkan
authored
Merge pull request #91 from aspnetboilerplate/issue-90
fixed #90: upgraded to ABP 2.2.1
2 parents e5a9277 + a4ae7c9 commit f68f708

File tree

14 files changed

+39
-49
lines changed

14 files changed

+39
-49
lines changed

‎angular/package.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@
3232
"@types/node": "^6.0.42",
3333
"@types/signalr": "^2.2.33",
3434
"@types/toastr": "^2.1.33",
35-
"abp-ng2-module": "^1.1.1",
36-
"abp-web-resources": "^2.1.2",
35+
"abp-ng2-module": "^1.2.0",
36+
"abp-web-resources": "^2.2.1",
3737
"animate.css": "^3.5.2",
3838
"block-ui": "^2.70.1",
3939
"bootstrap": "^3.3.7",

‎angular/yarn.lock‎

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -207,21 +207,17 @@ abbrev@~1.0.9:
207207
version "1.0.9"
208208
resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.0.9.tgz#91b4792588a7738c25f35dd6f63752a2f8776135"
209209

210-
abp-ng2-module@^1.1.1:
211-
version "1.1.1"
212-
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.1.1.tgz#b47847a24e2dd932e8fe0b119610bb866fd86ef0"
210+
abp-ng2-module@^1.2.0:
211+
version "1.2.0"
212+
resolved "https://registry.yarnpkg.com/abp-ng2-module/-/abp-ng2-module-1.2.0.tgz#9f4c70453e18d777bdffe3d6510522110a4e3587"
213213
dependencies:
214214
"@angular/core" "^4.0.0"
215215
"@angular/http" "^4.0.0"
216-
abp-web-resources "^1.3.0"
217-
218-
abp-web-resources@^1.3.0:
219-
version "1.3.0"
220-
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-1.3.0.tgz#1021111913541e4f26874400bd9c1a6bb716e49b"
216+
abp-web-resources "^2.2.1"
221217

222-
abp-web-resources@^2.1.2:
223-
version "2.1.2"
224-
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.1.2.tgz#5c329eb0c0d63662f69096aba36d3bb2de76c631"
218+
abp-web-resources@^2.2.1:
219+
version "2.2.1"
220+
resolved "https://registry.yarnpkg.com/abp-web-resources/-/abp-web-resources-2.2.1.tgz#0877e7743a99b2de8fca8d4476517b48db2bda87"
225221

226222
[email protected], accepts@~1.3.3:
227223
version "1.3.3"

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,12 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.AutoMapper" Version="2.1.2" />
22-
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.1.2" />
21+
<PackageReference Include="Abp.AutoMapper" Version="2.2.1" />
22+
<PackageReference Include="Abp.ZeroCore.EntityFrameworkCore" Version="2.2.1" />
2323
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
2424
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
2525
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="1.1.2" />
26-
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.0.0" />
26+
<PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="2.1.1" />
2727
</ItemGroup>
2828

2929
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Migrator/AbpCompanyName.AbpProjectName.Migrator.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
</ItemGroup>
1919

2020
<ItemGroup>
21-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.2" />
21+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.2.1" />
2222
</ItemGroup>
2323

2424
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Core/AbpCompanyName.AbpProjectName.Web.Core.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,16 +35,16 @@
3535
<PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="1.1.2" />
3636
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="1.1.2" />
3737
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
38-
<PackageReference Include="Abp.AspNetCore" Version="2.1.2" />
39-
<PackageReference Include="Abp.ZeroCore" Version="2.1.2" />
38+
<PackageReference Include="Abp.AspNetCore" Version="2.2.1" />
39+
<PackageReference Include="Abp.ZeroCore" Version="2.2.1" />
4040
</ItemGroup>
4141

4242
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
4343
<Reference Include="System" />
4444
<Reference Include="Microsoft.CSharp" />
4545

46-
<PackageReference Include="Abp.Web.SignalR" Version="2.1.2" />
47-
<PackageReference Include="Abp.Owin" Version="2.1.2" />
46+
<PackageReference Include="Abp.Web.SignalR" Version="2.2.1" />
47+
<PackageReference Include="Abp.Owin" Version="2.2.1" />
4848
</ItemGroup>
4949

5050
</Project>

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Host/AbpCompanyName.AbpProjectName.Web.Host.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="1.1.1">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
39-
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
39+
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.1.1" />
4040
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
4141
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
4242
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
@@ -45,7 +45,7 @@
4545
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
4646
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
4747
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
48-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.2" />
48+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.2.1" />
4949
</ItemGroup>
5050

5151
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/AbpCompanyName.AbpProjectName.Web.Mvc.csproj‎

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,6 @@
1515
<DefineConstants>FEATURE_SIGNALR</DefineConstants>
1616
</PropertyGroup>
1717

18-
<ItemGroup>
19-
<Content Include="wwwroot\view-resources\Views\Roles\Index.js" />
20-
<Content Include="wwwroot\view-resources\Views\Roles\_EditRoleModal.js" />
21-
<Content Include="wwwroot\view-resources\Views\Shared\_Layout.js" />
22-
<Content Include="wwwroot\view-resources\Views\Tenants\_EditTenantModal.js" />
23-
<Content Include="wwwroot\view-resources\Views\Users\_EditUserModal.js" />
24-
</ItemGroup>
25-
2618
<ItemGroup>
2719
<None Include="app.config" />
2820
<None Update="Dockerfile">
@@ -47,7 +39,7 @@
4739
</PackageReference>
4840
<PackageReference Include="AspNet.Security.OpenIdConnect.Server" Version="1.0.0" />
4941
<PackageReference Include="PaulMiami.AspNetCore.Mvc.Recaptcha" Version="1.2.0" />
50-
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.0.0" />
42+
<PackageReference Include="Castle.LoggingFacility.MsLogging" Version="2.1.1" />
5143
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="1.1.2" />
5244
<PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="1.1.2" />
5345
<PackageReference Include="Microsoft.AspNetCore.Diagnostics" Version="1.1.2" />
@@ -58,9 +50,9 @@
5850
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
5951
<PackageReference Include="Microsoft.VisualStudio.Web.BrowserLink" Version="1.1.2" />
6052
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
61-
<PackageReference Include="Abp.HangFire" Version="2.1.2" />
62-
<PackageReference Include="Abp.RedisCache" Version="2.1.2" />
63-
<PackageReference Include="Abp.Castle.Log4Net" Version="2.1.2" />
53+
<PackageReference Include="Abp.HangFire" Version="2.2.1" />
54+
<PackageReference Include="Abp.RedisCache" Version="2.2.1" />
55+
<PackageReference Include="Abp.Castle.Log4Net" Version="2.2.1" />
6456
</ItemGroup>
6557

6658
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/bower.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,6 @@
2626
"chart.js": "chartjs#^2.6.0",
2727
"jquery-sparkline": "^2.1.3",
2828
"Flot": "jquery-flot#^0.8.3",
29-
"abp-web-resources": "^2.1.2"
29+
"abp-web-resources": "^2.2.1"
3030
}
3131
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/.bower.json‎

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "2.1.2",
7+
"version": "2.2.1",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,14 +25,13 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "2.1.2",
28+
"_release": "2.2.1",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v2.1.2",
32-
"commit": "912597876c6f853b8e969959ba7f7401e61506a3"
31+
"tag": "v2.2.1",
32+
"commit": "31ec5d18b18d0d61073c05813af93604562fd9a4"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^2.1.2",
36-
"_originalSource": "abp-web-resources",
37-
"_direct": true
35+
"_target": "^2.2.1",
36+
"_originalSource": "abp-web-resources"
3837
}

‎aspnet-core/src/AbpCompanyName.AbpProjectName.Web.Mvc/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
abp.ajax = function (userOptions) {
1313
userOptions = userOptions || {};
1414

15-
var options = $.extend({}, abp.ajax.defaultOpts, userOptions);
15+
var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
1616
options.success = undefined;
1717
options.error = undefined;
1818

@@ -39,7 +39,10 @@
3939
defaultOpts: {
4040
dataType: 'json',
4141
type: 'POST',
42-
contentType: 'application/json'
42+
contentType: 'application/json',
43+
headers: {
44+
'X-Requested-With': 'XMLHttpRequest'
45+
}
4346
},
4447

4548
defaultError: {

0 commit comments

Comments
 (0)