将部分项目修改为共享项目，减少生成后dll文件数量

EasyMQ.Common/EasyMQ.Common.projitems

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>b06e5c74-8db5-4e29-996b-b1b5ef43b6de</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>EasyMQ.Common</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)IBus.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IPubSub.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)IRPC.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ISendReceive.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ISerializer.cs" />
+  </ItemGroup>
+</Project>

EasyMQ.Common/EasyMQ.Common.shproj

@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>b06e5c74-8db5-4e29-996b-b1b5ef43b6de</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <Import Project="EasyMQ.Common.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

EasyMQ.MessagePackSerializer/EasyMQ.MessagePackSerializer.csproj

@@ -15,8 +15,8 @@
     </PackageReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\EasyMQ\EasyMQ.csproj" />
-  </ItemGroup>
+  <Import Project="..\EasyMQ.Common\EasyMQ.Common.projitems" Label="Shared" />
+
+  <Import Project="..\ActiveMQ\Apache.NMS\Apache.NMS.projitems" Label="Shared" />
 
 </Project>

EasyMQ/EasyMQ.csproj

@@ -1,26 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Title>EasyMQ</Title>
-    <LangVersion>latest</LangVersion>
-    <Description>本项目是基于ActiveMQ的封装，实现了RPC、队列和消息订阅功能</Description>
-  </PropertyGroup>
-
-  <Import Project="..\ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems" Label="Shared" />
-
-  <Import Project="..\ActiveMQ\Apache.NMS\Apache.NMS.projitems" Label="Shared" />
-
-  <Import Project="..\ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems" Label="Shared" />
-
-  <ItemGroup>
-    <PackageReference Include="System.Buffers" Version="4.5.1" />
-    <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
-  </ItemGroup>
-
-</Project>

EasyMQ/EasyMQ.projitems

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <MSBuildAllProjects Condition="'$(MSBuildVersion)' == '' Or '$(MSBuildVersion)' &lt; '16.0'">$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
+    <HasSharedItems>true</HasSharedItems>
+    <SharedGUID>86b95696-3adb-4ee3-9de9-48751be8d149</SharedGUID>
+  </PropertyGroup>
+  <PropertyGroup Label="Configuration">
+    <Import_RootNamespace>EasyMQ</Import_RootNamespace>
+  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveHutch.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\ActiveMQBus.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\ActiveMQPubSub.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\ActiveMQRPC.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\ActiveMQSendReceive.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\MessageConverter.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)ActiveMQ\TypeHandle.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MQBus.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MQDispose.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MQPubSub.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MQRPC.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)MQSendReceive.cs" />
+    <Compile Include="$(MSBuildThisFileDirectory)UnmanagedMessageAttribute.cs" />
+  </ItemGroup>
+</Project>

EasyMQ/EasyMQ.shproj

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup Label="Globals">
+    <ProjectGuid>86b95696-3adb-4ee3-9de9-48751be8d149</ProjectGuid>
+    <MinimumVisualStudioVersion>14.0</MinimumVisualStudioVersion>
+  </PropertyGroup>
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.Default.props" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.Common.props" />
+  <PropertyGroup />
+  <ItemGroup>
+    <Compile Include="ActiveHutch.cs" />
+    <Compile Include="ActiveMQ\ActiveMQBus.cs" />
+    <Compile Include="ActiveMQ\ActiveMQPubSub.cs" />
+    <Compile Include="ActiveMQ\ActiveMQRPC.cs" />
+    <Compile Include="ActiveMQ\ActiveMQSendReceive.cs" />
+    <Compile Include="ActiveMQ\MessageConverter.cs" />
+    <Compile Include="ActiveMQ\TypeHandle.cs" />
+    <Compile Include="MQBus.cs" />
+    <Compile Include="MQDispose.cs" />
+    <Compile Include="MQPubSub.cs" />
+    <Compile Include="MQRPC.cs" />
+    <Compile Include="MQSendReceive.cs" />
+    <Compile Include="UnmanagedMessageAttribute.cs" />
+  </ItemGroup>
+  <Import Project="EasyMQ1.projitems" Label="Shared" />
+  <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\CodeSharing\Microsoft.CodeSharing.CSharp.targets" />
+</Project>

Shaker.Model/Shaker.csproj

@@ -10,11 +10,11 @@
   </PropertyGroup>
 
   <ItemGroup>
