upgrade abp to v4.0.1

personball · personball · commit cf1eec1162b9 · 2018-11-10T09:15:52.000+08:00
diff --git a/common.props b/common.props
@@ -1,5 +1,5 @@
 <Project>
 	<PropertyGroup>
-		<Version>2.0.1</Version>
+		<Version>2.1.0</Version>
 	</PropertyGroup>
 </Project>
diff --git a/src/Abplus.AspNetCore.SignalR/Abplus.AspNetCore.SignalR.csproj b/src/Abplus.AspNetCore.SignalR/Abplus.AspNetCore.SignalR.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
-    <PackageReference Include="Abp.AspNetCore.SignalR" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
+    <PackageReference Include="Abp.AspNetCore.SignalR" Version="4.0.1" />
     <PackageReference Include="stackexchange.redis" Version="1.2.6" />
   </ItemGroup>
 
diff --git a/src/Abplus.AspNetCore.SignalR/Abplus.AspNetCore.SignalR.nuspec b/src/Abplus.AspNetCore.SignalR/Abplus.AspNetCore.SignalR.nuspec
@@ -15,10 +15,9 @@
     <copyright>Copyright 2018</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Abp" version="3.8.3" />
-      <dependency id="Abp.AspNetCore.SignalR" version="3.8.3" />
-      <dependency id="StackExchange.Redis" version="1.2.6" />
       <dependency id="Abplus" version="$version$" />
+      <dependency id="Abp.AspNetCore.SignalR" version="4.0.1" />
+      <dependency id="StackExchange.Redis" version="1.2.6" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Abplus.MqMessages.AuditingConsumerHandler/Abplus.MqMessages.AuditingConsumerHandler.csproj b/src/Abplus.MqMessages.AuditingConsumerHandler/Abplus.MqMessages.AuditingConsumerHandler.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
     <PackageReference Include="rebus" Version="4.2.1" />
   </ItemGroup>
 
diff --git a/src/Abplus.MqMessages.AuditingStore/Abplus.MqMessages.AuditingStore.csproj b/src/Abplus.MqMessages.AuditingStore/Abplus.MqMessages.AuditingStore.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Abplus.MqMessages.AuditingStore/Abplus.MqMessages.AuditingStore.nuspec b/src/Abplus.MqMessages.AuditingStore/Abplus.MqMessages.AuditingStore.nuspec
@@ -15,7 +15,6 @@
     <copyright>Copyright 2018</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Abp" version="3.8.3" />
       <dependency id="Abplus.MqMessages" version="$version$" />
       <dependency id="Abplus.MqMessages.RebusCore" version="$version$" />
     </dependencies>
diff --git a/src/Abplus.MqMessages.IndexToES/Abplus.MqMessages.IndexToES.csproj b/src/Abplus.MqMessages.IndexToES/Abplus.MqMessages.IndexToES.csproj
@@ -35,7 +35,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
     <PackageReference Include="nest" Version="6.2.0" />
     <PackageReference Include="rebus" Version="4.2.1" />
   </ItemGroup>
diff --git a/src/Abplus.MqMessages.IndexToES/Abplus.MqMessages.IndexToES.nuspec b/src/Abplus.MqMessages.IndexToES/Abplus.MqMessages.IndexToES.nuspec
@@ -15,9 +15,9 @@
     <copyright>Copyright 2018</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Abp" version="3.8.3" />
       <dependency id="Rebus" version="4.2.1" />
       <dependency id="NEST" version="6.2.0" />
+      <dependency id="Abplus.MqMessages" version="$version$" />
     </dependencies>
     <contentFiles>
       <files include="MqMessages\MqHandlers\MqMessagesT4Register.cs" />
diff --git a/src/Abplus.MqMessages.RebusCore/Abplus.MqMessages.RebusCore.csproj b/src/Abplus.MqMessages.RebusCore/Abplus.MqMessages.RebusCore.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
     <PackageReference Include="rebus" Version="4.2.1" />
   </ItemGroup>
 
