ntminer преди 6 години
родител
ревизия
08c57c5d4d
променени са 36 файла, в които са добавени 62 реда и са изтрити 62 реда
  1. 1 1
      NTMiner.sln
  2. 4 4
      src/AppModels/AppModels.csproj
  3. 4 4
      src/AppViews0/AppViews0.csproj
  4. 2 2
      src/CalcConfigUpdater/CalcConfigUpdater.csproj
  5. 4 4
      src/MinerClient/MinerClient.csproj
  6. 4 4
      src/MinerClientSelfHost/MinerClientSelfHost.csproj
  7. 4 4
      src/MinerStudio/MinerStudio.csproj
  8. 4 4
      src/MinerStudioSelfHost/MinerStudioSelfHost.csproj
  9. 2 2
      src/NTMiner.Core/NTMiner.Core.csproj
  10. 0 0
      src/NTMinerBus/Bus/Cmd.cs
  11. 0 0
      src/NTMinerBus/Bus/DelegateHandler`1.cs
  12. 0 0
      src/NTMinerBus/Bus/DirectBus/DirectBus.cs
  13. 0 0
      src/NTMinerBus/Bus/DirectBus/DirectCommandBus.cs
  14. 0 0
      src/NTMinerBus/Bus/DirectBus/DirectEventBus.cs
  15. 0 0
      src/NTMinerBus/Bus/EventBase.cs
  16. 0 0
      src/NTMinerBus/Bus/IBus.cs
  17. 0 0
      src/NTMinerBus/Bus/ICmd.cs
  18. 0 0
      src/NTMinerBus/Bus/ICmdBus.cs
  19. 0 0
      src/NTMinerBus/Bus/IDelegateHandler.cs
  20. 0 0
      src/NTMinerBus/Bus/IEvent.cs
  21. 0 0
      src/NTMinerBus/Bus/IEventBus.cs
  22. 0 0
      src/NTMinerBus/Bus/IHandlerId.cs
  23. 0 0
      src/NTMinerBus/Bus/IMessage.cs
  24. 0 0
      src/NTMinerBus/Bus/IMessageDispatcher.cs
  25. 0 0
      src/NTMinerBus/Bus/MessageDispatchEventArgs.cs
  26. 0 0
      src/NTMinerBus/Bus/MessageDispatcher.cs
  27. 0 0
      src/NTMinerBus/Bus/MessageDispatcherExtensions.cs
  28. 0 0
      src/NTMinerBus/Bus/MessageTypeAttribute.cs
  29. 0 0
      src/NTMinerBus/LogEnum.cs
  30. 21 21
      src/NTMinerBus/NTMinerBus.csproj
  31. 2 2
      src/NTMinerBus/Properties/AssemblyInfo.cs
  32. 2 2
      src/NTMinerDaemon/NTMinerDaemon.csproj
  33. 2 2
      src/NTMinerServices/NTMinerServices.csproj
  34. 2 2
      src/NTMinerUpdater/NTMinerUpdater.csproj
  35. 2 2
      src/NTMinerWpf/NTMinerWpf.csproj
  36. 2 2
      src/NTMinerlib/NTMinerlib.csproj

+ 1 - 1
NTMiner.sln

@@ -71,7 +71,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "View", "View", "{6F255C76-F
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{3E8B6DD0-5039-4E01-899B-2FB28372E66E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTMiner.Bus", "src\NTMiner.Bus\NTMiner.Bus.csproj", "{E17F278A-E393-403E-9D37-E371036D7A02}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NTMinerBus", "src\NTMinerBus\NTMinerBus.csproj", "{E17F278A-E393-403E-9D37-E371036D7A02}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

+ 4 - 4
src/AppModels/AppModels.csproj

@@ -199,14 +199,14 @@
     <Compile Include="Vms\WalletViewModel.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 4 - 4
src/AppViews0/AppViews0.csproj

@@ -804,14 +804,14 @@
       <Project>{b7107a67-a76e-4313-8c5b-3265dde238b6}</Project>
       <Name>BlankWindow</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 2 - 2
src/CalcConfigUpdater/CalcConfigUpdater.csproj

@@ -58,9 +58,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 4 - 4
src/MinerClient/MinerClient.csproj

@@ -164,14 +164,14 @@
       <Project>{134d71fc-0b67-4a5a-ac05-67509de3b86b}</Project>
       <Name>MinerClientSelfHost</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 4 - 4
src/MinerClientSelfHost/MinerClientSelfHost.csproj

@@ -59,14 +59,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 4 - 4
src/MinerStudio/MinerStudio.csproj

@@ -153,14 +153,14 @@
       <Project>{526c022a-3c86-4998-a8f1-f5860f183c7c}</Project>
       <Name>MinerStudioSelfHost</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 4 - 4
src/MinerStudioSelfHost/MinerStudioSelfHost.csproj

@@ -61,14 +61,14 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
-      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
-    </ProjectReference>
     <ProjectReference Include="..\NTMiner.Core\NTMiner.Core.csproj">
       <Project>{85d052ab-44b8-46f3-9d7b-f624c24fd8ba}</Project>
       <Name>NTMiner.Core</Name>
     </ProjectReference>
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
+      <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
+      <Name>NTMinerBus</Name>
+    </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>
       <Name>NTMinerDataObjects</Name>

+ 2 - 2
src/NTMiner.Core/NTMiner.Core.csproj

@@ -246,9 +246,9 @@
     </COMReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 0 - 0
src/NTMiner.Bus/Cmd.cs → src/NTMinerBus/Bus/Cmd.cs


+ 0 - 0
src/NTMiner.Bus/DelegateHandler`1.cs → src/NTMinerBus/Bus/DelegateHandler`1.cs


+ 0 - 0
src/NTMiner.Bus/DirectBus/DirectBus.cs → src/NTMinerBus/Bus/DirectBus/DirectBus.cs


+ 0 - 0
src/NTMiner.Bus/DirectBus/DirectCommandBus.cs → src/NTMinerBus/Bus/DirectBus/DirectCommandBus.cs


+ 0 - 0
src/NTMiner.Bus/DirectBus/DirectEventBus.cs → src/NTMinerBus/Bus/DirectBus/DirectEventBus.cs


+ 0 - 0
src/NTMiner.Bus/EventBase.cs → src/NTMinerBus/Bus/EventBase.cs


+ 0 - 0
src/NTMiner.Bus/IBus.cs → src/NTMinerBus/Bus/IBus.cs


+ 0 - 0
src/NTMiner.Bus/ICmd.cs → src/NTMinerBus/Bus/ICmd.cs


+ 0 - 0
src/NTMiner.Bus/ICmdBus.cs → src/NTMinerBus/Bus/ICmdBus.cs


+ 0 - 0
src/NTMiner.Bus/IDelegateHandler.cs → src/NTMinerBus/Bus/IDelegateHandler.cs


+ 0 - 0
src/NTMiner.Bus/IEvent.cs → src/NTMinerBus/Bus/IEvent.cs


+ 0 - 0
src/NTMiner.Bus/IEventBus.cs → src/NTMinerBus/Bus/IEventBus.cs


+ 0 - 0
src/NTMiner.Bus/IHandlerId.cs → src/NTMinerBus/Bus/IHandlerId.cs


+ 0 - 0
src/NTMiner.Bus/IMessage.cs → src/NTMinerBus/Bus/IMessage.cs


+ 0 - 0
src/NTMiner.Bus/IMessageDispatcher.cs → src/NTMinerBus/Bus/IMessageDispatcher.cs


+ 0 - 0
src/NTMiner.Bus/MessageDispatchEventArgs.cs → src/NTMinerBus/Bus/MessageDispatchEventArgs.cs


+ 0 - 0
src/NTMiner.Bus/MessageDispatcher.cs → src/NTMinerBus/Bus/MessageDispatcher.cs


+ 0 - 0
src/NTMiner.Bus/MessageDispatcherExtensions.cs → src/NTMinerBus/Bus/MessageDispatcherExtensions.cs


+ 0 - 0
src/NTMiner.Bus/MessageTypeAttribute.cs → src/NTMinerBus/Bus/MessageTypeAttribute.cs


+ 0 - 0
src/NTMiner.Bus/LogEnum.cs → src/NTMinerBus/LogEnum.cs


+ 21 - 21
src/NTMiner.Bus/NTMiner.Bus.csproj → src/NTMinerBus/NTMinerBus.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{E17F278A-E393-403E-9D37-E371036D7A02}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>NTMiner.Bus</RootNamespace>
-    <AssemblyName>NTMiner.Bus</AssemblyName>
+    <RootNamespace>NTMiner</RootNamespace>
+    <AssemblyName>NTMinerBus</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
@@ -40,26 +40,26 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="Cmd.cs" />
-    <Compile Include="DelegateHandler`1.cs" />
-    <Compile Include="DirectBus\DirectBus.cs" />
-    <Compile Include="DirectBus\DirectCommandBus.cs" />
-    <Compile Include="DirectBus\DirectEventBus.cs" />
-    <Compile Include="EventBase.cs" />
-    <Compile Include="IBus.cs" />
-    <Compile Include="ICmd.cs" />
-    <Compile Include="ICmdBus.cs" />
-    <Compile Include="IDelegateHandler.cs" />
-    <Compile Include="IEvent.cs" />
-    <Compile Include="IEventBus.cs" />
-    <Compile Include="IHandlerId.cs" />
-    <Compile Include="IMessage.cs" />
-    <Compile Include="IMessageDispatcher.cs" />
+    <Compile Include="Bus\Cmd.cs" />
+    <Compile Include="Bus\DelegateHandler`1.cs" />
+    <Compile Include="Bus\DirectBus\DirectBus.cs" />
+    <Compile Include="Bus\DirectBus\DirectCommandBus.cs" />
+    <Compile Include="Bus\DirectBus\DirectEventBus.cs" />
+    <Compile Include="Bus\EventBase.cs" />
+    <Compile Include="Bus\IBus.cs" />
+    <Compile Include="Bus\ICmd.cs" />
+    <Compile Include="Bus\ICmdBus.cs" />
+    <Compile Include="Bus\IDelegateHandler.cs" />
+    <Compile Include="Bus\IEvent.cs" />
+    <Compile Include="Bus\IEventBus.cs" />
+    <Compile Include="Bus\IHandlerId.cs" />
+    <Compile Include="Bus\IMessage.cs" />
+    <Compile Include="Bus\IMessageDispatcher.cs" />
     <Compile Include="LogEnum.cs" />
