Address review comments

Author: vedantmgoyal9

.gitmodules

@@ -1,6 +1,7 @@
 [submodule "src/WingetCreateCore/Common/Msi/rust-msi"]
-  path = src/WingetCreateCore/Common/Msi/rust-msi\
+	path = src/WingetCreateCore/Common/Msi/rust-msi
 	# TODO: Switch to mdsteele/rust-msi once the PR is merged
 	# https://github.com/mdsteele/rust-msi/pull/18
-  url = https://github.com/vedantmgoyal9/rust-msi
+	url = https://github.com/vedantmgoyal9/rust-msi
   shallow = true
+	branch = master

README.md

@@ -75,10 +75,10 @@ The latest version of the standalone exe can be found at https://aka.ms/wingetcr
 
 ```yaml
 - task: UseDotNet@2
-  displayName: 'Install .NET Runtime'
+  displayName: "Install .NET Runtime"
   inputs:
     packageType: sdk
-    version: '8.x'
+    version: "8.x"
     installationPath: '$(ProgramFiles)\dotnet'
 ```
 

src/WingetCreateCLI/Commands/SettingsCommand.cs

@@ -91,32 +91,32 @@ private static bool OpenJsonFile(string path)
                 return false;
             }
 
-            try
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                try
                 {
                     Process.Start(new ProcessStartInfo { UseShellExecute = true, FileName = path });
                 }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                {
-                    Process.Start("xdg-open", path);
-                }
-                else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+                catch (Win32Exception e)
                 {
-                    Process.Start("open", path);
+                    Logger.ErrorLocalized(nameof(Resources.Error_Prefix), e.Message);
+                    return false;
                 }
-                else
-                {
-                    throw new PlatformNotSupportedException();
-                }
-
-                return true;
             }
-            catch (Win32Exception e)
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             {
-                Logger.ErrorLocalized(nameof(Resources.Error_Prefix), e.Message);
-                return false;
+                Process.Start("xdg-open", path);
+            }
+            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
+            {
+                Process.Start("open", path);
             }
+            else
+            {
+                throw new PlatformNotSupportedException();
+            }
+
+            return true;
         }
     }
 }

src/WingetCreateCLI/Common.cs

@@ -23,11 +23,12 @@ public static class Common
 
         private static readonly Lazy<string> AppStatePathLazy = new(() =>
         {
-            string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".wingetcreate");
 #if WINDOWS
-            path = IsRunningAsUwp()
+            string path = IsRunningAsUwp()
                 ? ApplicationData.Current.LocalFolder.Path
                 : Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", ModuleName);
+#else
+            string path = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".wingetcreate");
 #endif
             Directory.CreateDirectory(path);
             return path;
@@ -88,21 +89,28 @@ public static string GetPathForDisplay(string path, bool substituteEnvironmentVa
             string localAppDataPath = Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData);
             string tempPath = Path.GetTempPath().TrimEnd(Path.DirectorySeparatorChar);
 
-            path = Path.GetFullPath(path);
-
-            if (path.StartsWith(tempPath, StringComparison.OrdinalIgnoreCase) && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                return path.Replace(tempPath, TempEnvironmentVariable, StringComparison.OrdinalIgnoreCase);
-            }
-            else if (path.StartsWith(localAppDataPath, StringComparison.OrdinalIgnoreCase) && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                return path.Replace(localAppDataPath, LocalAppDataEnvironmentVariable, StringComparison.OrdinalIgnoreCase);
+                if (path.StartsWith(tempPath, StringComparison.OrdinalIgnoreCase))
+                {
+                    return path.Replace(tempPath, TempEnvironmentVariable, StringComparison.OrdinalIgnoreCase);
+                }
+                else if (path.StartsWith(localAppDataPath, StringComparison.OrdinalIgnoreCase))
+                {
+                    return path.Replace(localAppDataPath, LocalAppDataEnvironmentVariable, StringComparison.OrdinalIgnoreCase);
+                }
+                else if (path.StartsWith(userProfilePath, StringComparison.OrdinalIgnoreCase))
+                {
+                    return path.Replace(userProfilePath, UserProfileEnvironmentVariable, StringComparison.OrdinalIgnoreCase);
+                }
             }
-            else if (path.StartsWith(userProfilePath, StringComparison.OrdinalIgnoreCase) && !path.StartsWith(localAppDataPath, StringComparison.OrdinalIgnoreCase))
+            else
             {
-                return RuntimeInformation.IsOSPlatform(OSPlatform.Windows)
-                    ? path.Replace(userProfilePath, UserProfileEnvironmentVariable, StringComparison.OrdinalIgnoreCase)
-                    : path.Replace(userProfilePath, UserHomeDirectoryShortcutUnix, StringComparison.OrdinalIgnoreCase);
+                // Paths are case-sensitive on Unix
+                if (path.StartsWith(userProfilePath, StringComparison.Ordinal))
+                {
+                    return path.Replace(userProfilePath, UserHomeDirectoryShortcutUnix, StringComparison.Ordinal);
+                }
             }
 
             return path;