diff --git a/src/Abplus.MqMessages.RebusRabbitMqConsumer/Abplus.MqMessages.RebusRabbitMqConsumer.csproj b/src/Abplus.MqMessages.RebusRabbitMqConsumer/Abplus.MqMessages.RebusRabbitMqConsumer.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
     <PackageReference Include="Rebus.Castle.Windsor" Version="4.1.0" />
     <PackageReference Include="rebus.rabbitmq" Version="4.4.2" />
   </ItemGroup>
diff --git a/src/Abplus.MqMessages.RebusRabbitMqPublisher/Abplus.MqMessages.RebusRabbitMqPublisher.csproj b/src/Abplus.MqMessages.RebusRabbitMqPublisher/Abplus.MqMessages.RebusRabbitMqPublisher.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
     <PackageReference Include="Rebus.Castle.Windsor" Version="4.1.0" />
     <PackageReference Include="rebus.rabbitmq" Version="4.4.2" />
   </ItemGroup>
diff --git a/src/Abplus.MqMessages.RedisStoreMessageTracker/Abplus.MqMessages.RedisStoreMessageTracker.csproj b/src/Abplus.MqMessages.RedisStoreMessageTracker/Abplus.MqMessages.RedisStoreMessageTracker.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
-    <PackageReference Include="abp.rediscache" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
+    <PackageReference Include="abp.rediscache" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Abplus.MqMessages.RedisStoreMessageTracker/Abplus.MqMessages.RedisStoreMessageTracker.nuspec b/src/Abplus.MqMessages.RedisStoreMessageTracker/Abplus.MqMessages.RedisStoreMessageTracker.nuspec
@@ -15,8 +15,8 @@
     <copyright>Copyright 2018</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Abp" version="3.8.3" />
-      <dependency id="Abp.RedisCache" version="3.8.3"/>
+      <dependency id="Abplus" version="$version$" />
+      <dependency id="Abp.RedisCache" version="4.0.1"/>
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Abplus.MqMessages/Abplus.MqMessages.csproj b/src/Abplus.MqMessages/Abplus.MqMessages.csproj
@@ -8,8 +8,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Abp" Version="3.8.3" />
-    <PackageReference Include="Abp.AutoMapper" Version="3.8.3" />
+    <PackageReference Include="Abp" Version="4.0.1" />
+    <PackageReference Include="Abp.AutoMapper" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Abplus.MqMessages/Abplus.MqMessages.nuspec b/src/Abplus.MqMessages/Abplus.MqMessages.nuspec
@@ -16,7 +16,7 @@
     <tags></tags>
     <dependencies>
       <dependency id="Abplus" version="$version$" />
-      <dependency id="Abp.AutoMapper" version="3.8.3" />
+      <dependency id="Abp.AutoMapper" version="4.0.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Abplus.MqMessages/MqMessages/AutoGeneration/DontGenerateMqMessage.cs b/src/Abplus.MqMessages/MqMessages/AutoGeneration/DontGenerateMqMessage.cs
@@ -0,0 +1,12 @@
+﻿using System;
+
+namespace Abp.MqMessages.AutoGeneration
+{
+    /// <summary>
+    /// 标记指定EventData不参与自动生成MqMessage
+    /// </summary>
+    [AttributeUsage(AttributeTargets.Class, Inherited = false)]
+    public class DontGenerateMqMessage : Attribute
+    {
+    }
+}
diff --git a/src/Abplus/Abplus.csproj b/src/Abplus/Abplus.csproj
@@ -9,7 +9,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Abplus/Abplus.nuspec b/src/Abplus/Abplus.nuspec
@@ -15,7 +15,7 @@
     <copyright>Copyright 2018</copyright>
     <tags></tags>
     <dependencies>
-      <dependency id="Abp" version="3.8.3" />
+      <dependency id="Abp" version="4.0.1" />
     </dependencies>
   </metadata>
 </package>