-    <Compile Include="MessageDispatcher.cs" />
-    <Compile Include="MessageDispatcherExtensions.cs" />
-    <Compile Include="MessageDispatchEventArgs.cs" />
-    <Compile Include="MessageTypeAttribute.cs" />
+    <Compile Include="Bus\MessageDispatcher.cs" />
+    <Compile Include="Bus\MessageDispatcherExtensions.cs" />
+    <Compile Include="Bus\MessageDispatchEventArgs.cs" />
+    <Compile Include="Bus\MessageTypeAttribute.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>

+ 2 - 2
src/NTMiner.Bus/Properties/AssemblyInfo.cs → src/NTMinerBus/Properties/AssemblyInfo.cs

@@ -5,11 +5,11 @@ using System.Runtime.InteropServices;
 // 有关程序集的一般信息由以下
 // 控制。更改这些特性值可修改
 // 与程序集关联的信息。
-[assembly: AssemblyTitle("NTMiner.Bus")]
+[assembly: AssemblyTitle("NTMinerBus")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("NTMiner.Bus")]
+[assembly: AssemblyProduct("NTMinerBus")]
 [assembly: AssemblyCopyright("Copyright ©  2019")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]

+ 2 - 2
src/NTMinerDaemon/NTMinerDaemon.csproj

