Merge pull request #891 from eksime/cleanup-gapotchenko-processutil

dlamkins · web-flow · commit e909fb3e65b8 · 2023-12-28T20:50:11.000-05:00
Remove ProcessUtil and bump Gapotchenko.FX version
diff --git a/Blish HUD/Blish HUD.csproj b/Blish HUD/Blish HUD.csproj
@@ -238,7 +238,7 @@
     <PackageReference Include="DynamicLanguageRuntime" Version="1.3.2" PrivateAssets="all" />
     <PackageReference Include="EntryPoint" Version="1.3.0" PrivateAssets="all" />
     <PackageReference Include="Flurl.Http" Version="2.4.2" PrivateAssets="all" />
-    <PackageReference Include="Gapotchenko.FX.Diagnostics.Process" Version="2021.1.5" PrivateAssets="all" />
+    <PackageReference Include="Gapotchenko.FX.Diagnostics.Process" Version="2022.2.7" PrivateAssets="all" />
     <PackageReference Include="Gw2Sharp" Version="1.7.4" />
     <PackageReference Include="Humanizer.Core.de" Version="2.6.2" PrivateAssets="all" />
     <PackageReference Include="Humanizer.Core.es" Version="2.6.2" PrivateAssets="all" />
diff --git a/Blish HUD/GameServices/GameIntegration/Gw2InstanceIntegration.cs b/Blish HUD/GameServices/GameIntegration/Gw2InstanceIntegration.cs
@@ -219,7 +219,7 @@ private void HandleProcessUpdate(Process newProcess) {
                 }
 
                 try {
-                    this.CommandLine = newProcess.GetCommandLine();
+                    this.CommandLine = newProcess.ReadArguments();
                 } catch (Win32Exception e) {
                     this.CommandLine = string.Empty;
                     Logger.Warn(e, "A Win32Exception was encountered while trying to retrieve the process command line.");
diff --git a/Blish HUD/_Utils/ProcessUtil.cs b/Blish HUD/_Utils/ProcessUtil.cs

Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private void HandleProcessUpdate(Process newProcess) {`
`219`	`219`	`}`
`220`	`220`
`221`	`221`	`try {`
`222`		`- this.CommandLine = newProcess.GetCommandLine();`
	`222`	`+ this.CommandLine = newProcess.ReadArguments();`
`223`	`223`	`} catch (Win32Exception e) {`
`224`	`224`	`this.CommandLine = string.Empty;`
`225`	`225`	`Logger.Warn(e, "A Win32Exception was encountered while trying to retrieve the process command line.");`