Upgraded To abp 3.2.4

aspnetboilerplate · Nov 21, 2017 · faf1430 · faf1430
1 parent cdbe953
commit faf1430
Show file tree

Hide file tree

Showing 13 changed files with 39 additions and 32 deletions.
diff --git a/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj b/...bpCompanyName.AbpProjectName.Application/AbpCompanyName.AbpProjectName.Application.csproj
@@ -17,8 +17,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.3" />
-    <PackageReference Include="Abp.AutoMapper" Version="3.2.3" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.4" />
+    <PackageReference Include="Abp.AutoMapper" Version="3.2.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj b/src/AbpCompanyName.AbpProjectName.Core/AbpCompanyName.AbpProjectName.Core.csproj
@@ -17,7 +17,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="3.2.3" />
+    <PackageReference Include="Abp" Version="3.2.4" />
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="2.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.0.0" />
   </ItemGroup>

diff --git a/...pProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj b/...pProjectName.EntityFrameworkCore/AbpCompanyName.AbpProjectName.EntityFrameworkCore.csproj
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.3" />
+    <PackageReference Include="Abp.EntityFrameworkCore" Version="3.2.4" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.0.1" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.4" />

diff --git a/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj b/src/AbpCompanyName.AbpProjectName.Web/AbpCompanyName.AbpProjectName.Web.csproj
@@ -49,8 +49,8 @@
       <PrivateAssets>All</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Castle.Core" Version="4.2.1" />
-    <PackageReference Include="Abp.AspNetCore" Version="3.2.3" />
-    <PackageReference Include="Abp.Castle.Log4Net" Version="3.2.3" />
+    <PackageReference Include="Abp.AspNetCore" Version="3.2.4" />
+    <PackageReference Include="Abp.Castle.Log4Net" Version="3.2.4" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">

diff --git a/src/AbpCompanyName.AbpProjectName.Web/bower.json b/src/AbpCompanyName.AbpProjectName.Web/bower.json
@@ -13,6 +13,6 @@
     "jquery-validation": "^1.15.0",
     "blockUI": "jquery.blockUI#*",
     "spin.js": "^2.3.2",
-    "abp-web-resources": "^3.1.0"
+    "abp-web-resources": "^3.2.2"
   }
 }
diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/.bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "3.1.0",
+  "version": "3.2.3",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],
@@ -25,13 +25,13 @@
     ".nuget",
     "packages"
   ],
-  "_release": "3.1.0",
+  "_release": "3.2.3",
   "_resolution": {
     "type": "version",
-    "tag": "v3.1.0",
-    "commit": "5aed49096426c5c1424fcc5c2eae6bad8910b69f"
+    "tag": "v3.2.3",
+    "commit": "5a6ff004cd1a55384dc8697dee3f06009d72e4ae"
   },
   "_source": "https://github.com/aspnetboilerplate/bower-abp-resources.git",
-  "_target": "^3.1.0",
+  "_target": "^3.2.2",
   "_originalSource": "abp-web-resources"
 }
diff --git a/...AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js b/...AbpProjectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.jquery.js
@@ -13,6 +13,17 @@
         userOptions = userOptions || {};
 
         var options = $.extend(true, {}, abp.ajax.defaultOpts, userOptions);
+        var oldBeforeSendOption = options.beforeSend;		
+        options.beforeSend = function(xhr) {
+            if (oldBeforeSendOption) {
+                 oldBeforeSendOption(xhr);
+            }
+
+            xhr.setRequestHeader("Pragma", "no-cache");
+            xhr.setRequestHeader("Cache-Control", "no-cache");
+            xhr.setRequestHeader("Expires", "Sat, 01 Jan 2000 00:00:00 GMT");
+        };
+
         options.success = undefined;
         options.error = undefined;
 
@@ -243,4 +254,4 @@
         abp.ajax.defaultError404.details = abp.localization.abpWeb('DefaultErrorDetail404');
     });
 
