Skip to content

Commit faf1430

Browse files
committed
Upgraded To abp 3.2.4
1 parent cdbe953 commit faf1430

File tree

13 files changed

+39
-32
lines changed

13 files changed

+39
-32
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.3" />
21-
<PackageReference Include="Abp.AutoMapper" Version="3.2.3" />
20+
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.4" />
21+
<PackageReference Include="Abp.AutoMapper" Version="3.2.4" />
2222
</ItemGroup>
2323

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

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

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

1919
<ItemGroup>
20-
<PackageReference Include="Abp" Version="3.2.3" />
20+
<PackageReference Include="Abp" Version="3.2.4" />
2121
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
2222
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
2323
</ItemGroup>

src/AbpCompanyName.AbpProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
</ItemGroup>
2222

2323
<ItemGroup>
24-
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.3" />
24+
<PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.4" />
2525
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
2626
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
2727
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.4" />

src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@
4949
<PrivateAssets>All</PrivateAssets>
5050
</PackageReference>
5151
<PackageReference Include="Castle.Core" Version="4.2.1" />
52-
<PackageReference Include="Abp.AspNetCore" Version="3.2.3" />
53-
<PackageReference Include="Abp.Castle.Log4Net" Version="3.2.3" />
52+
<PackageReference Include="Abp.AspNetCore" Version="3.2.4" />
53+
<PackageReference Include="Abp.Castle.Log4Net" Version="3.2.4" />
5454
</ItemGroup>
5555

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

src/AbpCompanyName.AbpProjectName.Web/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,6 @@
1313
"jquery-validation": "^1.15.0",
1414
"blockUI": "jquery.blockUI#*",
1515
"spin.js": "^2.3.2",
16-
"abp-web-resources": "^3.1.0"
16+
"abp-web-resources": "^3.2.2"
1717
}
1818
}

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "3.1.0",
7+
"version": "3.2.3",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],
@@ -25,13 +25,13 @@
2525
".nuget",
2626
"packages"
2727
],
28-
"_release": "3.1.0",
28+
"_release": "3.2.3",
2929
"_resolution": {
3030
"type": "version",
31-
"tag": "v3.1.0",
32-
"commit": "5aed49096426c5c1424fcc5c2eae6bad8910b69f"
31+
"tag": "v3.2.3",
32+
"commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
3333
},
3434
"_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
35-
"_target": "^3.1.0",
35+
"_target": "^3.2.2",
3636
"_originalSource": "abp-web-resources"
3737
}

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

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,17 @@
1313
userOptions = userOptions || {};
1414

1515
var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
16+
var oldBeforeSendOption = options.beforeSend;
17+
options.beforeSend = function(xhr) {
18+
if (oldBeforeSendOption) {
19+
oldBeforeSendOption(xhr);
20+
}
21+
22+
xhr.setRequestHeader("Pragma", "no-cache");
23+
xhr.setRequestHeader("Cache-Control", "no-cache");
24+
xhr.setRequestHeader("Expires", "Sat, 01 Jan 2000 00:00:00 GMT");
25+
};
26+
1627
options.success = undefined;
1728
options.error = undefined;
1829

@@ -243,4 +254,4 @@
243254
abp.ajax.defaultError404.details = abp.localization.abpWeb('DefaultErrorDetail404');
244255
});
245256

246-
})(jQuery);
257+
})(jQuery);

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,24 +13,21 @@
1313

1414
},
1515
info: {
16-
type: 'info'
16+
icon: 'info'
1717
},
1818
success: {
19-
type: 'success'
19+
icon: 'success'
2020
},
2121
warn: {
22-
type: 'warning'
22+
icon: 'warning'
2323
},
2424
error: {
25-
type: 'error'
25+
icon: 'error'
2626
},
2727
confirm: {
28-
type: 'warning',
28+
icon: 'warning',
2929
title: 'Are you sure?',
30-
showCancelButton: true,
31-
cancelButtonText: 'Cancel',
32-
confirmButtonColor: "#DD6B55",
33-
confirmButtonText: 'Yes'
30+
buttons: ['Cancel', 'Yes']
3431
}
3532
}
3633
};
@@ -54,7 +51,7 @@
5451
);
5552

5653
return $.Deferred(function ($dfd) {
57-
sweetAlert(opts, function () {
54+
sweetAlert(opts).then(function () {
5855
$dfd.resolve();
5956
});
6057
});
@@ -95,7 +92,7 @@
9592
);
9693

9794
return $.Deferred(function ($dfd) {
98-
sweetAlert(opts, function (isConfirmed) {
95+
sweetAlert(opts).then(function (isConfirmed) {
9996
callback && callback(isConfirmed);
10097
$dfd.resolve(isConfirmed);
10198
});
@@ -104,8 +101,7 @@
104101

105102
abp.event.on('abp.dynamicScriptsInitialized', function () {
106103
abp.libs.sweetAlert.config.confirm.title = abp.localization.abpWeb('AreYouSure');
107-
abp.libs.sweetAlert.config.confirm.cancelButtonText = abp.localization.abpWeb('Cancel');
108-
abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
104+
abp.libs.sweetAlert.config.confirm.buttons = [abp.localization.abpWeb('Cancel'), abp.localization.abpWeb('Yes')];
109105
});
110106

111-
})(jQuery);
107+
})(jQuery);

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
"authors": [
55
"Halil İbrahim Kalkan"
66
],
7-
"version": "v3.1.0",
7+
"version": "v3.2.3",
88
"description": "Script and style resources for ASP.NET Boilerplate based web projects.",
99
"main": "Abp/Framework/scripts/abp.js",
1010
"moduleType": [],

src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "abp-web-resources",
3-
"version": "3.1.0",
3+
"version": "3.2.3",
44
"description": "ASP.NET Boilerplate web resources",
55
"main": "Abp/Framework/scripts/abp.js",
66
"dependencies": {},

0 commit comments

Comments
 (0)