Change default settings & project configurations.

hcoona · Dec 20, 2019 · 02aa307 · 02aa307
1 parent 1e40573
commit 02aa307
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 26 deletions.
diff --git a/...eothermalResearchInstitute.ServerConsole/GeothermalResearchInstitute.ServerConsole.csproj b/...eothermalResearchInstitute.ServerConsole/GeothermalResearchInstitute.ServerConsole.csproj
@@ -6,8 +6,8 @@
 
     <RuntimeIdentifier>win-x64</RuntimeIdentifier>
     <SelfContained>true</SelfContained>
-    <PublishSingleFile>True</PublishSingleFile>
-    <PublishReadyToRun>True</PublishReadyToRun>
+    <PublishSingleFile>False</PublishSingleFile>
+    <PublishReadyToRun>False</PublishReadyToRun>
     <PublishTrimmed>False</PublishTrimmed>
   </PropertyGroup>
 
@@ -38,25 +38,28 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Condition="'$(Configuration)' != 'Release'" Include="..\GeothermalResearchInstitute.FakePlcV2\GeothermalResearchInstitute.FakePlcV2.csproj" />
-    <Compile Condition="'$(Configuration)' == 'Release'" Remove="FakeDevicesHostedService.cs" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <None Update="appsettings.ini">
+  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
+    <ProjectReference Include="..\GeothermalResearchInstitute.FakePlcV2\GeothermalResearchInstitute.FakePlcV2.csproj" />
+    <None Update="appsettings.Development.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
-    <None Update="appsettings.Production.ini">
+    <None Update="appsettings.Staging.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
-    <None Condition="'$(Configuration)' == 'Debug'" Update="appsettings.Development.ini">
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Release'">
+    <Compile Remove="FakeDevicesHostedService.cs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Update="appsettings.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
-    <None Condition="'$(Configuration)' == 'Debug'" Update="appsettings.Staging.ini">
+    <None Update="appsettings.Production.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>

diff --git a/GeothermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/appsettings.ini b/GeothermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/appsettings.ini
@@ -6,8 +6,8 @@ TcpPort = 8889
 DefaultReadTimeoutMillis = 5000
 
 [tasks]
-; 1 second
-CollectAlarmIntervalMillis = 1000
+; 1 minute
+CollectAlarmIntervalMillis = 60000
 
 ; 10 minutes
 CollectMetricIntervalMillis = 600000

diff --git a/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj b/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj
@@ -13,8 +13,8 @@
     <DebugType>Full</DebugType>
     <DebugSymbols>True</DebugSymbols>
   </PropertyGroup>
+
   <ItemGroup>
-    <PackageReference Condition="'$(Configuration)' != 'Release'" Include="Grpc.Core.Testing" Version="2.25.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.CommandLine" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="3.0.0" />
@@ -34,12 +34,30 @@
     <PackageReference Include="Unity.Container" Version="5.11.4" />
     <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.11.5" />
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\..\GrpcLoggerAdapater\GrpcLoggerAdapater\GrpcLoggerAdapater.csproj" />
     <ProjectReference Include="..\..\third_party\ExtendedWPFToolkit\Xceed.Wpf.Toolkit\Xceed.Wpf.Toolkit.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.Grpc\GeothermalResearchInstitute.Grpc.csproj" />
     <ProjectReference Include="..\GeothermalResearchInstitute.PlcV2\GeothermalResearchInstitute.PlcV2.csproj" />
   </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Debug'">
+    <PackageReference Include="Grpc.Core.Testing" Version="2.25.0" />
+    <None Update="appsettings.Development.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    </None>
+    <None Update="appsettings.Staging.ini">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
+    </None>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(Configuration)' == 'Release'">
+    <Compile Remove="FakeClients\**" />
+  </ItemGroup>
+
   <ItemGroup>
     <None Remove="Resources\device.png" />
     <Resource Include="Resources\device.png" />
@@ -52,6 +70,7 @@
     <None Remove="Resources\logo.png" />
     <Resource Include="Resources\logo.png" />
   </ItemGroup>
+
   <ItemGroup>
     <None Update="appsettings.ini">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
@@ -61,16 +80,5 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
       <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
     </None>
-    <None Condition="'$(Configuration)' == 'Debug'" Update="appsettings.Development.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </None>
-    <None Condition="'$(Configuration)' == 'Debug'" Update="appsettings.Staging.ini">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-      <ExcludeFromSingleFile>true</ExcludeFromSingleFile>
-    </None>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Condition="'$(Configuration)' == 'Release'" Remove="FakeClients\**" />
   </ItemGroup>
 </Project>