Merge pull request #387 from wbonbon/master

update and minor fix
anoyetta · Jan 19, 2024 · 2b32543 · 2b32543
2 parents 1cdd084 + 73f86b9
commit 2b32543
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 53 deletions.
diff --git a/source/ACT.Hojoring.Activator/ACT.Hojoring.Activator.csproj b/source/ACT.Hojoring.Activator/ACT.Hojoring.Activator.csproj
@@ -64,7 +64,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next.StrongName">
-      <Version>4.0.2</Version>
+      <Version>4.0.3</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>

diff --git a/source/ACT.Hojoring.Updater/ACT.Hojoring.Updater.csproj b/source/ACT.Hojoring.Updater/ACT.Hojoring.Updater.csproj
@@ -91,7 +91,7 @@
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
     <PackageReference Include="Octokit">
-      <Version>0.50.0</Version>
+      <Version>9.1.0</Version>
     </PackageReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.Core/ACT.SpecialSpellTimer.Core.csproj
@@ -311,25 +311,22 @@
       <Version>3.0.0</Version>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>4.8.0</Version>
+      <Version>4.11.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.Mvc">
-      <Version>5.2.7</Version>
+      <Version>5.3.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp.Scripting">
-      <Version>3.8.0</Version>
+      <Version>4.8.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="NLog.Config">
-      <Version>4.7.12</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.StructuredEvents">
-      <Version>0.4.0</Version>
+    <PackageReference Include="NLog">
+      <Version>5.2.8</Version>
     </PackageReference>
     <PackageReference Include="NPOI">
-      <Version>2.5.5</Version>
+      <Version>2.6.2</Version>
     </PackageReference>
     <PackageReference Include="Prism.Core">
       <Version>8.1.97</Version>

diff --git a/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.csproj b/source/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer/ACT.SpecialSpellTimer.csproj
@@ -84,7 +84,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next.StrongName">
-      <Version>4.0.2</Version>
+      <Version>4.0.3</Version>
     </PackageReference>
     <PackageReference Include="Costura.Fody">
       <Version>5.7.0</Version>

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/ACT.TTSYukkuri.Core.csproj b/source/ACT.TTSYukkuri/ACT.TTSYukkuri.Core/ACT.TTSYukkuri.Core.csproj
@@ -456,7 +456,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AWSSDK.Polly">
-      <Version>3.7.301.21</Version>
+      <Version>3.7.301.34</Version>
     </PackageReference>
     <PackageReference Include="CommonServiceLocator">
       <Version>2.0.7</Version>
@@ -471,19 +471,19 @@
       <Version>4.7.0.9</Version>
     </PackageReference>
     <PackageReference Include="Google.Cloud.TextToSpeech.V1">
-      <Version>3.2.0</Version>
+      <Version>3.3.0</Version>
     </PackageReference>
     <PackageReference Include="Hardcodet.NotifyIcon.Wpf">
       <Version>1.1.0</Version>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>4.8.0</Version>
+      <Version>4.11.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Extensions.DependencyInjection">
-      <Version>5.0.1</Version>
+      <Version>8.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.NETCore.Platforms">
-      <Version>5.0.0</Version>
+      <Version>7.0.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Win32.Primitives">
       <Version>4.3.0</Version>
@@ -497,11 +497,8 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="NLog.Config">
-      <Version>4.7.12</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.StructuredEvents">
-      <Version>0.4.0</Version>
+    <PackageReference Include="NLog">
+      <Version>5.2.8</Version>
     </PackageReference>
     <PackageReference Include="Prism.Core">
       <Version>8.1.97</Version>
@@ -537,7 +534,7 @@
       <Version>4.3.0</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.DiagnosticSource">
-      <Version>4.7.1</Version>
+      <Version>8.0.0</Version>
     </PackageReference>
     <PackageReference Include="System.Diagnostics.Tools">
       <Version>4.3.0</Version>

diff --git a/source/ACT.TTSYukkuri/ACT.TTSYukkuri/ACT.TTSYukkuri.csproj b/source/ACT.TTSYukkuri/ACT.TTSYukkuri/ACT.TTSYukkuri.csproj
@@ -98,7 +98,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next.StrongName">
-      <Version>4.0.2</Version>
+      <Version>4.0.3</Version>
     </PackageReference>
     <PackageReference Include="Costura.Fody">
       <Version>5.7.0</Version>

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter.Core/ACT.UltraScouter.Core.csproj b/source/ACT.UltraScouter/ACT.UltraScouter.Core/ACT.UltraScouter.Core.csproj
@@ -499,16 +499,13 @@
       <Version>4.7.0.9</Version>
     </PackageReference>
     <PackageReference Include="MahApps.Metro.IconPacks">
-      <Version>4.8.0</Version>
+      <Version>4.11.0</Version>
     </PackageReference>
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="NLog.Config">
-      <Version>4.7.12</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.StructuredEvents">
-      <Version>0.4.0</Version>
+    <PackageReference Include="NLog">
+      <Version>5.2.8</Version>
     </PackageReference>
     <PackageReference Include="Prism.Core">
       <Version>8.1.97</Version>