+    <PackageReference Include="MessagePack" Version="2.5.140" />
     <PackageReference Include="MongoDB.Driver" Version="2.25.0" />
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\EasyMQ.MessagePackSerializer\EasyMQ.MessagePackSerializer.csproj" />
     <ProjectReference Include="..\OxyPlot\OxyPlot.SkiaSharp.Wpf\OxyPlot.SkiaSharp.Wpf.csproj" />
   </ItemGroup>
 

ShakerControl.sln

@@ -23,8 +23,6 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "HandyControl_Shared", "Hand
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HandyControl", "HandyControl\HandyControl\HandyControl.csproj", "{780562A9-9226-43D1-A6B1-F2DCD1ED0415}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EasyMQ", "EasyMQ\EasyMQ.csproj", "{63491951-3E53-4FCE-9920-660050926FEE}"
-EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShakerControl", "ShakerControl\ShakerControl.csproj", "{184AA514-2B56-4D6C-89B7-34DE02A8CF23}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AppResource", "AppResource\AppResource.csproj", "{B5EBB0A6-0C6F-404A-ACAC-B6A929C39B81}"
@@ -55,6 +53,10 @@ Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "Apache.NMS.ActiveMQ", "Acti
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "XamlAnimatedGif", "XamlAnimatedGif\XamlAnimatedGif.csproj", "{CC18CF43-87BC-4A75-A3D9-A614129E1F46}"
 EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EasyMQ.Common", "EasyMQ.Common\EasyMQ.Common.shproj", "{B06E5C74-8DB5-4E29-996B-B1B5EF43B6DE}"
+EndProject
+Project("{D954291E-2A0B-460D-934E-DC6B0785DB48}") = "EasyMQ", "EasyMQ\EasyMQ.shproj", "{86B95696-3ADB-4EE3-9DE9-48751BE8D149}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -73,10 +75,6 @@ Global
 		{780562A9-9226-43D1-A6B1-F2DCD1ED0415}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{780562A9-9226-43D1-A6B1-F2DCD1ED0415}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{780562A9-9226-43D1-A6B1-F2DCD1ED0415}.Release|Any CPU.Build.0 = Release|Any CPU
