Ensure all temp files created in subfolder of %TEMP%

Fixes #492.
dotnet · Jul 24, 2024 · 8471eb4 · 8471eb4
1 parent e25d796
commit 8471eb4
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 4 deletions.
diff --git a/src/ProjectSystemTools/BuildLogging/Model/Backend/EvaluationLogger.cs b/src/ProjectSystemTools/BuildLogging/Model/Backend/EvaluationLogger.cs
@@ -80,7 +80,7 @@ private void AnyEvent(object sender, BuildEventArgs args)
                         return;
                     }
 
-                    var logPath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid()}.binlog");
+                    var logPath = PathUtil.GetTempFileName($"{Guid.NewGuid()}.binlog");
                     var binaryLogger = new BinaryLogger
                     {
                         Parameters = logPath,

diff --git a/src/ProjectSystemTools/BuildLogging/Model/Backend/LoggerBase.cs b/src/ProjectSystemTools/BuildLogging/Model/Backend/LoggerBase.cs
@@ -26,7 +26,7 @@ protected string GetLogPath(Build build)
 
             var filename = $"{Path.GetFileNameWithoutExtension(build.ProjectPath)}_{dimensionsString}{build.BuildType}_{build.StartTime:o}.binlog".Replace(':', '_');
 
-            return Path.Combine(Path.GetTempPath(), filename);
+            return PathUtil.GetTempFileName(filename);
         }
 
         protected void Copy(string from, string to)

diff --git a/src/ProjectSystemTools/BuildLogging/Model/Backend/ProjectLogger.cs b/src/ProjectSystemTools/BuildLogging/Model/Backend/ProjectLogger.cs
@@ -23,7 +23,7 @@ internal sealed class ProjectLogger : LoggerBase
         public ProjectLogger(BackEndBuildTableDataSource dataSource, bool isDesignTime) :
             base(dataSource)
         {
-            _logPath = Path.Combine(Path.GetTempPath(), $"{Guid.NewGuid()}.binlog");
+            _logPath = PathUtil.GetTempFileName($"{Guid.NewGuid()}.binlog");
             _binaryLogger = new BinaryLogger
             {
                 Parameters = _logPath,

diff --git a/src/ProjectSystemTools/BuildLogging/Model/Backend/RoslynLogger.cs b/src/ProjectSystemTools/BuildLogging/Model/Backend/RoslynLogger.cs
@@ -171,7 +171,7 @@ private class RoslynTraceListener : TraceListener
 
             public RoslynTraceListener(IImmutableSet<string> roslynEvents)
             {
-                LogPath = Path.Combine(Path.GetTempPath(), $"RoslynLog-{Guid.NewGuid()}.txt");
+                LogPath = PathUtil.GetTempFileName($"RoslynLog-{Guid.NewGuid()}.txt");
 
                 _set = roslynEvents;
 

diff --git a/src/ProjectSystemTools/Utilities/PathUtil.cs b/src/ProjectSystemTools/Utilities/PathUtil.cs
@@ -0,0 +1,18 @@
+// Copyright (c) Microsoft. All Rights Reserved. Licensed under the MIT license. See the LICENSE.md file in the project root for more information.
+
+using Microsoft.IO;
+
+namespace Microsoft.VisualStudio.ProjectSystem.Tools;
+
+internal static class PathUtil
+{
+    public static string GetTempFileName(string fileName)
+    {
+        string tempPath = Path.Combine(Path.GetTempPath(), "project-system-tools");
+
+        // Ensure our directory exists
+        Directory.CreateDirectory(tempPath);
+
+        return Path.Combine(tempPath, fileName);
+    }
+}