@@ -158,9 +158,9 @@
     <EmbeddedResource Include="NoDevFee\WinDivert.dll" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 2 - 2
src/NTMinerServices/NTMinerServices.csproj

@@ -135,9 +135,9 @@
     <EmbeddedResource Include="logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 2 - 2
src/NTMinerUpdater/NTMinerUpdater.csproj

@@ -141,9 +141,9 @@
       <Project>{b7107a67-a76e-4313-8c5b-3265dde238b6}</Project>
       <Name>BlankWindow</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 2 - 2
src/NTMinerWpf/NTMinerWpf.csproj

@@ -200,9 +200,9 @@
       <Project>{b7107a67-a76e-4313-8c5b-3265dde238b6}</Project>
       <Name>BlankWindow</Name>
     </ProjectReference>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>

+ 2 - 2
src/NTMinerlib/NTMinerlib.csproj

@@ -83,9 +83,9 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\NTMiner.Bus\NTMiner.Bus.csproj">
+    <ProjectReference Include="..\NTMinerBus\NTMinerBus.csproj">
       <Project>{e17f278a-e393-403e-9d37-e371036d7a02}</Project>
-      <Name>NTMiner.Bus</Name>
+      <Name>NTMinerBus</Name>
     </ProjectReference>
     <ProjectReference Include="..\NTMinerDataObjects\NTMinerDataObjects.csproj">
       <Project>{defc7387-f9fa-4651-a281-6612efb7fbb6}</Project>