zoule 3 months ago
parent
commit
a96bbea593
35 changed files with 542 additions and 1252 deletions
  1. 0 22
      ConsoleApp1/ConsoleApp1.csproj
  2. 0 2
      ConsoleApp1/Program.cs
  3. 0 76
      Service/CheckServer/App.config
  4. 0 76
      Service/CpuCgServer/App.config
  5. 0 76
      Service/GpuCgServer/App.config
  6. 0 76
      Service/X2D1TaskServer/App.config
  7. 12 8
      XdCxRhDW.Api/app.config
  8. 1 21
      XdCxRhDW.App/App.config
  9. 38 0
      XdCxRhDW.App/MainForm.Designer.cs
  10. 44 30
      XdCxRhDW.App/MainForm.cs
  11. 189 188
      XdCxRhDW.App/MainForm.resx
  12. 20 20
      XdCxRhDW.App/XdCxRhDW.App.csproj
  13. 10 10
      XdCxRhDW.App/packages.config
  14. 12 8
      XdCxRhDW.Entity/app.config
  15. 33 27
      XdCxRhDW.Framework/01.XdCxRhDW.Framework.csproj
  16. 8 0
      XdCxRhDW.Framework/AppConfigHelper.cs
  17. 0 8
      XdCxRhDW.Framework/ILLink/ILLink.Descriptors.LibraryBuild.xml
  18. 12 8
      XdCxRhDW.Framework/app.config
  19. 13 13
      XdCxRhDW.Framework/packages.config
  20. 21 77
      XdCxRhDW.Repostory/04.XdCxRhDW.Repostory.csproj
  21. 24 0
      XdCxRhDW.Repostory/EFContext/MySqlConfiguration.cs
  22. 9 11
      XdCxRhDW.Repostory/EFContext/MySqlContext.cs
  23. 0 8
      XdCxRhDW.Repostory/ILLink/ILLink.Descriptors.LibraryBuild.xml
  24. 0 138
      XdCxRhDW.Repostory/Oracle.DataAccess.Common.Configuration.Section.xsd
  25. 0 221
      XdCxRhDW.Repostory/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd
  26. 13 25
      XdCxRhDW.Repostory/app.config
  27. 10 29
      XdCxRhDW.Repostory/packages.config
  28. 12 8
      XdCxRhDW.Sender/App.config
  29. 12 8
      XdCxRhDW.UI.Lib/app.config
  30. 16 19
      XdCxRhDW.WebApi/05.XdCxRhDW.WebApi.csproj
  31. 0 8
      XdCxRhDW.WebApi/ILLink/ILLink.Descriptors.LibraryBuild.xml
  32. 13 9
      XdCxRhDW.WebApi/app.config
  33. 8 8
      XdCxRhDW.WebApi/packages.config
  34. 0 6
      XdCxRhDW.sln
  35. 12 8
      XdCxRhDw.Dto/app.config

+ 0 - 22
ConsoleApp1/ConsoleApp1.csproj

@@ -1,22 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0</TargetFramework>
-    <ImplicitUsings>enable</ImplicitUsings>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Core" Version="9.0.3" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.3">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-    <PackageReference Include="MySql.EntityFrameworkCore" Version="9.0.0" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.4" />
-    <PackageReference Include="Npgsql.Json.NET" Version="9.0.3" />
-    <PackageReference Include="Oracle.EntityFrameworkCore" Version="9.23.60" />
-  </ItemGroup>
-
-</Project>

+ 0 - 2
ConsoleApp1/Program.cs

@@ -1,2 +0,0 @@
-// See https://aka.ms/new-console-template for more information
-Console.WriteLine("Hello, World!");

+ 0 - 76
Service/CheckServer/App.config

@@ -13,80 +13,4 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
 	</startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

+ 0 - 76
Service/CpuCgServer/App.config

@@ -14,80 +14,4 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
 	</startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

+ 0 - 76
Service/GpuCgServer/App.config

@@ -14,80 +14,4 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
 	</startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

+ 0 - 76
Service/X2D1TaskServer/App.config

@@ -33,80 +33,4 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
 	</startup>
-  <runtime>
-    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
-      <dependentAssembly>
-        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.0.0" newVersion="4.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Net.Http.Formatting" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="6.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Http.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Owin.Security" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Web.Cors" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-5.3.0.0" newVersion="5.3.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-2.0.0.0" newVersion="2.0.0.0" />
-      </dependentAssembly>
-      <dependentAssembly>
-        <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
-      </dependentAssembly>
-    </assemblyBinding>
-  </runtime>
 </configuration>

+ 12 - 8
XdCxRhDW.Api/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -12,31 +12,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 1 - 21
XdCxRhDW.App/App.config

@@ -1,12 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-	<configSections>
-		<section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
-	</configSections>
 	<connectionStrings>
-		<add name="DbCon" connectionString="Data Source=Database.db" providerName="System.Data.SQLite.EF6" />
-		<add name="MySql" connectionString="server=192.168.1.5;uid=root;pwd=123456;database=test" providerName="MySql.Data.MySqlClient" />
-		<add name="LogDbCon" connectionString="Data Source=Log.db" providerName="System.Data.SQLite.EF6" />
+		<add name="MySql"  connectionString="server=192.168.101.3;uid=root;pwd=123456;database=test;" />
 	</connectionStrings>
 	<appSettings>
 		<!--程序标题-->
@@ -35,19 +30,4 @@
 	<startup>
 		<supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
 	</startup>
-
-	<system.data>
-		<DbProviderFactories>
-			<add
-			 name="MySQL Data Provider"
-			 invariant="MySql.Data.MySqlClient"
-			 description=".Net Framework Data Provider for MySQL"
-			 type="MySql.Data.MySqlClient.MySqlClientFactory, MySql.Data" />
-		</DbProviderFactories>
-	</system.data>
-	<entityFramework>
-		<providers>
-			<provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d"></provider>
-		</providers>
-	</entityFramework>
 </configuration>

+ 38 - 0
XdCxRhDW.App/MainForm.Designer.cs

@@ -60,10 +60,14 @@
             this.documentManager1 = new DevExpress.XtraBars.Docking2010.DocumentManager(this.components);
             this.tabbedView1 = new DevExpress.XtraBars.Docking2010.Views.Tabbed.TabbedView(this.components);
             this.dockManager1 = new DevExpress.XtraBars.Docking.DockManager(this.components);
+            this.tablePanel1 = new DevExpress.Utils.Layout.TablePanel();
+            this.txtMsg = new DevExpress.XtraEditors.LabelControl();
             ((System.ComponentModel.ISupportInitialize)(this.ribbon)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.documentManager1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).BeginInit();
+            this.tablePanel1.SuspendLayout();
             this.SuspendLayout();
             // 
             // ribbon
@@ -337,11 +341,40 @@
             "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl",
             "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"});
             // 
+            // tablePanel1
+            // 
+            this.tablePanel1.Columns.AddRange(new DevExpress.Utils.Layout.TablePanelColumn[] {
+            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F),
+            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.AutoSize, 55F),
+            new DevExpress.Utils.Layout.TablePanelColumn(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F)});
+            this.tablePanel1.Controls.Add(this.txtMsg);
+            this.tablePanel1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tablePanel1.Location = new System.Drawing.Point(0, 126);
+            this.tablePanel1.Name = "tablePanel1";
+            this.tablePanel1.Rows.AddRange(new DevExpress.Utils.Layout.TablePanelRow[] {
+            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F),
+            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Absolute, 26F),
+            new DevExpress.Utils.Layout.TablePanelRow(DevExpress.Utils.Layout.TablePanelEntityStyle.Relative, 1F)});
+            this.tablePanel1.Size = new System.Drawing.Size(1347, 578);
+            this.tablePanel1.TabIndex = 2;
+            this.tablePanel1.UseSkinIndents = true;
+            // 
+            // txtMsg
+            // 
+            this.tablePanel1.SetColumn(this.txtMsg, 1);
+            this.txtMsg.Location = new System.Drawing.Point(639, 282);
+            this.txtMsg.Name = "txtMsg";
+            this.tablePanel1.SetRow(this.txtMsg, 1);
+            this.txtMsg.Size = new System.Drawing.Size(70, 14);
+            this.txtMsg.TabIndex = 0;
+            this.txtMsg.Text = "labelControl1";
+            // 
             // MainForm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1347, 704);
+            this.Controls.Add(this.tablePanel1);
             this.Controls.Add(this.ribbon);
             this.IconOptions.Image = ((System.Drawing.Image)(resources.GetObject("MainForm.IconOptions.Image")));
             this.IsMdiContainer = true;
