Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025 · Dec 16, 2025
diff --git a/src/Installer/dotnetup/WindowsPathHelper.cs b/src/Installer/dotnetup/WindowsPathHelper.cs
        return paths;
    }

    /// <summary>
    /// Splits a PATH string into entries.
    /// </summary>
    private static List<string> SplitPath(string path)
    {
        return path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
    }

    /// <summary>
    /// Removes the Program Files dotnet path from the given PATH string.
    /// </summary>
    public static string RemoveProgramFilesDotnetFromPath(string path)
    {
        var pathEntries =path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
        var pathEntries =SplitPath(path);
        var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

        // Remove entries that match Program Files dotnet paths (case-insensitive)
    /// </summary>
    public static string AddProgramFilesDotnetToPath(string path)
    {
        var pathEntries =path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
        var pathEntries =SplitPath(path);
        var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

        // Get the primary Program Files dotnet path (non-x86)
    public static bool AdminPathContainsProgramFilesDotnet()
    {
        var adminPath = ReadAdminPath();
        var pathEntries =adminPath.Split(';', StringSplitOptions.RemoveEmptyEntries);
        var pathEntries =SplitPath(adminPath);
        var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

        return pathEntries.Any(entry =>
        }
    }



    /// <summary>
    /// Broadcasts a WM_SETTINGCHANGE message to notify other applications that the environment has changed.
    /// </summary>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -97,12 +97,20 @@ public static List<string> GetProgramFilesDotnetPaths()
		return paths;
		}

		/// <summary>
		/// Splits a PATH string into entries.
		/// </summary>
		private static List<string> SplitPath(string path)
		{
		return path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
		}

		/// <summary>
		/// Removes the Program Files dotnet path from the given PATH string.
		/// </summary>
		public static string RemoveProgramFilesDotnetFromPath(string path)
Copy link Member dsplaistedDec 17, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This method is currently only called by tests, and it has similar but different logic to the real logic. Change this so that it takes both an unexpanded and expanded path as a parameter, and does the logic currently in RemoveProgramFilesDotnetFromAdminPath. Then that method can call this one. Copy link ContributorAuthor CopilotAIDec 17, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Fixed in commit`bbd3d5c`. Refactored`RemoveProgramFilesDotnetFromPath` to take both`unexpandedPath` and`expandedPath` as parameters: publicstaticstringRemoveProgramFilesDotnetFromPath(stringunexpandedPath,stringexpandedPath) The method now does the logic that was in`RemoveProgramFilesDotnetFromAdminPath`, which now just calls this method. Tests updated to pass both parameters.
		{
		var pathEntries =path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
		var pathEntries =SplitPath(path);
		var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

		// Remove entries that match Program Files dotnet paths (case-insensitive)
Expand All		@@ -121,7 +129,7 @@ public static string RemoveProgramFilesDotnetFromPath(string path)
		/// </summary>
		public static string AddProgramFilesDotnetToPath(string path)
Copy link Member dsplaistedDec 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. This process needs to be changed so that if the PATH needs to be modified, it reads the unexpanded path and then adds to that. Reuse existing methods for similar functionality if possible. Refactor if you need to. Copy link ContributorAuthor CopilotAIDec 18, 2025 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Fixed in commit`b182662`. Refactored`AddProgramFilesDotnetToPath()` to take both`unexpandedPath` and`expandedPath` parameters. The method now: Uses the expanded PATH for detection (to check if dotnet is already present) Modifies the unexpanded PATH (to preserve environment variables like`%ProgramFiles%`,`%USERPROFILE%`, etc.) Updated`AddDotnetToAdminPath()` to read both expanded and unexpanded admin PATH and pass both to the helper method.
		{
		var pathEntries =path.Split(';', StringSplitOptions.RemoveEmptyEntries).ToList();
		var pathEntries =SplitPath(path);
		var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

		// Get the primary Program Files dotnet path (non-x86)
Expand DownExpand Up		@@ -153,7 +161,7 @@ public static string AddProgramFilesDotnetToPath(string path)
		public static bool AdminPathContainsProgramFilesDotnet()
		{
		var adminPath = ReadAdminPath();
		var pathEntries =adminPath.Split(';', StringSplitOptions.RemoveEmptyEntries);
		var pathEntries =SplitPath(adminPath);
		var programFilesDotnetPaths = GetProgramFilesDotnetPaths();

		return pathEntries.Any(entry =>
Expand DownExpand Up		@@ -190,8 +198,6 @@ public static void LogPathChange(string operation, string oldPath, string newPat
		}
		}



		/// <summary>
		/// Broadcasts a WM_SETTINGCHANGE message to notify other applications that the environment has changed.
		/// </summary>
Expand Down