-		{63491951-3E53-4FCE-9920-660050926FEE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{63491951-3E53-4FCE-9920-660050926FEE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{63491951-3E53-4FCE-9920-660050926FEE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{63491951-3E53-4FCE-9920-660050926FEE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{184AA514-2B56-4D6C-89B7-34DE02A8CF23}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{184AA514-2B56-4D6C-89B7-34DE02A8CF23}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{184AA514-2B56-4D6C-89B7-34DE02A8CF23}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -123,17 +121,19 @@ Global
 		SolutionGuid = {2F47BC24-8E2F-4B7E-BF64-59F4128F7AF2}
 	EndGlobalSection
 	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
+		ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
+		EasyMQ\EasyMQ.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
 		IPLCControl\IPLCControl.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
 		NModbus\NModbus.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
 		PLCControl.Modbus\PLCControl.Modbus.projitems*{184aa514-2b56-4d6c-89b7-34de02a8cf23}*SharedItemsImports = 5
+		ActiveMQ\Apache.NMS\Apache.NMS.projitems*{2204f421-a13f-4a68-8914-621379b6026c}*SharedItemsImports = 5
+		EasyMQ.Common\EasyMQ.Common.projitems*{2204f421-a13f-4a68-8914-621379b6026c}*SharedItemsImports = 5
 		HandyControl\Microsoft.Expression.Interactions\Microsoft.Expression.Interactions.projitems*{3531857c-28fc-4e0f-82d9-bfbb70740e04}*SharedItemsImports = 13
 		PLCControl.Modbus\PLCControl.Modbus.projitems*{38f42ad4-b81d-47e3-88f7-fe4527ee619f}*SharedItemsImports = 13
 		NModbus\NModbus.projitems*{3e3cf20c-4680-453a-b02b-a8a5e61065f5}*SharedItemsImports = 13
 		OxyPlot\OxyPlot\OxyPlot.projitems*{4b42c9b8-3ac3-4cf0-9837-910c72828dfa}*SharedItemsImports = 5
 		ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems*{4b8a4f8c-877b-44ee-99a3-f21030f79401}*SharedItemsImports = 13
-		ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems*{63491951-3e53-4fce-9920-660050926fee}*SharedItemsImports = 5
-		ActiveMQ\Apache.NMS\Apache.NMS.projitems*{63491951-3e53-4fce-9920-660050926fee}*SharedItemsImports = 5
-		ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems*{63491951-3e53-4fce-9920-660050926fee}*SharedItemsImports = 5
 		HandyControl\System.Windows.Interactivity\System.Windows.Interactivity.projitems*{6f0c9cff-2269-46a7-9664-478354c582a4}*SharedItemsImports = 13
 		IPLCControl\IPLCControl.projitems*{75a180d3-ff66-4e3f-bd7f-5eb6a9eb277f}*SharedItemsImports = 13
 		HandyControl\HandyControl_Shared\HandyControl_Shared.projitems*{780562a9-9226-43d1-a6b1-f2dcd1ed0415}*SharedItemsImports = 5
@@ -145,8 +145,12 @@ Global
 		EventBroker\EventBroker.projitems*{861edd04-79e4-4e4c-a406-1f1357dd24ba}*SharedItemsImports = 13
 		ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems*{99cb1122-4d3a-434b-a11f-f997c940abc0}*SharedItemsImports = 13
 		HandyControl\HandyControl_Shared\HandyControl_Shared.projitems*{aac11083-faca-405d-9197-5c1212d65656}*SharedItemsImports = 13
+		EasyMQ.Common\EasyMQ.Common.projitems*{b06e5c74-8db5-4e29-996b-b1b5ef43b6de}*SharedItemsImports = 13
 		HandyControl\Microsoft.Windows.Shell\Microsoft.Windows.Shell.projitems*{bbe51380-8b21-49ff-9cfc-b29447a40999}*SharedItemsImports = 13
 		OxyPlot\OxyPlot\OxyPlot.projitems*{c0c33a23-e2ba-4f04-83b3-2d512db0a46c}*SharedItemsImports = 13
+		ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems*{e3980ffb-0be3-4004-b82c-dedeac3819fe}*SharedItemsImports = 5
+		ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems*{e3980ffb-0be3-4004-b82c-dedeac3819fe}*SharedItemsImports = 5
+		EasyMQ\EasyMQ.projitems*{e3980ffb-0be3-4004-b82c-dedeac3819fe}*SharedItemsImports = 5
 		HandyControl\Microsoft.Expression.Drawing\Microsoft.Expression.Drawing.projitems*{e5dc7c25-6293-4660-b5fb-186496386b90}*SharedItemsImports = 13
 	EndGlobalSection
 EndGlobal

ShakerControl/ShakerControl.csproj

@@ -11,6 +11,7 @@
     <AssemblyName>电动振动台集散控制组件控制端</AssemblyName>
     <Company>北京航天希尔测试技术有限公司</Company>
     <Authors>北京航天希尔测试技术有限公司</Authors>
+    <NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -44,5 +45,8 @@
   <Import Project="..\NModbus\NModbus.projitems" Label="Shared" />
   <Import Project="..\IPLCControl\IPLCControl.projitems" Label="Shared" />
   <Import Project="..\PLCControl.Modbus\PLCControl.Modbus.projitems" Label="Shared" />
+  <Import Project="..\EasyMQ\EasyMQ.projitems" Label="Shared" />
+  <Import Project="..\ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems" Label="Shared" />
+  <Import Project="..\ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems" Label="Shared" />
 
 </Project>

ShakerManger/ShakerManger.csproj

@@ -13,6 +13,7 @@
     <ApplicationIcon>管理端.ico</ApplicationIcon>
     <AssemblyName>电动振动台集散控制组件管理端</AssemblyName>
     <Authors>北京航天希尔测试技术有限公司</Authors>
+    <NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
   <ItemGroup>
@@ -59,4 +60,9 @@
     </EmbeddedResource>
   </ItemGroup>
 
+  <Import Project="..\ActiveMQ\Apache.NMS.ActiveMQ\Apache.NMS.ActiveMQ.projitems" Label="Shared" />
+  <Import Project="..\EasyMQ\EasyMQ.projitems" Label="Shared" />
+
+  <Import Project="..\ActiveMQ\ICSharpCode.SharpZipLib\ICSharpCode.SharpZipLib.projitems" Label="Shared" />
+
 </Project>