Merge pull request #342 from unoplatform/dev/jela/relax-dotnet-check

fix: Don't require sudo for dotnet workloads validation
unoplatform · Feb 18, 2025 · 9882aef · 9882aef
2 parents 3e6e39b + 851fb1f
commit 9882aef
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 3 deletions.
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -11,7 +11,7 @@
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
             "program": "${workspaceFolder}/UnoCheck/bin/Debug/netcoreapp3.1/UnoCheck.dll",
-            "args":["-v", "--manifest", "https://raw.githubusercontent.com/unoplatform/uno.check/bf3684e2ad725baa66da3573759129d6bb1d8817/manifests/uno.ui.manifest.json"],
+            "args":["-v", "--non-interactive", "--manifest", "${workspaceFolder}/manifests/uno.ui.manifest.json"],
             "cwd": "${workspaceFolder}/UnoCheck",
             // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console
             "console": "internalConsole",

diff --git a/UnoCheck/DotNet/DotNetWorkloadManager.cs b/UnoCheck/DotNet/DotNetWorkloadManager.cs
@@ -102,7 +102,7 @@ public async Task<string[]> GetInstalledWorkloads()
 				"--machine-readable"
 			};
 
-			var r = await Util.WrapShellCommandWithSudo(dotnetExe, DotNetCliWorkingDir, Util.Verbose, args.ToArray());
+			var r = await Util.ShellCommand(dotnetExe, DotNetCliWorkingDir, Util.Verbose, args.ToArray());
 
 			// Throw if this failed with a bad exit code
 			if (r.ExitCode != 0)
@@ -127,7 +127,7 @@ public async Task<string[]> GetInstalledWorkloads()
 				"--print-rollback"
 			};
 
-			var r = await Util.WrapShellCommandWithSudo(dotnetExe, DotNetCliWorkingDir, Util.Verbose, args.ToArray());
+			var r = await Util.ShellCommand(dotnetExe, DotNetCliWorkingDir, Util.Verbose, args.ToArray());
 
 			// Throw if this failed with a bad exit code
 			if (r.ExitCode != 0)

diff --git a/UnoCheck/Util.cs b/UnoCheck/Util.cs
@@ -198,6 +198,12 @@ public static bool Delete(string path, bool isFile)
 			return false;
 		}
 
+		public static Task<ShellProcessRunner.ShellProcessResult> ShellCommand(string cmd, string workingDir, bool verbose, string[] args)
+		{
+			var cli = new ShellProcessRunner(new ShellProcessRunnerOptions(cmd, string.Join(" ", args)) { WorkingDirectory = workingDir, Verbose = verbose } );
+			return Task.FromResult(cli.WaitForExit());
+		}
+
 		public static Task<ShellProcessRunner.ShellProcessResult> WrapShellCommandWithSudo(string cmd, string[] args)
 			=> WrapShellCommandWithSudo(cmd, null, false, args);