Update Package versions.

hcoona · Dec 17, 2019 · eda4fd7 · eda4fd7
1 parent 9e1ac9f
commit eda4fd7
Show file tree

Hide file tree

Showing 16 changed files with 58 additions and 24 deletions.
diff --git a/...esearchInstitute/GeothermalResearchInstitute.Grpc/GeothermalResearchInstitute.Grpc.csproj b/...esearchInstitute/GeothermalResearchInstitute.Grpc/GeothermalResearchInstitute.Grpc.csproj
@@ -5,9 +5,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.10.0" />
-    <PackageReference Include="Grpc" Version="2.24.0" />
-    <PackageReference Include="Grpc.Tools" Version="2.24.0" PrivateAssets="All" />
+    <PackageReference Include="Google.Protobuf" Version="3.11.2" />
+    <PackageReference Include="Grpc" Version="2.25.0" />
+    <PackageReference Include="Grpc.Tools" Version="2.25.0" PrivateAssets="All" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...rchInstitute/GeothermalResearchInstitute.PlcClient/GeothermalResearchInstitute.Plc.csproj b/...rchInstitute/GeothermalResearchInstitute.PlcClient/GeothermalResearchInstitute.Plc.csproj
@@ -12,8 +12,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.1" />
     <PackageReference Include="Overby.Extensions.AsyncBinaryReaderWriter" Version="1.0.39" />
-    <PackageReference Include="System.Text.Json" Version="4.6.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />
   </ItemGroup>
 
 </Project>
diff --git a/...archInstitute/GeothermalResearchInstitute.ServerConsole/GrpcServices/DeviceServiceImpl.cs b/...archInstitute/GeothermalResearchInstitute.ServerConsole/GrpcServices/DeviceServiceImpl.cs
@@ -60,6 +60,11 @@ public DeviceServiceImpl(
                 TimeSpan.FromMilliseconds(tasksOptions.Value.CollectMetricIntervalMillis),
                 TimeSpan.FromMilliseconds(tasksOptions.Value.CollectMetricIntervalMillis));
 
+            IOptionsSnapshot<CoreOptions> coreOptions =
+                this.serviceProvider.GetRequiredService<IOptionsSnapshot<CoreOptions>>();
+            this.logger.LogInformation("CoreOptions: {0}", coreOptions.Value);
+            this.logger.LogInformation("TasksOptions: {0}", tasksOptions.Value);
+
             if (this.logger.IsEnabled(LogLevel.Debug))
             {
                 IOptionsSnapshot<DeviceOptions> deviceOptions = this.serviceProvider.GetRequiredService<IOptionsSnapshot<DeviceOptions>>();

diff --git a/GeothermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/Options/CoreOptions.cs b/GeothermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/Options/CoreOptions.cs
@@ -3,6 +3,8 @@
 // Licensed under the GPLv3 license. See LICENSE file in the project root for full license information.
 // </copyright>
 
+using System.Text.Json;
+
 namespace GeothermalResearchInstitute.ServerConsole.Options
 {
     public class CoreOptions
@@ -14,5 +16,10 @@ public class CoreOptions
         public int DefaultReadTimeoutMillis { get; set; }
 
         public int MaxFakeDeviceNum { get; set; }
+
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
     }
 }
diff --git a/...hermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/Options/TasksOptions.cs b/...hermalResearchInstitute/GeothermalResearchInstitute.ServerConsole/Options/TasksOptions.cs
@@ -3,12 +3,19 @@
 // Licensed under the GPLv3 license. See LICENSE file in the project root for full license information.
 // </copyright>
 
+using System.Text.Json;
+
 namespace GeothermalResearchInstitute.ServerConsole.Options
 {
     public class TasksOptions
     {
         public int CollectAlarmIntervalMillis { get; set; }
 
         public int CollectMetricIntervalMillis { get; set; }
+
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
     }
 }
diff --git a/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj b/...lResearchInstitute/GeothermalResearchInstitute.Wpf/GeothermalResearchInstitute.Wpf.csproj
@@ -11,24 +11,25 @@
     <PublishTrimmed>False</PublishTrimmed>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Condition="'$(Configuration)' != 'Release'" Include="Grpc.Core.Testing" Version="2.24.0" />
+    <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" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Configuration" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
-    <PackageReference Include="Prism.Unity" Version="7.2.0.1367" />
+    <PackageReference Include="Prism.Unity" Version="7.2.0.1422" />
     <PackageReference Include="Prism.Validation" Version="1.3.0" />
     <PackageReference Include="Serilog" Version="2.9.0" />
     <PackageReference Include="Serilog.Enrichers.Thread" Version="3.1.0" />
     <PackageReference Include="Serilog.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.4.0" />
     <PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
-    <PackageReference Include="Unity.Container" Version="5.11.1" />
-    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.10.2" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <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" />

diff --git a/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/Options/CoreOptions.cs b/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/Options/CoreOptions.cs
@@ -3,6 +3,8 @@
 // Licensed under the GPLv3 license. See LICENSE file in the project root for full license information.
 // </copyright>
 
+using System.Text.Json;
+
 namespace GeothermalResearchInstitute.Wpf.Options
 {
     public class CoreOptions
@@ -20,5 +22,10 @@ public class CoreOptions
         public int DefaultRefreshIntervalMillis { get; set; } = 1000;
 
         public int MaxErrorToleranceNum { get; set; } = 5;
+
+        public override string ToString()
+        {
+            return JsonSerializer.Serialize(this);
+        }
     }
 }
