simplify CreateTempSubdirectory (#45633)

Author: nagilson

src/Cli/Microsoft.DotNet.InternalAbstractions/DirectoryPath.cs

@@ -35,19 +35,9 @@ public FilePath WithFile(string fileName)
             return new FilePath(Path.Combine(Value, fileName));
         }
 
-        public string ToQuotedString()
-        {
-            return $"\"{Value}\"";
-        }
-
-        public string ToXmlEncodeString()
-        {
-            return System.Net.WebUtility.HtmlEncode(Value);
-        }
-
         public override string ToString()
         {
-            return ToQuotedString();
+            return $"\"{Value}\"";
         }
 
         public DirectoryPath GetParentPath()
@@ -56,8 +46,8 @@ public DirectoryPath GetParentPath()
 
             var directoryInfo = new DirectoryInfo(Value);
 
-            DirectoryInfo parentDirectory = directoryInfo.Parent;
-            if (directoryInfo.Parent is null)
+            DirectoryInfo? parentDirectory = directoryInfo.Parent;
+            if (parentDirectory is null)
             {
                 throw new InvalidOperationException(Value + " does not have parent directory.");
             }
@@ -69,8 +59,8 @@ public DirectoryPath GetParentPath()
         {
             var directoryInfo = new DirectoryInfo(Value);
 
-            DirectoryInfo parentDirectory = directoryInfo.Parent;
-            if (directoryInfo.Parent is null)
+            DirectoryInfo? parentDirectory = directoryInfo.Parent;
+            if (parentDirectory is null)
             {
                 return null;
             }

src/Cli/Microsoft.DotNet.InternalAbstractions/EnvironmentWrapper.cs

@@ -21,19 +21,14 @@ public FilePath(string value)
             Value = value;
         }
 
-        public string ToQuotedString()
-        {
-            return $"\"{Value}\"";
-        }
-
         public override string ToString()
         {
             return Value;
         }
 
         public DirectoryPath GetDirectoryPath()
         {
-            return new DirectoryPath(Path.GetDirectoryName(Value));
+            return new DirectoryPath(Path.GetDirectoryName(Value)!);
         }
     }
 }

src/Cli/Microsoft.DotNet.InternalAbstractions/FilePath.cs

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Abstractions for making code that uses file system and environment testable.</Description>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>$(SdkTargetFramework);net472</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <StrongNameKeyId>MicrosoftAspNetCore</StrongNameKeyId>

src/Cli/Microsoft.DotNet.InternalAbstractions/Microsoft.DotNet.InternalAbstractions.csproj

@@ -5,41 +5,14 @@ namespace Microsoft.DotNet;
 
 static class PathUtilities
 {
-    const int S_IRUSR = 256;
-    const int S_IWUSR = 128;
-    const int S_IXUSR = 64;
-    const int S_IRWXU = S_IRUSR | S_IWUSR | S_IXUSR; // 700 (octal) Permissions 
-
-    const int MAX_NUM_DIRECTORY_CREATE_RETRIES = 2;
-
     public static string CreateTempSubdirectory()
     {
-        return CreateTempSubdirectoryRetry(0);
-    }
-
-    [DllImport("libc", SetLastError = true)]
-    private static extern int mkdir(string pathname, int mode);
-    private static string CreateTempSubdirectoryRetry(int attemptNo)
-    {
+#if NETFRAMEWORK
         string path = Path.Combine(Path.GetTempPath(), Guid.NewGuid().ToString());
-        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-        {
-            int mkdirStatusCode = mkdir(path, S_IRWXU);
-            if (mkdirStatusCode != 0)
-            {
-                int errno = Marshal.GetLastWin32Error();
-                if (Directory.Exists(path) && attemptNo < MAX_NUM_DIRECTORY_CREATE_RETRIES)
-                {
-                    return CreateTempSubdirectoryRetry(attemptNo + 1);
-                }
-                else
-                    throw new IOException($"Failed to create a temporary subdirectory {path} with mkdir, error code: {errno}");
-            }
-        }
-        else
-        {
-            Directory.CreateDirectory(path);
-        }
+        Directory.CreateDirectory(path);
         return path;
+#else
+        return Directory.CreateTempSubdirectory().FullName;
+#endif
     }
 }

src/Common/PathUtilities.cs

@@ -6,7 +6,6 @@
 using Microsoft.DotNet.Cli.ToolManifest;
 using Microsoft.DotNet.Cli.ToolPackage;
 using Microsoft.DotNet.Cli.Utils;
-using Microsoft.DotNet.InternalAbstractions;
 using Microsoft.DotNet.Tools.Tool.Run;
 using Microsoft.Extensions.DependencyModel.Tests;
 using Microsoft.Extensions.EnvironmentAbstractions;
@@ -39,7 +38,7 @@ public void WhenRunWithRollForwardOptionItShouldIncludeRollForwardInNativeHost()
             {
                 CommandName = "dotnet-a",
                 CommandArguments = testForwardArgument
-            }, toolRunCommand._allowRollForward); 
+            }, toolRunCommand._allowRollForward);
 
             result.Should().NotBeNull();
             result.Args.Should().Contain("--roll-forward", "Major", fakeExecutable.Value);

test/dotnet.Tests/CommandTests/ToolRunCommandTests.cs

@@ -12,7 +12,6 @@
 using Microsoft.Extensions.EnvironmentAbstractions;
 using LocalizableStrings = Microsoft.DotNet.Tools.Tool.Update.LocalizableStrings;
 using Parser = Microsoft.DotNet.Cli.Parser;
-using Microsoft.DotNet.InternalAbstractions;
 using Microsoft.DotNet.Tools.Tool.Uninstall;
 using Microsoft.DotNet.Cli.ShellShim;
 using Microsoft.DotNet.Cli.ToolPackage;
@@ -383,7 +382,7 @@ public void GivenAnExistedLowerversionWhenReinstallThrowsItRollsBack()
             _reporter.Lines.Clear();
 
             ParseResult result = Parser.Instance.Parse("dotnet tool update " + $"-g {_packageId}");
-            
+
             var command = new ToolUpdateGlobalOrToolPathCommand(
                 result,
                 (location, forwardArguments, currentWorkingDirectory) => (_store, _store,
@@ -421,7 +420,7 @@ public void GivenPackagedShimIsProvidedWhenRunWithPackageIdItCreatesShimUsingPac
 
             string options = $"-g {_packageId}";
             ParseResult result = Parser.Instance.Parse("dotnet tool update " + options);
-            
+
             var command = new ToolUpdateGlobalOrToolPathCommand(
                 result,
                 (_, _, _) => (_store, _store, new ToolPackageDownloaderMock(