From eae5da399a27593bf7b4a7bc48d37255b067db35 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 01:27:47 +0000 Subject: [PATCH 1/4] Initial plan for issue From ceeddffe8981ea6ebef13c467c15aaadf403116d Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 01:42:14 +0000 Subject: [PATCH 2/4] Change .dotnet/aspire to .aspire in temporary path locations Co-authored-by: mitchdenny <513398+mitchdenny@users.noreply.github.com> --- src/Aspire.Cli/DotNetCliRunner.cs | 2 +- tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Aspire.Cli/DotNetCliRunner.cs b/src/Aspire.Cli/DotNetCliRunner.cs index 179289d0db4..5ff2b58ce52 100644 --- a/src/Aspire.Cli/DotNetCliRunner.cs +++ b/src/Aspire.Cli/DotNetCliRunner.cs @@ -336,7 +336,7 @@ public async Task NewProjectAsync(string templateName, string name, string internal static string GetBackchannelSocketPath() { var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var dotnetCliPath = Path.Combine(homeDirectory, ".dotnet", "aspire", "cli", "backchannels"); + var dotnetCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); if (!Directory.Exists(dotnetCliPath)) { diff --git a/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs b/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs index 4c64f48b1c2..8cc50b10805 100644 --- a/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs +++ b/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs @@ -8,7 +8,7 @@ internal static class UnixSocketHelper public static string GetBackchannelSocketPath() { var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var dotnetCliPath = Path.Combine(homeDirectory, ".dotnet", "aspire", "cli", "backchannels"); + var dotnetCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); if (!Directory.Exists(dotnetCliPath)) { From fabf813ebe0d77ce7551066e66a86b2ed65e0f2b Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 02:31:05 +0000 Subject: [PATCH 3/4] Rename dotnetCliPath to aspireCliPath in UnixSocketHelper Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com> --- tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs b/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs index 8cc50b10805..a1a3736e0b9 100644 --- a/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs +++ b/tests/Aspire.Hosting.Tests/Utils/UnixSocketHelper.cs @@ -8,15 +8,15 @@ internal static class UnixSocketHelper public static string GetBackchannelSocketPath() { var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var dotnetCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); + var aspireCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); - if (!Directory.Exists(dotnetCliPath)) + if (!Directory.Exists(aspireCliPath)) { - Directory.CreateDirectory(dotnetCliPath); + Directory.CreateDirectory(aspireCliPath); } var uniqueSocketPathSegment = Guid.NewGuid().ToString("N"); - var socketPath = Path.Combine(dotnetCliPath, $"cli.sock.{uniqueSocketPathSegment}"); + var socketPath = Path.Combine(aspireCliPath, $"cli.sock.{uniqueSocketPathSegment}"); return socketPath; } From a0955605e26e48774949a6aa9c628b5bdf7c1bfd Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Mon, 26 May 2025 02:39:28 +0000 Subject: [PATCH 4/4] Rename dotnetCliPath to aspireCliPath in DotNetCliRunner.cs Co-authored-by: davidfowl <95136+davidfowl@users.noreply.github.com> --- src/Aspire.Cli/DotNetCliRunner.cs | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/Aspire.Cli/DotNetCliRunner.cs b/src/Aspire.Cli/DotNetCliRunner.cs index 5ff2b58ce52..d59e0b3481d 100644 --- a/src/Aspire.Cli/DotNetCliRunner.cs +++ b/src/Aspire.Cli/DotNetCliRunner.cs @@ -336,15 +336,15 @@ public async Task NewProjectAsync(string templateName, string name, string internal static string GetBackchannelSocketPath() { var homeDirectory = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); - var dotnetCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); + var aspireCliPath = Path.Combine(homeDirectory, ".aspire", "cli", "backchannels"); - if (!Directory.Exists(dotnetCliPath)) + if (!Directory.Exists(aspireCliPath)) { - Directory.CreateDirectory(dotnetCliPath); + Directory.CreateDirectory(aspireCliPath); } var uniqueSocketPathSegment = Guid.NewGuid().ToString("N"); - var socketPath = Path.Combine(dotnetCliPath, $"cli.sock.{uniqueSocketPathSegment}"); + var socketPath = Path.Combine(aspireCliPath, $"cli.sock.{uniqueSocketPathSegment}"); return socketPath; }