diff --git a/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/ViewModels/WelcomeViewModel.cs b/GeothermalResearchInstitute/GeothermalResearchInstitute.Wpf/ViewModels/WelcomeViewModel.cs
@@ -7,8 +7,10 @@
 using System.ComponentModel;
 using System.Linq;
 using GeothermalResearchInstitute.Wpf.Common;
+using GeothermalResearchInstitute.Wpf.Options;
 using GeothermalResearchInstitute.Wpf.Views;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Options;
 using Prism.Commands;
 using Prism.Mvvm;
 using Prism.Regions;
@@ -18,12 +20,17 @@ namespace GeothermalResearchInstitute.Wpf.ViewModels
     public class WelcomeViewModel : BindableBase
     {
         private readonly ILogger<WelcomeViewModel> logger;
+        private readonly IOptions<CoreOptions> coreOptions;
         private readonly IRegionManager regionManager;
         private ViewModelContext viewModelContext;
 
-        public WelcomeViewModel(ILogger<WelcomeViewModel> logger, IRegionManager regionManager)
+        public WelcomeViewModel(
+            ILogger<WelcomeViewModel> logger,
+            IOptions<CoreOptions> coreOptions,
+            IRegionManager regionManager)
         {
-            this.logger = logger;
+            this.logger = logger ?? throw new ArgumentNullException(nameof(logger));
+            this.coreOptions = coreOptions ?? throw new ArgumentNullException(nameof(coreOptions));
             this.regionManager = regionManager ?? throw new ArgumentNullException(nameof(regionManager));
 
             this.NavigateToLoginViewCommand = new DelegateCommand(this.ExecuteNavigateToLoginView);
@@ -33,7 +40,7 @@ public WelcomeViewModel(ILogger<WelcomeViewModel> logger, IRegionManager regionM
             this.NavigateToContactViewCommand = new DelegateCommand(
                 this.ExecuteNavigateToContactView);
 
-            this.logger.LogInformation("Hello World!");
+            this.logger.LogInformation("CoreOptions: {0}", this.coreOptions.Value);
         }
 
         public ViewModelContext ViewModelContext

diff --git a/GrpcLoggerAdapater/GrpcLoggerAdapater/GrpcLoggerAdapater.csproj b/GrpcLoggerAdapater/GrpcLoggerAdapater/GrpcLoggerAdapater.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Grpc.Core" Version="2.24.0" />
+    <PackageReference Include="Grpc.Core" Version="2.25.0" />
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="3.0.0" />
   </ItemGroup>
 

diff --git a/...it/MicrosoftExtensions.Logging.Xunit.Tests/MicrosoftExtensions.Logging.Xunit.Tests.csproj b/...it/MicrosoftExtensions.Logging.Xunit.Tests/MicrosoftExtensions.Logging.Xunit.Tests.csproj
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/SharpCircularList/CircularList.UnitTest/CircularList.UnitTest.csproj b/SharpCircularList/CircularList.UnitTest/CircularList.UnitTest.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="MSTest.TestAdapter" Version="2.0.0" />
     <PackageReference Include="MSTest.TestFramework" Version="2.0.0" />
   </ItemGroup>

diff --git a/SwigDoc2Latex/SwigDoc2Latex.CsConsoleApp/SwigDoc2Latex.CsConsoleApp.csproj b/SwigDoc2Latex/SwigDoc2Latex.CsConsoleApp/SwigDoc2Latex.CsConsoleApp.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HtmlAgilityPack" Version="1.11.16" />
+    <PackageReference Include="HtmlAgilityPack" Version="1.11.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/TimeLimiter/TimeLimiterUnitTest/TimeLimiterUnitTest.csproj b/TimeLimiter/TimeLimiterUnitTest/TimeLimiterUnitTest.csproj
@@ -18,7 +18,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
       <PrivateAssets>all</PrivateAssets>

diff --git a/codelab/PrismLab/PrismLab.csproj b/codelab/PrismLab/PrismLab.csproj
@@ -8,8 +8,8 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Configuration.Ini" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.0.0" />
-    <PackageReference Include="Prism.Unity" Version="7.2.0.1367" />
-    <PackageReference Include="Unity.Container" Version="5.11.1" />
-    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.10.2" />
+    <PackageReference Include="Prism.Unity" Version="7.2.0.1422" />
+    <PackageReference Include="Unity.Container" Version="5.11.4" />
+    <PackageReference Include="Unity.Microsoft.DependencyInjection" Version="5.11.5" />
   </ItemGroup>
 </Project>
diff --git a/codelab/TcpServerLab/TcpServerLab.csproj b/codelab/TcpServerLab/TcpServerLab.csproj
@@ -21,8 +21,8 @@
     <PackageReference Include="Microsoft.Extensions.Logging" Version="3.0.1" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="3.0.1" />
     <PackageReference Include="Overby.Extensions.AsyncBinaryReaderWriter" Version="1.0.39" />
-    <PackageReference Include="System.Text.Json" Version="4.6.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />
   </ItemGroup>
 
 </Project>
diff --git a/codelab/TplLab/TplLab.csproj b/codelab/TplLab/TplLab.csproj
@@ -6,8 +6,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="4.6.0" />
-    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.10.0" />
+    <PackageReference Include="System.Text.Json" Version="4.7.0" />
+    <PackageReference Include="System.Threading.Tasks.Dataflow" Version="4.11.0" />
   </ItemGroup>
 
 </Project>