diff --git a/src/Samples/AuditingConsumer/Sample.MqMessageAuditingStore/Sample.MqMessageAuditingStore.csproj b/src/Samples/AuditingConsumer/Sample.MqMessageAuditingStore/Sample.MqMessageAuditingStore.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samples/Sample.DotNetCoreConsumerHost/Sample.DotNetCoreConsumerHost.csproj b/src/Samples/Sample.DotNetCoreConsumerHost/Sample.DotNetCoreConsumerHost.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samples/Sample.DotNetCorePublisherHost/Sample.DotNetCorePublisherHost.csproj b/src/Samples/Sample.DotNetCorePublisherHost/Sample.DotNetCorePublisherHost.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="abp" Version="3.8.3" />
+    <PackageReference Include="abp" Version="4.0.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/Samples/Sample.DotNetFxConsumerHost/Sample.DotNetFxConsumerHost.csproj b/src/Samples/Sample.DotNetFxConsumerHost/Sample.DotNetFxConsumerHost.csproj
@@ -33,32 +33,32 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Abp, Version=3.8.3.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Abp.3.8.3\lib\netstandard2.0\Abp.dll</HintPath>
+    <Reference Include="Abp, Version=4.0.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Abp.4.0.1\lib\netstandard2.0\Abp.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Facilities.Logging, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Castle.LoggingFacility.4.1.0\lib\net45\Castle.Facilities.Logging.dll</HintPath>
+      <HintPath>..\..\..\packages\Castle.LoggingFacility.4.1.1\lib\net45\Castle.Facilities.Logging.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Services.Logging.NLogIntegration, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Castle.Core-NLog.4.3.1\lib\net45\Castle.Services.Logging.NLogIntegration.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Windsor, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Castle.Windsor.4.1.0\lib\net45\Castle.Windsor.dll</HintPath>
+      <HintPath>..\..\..\packages\Castle.Windsor.4.1.1\lib\net45\Castle.Windsor.dll</HintPath>
     </Reference>
-    <Reference Include="JetBrains.Annotations, Version=11.1.0.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\JetBrains.Annotations.11.1.0\lib\net20\JetBrains.Annotations.dll</HintPath>
+    <Reference Include="JetBrains.Annotations, Version=2018.2.1.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\JetBrains.Annotations.2018.2.1\lib\net20\JetBrains.Annotations.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Diagnostics.Tracing.EventSource, Version=1.1.28.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Diagnostics.Tracing.EventSource.Redist.1.1.28\lib\net46\Microsoft.Diagnostics.Tracing.EventSource.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Caching.Abstractions, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Abstractions.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Caching.Memory, Version=2.1.2.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\Microsoft.Extensions.Caching.Memory.2.1.2\lib\netstandard2.0\Microsoft.Extensions.Caching.Memory.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=2.1.1.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
@@ -130,8 +130,8 @@
     <Reference Include="System.Data.OracleClient" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.IO.Compression, Version=4.2.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL" />
-    <Reference Include="System.Linq.Dynamic.Core, Version=0.0.0.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\System.Linq.Dynamic.Core.1.0.8.11\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
+    <Reference Include="System.Linq.Dynamic.Core, Version=1.0.9.0, Culture=neutral, PublicKeyToken=0f07ec44de6ac832, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\System.Linq.Dynamic.Core.1.0.9\lib\net46\System.Linq.Dynamic.Core.dll</HintPath>
     </Reference>
     <Reference Include="System.Memory, Version=4.0.1.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Memory.4.5.1\lib\netstandard2.0\System.Memory.dll</HintPath>
@@ -198,8 +198,8 @@
     <Reference Include="System.Xml.XPath.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\System.Xml.XPath.XmlDocument.4.3.0\lib\net46\System.Xml.XPath.XmlDocument.dll</HintPath>
     </Reference>