-})(jQuery);
+})(jQuery);
diff --git a/...ojectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js b/...ojectName.Web/wwwroot/lib/abp-web-resources/Abp/Framework/scripts/libs/abp.sweet-alert.js
@@ -13,24 +13,21 @@
 
             },
             info: {
-                type: 'info'
+                icon: 'info'
             },
             success: {
-                type: 'success'
+                icon: 'success'
             },
             warn: {
-                type: 'warning'
+                icon: 'warning'
             },
             error: {
-                type: 'error'
+                icon: 'error'
             },
             confirm: {
-                type: 'warning',
+                icon: 'warning',
                 title: 'Are you sure?',
-                showCancelButton: true,
-                cancelButtonText: 'Cancel',
-                confirmButtonColor: "#DD6B55",
-                confirmButtonText: 'Yes'
+                buttons: ['Cancel', 'Yes']
             }
         }
     };
@@ -54,7 +51,7 @@
         );
 
         return $.Deferred(function ($dfd) {
-            sweetAlert(opts, function () {
+            sweetAlert(opts).then(function () {
                 $dfd.resolve();
             });
         });
@@ -95,7 +92,7 @@
         );
 
         return $.Deferred(function ($dfd) {
-            sweetAlert(opts, function (isConfirmed) {
+            sweetAlert(opts).then(function (isConfirmed) {
                 callback && callback(isConfirmed);
                 $dfd.resolve(isConfirmed);
             });
@@ -104,8 +101,7 @@
 
     abp.event.on('abp.dynamicScriptsInitialized', function () {
         abp.libs.sweetAlert.config.confirm.title = abp.localization.abpWeb('AreYouSure');
-        abp.libs.sweetAlert.config.confirm.cancelButtonText = abp.localization.abpWeb('Cancel');
-        abp.libs.sweetAlert.config.confirm.confirmButtonText = abp.localization.abpWeb('Yes');
+        abp.libs.sweetAlert.config.confirm.buttons = [abp.localization.abpWeb('Cancel'), abp.localization.abpWeb('Yes')];
     });
 
-})(jQuery);
+})(jQuery);
diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/bower.json
@@ -4,7 +4,7 @@
   "authors": [
     "Halil İbrahim Kalkan"
   ],
-  "version": "v3.1.0",
+  "version": "v3.2.3",
   "description": "Script and style resources for ASP.NET Boilerplate based web projects.",
   "main": "Abp/Framework/scripts/abp.js",
   "moduleType": [],

diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/package.json
@@ -1,6 +1,6 @@
 {
   "name": "abp-web-resources",
-  "version": "3.1.0",
+  "version": "3.2.3",
   "description": "ASP.NET Boilerplate web resources",
   "main": "Abp/Framework/scripts/abp.js",
   "dependencies": {},

diff --git a/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config b/src/AbpCompanyName.AbpProjectName.Web/wwwroot/lib/abp-web-resources/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp.Web.Resources" version="3.1.0" targetFramework="net461" />
+  <package id="Abp.Web.Resources" version="3.2.3" targetFramework="net461" />
 </packages>
diff --git a/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Tests/AbpCompanyName.AbpProjectName.Tests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="xunit.extensibility.execution" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Shouldly" Version="2.8.3" />
-    <PackageReference Include="Abp.TestBase" Version="3.2.3" />
+    <PackageReference Include="Abp.TestBase" Version="3.2.4" />
     <PackageReference Include="NSubstitute" Version="3.1.0" />
     <PackageReference Include="Castle.Windsor.MsDependencyInjection" Version="3.2.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.0.1" />

diff --git a/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj b/test/AbpCompanyName.AbpProjectName.Web.Tests/AbpCompanyName.AbpProjectName.Web.Tests.csproj
@@ -26,7 +26,7 @@
     <PackageReference Include="xunit" Version="2.3.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
     <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.1" />
-    <PackageReference Include="Abp.AspNetCore.TestBase" Version="3.2.3" />
+    <PackageReference Include="Abp.AspNetCore.TestBase" Version="3.2.4" />
     <PackageReference Include="AngleSharp" Version="0.9.9" />
   </ItemGroup>