@@ -353,6 +386,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.documentManager1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabbedView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.dockManager1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.tablePanel1)).EndInit();
+            this.tablePanel1.ResumeLayout(false);
+            this.tablePanel1.PerformLayout();
             this.ResumeLayout(false);
             this.PerformLayout();
 
@@ -388,5 +424,7 @@
         private DevExpress.XtraBars.BarButtonItem btnSignalEmulation;
         private DevExpress.XtraBars.BarButtonItem btnFixedStation;
         private DevExpress.XtraBars.BarButtonItem btnDraw;
+        private DevExpress.Utils.Layout.TablePanel tablePanel1;
+        private DevExpress.XtraEditors.LabelControl txtMsg;
     }
 }

+ 44 - 30
XdCxRhDW.App/MainForm.cs

@@ -39,6 +39,9 @@ using DevExpress.LookAndFeel.Design;
 using System.Configuration;
 using XdCxRhDW.Framework;
 using XdCxRhDW.UI.Lib;
+using DevExpress.XtraBars.Docking2010.Views.Tabbed;
+using MySql.Data.EntityFramework;
+using MySql.Data.MySqlClient;
 
 namespace XdCxRhDW
 {
@@ -76,10 +79,48 @@ namespace XdCxRhDW
         {
             this.text = this.Text;
             this.HtmlText = $"<size=12>{this.text}";
-            using (MySqlContext db = new MySqlContext())
+            this.ribbonPageGroup1.Enabled = false;
+            this.ribbonPageGroup2.Enabled = false;
+            btnXlCalculate.Enabled = false;
+            txtSvrLog.Enabled = false;
+            string con = AppConfigHelper.GetConnectionString("MySql");
+            string conWithTimeout = con;
+            if (!con.Contains("ConnectionTimeout"))
             {
-                SysConfig.Config = db.SysSetings.FirstOrDefault();
+                conWithTimeout = $"{con}ConnectionTimeout=5;";
             }
+            tabbedView1.DocumentActivated += (s, arg) => this.tablePanel1.Visible = false;
+            tabbedView1.DocumentRemoved += (s, arg) => this.tablePanel1.Visible = tabbedView1.ActiveDocument == null;
+            bool dbEnable = false;
+            using (MySqlConnection myCon = new MySqlConnection(conWithTimeout))
+            {
+                txtMsg.Text = $"正在连接MySql...";
+                await Task.Run(() =>
+                {
+                    try
+                    {
+                        myCon.Open();
+                        dbEnable = true;
+                    }
+                    catch
+                    {
+                    }
+                });
+            }
+            if (!dbEnable)
+            {
+                txtMsg.Text = $"无法连接到MySql=>{con}";
+                return;
+            }
+
+            using (MySqlContext ctx = new MySqlContext())
+            {
+                SysConfig.Config =await ctx.SysSetings.FirstOrDefaultAsync();
+            }
+            this.ribbonPageGroup1.Enabled = true;
+            this.ribbonPageGroup2.Enabled = true;
+            btnXlCalculate.Enabled = true;
+            txtSvrLog.Enabled = true;
             if (SysConfig.Config != null)
             {
                 StartWebApi();
@@ -139,34 +180,6 @@ namespace XdCxRhDW
         {
             try
             {
-                //using (MySqlContext db = new MySqlContext())
-                //{
-                //    if (File.Exists(db.DbFile))
-                //    {
-                //        FileInfo fInfo = new FileInfo(db.DbFile);
-                //        if (fInfo.IsReadOnly)
-                //        {
-                //            fInfo.IsReadOnly = false;
-                //        }
-
-                //    }
-
-                //}
-                //using (MySqlContext db = new MySqlContext())
-                //{
-                //    if (File.Exists(db.DbFile))
-                //    {
-                //        FileInfo fInfo = new FileInfo(db.DbFile);
-                //        if (fInfo.IsReadOnly)
-                //        {
-                //            fInfo.IsReadOnly = false;
-                //        }
-                //    }
-                //}
-                //using (MySqlContext db = new MySqlContext())
-                //{
-                //    db.SyncDb();
-                //}
                 //using (MySqlContext db = new MySqlContext())
                 //{
                 //    db.SyncDb();
@@ -474,6 +487,7 @@ namespace XdCxRhDW
 
         private void btn_ItemClick(object sender, ItemClickEventArgs e)
         {
+            this.tablePanel1.Visible = false;
             var btnTxt = e?.Item?.Caption?.Trim() ?? "任务管理";
             BaseDocument doc = null;
             doc = tabbedView1.Documents.Find(p => p.Control.GetType() == ctrlTypes[btnTxt]).FirstOrDefault();

+ 189 - 188
XdCxRhDW.App/MainForm.resx

@@ -150,49 +150,49 @@
   <data name="btnTask.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAABx0RVh0VGl0
-        bGUASGlkZTtSZW1vdmU7RGVsZXRlO2V5ZXgJjS0AAAm6SURBVFhHxZYJVFTnGYavxizGJpo0iWlqYpOY
-        xaRNNUajcQMUkGVAZBVkU2CGdZAtIqsgCqhsAWVAdjBCWES2GVBAhh2VaEAYlUV2cAEVLKY9ffv9o6Cm
-        tk17epJ7znNn/uV+7/t//3IvB+BX5amVvyTyW71w5/9EndCZq3N05modnbgaB8Lekau2deCkAoJvx52x
-        seUqrfhc5Q4bjq4ZU5SZWXISU8ufb6DuJ/+ZaJ2jkKuVizpx1XaOnJSEqwT23Bk+iVrbchUkXEHC5ZbW
-        cvFSU4vIup0u90uMzeNYudho29MNyFwtfhYsyNOQuZhzsp1m09A1s8TYLKXRxhTDGYdRZGjyN4dlK549
-        qWf03xmYEmABiWceY9ZjsDJrZ8xQUFCYVWS0LaXJZhuG0w6jxtIY2dp6Iawth7flZxig0bDOLGCss/Y8
-        afgOU+khy1TpAfMLVSHbUBFkhDJ/XYi9tFHgvqkl21HxWKr1ams/vZVvqqiozMnX35reYGWMoZQo1FgY
-        IktD+xsWK1NNizuuqvmYAScSd3owrzKXJ4Vz9xgvqI20Onou1m5ClumJ7sIADFUcxK36aNw5J8JY42H0
-        lwaj7Zg7qg+ZocRPH7Kqgr+XughvNWzfisHEcEhN9ZGhyoumeCxDMzI2qnHpSqqPDNQ6COWLia3iKWFi
-        ljTCyqU1ze1+f1kwCR3B+IUk3Lt0DH+RZWOyIx8/dpfgx54yTHaLce9KIcZac3G3vw21+4JQZ2GAwfiD
-        qDLZgiQV9QRNTc0XWdxWW0Muee1GLnG10iMD1Xa0bWztp8WddFbOOSeyl3Tm+2KkOgpjzSnoqk5EZlwQ
-        gnxcsd3cEiqbdLBkuTI+WaIIBSUt2Aoc0HyuCZUBQag100d/bDAqjTajfI8fmvOT+3SWv/8mxX6WxY9f
-        tY6L+3LNIwNVtGcrrQXMwMwNS9+dfV5kK+vI88VgVQzK0kPg5eoEc6OtMOFtgq6qMjQ3qUOdpwd1PTMo
-        65jA0NgCpWIJij29ULNNF33RQSg30EJZwF6M9rajLkaIw9ofdL81Z+bchyZmxCxd+cgA269MnDWeOWie
-        13bcE/XH9yPga2fs4pvCytQMK5TIgJ0fnPyi4BuZgvDkE4jNFCPuOzFaLndB4huAamMd9Eb445SuJvI8
-        dqOpRooQfz+cSQpAxX5THFB5p4w05hDytTBtgBWIWemumrxmkR1yIz0R6GyNiP17kJN7Ehv1hHDemwa/
-        mHykihtR2X4NBU0t8I9IwemqJhR5+qHKSBs9h7xRpqOGfO89VH8WWTknEeTlAVdahOnBLsh3U4fT0le3
-        ktZsYubjBtjoXzgVZNKZE+aKA242yMnJhUx2GUfTC2BkHwbv6EKEp1dA2tGPqqs9ONs/goFbYzjhthtn
-        9HnoCt4NsZYqCrwD0UZ93IKSERiWhra2dmRlZsHDVAfJPnxEai/uJa15hHwqCPnt2SQHZdXCUAEidvEh
-        EZeit28Ad+6MQ+hzBNZeSfCNKUR8Xj1OtXaQ+DAGb9+BxCcAlboa6NrrjhINZWS50Tbtv47kgga4Bn8L
-        Y9v9uE0xenr6UFwigZf5FogEGrD84BlN0pRngRmQj/6kJy/xsIfFZGF+Ibq7ejE6No7xifsw5O+DwDcD
-        vtFFSMpvhNeBOPTdHIXY2x8VlO4Of2cUqikhzcEVldJGnGq4gpjMGvhEFWD9FjdM3LuP0dvj6L7Wh8Ii
-        CXbrK026fTrrCGm+TLC1IL/NKfLSkqWJYkdbf2jH0OBNjN2ewN3xSRjY7IW5WwLcD+WRgQYUiCuRabcT
-        p7VVcdXbHgWqCkiyFaL0dA0MLdyRW96CsNQKuIVmY4Pe17g7MUlZuIeR62Nou9wNUVTU0K7PZl0gzVcJ
-        dnzLDfzGyi3lSvmpRnR19GFo6BZu3Bon5/fA94iCqUsc/GkKLrb3IIvET/GUcWWXAPkb1+GojQOKS6ug
-        oSuAicBHbiCcDNgHpEN3RyDGSPzm6ASGb9xBd+8IJOXN2GQcLnvcAJuCF80cRSGJGVIy0I/e/psYHBnD
-        CD0UEX8CpsIoVDe1I9vRDWXqGyBz3YE8xTUQ7bBFEWVEmWeJZav1kJJbRVlqQpCoFIZ2YfAJScH1m3cx
-        fP0O+odGycANHBKVQ2HzHvZCYmeCfArYInzui7X6ixy8s26ca+5AR9cwrvXdRN/gKC5euobCslp8K3BG
-        mZoi2pzNkaPwFeJp5OKyKmgZ2FHqPZCaW41jRc04mFwB95AcrNdxh7ThEgmPoYcG1NlzA+dbe2HATxpb
-        +NH6P5Km/Gie2obyadhiEWoXHF2KS7I+XO4cRue16xgeuYXjAiEkKgpotTfBd+tWItHWGbLOARRXXkJW
-        STOyJBcQn12PfbGl8Io8CXWzPdgVlIhuGgQTvtI9jLarQ/AKLsJqta93ktYrBEv/9DaUb0XiFQPrb2Ji
-        U6Voae9H/+AIsh1cUKK8Di02BshavQKxVg44e7EDUemVOJB4Wi56IOE0Ag9LIAw8DpWtPtjmEILWywNk
-        chiXrgziB4oVHl8BJZ298aQxn3iBYFM/4/GTUL4didfMHY+IqhvakUkjL96wBi3bdXH8qy8Qu8MOkooG
-        8D1FsNqVABdKtXBfJvjeKdAXHMQaLRfs9BXh+9YeEh2g6evD6RoZHLyyobg5UESx3yIepJ40p0/CmD8t
-        p/IDE/Pnz59DHxOLQ9eqthUpfoWL5to4tvJzJAic0D8wgvKaFuzelwwdS3+s0nQihOCZ+cLVLw55dEw3
-        /3ANZ4ni8lb4HSyGhumRgWXr+OwDg70Np98DwQs+fDB4dota/DkX+fFSqueemTt37isB732SX7h+Fb43
-        1kDGiiUINbT8K8vIkZQqJGbW4YT4e1Q3XkX9+U7UN3fJ/58QX0DCt7UIiiqFhXMG1E2iu9Zo7A54/oWX
-        3qe4bMux7E6LP2Eg/MPPqF6elpf9F36cV7h2Jc4bqiJt+Z9h/caC77S0tJYr8/gaG3UDwjSMw8Q88+j2
-        zduPTupsTwD9QssiflLd+BuZsn6oZD3PN2Lxsi1qFOtt4rcES7n8O4CY0bBplVz8CQOH3vuU2rjZ3m9/
-        kJJHc31OdyPSln2G7fPeSFu0aNHrbFqo/SWCjYQtot8T7xB/eMhCggn+jniNYMcsO+vZSp8WnuKfDIQu
-        XEx9uJfivlw30aitiIQln8Ji7uupVDd1WLAgDBbwOeJ5gqWUiTDYf1bH2lifqWeeEP6XBkLe/oj6crM9
-        3nw3cv+CDyfNXn6NvSzk4vbz5nN2D6Frasv+W6YE/hPTBliBLuaYjWYqfTOnhBk/ffj/wbSBX5OnVv5y
-        gPsH74Mcs+ZboRcAAAAASUVORK5CYII=
+        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
+        gxyzk7AwVQAAAABJRU5ErkJggg==
 </value>
   </data>
   <data name="btnTask.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -382,48 +382,50 @@
   <data name="btnSat.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
-        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNhdGVsaXRlOxVk56QAAAILSURB
-        VDhPjZHNaxNRFMULhS7daF37FwhmoQjdGMWt4EYScGM6oSC4GE2NhtbRYBonaUK+TUxmFTQfJoGEiApi
-        BZMomEUdA6FuBZGmuBDaSkOv546TIe1U7IXfvHnv3XPee/dOENF/abVaB8J7fz/7YmaueB68Akd4Pi6q
-        1+vuXC73LZ1OW5PJpNkAostgW376iTC+4LWRuNFo3KvVasNqtUqJRGJgMoDAAYbP3n5l8W9gHYm73e6J
-        SqWyVSqVKBqNDmOx2I09Bkh2gV3ljSYeWoXHs5lMZgqnfsCp20tLvvm7njs/Q6HQRiQSmWfT/QbS7PIK
-        i3fPCU9u2+329WKxuNbpdKjX61E4HN7x+R56IDo6utVBT5CAG++bKhQKa+12mwaDAfX7fcItCIINFo1j
-        KiI75/P5dxgNcbPZJEVRKB6Pvy6Xy3qmrh03wJtPiaJ4EjfYYgNVVTUx2kbBYHAVz5jEDY0WmwxSqZSE
-        6pLT6dyEgFB1ymazFAgEPttstvWL15YXIDRabDLgkO5LZa/3AQmCsOn3+39B3JBlefKCIyrPzBVovMUm
-        g5u3xGPgy+LiwnO0i1wu12kuFJL3tBhc4nxNe9X7chp81w2ugOP8j5MlYOF/CIwWAwevcWgG18MrZ4Cq
-        r/0z2AS49akWmoFH+WgRk+8Jowp+6HuHCqMGj0qrFnAWTPP88NDEH/j96Y9kjSwpAAAAAElFTkSuQmCC
+        dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAPdEVYdFRpdGxlAFNhdGVsaXRlOxVk56QAAAIoSURB
+        VDhPlZLBa9NQHMcHgx296Dz7Fwj2oAjvYhWvghdpYRe3lgcDD2k7p2UzWuzaviyhTZPa2ORUtC81DTRU
+        piBWMK0Fe6i1UOZVEFmHB2GbWPbkVVtiMxn+4Bd+L/l9P+/l930zhJCZ49K27SOTfvv9mAoA8WUA8QsA
+        8Qm6doqq1eqqqqqf8/m8V5ZlNwBAfB1AfJB68p4AiJ87AZZl3TNNc1ipVIgkSQMXAEC8CCAePn39iYp/
+        AIi9Y3G73T5jGMa+ruskk8kMRVG89RcAQBwBEB9qr0bioTfwaElRlDnLst6ZpnmwsRFfuRu9843n+d10
+        Or1CodMAdmmzTsWHlwKPb/v9/h2M8Xaz2SS9Xo8IgvAzHn8YlWX55PhUR/0CCyBelSRprlQqbTcaDTIY
+        DEi/3yemaRJZlnepyJmuIVJysVh8Y9v2RFyr1YimaSSbzb4sl8uTXpeNiqKcYxjmrCRJ+xTQ7XZHYlVV
+        CcdxHUEQZp0WuwC5XI4VRZEEg8E9juOIYRikUCgQhNAHn8+3c/Xm5prTYheABnufLcdiD0ggENhLJBLf
+        EUJWKpWavbKYSQFYIk6LXYBQmDkVCjMf19fXnvE8TyKRyHk6qGmLAcTXaP9IuxDbml+IbX35A7gRCjOn
+        aY0QYhFCHlo7LaaXbbzhCLAs1C8sC/Xu5Bj/iLHFzncjQFRreRj5LYlqrW5Ua311NhwXkxkk9Y4nqXcu
+        JvXOPF3/T/4C+P3pj1/PMtcAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="btnSat.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         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
-        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
-        2GJTAAAAAElFTkSuQmCC
+        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
 </value>
   </data>
   <data name="btnDetectTool.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -701,114 +703,113 @@
   </metadata>
   <data name="MainForm.IconOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        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
+        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
 </value>
   </data>
   <metadata name="dockManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

+ 20 - 20
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -99,8 +99,8 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="Google.Protobuf, Version=3.30.0.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.30.0\lib\net45\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.30.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.30.2\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
@@ -111,8 +111,8 @@
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=5.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.5.0.0\lib\net461\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.9.3.0\lib\net462\MySql.Data.dll</HintPath>
@@ -127,14 +127,14 @@
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.8.0.0\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+    <Reference Include="System.Configuration.ConfigurationManager, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Configuration.ConfigurationManager.9.0.4\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -143,35 +143,35 @@
       <HintPath>..\System.Data.SQLite.dll</HintPath>
     </Reference>
     <Reference Include="System.Deployment" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=8.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.8.0.1\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.4\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
-    <Reference Include="System.IO.Pipelines, Version=5.0.0.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.5.0.2\lib\net461\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.4\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Drawing" />
-    <Reference Include="System.Memory, Version=4.0.1.2, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.5.5\lib\net461\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http">
       <Private>True</Private>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.4.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.5.0\lib\net46\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.0.0\lib\net461\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime.Remoting" />
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Runtime.Serialization.Formatters.Soap" />
     <Reference Include="System.Security" />
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Web.Extensions" />

+ 10 - 10
XdCxRhDW.App/packages.config

@@ -2,20 +2,20 @@
 <packages>
   <package id="BouncyCastle.Cryptography" version="2.5.1" targetFramework="net472" />
   <package id="EntityFramework" version="6.5.1" targetFramework="net472" />
-  <package id="Google.Protobuf" version="3.30.0" targetFramework="net472" />
+  <package id="Google.Protobuf" version="3.30.2" targetFramework="net472" />
   <package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net472" />
   <package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="5.0.0" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.4" targetFramework="net472" />
   <package id="MySql.Data" version="9.3.0" targetFramework="net472" />
   <package id="MySql.Data.EntityFramework" version="9.3.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.5.1" targetFramework="net472" />
-  <package id="System.Configuration.ConfigurationManager" version="8.0.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="8.0.1" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="5.0.2" targetFramework="net472" />
-  <package id="System.Memory" version="4.5.5" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.5.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.0.0" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="System.Configuration.ConfigurationManager" version="9.0.4" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.4" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="9.0.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net472" />
   <package id="ZstdSharp.Port" version="0.8.5" targetFramework="net472" />
 </packages>

+ 12 - 8
XdCxRhDW.Entity/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -12,31 +12,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 33 - 27
XdCxRhDW.Framework/01.XdCxRhDW.Framework.csproj

@@ -12,6 +12,8 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <Deterministic>true</Deterministic>
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -36,8 +38,8 @@
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.3\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
@@ -51,44 +53,44 @@
     <Reference Include="Serilog.Sinks.Console, Version=6.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\packages\Serilog.Sinks.Console.6.0.0\lib\net471\Serilog.Sinks.Console.dll</HintPath>
     </Reference>
-    <Reference Include="Serilog.Sinks.File, Version=6.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
-      <HintPath>..\packages\Serilog.Sinks.File.6.0.0\lib\net471\Serilog.Sinks.File.dll</HintPath>
+    <Reference Include="Serilog.Sinks.File, Version=7.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
+      <HintPath>..\packages\Serilog.Sinks.File.7.0.0\lib\net471\Serilog.Sinks.File.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.4\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.Drawing" />
-    <Reference Include="System.IO.Pipelines, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.9.0.3\lib\net462\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.4\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
-    <Reference Include="System.Memory, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.1\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.9.0.3\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.4\lib\net462\System.Text.Encodings.Web.dll</HintPath>
     </Reference>
-    <Reference Include="System.Text.Json, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.9.0.3\lib\net462\System.Text.Json.dll</HintPath>
+    <Reference Include="System.Text.Json, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.4\lib\net462\System.Text.Json.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Channels, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Channels.9.0.3\lib\net462\System.Threading.Channels.dll</HintPath>
+    <Reference Include="System.Threading.Channels, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Channels.9.0.4\lib\net462\System.Threading.Channels.dll</HintPath>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.1\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
@@ -119,8 +121,12 @@
     <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets" Condition="Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息,请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\System.ValueTuple.4.6.1\build\net471\System.ValueTuple.targets'))" />
+  </Target>
 </Project>

+ 8 - 0
XdCxRhDW.Framework/AppConfigHelper.cs

@@ -20,6 +20,14 @@ namespace XdCxRhDW.Framework
             return str.Trim();
         }
 
+        public static string GetConnectionString(string name)
+        {
+            var str= ConfigurationManager.ConnectionStrings[name].ConnectionString.Trim();
+            if (!str.EndsWith(";"))
+                str = $"{str};";
+            return str;
+        }
+
         /// <summary>
         /// 获取App.config配置文件中appSettings节点中指定key的value
         /// <para>如果泛型为bool,则{"1","true","True","TRUE"}都会被转换成true,否则转换为false</para>

+ 0 - 8
XdCxRhDW.Framework/ILLink/ILLink.Descriptors.LibraryBuild.xml

@@ -1,8 +0,0 @@
-<linker>
-  <assembly fullname="System.Diagnostics.DiagnosticSource">
-    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
-      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
-      <method name="GetInstance" />
-    </type>
-  </assembly>
-</linker>

+ 12 - 8
XdCxRhDW.Framework/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -12,31 +12,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 13 - 13
XdCxRhDW.Framework/packages.config

@@ -1,20 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.3" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.4" targetFramework="net472" />
   <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net472" />
   <package id="Serilog" version="4.2.0" targetFramework="net472" />
   <package id="Serilog.Sinks.Async" version="2.1.0" targetFramework="net472" />
   <package id="Serilog.Sinks.Console" version="6.0.0" targetFramework="net472" />
-  <package id="Serilog.Sinks.File" version="6.0.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="9.0.3" targetFramework="net472" />
-  <package id="System.Memory" version="4.6.1" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="9.0.3" targetFramework="net472" />
-  <package id="System.Text.Json" version="9.0.3" targetFramework="net472" />
-  <package id="System.Threading.Channels" version="9.0.3" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.1" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.6.0" targetFramework="net472" />
+  <package id="Serilog.Sinks.File" version="7.0.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.4" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="9.0.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
+  <package id="System.Text.Encodings.Web" version="9.0.4" targetFramework="net472" />
+  <package id="System.Text.Json" version="9.0.4" targetFramework="net472" />
+  <package id="System.Threading.Channels" version="9.0.4" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net472" />
+  <package id="System.ValueTuple" version="4.6.1" targetFramework="net472" />
 </packages>

+ 21 - 77
XdCxRhDW.Repostory/04.XdCxRhDW.Repostory.csproj

@@ -45,11 +45,8 @@
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\packages\EntityFramework.6.5.1\lib\net45\EntityFramework.SqlServer.dll</HintPath>
     </Reference>
-    <Reference Include="EntityFramework6.Npgsql, Version=6.4.3.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
-      <HintPath>..\packages\EntityFramework6.Npgsql.6.4.3\lib\net461\EntityFramework6.Npgsql.dll</HintPath>
-    </Reference>
-    <Reference Include="Google.Protobuf, Version=3.30.1.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
-      <HintPath>..\packages\Google.Protobuf.3.30.1\lib\net45\Google.Protobuf.dll</HintPath>
+    <Reference Include="Google.Protobuf, Version=3.30.2.0, Culture=neutral, PublicKeyToken=a7d26565bac4d604, processorArchitecture=MSIL">
+      <HintPath>..\packages\Google.Protobuf.3.30.2\lib\net45\Google.Protobuf.dll</HintPath>
     </Reference>
     <Reference Include="K4os.Compression.LZ4, Version=1.3.8.0, Culture=neutral, PublicKeyToken=2186fa9121ef231d, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Compression.LZ4.1.3.8\lib\net462\K4os.Compression.LZ4.dll</HintPath>
@@ -60,17 +57,8 @@
     <Reference Include="K4os.Hash.xxHash, Version=1.0.8.0, Culture=neutral, PublicKeyToken=32cd54395057cec3, processorArchitecture=MSIL">
       <HintPath>..\packages\K4os.Hash.xxHash.1.0.8\lib\net462\K4os.Hash.xxHash.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.3\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Bcl.HashCode, Version=6.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.HashCode.6.0.0\lib\net462\Microsoft.Bcl.HashCode.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.DependencyInjection.Abstractions, Version=9.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.DependencyInjection.Abstractions.9.0.3\lib\net462\Microsoft.Extensions.DependencyInjection.Abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions, Version=9.0.0.3, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Extensions.Logging.Abstractions.9.0.3\lib\net462\Microsoft.Extensions.Logging.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="MySql.Data, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.9.3.0\lib\net462\MySql.Data.dll</HintPath>
@@ -78,72 +66,36 @@
     <Reference Include="MySql.Data.EntityFramework, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d, processorArchitecture=MSIL">
       <HintPath>..\packages\MySql.Data.EntityFramework.9.3.0\lib\net462\MySql.Data.EntityFramework.dll</HintPath>
     </Reference>
-    <Reference Include="Npgsql, Version=8.0.7.0, Culture=neutral, PublicKeyToken=5d8b90d52f46fda7, processorArchitecture=MSIL">
-      <HintPath>..\packages\Npgsql.8.0.7\lib\netstandard2.0\Npgsql.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.23.7.0\lib\net472\Oracle.ManagedDataAccess.dll</HintPath>
-    </Reference>
-    <Reference Include="Oracle.ManagedDataAccess.EntityFramework, Version=6.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Oracle.ManagedDataAccess.EntityFramework.23.7.0\lib\net472\Oracle.ManagedDataAccess.EntityFramework.dll</HintPath>
-    </Reference>
-    <Reference Include="SQLite.CodeFirst, Version=1.7.0.36, Culture=neutral, PublicKeyToken=eb96ba0a78d831a7, processorArchitecture=MSIL">
-      <HintPath>..\packages\SQLite.CodeFirst.1.7.0.36\lib\net45\SQLite.CodeFirst.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Collections.Immutable, Version=9.0.0.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Collections.Immutable.9.0.3\lib\net462\System.Collections.Immutable.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
-    <Reference Include="System.Configuration.ConfigurationManager, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Configuration.ConfigurationManager.9.0.3\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
+    <Reference Include="System.Configuration.ConfigurationManager, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Configuration.ConfigurationManager.9.0.4\lib\net462\System.Configuration.ConfigurationManager.dll</HintPath>
     </Reference>
     <Reference Include="System.Core" />
-    <Reference Include="System.Data.SQLite, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\Stub.System.Data.SQLite.Core.NetFramework.1.0.119.0\lib\net46\System.Data.SQLite.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.4\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
-    <Reference Include="System.Data.SQLite.EF6, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.EF6.1.0.119.0\lib\net46\System.Data.SQLite.EF6.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Data.SQLite.Linq, Version=1.0.119.0, Culture=neutral, PublicKeyToken=db937bc2d44ff139, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Data.SQLite.Linq.1.0.119.0\lib\net46\System.Data.SQLite.Linq.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Formats.Asn1, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Formats.Asn1.9.0.3\lib\net462\System.Formats.Asn1.dll</HintPath>
-    </Reference>
-    <Reference Include="System.IO.Pipelines, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.IO.Pipelines.9.0.3\lib\net462\System.IO.Pipelines.dll</HintPath>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.4\lib\net462\System.IO.Pipelines.dll</HintPath>
     </Reference>
     <Reference Include="System.Management" />
-    <Reference Include="System.Memory, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.1\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Numerics" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
-    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Encodings.Web.9.0.3\lib\net462\System.Text.Encodings.Web.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Text.Json, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Text.Json.9.0.3\lib\net462\System.Text.Json.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Channels, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Channels.9.0.3\lib\net462\System.Threading.Channels.dll</HintPath>
-    </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.1\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Transactions" />
     <Reference Include="System.Xml.Linq" />
@@ -157,6 +109,7 @@
     </Reference>
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="EFContext\MySqlConfiguration.cs" />
     <Compile Include="EFContext\MySqlContext.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="SysConfig.cs" />
@@ -164,12 +117,6 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="Oracle.DataAccess.Common.Configuration.Section.xsd">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="Oracle.ManagedDataAccess.Client.Configuration.Section.xsd">
-      <SubType>Designer</SubType>
-    </None>
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
@@ -186,8 +133,5 @@
       <Name>01.XdCxRhDW.Framework</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 24 - 0
XdCxRhDW.Repostory/EFContext/MySqlConfiguration.cs

@@ -0,0 +1,24 @@
+using MySql.Data.EntityFramework;
+using MySql.Data.MySqlClient;
+using System;
+using System.Collections.Generic;
+using System.Data.Entity;
+using System.Data.Entity.Infrastructure;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using XdCxRhDW.Framework;
+
+namespace XdCxRhDW.Repostory
+{
+    public class MySqlConfiguration: DbConfiguration
+    {
+        public MySqlConfiguration()
+        {
+            SetExecutionStrategy(MySqlProviderInvariantName.ProviderName, () => new MySqlExecutionStrategy());
+            SetProviderServices(MySqlProviderInvariantName.ProviderName, new MySqlProviderServices());
+            SetProviderFactory(MySqlProviderInvariantName.ProviderName, new MySqlClientFactory());
+            SetDefaultConnectionFactory(new MySqlConnectionFactory());
+        }
+    }
+}

+ 9 - 11
XdCxRhDW.Repostory/EFContext/MySqlContext.cs

@@ -1,30 +1,28 @@
-using System;
+using MySql.Data.EntityFramework;
+using MySql.Data.MySqlClient;
+using System;
 using System.Collections.Generic;
 using System.Configuration;
 using System.Data.Common;
 using System.Data.Entity;
 using System.Data.Entity.ModelConfiguration.Conventions;
-using System.Data.SQLite;
 using System.Linq;
 using System.Text;
 using System.Threading.Tasks;
 using XdCxRhDW.Entity;
+using XdCxRhDW.Framework;
 
 namespace XdCxRhDW.Repostory
 {
+    [DbConfigurationType(typeof(MySqlConfiguration))]
     public class MySqlContext: DbContext
     {
-        public MySqlContext(DbConnection con)
-         : base(con, true)
+        public MySqlContext()
+        : base(AppConfigHelper.GetConnectionString("MySql"))
         {
-          
+            //base的构造函数如果使用name则ConnectionString配置中必须包含providerName="MySql.Data.MySqlClient"、
+            //为了方便用户配置连接这里直接使用连接字符串而不是连接字符串的name
         }
-
-        public MySqlContext(string nameOrConnectionString="MySql")
-        : base(nameOrConnectionString)
-        {
-        }
-
         public Task<List<T>> SqlQueryAsync<T>(string sql)
         {
             return this.Database.SqlQuery<T>(sql).ToListAsync();

+ 0 - 8
XdCxRhDW.Repostory/ILLink/ILLink.Descriptors.LibraryBuild.xml

@@ -1,8 +0,0 @@
-<linker>
-  <assembly fullname="System.Diagnostics.DiagnosticSource">
-    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
-      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
-      <method name="GetInstance" />
-    </type>
-  </assembly>
-</linker>

+ 0 - 138
XdCxRhDW.Repostory/Oracle.DataAccess.Common.Configuration.Section.xsd

@@ -1,138 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-  <xs:simpleType name="parameterDirection">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="Output"/>
-      <xs:enumeration value="InputOutput"/>
-      <xs:enumeration value="ReturnValue"/>
-      <xs:enumeration value="Implicit"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="customBoolean">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="true"/>
-      <xs:enumeration value="false"/>
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ONSParameters">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="nodeList"/>
-      <!--<xs:enumeration value="walletFile"/>
-      <xs:enumeration value="walletPassword"/>-->
-    </xs:restriction>
-  </xs:simpleType>
-  <xs:simpleType name="ONSModeValues">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="local"/>
-      <xs:enumeration value="remote"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="datatype">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="System.Binary"/>
-      <xs:enumeration value="System.Boolean"/>
-      <xs:enumeration value="System.Byte"/>
-      <xs:enumeration value="System.Byte[]"/>
-      <xs:enumeration value="System.Char"/>
-      <xs:enumeration value="System.DateTime"/>
-      <xs:enumeration value="System.DateTimeOffset"/>
-      <xs:enumeration value="System.Decimal"/>
-      <xs:enumeration value="System.Double"/>
-      <xs:enumeration value="System.Guid"/>
-      <xs:enumeration value="System.Int16"/>
-      <xs:enumeration value="System.Int32"/>
-      <xs:enumeration value="System.Int64"/>
-      <xs:enumeration value="System.SByte"/>
-      <xs:enumeration value="System.Single"/>
-      <xs:enumeration value="System.String"/>
-      <xs:enumeration value="System.TimeSpan"/>
-      <xs:enumeration value="System.UInt16"/>
-      <xs:enumeration value="System.UInt32"/>
-      <xs:enumeration value="System.UInt64"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="providerType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="BFile"/>
-      <xs:enumeration value="BinaryFloat"/>
-      <xs:enumeration value="BinaryDouble"/>
-      <xs:enumeration value="Blob"/>
-      <xs:enumeration value="Byte"/>
-      <xs:enumeration value="Char"/>
-      <xs:enumeration value="Clob"/>
-      <xs:enumeration value="Date"/>
-      <xs:enumeration value="Decimal"/>
-      <xs:enumeration value="Double"/>
-      <xs:enumeration value="Int16"/>
-      <xs:enumeration value="Int32"/>
-      <xs:enumeration value="Int64"/>
-      <xs:enumeration value="IntervalDS"/>
-      <xs:enumeration value="IntervalYM"/>
-      <xs:enumeration value="Long"/>
-      <xs:enumeration value="LongRaw"/>
-      <xs:enumeration value="NChar"/>
-      <xs:enumeration value="NClob"/>
-      <xs:enumeration value="NVarchar2"/>
-      <xs:enumeration value="Object"/>
-      <xs:enumeration value="Raw"/>
-      <xs:enumeration value="Single"/>
-      <xs:enumeration value="TimeStamp"/>
-      <xs:enumeration value="TimeStampLTZ"/>
-      <xs:enumeration value="TimeStampTZ"/>
-      <xs:enumeration value="Varchar2"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="nativeDataType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="BFile"/>
-      <xs:enumeration value="Binary_Float"/>
-      <xs:enumeration value="Binary_Double"/>
-      <xs:enumeration value="Blob"/>
-      <xs:enumeration value="Char"/>
-      <xs:enumeration value="Clob"/>
-      <xs:enumeration value="Date"/>
-      <xs:enumeration value="Number"/>
-      <xs:enumeration value="Interval Day To Second"/>
-      <xs:enumeration value="Interval Year To Month"/>
-      <xs:enumeration value="Long"/>
-      <xs:enumeration value="Long Raw"/>
-      <xs:enumeration value="NChar"/>
-      <xs:enumeration value="NClob"/>
-      <xs:enumeration value="NVarchar2"/>
-      <xs:enumeration value="Raw"/>
-      <xs:enumeration value="Rowid"/>
-      <xs:enumeration value="Timestamp"/>
-      <xs:enumeration value="Timestamp With Local Time Zone"/>
-      <xs:enumeration value="Timestamp With Time Zone"/>
-      <xs:enumeration value="URowid"/>
-      <xs:enumeration value="UserDefinedType"/>
-      <xs:enumeration value="Varchar2"/>
-      <xs:enumeration value="XmlType"/>
-    </xs:restriction>
-  </xs:simpleType>
-
-  <xs:simpleType name="providerDBType">
-    <xs:restriction base="xs:string">
-      <xs:enumeration value="AnsiString"/>
-      <xs:enumeration value="AnsiStringFixedLength"/>
-      <xs:enumeration value="Binary"/>
-      <xs:enumeration value="Byte"/>
-      <xs:enumeration value="Date"/>
-      <xs:enumeration value="DateTime"/>
-      <xs:enumeration value="DateTimeOffset"/>
-      <xs:enumeration value="Decimal"/>
-      <xs:enumeration value="Double"/>
-      <xs:enumeration value="Int16"/>
-      <xs:enumeration value="Int32"/>
-      <xs:enumeration value="Int64"/>
-      <xs:enumeration value="Object"/>
-      <xs:enumeration value="Single"/>
-      <xs:enumeration value="String"/>
-      <xs:enumeration value="StringFixedLength"/>
-      <xs:enumeration value="Time"/>
-    </xs:restriction>
-  </xs:simpleType>
-</xs:schema>

+ 0 - 221
XdCxRhDW.Repostory/Oracle.ManagedDataAccess.Client.Configuration.Section.xsd

@@ -1,221 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified">
-  <xs:include schemaLocation="Oracle.DataAccess.Common.Configuration.Section.xsd"/>
-  <xs:element name="oracle.manageddataaccess.client" >
-    <xs:complexType>
-      <xs:choice minOccurs="0" maxOccurs="unbounded">
-        <xs:element name="version" type="odpmversiontype" minOccurs="0" />
-      </xs:choice>
-    </xs:complexType>
-  </xs:element>
-  <xs:complexType name="odpmversiontype">
-    <xs:complexContent>
-      <xs:extension base="odpmparameters">
-        <xs:attribute name="number" type="xs:string" use="required" />
-      </xs:extension>
-    </xs:complexContent>
-  </xs:complexType>
-
-  <xs:complexType name="odpmparameters">
-    <xs:all>
-      <xs:element minOccurs="0" name="settings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="setting">
-              <xs:complexType>
-                <xs:attribute name="name" type="xs:string" use="required" />
-                <xs:attribute name="value" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="udtMappings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="udtMapping">
-              <xs:complexType>
-                <xs:attribute name="typeName" type="xs:string" use="required" />
-                <xs:attribute name="factoryName" type="xs:string" use="required" />
-                <xs:attribute name="dataSource" type="xs:string" use="required" />
-                <xs:attribute name="schemaName" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="LDAPsettings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="LDAPsetting">
-              <xs:complexType>
-                <xs:attribute name="name" type="xs:string" use="required" />
-                <xs:attribute name="value" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="distributedTransaction">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="setting">
-              <xs:complexType>
-                <xs:attribute name="name" type="xs:string" use="required" />
-                <xs:attribute name="value" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="dataSources">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="dataSource">
-              <xs:complexType>
-                <xs:attribute name="alias" type="xs:string" use="required" />
-                <xs:attribute name="descriptor" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-
-      <xs:element minOccurs="0" name="connectionPools">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="connectionPool">
-              <xs:complexType>
-                <xs:attribute name="connectionString" type="xs:string" use="required" />
-                <xs:attribute name="poolName" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-
-
-      <xs:element minOccurs="0" name="edmMappings">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="edmMapping">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="unbounded" name="add">
-                    <xs:complexType>
-                      <xs:attribute name="name" type="xs:string" use="required" />
-                      <xs:attribute name="precision" type="xs:int" use="required" />
-                    </xs:complexType>
-                  </xs:element>
-                </xs:sequence>
-                <xs:attribute name="dataType" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="edmNumberMapping">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element minOccurs="0" maxOccurs="unbounded" name="add">
-                    <xs:complexType>
-                      <xs:attribute name="NETType" type="xs:string" use="required" />
-                      <xs:attribute name="MinPrecision" type="xs:int" use="required" />
-                      <xs:attribute name="MaxPrecision" type="xs:int" use="required" />
-                      <xs:attribute name="DBType" type="xs:string" use="required" />
-                    </xs:complexType>
-                  </xs:element>
-                </xs:sequence>
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="implicitRefCursor">
-        <xs:complexType>
-          <xs:sequence>
-            <xs:element maxOccurs="unbounded" minOccurs="0" name="storedProcedure">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element maxOccurs="unbounded" minOccurs="1" name="refCursor">
-                    <xs:complexType>
-                      <xs:sequence>
-                        <xs:element maxOccurs="1" minOccurs="1" name="bindInfo">
-                          <xs:complexType>
-                            <xs:attribute name="mode" type="parameterDirection" use="required" />
-                          </xs:complexType>
-                        </xs:element>
-                        <xs:element maxOccurs="unbounded" minOccurs="0" name="metadata">
-                          <xs:complexType>
-                            <xs:attribute name="columnOrdinal" type="xs:int" use="required" />
-                            <xs:attribute name="columnName" type="xs:string" use="required" />
-                            <xs:attribute name="baseColumnName" type="xs:string" use="optional" />
-                            <xs:attribute name="baseSchemaName" type="xs:string" use="optional" />
-                            <xs:attribute name="baseTableName" type="xs:string" use="optional" />
-                            <xs:attribute name="providerType" type="providerType" use="optional" />
-                            <xs:attribute name="columnSize" type="xs:int" use="optional" />
-                            <xs:attribute name="numericPrecision" type="xs:int" use="optional" />
-                            <xs:attribute name="numericScale" type="xs:int" use="optional" />
-                            <xs:attribute name="isUnique" type="customBoolean" use="optional" />
-                            <xs:attribute name="isKey" type="customBoolean" use="optional" />
-                            <xs:attribute name="isRowID" type="customBoolean" use="optional" />
-                            <xs:attribute name="dataType" type="datatype" use="optional" />
-                            <xs:attribute name="allowDBNull" type="customBoolean" use="optional" />
-                            <xs:attribute name="isAliased" type="customBoolean" use="optional" />
-                            <xs:attribute name="isByteSemantic" type="customBoolean" use="optional" />
-                            <xs:attribute name="isExpression" type="customBoolean" use="optional" />
-                            <xs:attribute name="isHidden" type="customBoolean" use="optional" />
-                            <xs:attribute name="isReadOnly" type="customBoolean" use="optional" />
-                            <xs:attribute name="isLong" type="customBoolean" use="optional" />
-                            <xs:attribute name="udtTypeName" type="xs:string" use="optional" />
-                            <xs:attribute name="nativeDataType" type="nativeDataType" use="optional" />
-                            <xs:attribute name="providerDBType" type="providerDBType" use="optional" />
-                            <xs:attribute name="objectName" type="xs:string" use="optional" />
-                          </xs:complexType>
-                        </xs:element>
-                      </xs:sequence>
-                      <xs:attribute name="name" type="xs:string" use="optional" />
-                      <xs:attribute name="position" type="xs:int" use="optional" />
-                    </xs:complexType>
-                  </xs:element>
-                </xs:sequence>
-                <xs:attribute name="schema" type="xs:string" use="optional" />
-                <xs:attribute name="name" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-        </xs:complexType>
-      </xs:element>
-      <xs:element minOccurs="0" name="onsConfig">
-        <xs:complexType>
-          <xs:sequence>
- 		    <xs:element minOccurs="0" name="settings">
-				<xs:complexType>
-				  <xs:sequence>
-					<xs:element maxOccurs="2" minOccurs="0" name="setting">
-					  <xs:complexType>
-						<xs:attribute name="name" type="xs:string" use="required" />
-						<xs:attribute name="value" type="xs:string" use="required" />
-					  </xs:complexType>
-					</xs:element>
-				  </xs:sequence>
-				</xs:complexType>
-			</xs:element>
-            <xs:element minOccurs="0" maxOccurs="unbounded" name="ons">
-              <xs:complexType>
-                <xs:sequence>
-                  <xs:element maxOccurs="3" minOccurs="1" name="add">
-                    <xs:complexType>
-                      <xs:attribute name="name" type="ONSParameters" use="required" />
-                      <xs:attribute name="value" type="xs:string" use="required" />
-                    </xs:complexType>
-                  </xs:element>
-                </xs:sequence>
-                <xs:attribute name="database" type="xs:string" use="required" />
-              </xs:complexType>
-            </xs:element>
-          </xs:sequence>
-          <xs:attribute name="configFile" type="xs:string" use="optional" />
-          <xs:attribute name="mode" type="ONSModeValues" use="required" />
-        </xs:complexType>
-      </xs:element>
-    </xs:all>
-  </xs:complexType>
-</xs:schema>

+ 13 - 25
XdCxRhDW.Repostory/app.config

@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <configSections>
-    <section name="oracle.manageddataaccess.client" type="OracleInternal.Common.ODPMSectionHandler, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-  </configSections>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
@@ -11,27 +8,27 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Google.Protobuf" publicKeyToken="a7d26565bac4d604" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.30.1.0" newVersion="3.30.1.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.30.2.0" newVersion="3.30.2.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="ZstdSharp" publicKeyToken="8d151af33a4ad5cf" culture="neutral" />
@@ -47,7 +44,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Text.Encodings.Web" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -55,7 +52,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.HashCode" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
@@ -63,7 +60,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Logging.Abstractions" publicKeyToken="adb9793829ddae60" culture="neutral" />
@@ -71,7 +68,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
@@ -87,19 +84,10 @@
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-  <system.data>
-    <DbProviderFactories>
-      <remove invariant="Oracle.ManagedDataAccess.Client" />
-      <add name="ODP.NET, Managed Driver" invariant="Oracle.ManagedDataAccess.Client" description="Oracle Data Provider for .NET, Managed Driver" type="Oracle.ManagedDataAccess.Client.OracleClientFactory, Oracle.ManagedDataAccess, Version=4.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-    </DbProviderFactories>
-  </system.data>
-  <connectionStrings>
-    <add name="OracleDbContext" providerName="Oracle.ManagedDataAccess.Client" connectionString="User Id=oracle_user;Password=oracle_user_password;Data Source=oracle" />
-  </connectionStrings>
   <entityFramework>
     <providers>
-      <provider invariantName="Oracle.ManagedDataAccess.Client" type="Oracle.ManagedDataAccess.EntityFramework.EFOracleProviderServices, Oracle.ManagedDataAccess.EntityFramework, Version=6.122.23.1, Culture=neutral, PublicKeyToken=89b483f429c47342" />
-    <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
-      </provider></providers>
+      <provider invariantName="MySql.Data.MySqlClient" type="MySql.Data.MySqlClient.MySqlProviderServices, MySql.Data.EntityFramework, Version=9.3.0.0, Culture=neutral, PublicKeyToken=c5687fc88969c44d">
+      </provider>
+    </providers>
   </entityFramework>
 </configuration>

+ 10 - 29
XdCxRhDW.Repostory/packages.config

@@ -2,39 +2,20 @@
 <packages>
   <package id="BouncyCastle.Cryptography" version="2.5.1" targetFramework="net472" />
   <package id="EntityFramework" version="6.5.1" targetFramework="net472" />
-  <package id="EntityFramework6.Npgsql" version="6.4.3" targetFramework="net472" />
-  <package id="Google.Protobuf" version="3.30.1" targetFramework="net472" />
+  <package id="Google.Protobuf" version="3.30.2" targetFramework="net472" />
   <package id="K4os.Compression.LZ4" version="1.3.8" targetFramework="net472" />
   <package id="K4os.Compression.LZ4.Streams" version="1.3.8" targetFramework="net472" />
   <package id="K4os.Hash.xxHash" version="1.0.8" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.3" targetFramework="net472" />
-  <package id="Microsoft.Bcl.HashCode" version="6.0.0" targetFramework="net472" />
-  <package id="Microsoft.Extensions.DependencyInjection.Abstractions" version="9.0.3" targetFramework="net472" />
-  <package id="Microsoft.Extensions.Logging.Abstractions" version="9.0.3" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.4" targetFramework="net472" />
   <package id="MySql.Data" version="9.3.0" targetFramework="net472" />
   <package id="MySql.Data.EntityFramework" version="9.3.0" targetFramework="net472" />
-  <package id="Npgsql" version="8.0.7" targetFramework="net472" />
-  <package id="Oracle.ManagedDataAccess" version="23.7.0" targetFramework="net472" />
-  <package id="Oracle.ManagedDataAccess.EntityFramework" version="23.7.0" targetFramework="net472" />
-  <package id="SQLite.CodeFirst" version="1.7.0.36" targetFramework="net472" />
-  <package id="Stub.System.Data.SQLite.Core.NetFramework" version="1.0.119.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net472" />
-  <package id="System.Collections.Immutable" version="9.0.3" targetFramework="net472" />
-  <package id="System.Configuration.ConfigurationManager" version="9.0.3" targetFramework="net472" />
-  <package id="System.Data.SQLite" version="1.0.119.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.Core" version="1.0.119.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.EF6" version="1.0.119.0" targetFramework="net472" />
-  <package id="System.Data.SQLite.Linq" version="1.0.119.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net472" />
-  <package id="System.Formats.Asn1" version="9.0.3" targetFramework="net472" />
-  <package id="System.IO.Pipelines" version="9.0.3" targetFramework="net472" />
-  <package id="System.Memory" version="4.6.1" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
-  <package id="System.Text.Encodings.Web" version="9.0.3" targetFramework="net472" />
-  <package id="System.Text.Json" version="9.0.3" targetFramework="net472" />
-  <package id="System.Threading.Channels" version="9.0.3" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.1" targetFramework="net472" />
-  <package id="System.ValueTuple" version="4.6.0" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="System.Configuration.ConfigurationManager" version="9.0.4" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.4" targetFramework="net472" />
+  <package id="System.IO.Pipelines" version="9.0.4" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net472" />
   <package id="ZstdSharp.Port" version="0.8.5" targetFramework="net472" />
 </packages>

+ 12 - 8
XdCxRhDW.Sender/App.config

@@ -22,7 +22,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -30,31 +30,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 12 - 8
XdCxRhDW.UI.Lib/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -12,31 +12,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 16 - 19
XdCxRhDW.WebApi/05.XdCxRhDW.WebApi.csproj

@@ -37,8 +37,8 @@
     <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Autofac, Version=8.2.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
-      <HintPath>..\packages\Autofac.8.2.0\lib\netstandard2.0\Autofac.dll</HintPath>
+    <Reference Include="Autofac, Version=8.2.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.8.2.1\lib\netstandard2.0\Autofac.dll</HintPath>
     </Reference>
     <Reference Include="Autofac.Integration.Owin, Version=7.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
       <HintPath>..\packages\Autofac.Owin.7.1.0\lib\net472\Autofac.Integration.Owin.dll</HintPath>
@@ -55,8 +55,8 @@
     <Reference Include="Microsoft.AspNet.SignalR.Core, Version=2.4.3.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.AspNet.SignalR.Core.2.4.3\lib\net45\Microsoft.AspNet.SignalR.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.3\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.4\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Owin, Version=4.2.2.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\Microsoft.Owin.4.2.2\lib\net45\Microsoft.Owin.dll</HintPath>
@@ -98,22 +98,22 @@
       <HintPath>..\packages\Swashbuckle.Core.5.6.0\lib\net40\Swashbuckle.Core.dll</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    <Reference Include="System.Buffers, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.1\lib\net462\System.Buffers.dll</HintPath>
     </Reference>
     <Reference Include="System.ComponentModel.Composition" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Core" />
-    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.3, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.3\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
+    <Reference Include="System.Diagnostics.DiagnosticSource, Version=9.0.0.4, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Diagnostics.DiagnosticSource.9.0.4\lib\net462\System.Diagnostics.DiagnosticSource.dll</HintPath>
     </Reference>
     <Reference Include="System.IO, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.IO.4.3.0\lib\net462\System.IO.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Memory, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Memory.4.6.1\lib\net462\System.Memory.dll</HintPath>
+    <Reference Include="System.Memory, Version=4.0.5.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.3\lib\net462\System.Memory.dll</HintPath>
     </Reference>
     <Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Net.Http.4.3.4\lib\net46\System.Net.Http.dll</HintPath>
@@ -128,16 +128,16 @@
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
-    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    <Reference Include="System.Numerics.Vectors, Version=4.1.6.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.1\lib\net462\System.Numerics.Vectors.dll</HintPath>
     </Reference>
     <Reference Include="System.Runtime, Version=4.1.1.1, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
       <HintPath>..\packages\System.Runtime.4.3.1\lib\net462\System.Runtime.dll</HintPath>
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.1\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.2\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
     </Reference>
     <Reference Include="System.Security" />
     <Reference Include="System.Security.Cryptography.Algorithms, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -160,8 +160,8 @@
       <Private>True</Private>
       <Private>True</Private>
     </Reference>
-    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
-      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.1\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.6.3\lib\net462\System.Threading.Tasks.Extensions.dll</HintPath>
     </Reference>
     <Reference Include="System.Web" />
     <Reference Include="System.Web.Cors, Version=5.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -206,8 +206,5 @@
       <Name>01.XdCxRhDW.Framework</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="ILLink\ILLink.Descriptors.LibraryBuild.xml" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

+ 0 - 8
XdCxRhDW.WebApi/ILLink/ILLink.Descriptors.LibraryBuild.xml

@@ -1,8 +0,0 @@
-<linker>
-  <assembly fullname="System.Diagnostics.DiagnosticSource">
-    <type fullname="System.Diagnostics.Metrics.MetricsEventSource">
-      <!-- Used by System.Private.CoreLib via reflection to init the EventSource -->
-      <method name="GetInstance" />
-    </type>
-  </assembly>
-</linker>

+ 13 - 9
XdCxRhDW.WebApi/app.config

@@ -4,15 +4,15 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Owin" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -20,7 +20,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-8.2.0.0" newVersion="8.2.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-8.2.1.0" newVersion="8.2.1.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Web.Http" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -48,15 +48,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Web.Infrastructure" publicKeyToken="31bf3856ad364e35" culture="neutral" />
@@ -68,11 +68,15 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

+ 8 - 8
XdCxRhDW.WebApi/packages.config

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Autofac" version="8.2.0" targetFramework="net472" />
+  <package id="Autofac" version="8.2.1" targetFramework="net472" />
   <package id="Autofac.Owin" version="7.1.0" targetFramework="net472" />
   <package id="Autofac.WebApi2" version="6.1.1" targetFramework="net472" />
   <package id="Autofac.WebApi2.Owin" version="6.2.1" targetFramework="net472" />
@@ -13,7 +13,7 @@
   <package id="Microsoft.AspNet.WebApi.Owin" version="5.3.0" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.OwinSelfHost" version="5.3.0" targetFramework="net472" />
   <package id="Microsoft.AspNet.WebApi.WebHost" version="5.3.0" targetFramework="net472" />
-  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.3" targetFramework="net472" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.4" targetFramework="net472" />
   <package id="Microsoft.Owin" version="4.2.2" targetFramework="net472" />
   <package id="Microsoft.Owin.Cors" version="4.2.2" targetFramework="net472" />
   <package id="Microsoft.Owin.Diagnostics" version="4.2.2" targetFramework="net472" />
@@ -29,18 +29,18 @@
   <package id="Owin" version="1.0" targetFramework="net472" />
   <package id="Swashbuckle" version="5.6.0" targetFramework="net472" />
   <package id="Swashbuckle.Core" version="5.6.0" targetFramework="net472" />
-  <package id="System.Buffers" version="4.6.0" targetFramework="net472" />
-  <package id="System.Diagnostics.DiagnosticSource" version="9.0.3" targetFramework="net472" />
+  <package id="System.Buffers" version="4.6.1" targetFramework="net472" />
+  <package id="System.Diagnostics.DiagnosticSource" version="9.0.4" targetFramework="net472" />
   <package id="System.IO" version="4.3.0" targetFramework="net472" />
-  <package id="System.Memory" version="4.6.1" targetFramework="net472" />
+  <package id="System.Memory" version="4.6.3" targetFramework="net472" />
   <package id="System.Net.Http" version="4.3.4" targetFramework="net472" />
-  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net472" />
+  <package id="System.Numerics.Vectors" version="4.6.1" targetFramework="net472" />
   <package id="System.Runtime" version="4.3.1" targetFramework="net472" />
-  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.1" targetFramework="net472" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.2" targetFramework="net472" />
   <package id="System.Security.Cryptography.Algorithms" version="4.3.1" targetFramework="net472" />
   <package id="System.Security.Cryptography.Encoding" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.Primitives" version="4.3.0" targetFramework="net472" />
   <package id="System.Security.Cryptography.X509Certificates" version="4.3.2" targetFramework="net472" />
-  <package id="System.Threading.Tasks.Extensions" version="4.6.1" targetFramework="net472" />
+  <package id="System.Threading.Tasks.Extensions" version="4.6.3" targetFramework="net472" />
   <package id="WebActivatorEx" version="2.2.0" targetFramework="net472" />
 </packages>

+ 0 - 6
XdCxRhDW.sln

@@ -33,8 +33,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "X2D1TaskServer", "Service\X
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "06.XdCxRhDW.UI.Lib", "XdCxRhDW.UI.Lib\06.XdCxRhDW.UI.Lib.csproj", "{6820FD32-41D9-49E0-A74D-7D692936D933}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ConsoleApp1", "ConsoleApp1\ConsoleApp1.csproj", "{D0784291-C471-4B37-979F-068A9C8CCC53}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -97,10 +95,6 @@ Global
 		{6820FD32-41D9-49E0-A74D-7D692936D933}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6820FD32-41D9-49E0-A74D-7D692936D933}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6820FD32-41D9-49E0-A74D-7D692936D933}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D0784291-C471-4B37-979F-068A9C8CCC53}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D0784291-C471-4B37-979F-068A9C8CCC53}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D0784291-C471-4B37-979F-068A9C8CCC53}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D0784291-C471-4B37-979F-068A9C8CCC53}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

+ 12 - 8
XdCxRhDw.Dto/app.config

@@ -4,7 +4,7 @@
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Tasks.Extensions" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.2.2.0" newVersion="4.2.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.2.4.0" newVersion="4.2.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Serilog" publicKeyToken="24c2f752a8e58a10" culture="neutral" />
@@ -12,31 +12,35 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.5.0" newVersion="4.0.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-6.0.2.0" newVersion="6.0.2.0" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.3.0" newVersion="6.0.3.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.6.0" newVersion="4.1.6.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Diagnostics.DiagnosticSource" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Threading.Channels" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-9.0.0.3" newVersion="9.0.0.3" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Pipelines" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.4" newVersion="9.0.0.4" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>