-    <Reference Include="TimeZoneConverter, Version=2.4.1.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\TimeZoneConverter.2.4.1\lib\net45\TimeZoneConverter.dll</HintPath>
+    <Reference Include="TimeZoneConverter, Version=2.4.2.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\..\packages\TimeZoneConverter.2.4.2\lib\net471\TimeZoneConverter.dll</HintPath>
     </Reference>
     <Reference Include="Topshelf, Version=4.1.0.172, Culture=neutral, PublicKeyToken=b800c4cfcdeea87b, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Topshelf.4.1.0\lib\net452\Topshelf.dll</HintPath>
diff --git a/src/Samples/Sample.DotNetFxConsumerHost/packages.config b/src/Samples/Sample.DotNetFxConsumerHost/packages.config
@@ -1,14 +1,14 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Abp" version="3.8.3" targetFramework="net471" />
+  <package id="Abp" version="4.0.1" targetFramework="net471" />
   <package id="Castle.Core" version="4.3.1" targetFramework="net471" />
   <package id="Castle.Core-NLog" version="4.3.1" targetFramework="net471" />
-  <package id="Castle.LoggingFacility" version="4.1.0" targetFramework="net471" />
-  <package id="Castle.Windsor" version="4.1.0" targetFramework="net471" />
-  <package id="JetBrains.Annotations" version="11.1.0" targetFramework="net471" />
+  <package id="Castle.LoggingFacility" version="4.1.1" targetFramework="net471" />
+  <package id="Castle.Windsor" version="4.1.1" targetFramework="net471" />
+  <package id="JetBrains.Annotations" version="2018.2.1" targetFramework="net471" />
   <package id="Microsoft.Diagnostics.Tracing.EventSource.Redist" version="1.1.28" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.1" targetFramework="net471" />
-  <package id="Microsoft.Extensions.Caching.Memory" version="2.1.1" targetFramework="net471" />
+  <package id="Microsoft.Extensions.Caching.Abstractions" version="2.1.2" targetFramework="net471" />
+  <package id="Microsoft.Extensions.Caching.Memory" version="2.1.2" targetFramework="net471" />
   <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="2.1.1" targetFramework="net471" />
   <package id="Microsoft.Extensions.Options" version="2.1.1" targetFramework="net471" />
   <package id="Microsoft.Extensions.Primitives" version="2.1.1" targetFramework="net471" />
@@ -31,7 +31,7 @@
   <package id="System.ComponentModel.Annotations" version="4.5.0" targetFramework="net471" />
   <package id="System.Configuration.ConfigurationManager" version="4.5.0" targetFramework="net471" />
   <package id="System.Data.Common" version="4.3.0" targetFramework="net471" />
-  <package id="System.Linq.Dynamic.Core" version="1.0.8.11" targetFramework="net471" />
+  <package id="System.Linq.Dynamic.Core" version="1.0.9" targetFramework="net471" />
   <package id="System.Linq.Queryable" version="4.3.0" targetFramework="net471" />
   <package id="System.Memory" version="4.5.1" targetFramework="net471" />
   <package id="System.Numerics.Vectors" version="4.4.0" targetFramework="net471" />
@@ -47,6 +47,6 @@
   <package id="System.Xml.XmlDocument" version="4.3.0" targetFramework="net471" />
   <package id="System.Xml.XPath" version="4.3.0" targetFramework="net471" />
   <package id="System.Xml.XPath.XmlDocument" version="4.3.0" targetFramework="net471" />
-  <package id="TimeZoneConverter" version="2.4.1" targetFramework="net471" />
+  <package id="TimeZoneConverter" version="2.4.2" targetFramework="net471" />
   <package id="Topshelf" version="4.1.0" targetFramework="net471" />
 </packages>
diff --git a/src/Samples/Sample.DotNetFxPublisherHost/Sample.DotNetFxPublisherHost.csproj b/src/Samples/Sample.DotNetFxPublisherHost/Sample.DotNetFxPublisherHost.csproj
diff --git a/src/Samples/Sample.DotNetFxPublisherHost/packages.config b/src/Samples/Sample.DotNetFxPublisherHost/packages.config