diff --git a/source/ACT.UltraScouter/ACT.UltraScouter/ACT.UltraScouter.csproj b/source/ACT.UltraScouter/ACT.UltraScouter/ACT.UltraScouter.csproj
@@ -83,7 +83,7 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="BCrypt.Net-Next.StrongName">
-      <Version>4.0.2</Version>
+      <Version>4.0.3</Version>
     </PackageReference>
     <PackageReference Include="Costura.Fody">
       <Version>5.7.0</Version>

diff --git a/source/ACT.XIVLog/ACT.XIVLog.csproj b/source/ACT.XIVLog/ACT.XIVLog.csproj
@@ -107,8 +107,8 @@
     <PackageReference Include="InputSimulator">
       <Version>1.0.4</Version>
     </PackageReference>
-    <PackageReference Include="NLog.Config">
-      <Version>4.7.12</Version>
+    <PackageReference Include="NLog">
+      <Version>5.2.8</Version>
     </PackageReference>
     <PackageReference Include="OBS.WebSockets.Core">
       <Version>1.0.0</Version>
@@ -126,7 +126,7 @@
       <Version>4.3.1</Version>
     </PackageReference>
     <PackageReference Include="TagLibSharp">
-      <Version>2.2.0</Version>
+      <Version>2.3.0</Version>
     </PackageReference>
   </ItemGroup>
   <ItemGroup>

diff --git a/source/FFXIV.Framework/FFXIV.Framework/Common/UpdateChecker.cs b/source/FFXIV.Framework/FFXIV.Framework/Common/UpdateChecker.cs
@@ -456,17 +456,42 @@ private static void DumpEnvironment()
         {
             var productName = "";
             var buildNo = "";
-            using (var managementClass = new ManagementClass("Win32_OperatingSystem"))
-            {
-                using (var managementObjectCollection = managementClass.GetInstances())
-                {
-                    foreach (var managementObject in managementObjectCollection)
-                    {
-                        productName = managementObject["caption"].ToString().Substring("Microsoft ".Length);
-                        buildNo = managementObject["BuildNumber"].ToString();
-                    }
-                }
+            try
+            {
+                using (var managementClass = new ManagementClass("Win32_OperatingSystem"))
+                {
+                    using (var managementObjectCollection = managementClass.GetInstances())
+                    {
+                        foreach (var managementObject in managementObjectCollection)
+                        {
+                            productName = managementObject["caption"].ToString().Substring("Microsoft ".Length);
+                            buildNo = managementObject["BuildNumber"].ToString();
+                        }
+                    }
+                }
             }
+            catch (Exception ex)
+            {
+                Logger.Info($"faild get WMI, {ex}");
+                buildNo = GetRegistryValue(
+                @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion",
+                "CurrentBuild");
+                int intBuildNo = 0;
+                Int32.TryParse( buildNo, out intBuildNo);
+                if (intBuildNo >= 20000)
+                {
+                    productName = "Windows11 or later ";
+                    productName += GetRegistryValue(
+                    @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion",
+                    "EditionID");
+                } else
+                {
+                    productName = "Windows10 ";
+                    productName += GetRegistryValue(
+                    @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion",
+                    "EditionID");
+                }
+            }
 
             var DisplayVersion = GetRegistryValue(
                 @"HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows NT\CurrentVersion",

diff --git a/source/FFXIV.Framework/FFXIV.Framework/FFXIV.Framework.csproj b/source/FFXIV.Framework/FFXIV.Framework/FFXIV.Framework.csproj
@@ -375,10 +375,10 @@
       <Version>1.0.4</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client">
-      <Version>5.2.7</Version>
+      <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.AspNet.WebApi.Client.ja">
-      <Version>5.2.7</Version>
+      <Version>6.0.0</Version>
     </PackageReference>
     <PackageReference Include="Microsoft.Net.Http">
       <Version>2.2.29</Version>
@@ -395,17 +395,14 @@
     <PackageReference Include="Newtonsoft.Json">
       <Version>13.0.3</Version>
     </PackageReference>
-    <PackageReference Include="NLog.Config">
-      <Version>4.7.12</Version>
-    </PackageReference>
-    <PackageReference Include="NLog.StructuredEvents">
-      <Version>0.4.0</Version>
+    <PackageReference Include="NLog">
+      <Version>5.2.8</Version>
     </PackageReference>
     <PackageReference Include="NPOI">
-      <Version>2.5.5</Version>
+      <Version>2.6.2</Version>
     </PackageReference>
     <PackageReference Include="Octokit">
-      <Version>0.50.0</Version>
+      <Version>9.1.0</Version>
     </PackageReference>
     <PackageReference Include="Prism.Core">
       <Version>8.1.97</Version>