Moved temp folder creation to FileUtils

seesharper · seesharper · commit a6ab735cba33 · 2018-04-30T11:25:48.000+02:00
diff --git a/src/Dotnet.Script.DependencyModel/Environment/RuntimeHelper.cs b/src/Dotnet.Script.DependencyModel/Environment/RuntimeHelper.cs
@@ -95,37 +95,6 @@ private static string GetRuntimeIdentifier()
             return runtimeIdentifier;
         }
 
-        public static string CreateTempFolder(string targetDirectory)
-        {
-            if (!Path.IsPathRooted(targetDirectory))
-            {
-                throw new ArgumentOutOfRangeException(nameof(targetDirectory), "Must be a root path");
-            }
-
-            var tempDirectory = Path.GetTempPath();
-            var pathRoot = Path.GetPathRoot(targetDirectory);
-            var targetDirectoryWithoutRoot = targetDirectory.Substring(pathRoot.Length);
-            if (pathRoot.Length > 0 && IsWindows)
-            {
-                var driveLetter = pathRoot.Substring(0, 1);
-                if (driveLetter == "\\")
-                {
-                    targetDirectoryWithoutRoot = targetDirectoryWithoutRoot.TrimStart(new char[] { '\\' });
-                    driveLetter = "UNC";
-                }
-
-                targetDirectoryWithoutRoot = Path.Combine(driveLetter, targetDirectoryWithoutRoot);
-            }
-            var pathToProjectDirectory = Path.Combine(tempDirectory, "scripts", targetDirectoryWithoutRoot);
-
-            if (!Directory.Exists(pathToProjectDirectory))
-            {
-                Directory.CreateDirectory(pathToProjectDirectory);
-            }
-
-            return pathToProjectDirectory;
-        }
-
         internal static bool AppliesToCurrentRuntime(string runtime)
         {            
             return string.IsNullOrWhiteSpace(runtime) || RuntimeMatcher.IsMatch(runtime);
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/FileUtils.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/FileUtils.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using Dotnet.Script.DependencyModel.Environment;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Text;
@@ -17,5 +18,36 @@ public static string ReadFile(string path)
                 }
             }
         }
+
+        public static string CreateTempFolder(string targetDirectory)
+        {
+            if (!Path.IsPathRooted(targetDirectory))
+            {
+                throw new ArgumentOutOfRangeException(nameof(targetDirectory), "Must be a root path");
+            }
+
+            var tempDirectory = Path.GetTempPath();
+            var pathRoot = Path.GetPathRoot(targetDirectory);
+            var targetDirectoryWithoutRoot = targetDirectory.Substring(pathRoot.Length);
+            if (pathRoot.Length > 0 && ScriptEnvironment.Instance.IsWindows)
+            {
+                var driveLetter = pathRoot.Substring(0, 1);
+                if (driveLetter == "\\")
+                {
+                    targetDirectoryWithoutRoot = targetDirectoryWithoutRoot.TrimStart(new char[] { '\\' });
+                    driveLetter = "UNC";
+                }
+
+                targetDirectoryWithoutRoot = Path.Combine(driveLetter, targetDirectoryWithoutRoot);
+            }
+            var pathToProjectDirectory = Path.Combine(tempDirectory, "scripts", targetDirectoryWithoutRoot);
+
+            if (!Directory.Exists(pathToProjectDirectory))
+            {
+                Directory.CreateDirectory(pathToProjectDirectory);
+            }
+
+            return pathToProjectDirectory;
+        }
     }
 }
diff --git a/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs b/src/Dotnet.Script.DependencyModel/ProjectSystem/ScriptProjectProvider.cs
@@ -109,7 +109,7 @@ private void CopyNuGetConfigFile(string targetDirectory, string pathToProjectFil
 
         private static string GetPathToProjectFile(string targetDirectory)
         { 
-            var pathToProjectDirectory = RuntimeHelper.CreateTempFolder(targetDirectory);
+            var pathToProjectDirectory = FileUtils.CreateTempFolder(targetDirectory);
             var pathToProjectFile = Path.Combine(pathToProjectDirectory, "script.csproj");
             return pathToProjectFile;
         }
diff --git a/src/Dotnet.Script.Tests/ScriptPackagesTests.cs b/src/Dotnet.Script.Tests/ScriptPackagesTests.cs
@@ -153,7 +153,7 @@ private static void BuildScriptPackages()
         private static string GetPathToPackagesFolder()
         {
             var targetDirectory = TestPathUtils.GetFullPathToTestFixture(Path.Combine("ScriptPackage", "packages"));
-            return RuntimeHelper.CreateTempFolder(targetDirectory);
+            return DependencyModel.ProjectSystem.FileUtils.CreateTempFolder(targetDirectory);
         }
 
         private static void RemoveDirectory(string path)

Original file line number	Diff line number	Diff line change
`@@ -109,7 +109,7 @@ private void CopyNuGetConfigFile(string targetDirectory, string pathToProjectFil`
`109`	`109`
`110`	`110`	`private static string GetPathToProjectFile(string targetDirectory)`
`111`	`111`	`{`
`112`		`- var pathToProjectDirectory = RuntimeHelper.CreateTempFolder(targetDirectory);`
	`112`	`+ var pathToProjectDirectory = FileUtils.CreateTempFolder(targetDirectory);`
`113`	`113`	`var pathToProjectFile = Path.Combine(pathToProjectDirectory, "script.csproj");`
`114`	`114`	`return pathToProjectFile;`
`115`	`115`	`}`
Original file line number	Diff line number	Diff line change
`@@ -153,7 +153,7 @@ private static void BuildScriptPackages()`
`153`	`153`	`private static string GetPathToPackagesFolder()`
`154`	`154`	`{`
`155`	`155`	`var targetDirectory = TestPathUtils.GetFullPathToTestFixture(Path.Combine("ScriptPackage", "packages"));`
`156`		`- return RuntimeHelper.CreateTempFolder(targetDirectory);`
	`156`	`+ return DependencyModel.ProjectSystem.FileUtils.CreateTempFolder(targetDirectory);`
`157`	`157`	`}`
`158`	`158`
`159`	`159`	`private static void RemoveDirectory(string path)`