Merge branch 'master' of http://git.ius.plus:88/Project-Wing/WingCloudServer

src/Publish.ps1

@@ -52,11 +52,13 @@ dotnet publish "../../WingStorageModule/src/WingStorageModule.csproj" -c Release
 Copy-Item -recurse -Force ../../WingStorageModule/src/bin/Release/net6.0/publish/WingStorageModule.dll -Destination ../../Wing/server/NetService/WingStorageModule.dll
 Copy-Item -recurse -Force ../../WingStorageModule/src/bin/Release/net6.0/publish/*.dll -Destination ../../Wing/server/Dependencies/ -Exclude WingStorageModule.dll
 
+nuget restore "../../DeviceService/DeviceService.csproj" -source "http://nuget.ius.plus:88/v3/index.json;https://nuget.cdn.azure.cn/v3/index.json"
+dotnet publish "../../DeviceService/DeviceService.csproj" -c Release
+Copy-Item -recurse -Force ../../DeviceService/bin/Release/net6.0/publish/DeviceService.dll -Destination ../../Wing/server/NetService/DeviceService.dll
+Copy-Item -recurse -Force ../../DeviceService/bin/Release/net6.0/publish/*.dll -Destination ../../Wing/server/Dependencies/ -Exclude DeviceService.dll
+
+
 # nuget restore "../../WingAuthenticationModule/WingAuthenticationModule.csproj" -source "http://nuget.ius.plus:88/v3/index.json;https://nuget.cdn.azure.cn/v3/index.json"
 # dotnet publish "../../WingAuthenticationModule/WingAuthenticationModule.csproj" -c Release
 # Copy-Item -recurse -Force ../../WingAuthenticationModule/bin/Release/net6.0/publish/WingAuthenticationModule.dll -Destination ../../Wing/server/NetService/WingAuthenticationModule.dll
 # Copy-Item -recurse -Force ../../WingAuthenticationModule/bin/Release/net6.0/publish/*.dll -Destination ../../Wing/server/Dependencies/ -Exclude WingAuthenticationModule.dll
-
-### tools
-IF (-not(Test-Path ../../Wing/server/Tools/)) { New-Item -Path ../../Wing/server/ -Name Tools -Type Directory -force }
-Copy-Item -recurse -Force ../../WingServerTools/src/* -Destination ../../Wing/server/Tools

src/WingCloudServer.csproj

@@ -13,31 +13,58 @@
   
   <ItemGroup>
     <None Update="appsettings.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="InProcessService\ReadMe.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="NetService\ReadMe.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Tools\Elasticsearch\ReadMe.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Update="Tools\lin\lin_mongod">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Tools\Mongo\ReadMe.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Update="Tools\lin\lin_ServerReboot">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\lin\lin_Sms.Tool">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\mac\mac_mongodump">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\mac\mac_mongod">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\mac\mac_ServerReboot">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\mac\mac_Sms.Tool">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\win\win_mongodump.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\win\win_mongod.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\win\win_ServerReboot.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
+    <None Update="Tools\win\win_Sms.Tool.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="macstart.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="start.sh">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="start.bat">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <None Update="Dependencies\ReadMe.txt">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
 </Project>