Upgraded nuget packages.

yuxiaoyong · Nov 26, 2015 · 3780ea5 · 3780ea5
1 parent c261393
commit 3780ea5
Show file tree

Hide file tree

Showing 13 changed files with 114 additions and 107 deletions.
diff --git a/src/EventCloud.Application/EventCloud.Application.csproj b/src/EventCloud.Application/EventCloud.Application.csproj
@@ -32,16 +32,16 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
+    <Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
+    <Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="AutoMapper, Version=4.0.4.0, Culture=neutral, PublicKeyToken=be96cd2c38ef1005, processorArchitecture=MSIL">

diff --git a/src/EventCloud.Application/packages.config b/src/EventCloud.Application/packages.config
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
+  <package id="Abp" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
   <package id="AutoMapper" version="4.0.4" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />

diff --git a/src/EventCloud.Core/EventCloud.Core.csproj b/src/EventCloud.Core/EventCloud.Core.csproj
@@ -32,12 +32,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
+    <Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">

diff --git a/src/EventCloud.Core/packages.config b/src/EventCloud.Core/packages.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
+  <package id="Abp" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />

diff --git a/src/EventCloud.EntityFramework/EventCloud.EntityFramework.csproj b/src/EventCloud.EntityFramework/EventCloud.EntityFramework.csproj
@@ -32,20 +32,20 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.EntityFramework, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.EntityFramework.0.7.2.0\lib\net451\Abp.EntityFramework.dll</HintPath>
+    <Reference Include="Abp.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
+    <Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.EntityFramework.0.7.3.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
+    <Reference Include="Abp.Zero.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.EntityFramework.0.7.4.1\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Castle.Core, Version=3.3.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
@@ -64,8 +64,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.DynamicFilters, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.DynamicFilters.1.4.2\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
+    <Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">

diff --git a/src/EventCloud.EntityFramework/packages.config b/src/EventCloud.EntityFramework/packages.config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.EntityFramework" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.Zero.EntityFramework" version="0.7.3.0" targetFramework="net451" />
+  <package id="Abp" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.EntityFramework" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero.EntityFramework" version="0.7.4.1" targetFramework="net451" />
   <package id="Castle.Core" version="3.3.3" targetFramework="net451" />
   <package id="Castle.LoggingFacility" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net451" />
-  <package id="EntityFramework.DynamicFilters" version="1.4.2" targetFramework="net451" />
+  <package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
   <package id="Microsoft.AspNet.Identity.Core" version="2.2.1" targetFramework="net451" />
   <package id="Microsoft.Bcl.Immutable" version="1.0.34" targetFramework="net451" />
   <package id="Newtonsoft.Json" version="7.0.1" targetFramework="net451" />

