-
Notifications
You must be signed in to change notification settings - Fork 498
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Remove unnecessary subfolders from the session temp folder #615
Conversation
@@ -263,7 +264,14 @@ private static Socket CreateLoggingSocket(string socketPath) | |||
string? directoryName = Path.GetDirectoryName(socketPath); | |||
if (!string.IsNullOrEmpty(directoryName)) | |||
{ | |||
Directory.CreateDirectory(directoryName); | |||
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) | |
if (OperatingSystem.IsWindows()) |
We're backporting all of these changes right? |
Test hang? |
/azp run |
Azure Pipelines successfully started running 1 pipeline(s). |
/backport to release/8.0-preview1 |
Started backporting to release/8.0-preview1: https://github.com/dotnet/aspire/actions/runs/6722423794 |
@danegsta an error occurred while backporting to release/8.0-preview1, please check the run log for details! Error: @danegsta is not a repo collaborator, backporting is not allowed. If you're a collaborator please make sure your dotnet team membership visibility is set to Public on https://github.com/orgs/dotnet/people?query=danegsta |
/backport to release/8.0-preview1 |
Started backporting to release/8.0-preview1: https://github.com/dotnet/aspire/actions/runs/6722435032 |
@danegsta backporting to release/8.0-preview1 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Patch format detection failed.
Error: The process '/usr/bin/git' failed with exit code 128 Please backport manually! |
@danegsta an error occurred while backporting to release/8.0-preview1, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
* Remove extra subfolders from session temp folder path * Ensure the session folder is created with appropriate Unix permissions if it doesn't already exist * Check for Windows for proper CreateDirectory method * Remove extra using
* Remove extra subfolders from session temp folder path * Ensure the session folder is created with appropriate Unix permissions if it doesn't already exist * Check for Windows for proper CreateDirectory method * Remove extra using
With the new randomized session folder per DCP run, the additional
aspire/session/<pid>
subfolders aren't necessary. This simplifies the folder structure and should keep us from leaving folders behind in temp after a run (assuming normal exit conditions). In the off chance that the session folder wasn't created ahead of time (it should be with the changes in #607), we'll also apply the proper 0700 permissions on Unix just in case.