diff --git a/src/EventCloud.Web/Abp/Framework/scripts/libs/abp.jtable.js b/src/EventCloud.Web/Abp/Framework/scripts/libs/abp.jtable.js
@@ -55,7 +55,8 @@
                             $dfd.resolve({
                                 "Result": "OK",
                                 "Records": result.items || result[originalListAction.recordsField],
-                                "TotalRecordCount": result.totalCount
+                                "TotalRecordCount": result.totalCount,
+                                originalResult: result
                             });
                         })
                         .fail(function (error) {
@@ -78,7 +79,8 @@
                         .done(function (result) {
                             $dfd.resolve({
                                 "Result": "OK",
-                                "Record": originalCreateAction.recordField ? result[originalCreateAction.recordField] : result
+                                "Record": originalCreateAction.recordField ? result[originalCreateAction.recordField] : result,
+                                originalResult: result
                             });
                         })
                         .fail(function (error) {
@@ -99,7 +101,11 @@
 
                     originalUpdateAction.method(input)
                         .done(function (result) {
-                            var jtableResult = { "Result": "OK" };
+                            var jtableResult = {
+                                "Result": "OK",
+                                originalResult: result
+                            };
+
                             if (originalUpdateAction.returnsRecord) {
                                 if (originalUpdateAction.recordField) {
                                     jtableResult.Record = result[originalUpdateAction.recordField];
@@ -127,9 +133,10 @@
                     var input = $.extend({}, postData);
 
                     originalDeleteAction.method(input)
-                        .done(function () {
+                        .done(function (result) {
                             $dfd.resolve({
-                                "Result": "OK"
+                                "Result": "OK",
+                                originalResult: result
                             });
                         })
                         .fail(function (error) {

diff --git a/src/EventCloud.Web/EventCloud.Web.csproj b/src/EventCloud.Web/EventCloud.Web.csproj
@@ -41,36 +41,36 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.0.7.3.0\lib\net451\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.0.7.4.1\lib\net451\Abp.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.AutoMapper, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.AutoMapper.0.7.2.0\lib\net451\Abp.AutoMapper.dll</HintPath>
+    <Reference Include="Abp.AutoMapper, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.AutoMapper.0.7.4.1\lib\net451\Abp.AutoMapper.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.EntityFramework, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.EntityFramework.0.7.2.0\lib\net451\Abp.EntityFramework.dll</HintPath>
+    <Reference Include="Abp.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.EntityFramework.0.7.4.1\lib\net451\Abp.EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Web, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Web.0.7.3.0\lib\net451\Abp.Web.dll</HintPath>
+    <Reference Include="Abp.Web, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.0.7.4.1\lib\net451\Abp.Web.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Web.Api, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Web.Api.0.7.2.0\lib\net451\Abp.Web.Api.dll</HintPath>
+    <Reference Include="Abp.Web.Api, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Api.0.7.4.1\lib\net451\Abp.Web.Api.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Web.Mvc, Version=0.7.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Web.Mvc.0.7.2.0\lib\net451\Abp.Web.Mvc.dll</HintPath>
+    <Reference Include="Abp.Web.Mvc, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Web.Mvc.0.7.4.1\lib\net451\Abp.Web.Mvc.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.0.7.3.0\lib\net451\Abp.Zero.dll</HintPath>
+    <Reference Include="Abp.Zero, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.0.7.4.1\lib\net451\Abp.Zero.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Abp.Zero.EntityFramework, Version=0.7.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\Abp.Zero.EntityFramework.0.7.3.0\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
+    <Reference Include="Abp.Zero.EntityFramework, Version=0.7.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\Abp.Zero.EntityFramework.0.7.4.1\lib\net451\Abp.Zero.EntityFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Antlr3.Runtime">
@@ -98,8 +98,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\EntityFramework.6.1.3\lib\net45\EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework.DynamicFilters, Version=1.4.2.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework.DynamicFilters.1.4.2\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
+    <Reference Include="EntityFramework.DynamicFilters, Version=1.4.4.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.DynamicFilters.1.4.4\lib\net40\EntityFramework.DynamicFilters.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
@@ -439,13 +439,13 @@
       <DependentUpon>main.css</DependentUpon>
     </Content>
     <Content Include="App\Main\views\events\createDialog.cshtml" />
-    <Content Include="Abp\Framework\styles\abp.mixings.less" />
-    <Content Include="Abp\Framework\styles\abp.less" />
-    <Content Include="Abp\Framework\styles\abp.css.map" />
     <Content Include="App\Main\views\about\about.less" />
     <Content Include="App\Main\views\about\about.css.map">
       <DependentUpon>about.css</DependentUpon>
     </Content>
+    <Content Include="Abp\Framework\styles\abp.mixings.less" />
+    <Content Include="Abp\Framework\styles\abp.less" />
+    <Content Include="Abp\Framework\styles\abp.css.map" />
     <None Include="Properties\PublishProfiles\Publish_Release_FileSystem.pubxml" />
     <None Include="Scripts\jquery-2.1.4.intellisense.js" />
     <Content Include="Scripts\i18n\angular-locale_aa-dj.js" />

diff --git a/src/EventCloud.Web/packages.config b/src/EventCloud.Web/packages.config
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.AutoMapper" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.EntityFramework" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Web" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.Web.Api" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Web.Mvc" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Web.Resources" version="0.7.2.0" targetFramework="net451" />
-  <package id="Abp.Zero" version="0.7.3.0" targetFramework="net451" />
-  <package id="Abp.Zero.EntityFramework" version="0.7.3.0" targetFramework="net451" />
+  <package id="Abp" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.AutoMapper" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.EntityFramework" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Web" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Web.Api" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Web.Mvc" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Web.Resources" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero" version="0.7.4.1" targetFramework="net451" />
+  <package id="Abp.Zero.EntityFramework" version="0.7.4.1" targetFramework="net451" />
   <package id="Angular.UI.Bootstrap" version="0.13.4" targetFramework="net451" />
   <package id="Angular.UI.UI-Router" version="0.2.15" targetFramework="net451" />
   <package id="Angular.UI.Utils" version="0.2.3" targetFramework="net451" />
@@ -22,7 +22,7 @@
   <package id="Castle.Windsor" version="3.3.0" targetFramework="net451" />
   <package id="Castle.Windsor-log4net" version="3.3.0" targetFramework="net451" />
   <package id="EntityFramework" version="6.1.3" targetFramework="net451" />
-  <package id="EntityFramework.DynamicFilters" version="1.4.2" targetFramework="net451" />
+  <package id="EntityFramework.DynamicFilters" version="1.4.4" targetFramework="net451" />
   <package id="FontAwesome" version="4.4.0" targetFramework="net451" />
   <package id="jQuery" version="2.1.4" targetFramework="net451" />
   <package id="jQuery.BlockUI" version="2.70" targetFramework="net451" />