replace string with FilePath (#8494)

Author: William Lee

src/dotnet/ShellShim/IShellShimMaker.cs

@@ -1,8 +1,10 @@
-namespace Microsoft.DotNet.ShellShim
+using Microsoft.Extensions.EnvironmentAbstractions;
+
+namespace Microsoft.DotNet.ShellShim
 {
     public interface IShellShimMaker
     {
-        void CreateShim(string packageExecutablePath, string shellCommandName);
+        void CreateShim(FilePath packageExecutable, string shellCommandName);
         void EnsureCommandNameUniqueness(string shellCommandName);
     }
 }

src/dotnet/ShellShim/ShellShimMaker.cs

@@ -26,13 +26,13 @@ public ShellShimMaker(string pathToPlaceShim)
                 pathToPlaceShim ?? throw new ArgumentNullException(nameof(pathToPlaceShim));
         }
 
-        public void CreateShim(string packageExecutablePath, string shellCommandName)
+        public void CreateShim(FilePath packageExecutable, string shellCommandName)
         {
             FilePath shimPath = GetShimPath(shellCommandName);
 
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                CreateConfigFile(shimPath.Value + ".config", entryPoint: packageExecutablePath, runner: "dotnet");
+                CreateConfigFile(shimPath.Value + ".config", entryPoint: packageExecutable, runner: "dotnet");
                 using (var shim = File.Create(shimPath.Value))
                 using (var exe = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(LauncherExeResourceName))
                 {
@@ -41,8 +41,6 @@ public void CreateShim(string packageExecutablePath, string shellCommandName)
             }
             else
             {
-                var packageExecutable = new FilePath(packageExecutablePath);
-
                 var script = new StringBuilder();
                 script.AppendLine("#!/bin/sh");
                 script.AppendLine($"dotnet {packageExecutable.ToQuotedString()} \"$@\"");
@@ -63,7 +61,7 @@ public void EnsureCommandNameUniqueness(string shellCommandName)
             }
         }
 
-        internal void CreateConfigFile(string outputPath, string entryPoint, string runner)
+        internal void CreateConfigFile(string outputPath, FilePath entryPoint, string runner)
         {
             XDocument config;
             using (var resource = typeof(ShellShimMaker).Assembly.GetManifestResourceStream(LauncherConfigResourceName))
@@ -72,7 +70,7 @@ internal void CreateConfigFile(string outputPath, string entryPoint, string runn
             }
 
             var appSettings = config.Descendants("appSettings").First();
-            appSettings.Add(new XElement("add", new XAttribute("key", "entryPoint"), new XAttribute("value", entryPoint)));
+            appSettings.Add(new XElement("add", new XAttribute("key", "entryPoint"), new XAttribute("value", entryPoint.Value)));
             appSettings.Add(new XElement("add", new XAttribute("key", "runner"), new XAttribute("value", runner ?? string.Empty)));
             config.Save(outputPath);
         }

src/dotnet/commands/dotnet-install/dotnet-install-tool/InstallToolCommand.cs

@@ -83,7 +83,7 @@ public override int Execute()
             _shellShimMaker.EnsureCommandNameUniqueness(commandName);
 
             _shellShimMaker.CreateShim(
-                toolConfigurationAndExecutablePath.Executable.Value,
+                toolConfigurationAndExecutablePath.Executable,
                 commandName);
 
             _environmentPathInstruction

test/Installer/Microsoft.DotNet.Cli.Msi.Tests/Microsoft.DotNet.Cli.Msi.Tests.csproj

@@ -25,4 +25,8 @@
     <Reference Include="System" />
     <Reference Include="Microsoft.CSharp" />
   </ItemGroup>
+
+  <ItemGroup>
+    <Service Include="{82a7f48d-3b50-4b1e-b82e-3ada8210c358}" />
+  </ItemGroup>
 </Project>

test/Microsoft.DotNet.ShellShim.Tests/ShellShimMakerTests.cs

@@ -13,6 +13,7 @@
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Microsoft.DotNet.Tools.Test.Utilities.Mock;
 using Microsoft.DotNet.Tools.Tests.ComponentMocks;
+using Microsoft.Extensions.EnvironmentAbstractions;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -31,8 +32,9 @@ public ShellShimMakerTests(ITestOutputHelper output)
         [InlineData("my_native_app.exe", null)]
         [InlineData("./my_native_app.js", "nodejs")]
         [InlineData(@"C:\tools\my_native_app.dll", "dotnet")]
-        public void GivenAnRunnerOrEntryPointItCanCreateConfig(string entryPoint, string runner)
+        public void GivenAnRunnerOrEntryPointItCanCreateConfig(string entryPointPath, string runner)
         {
+            var entryPoint = new FilePath(entryPointPath);
             if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
                 return;
 
@@ -51,7 +53,7 @@ public void GivenAnRunnerOrEntryPointItCanCreateConfig(string entryPoint, string
                 .Should()
                 .Contain(e => e.Attribute("key").Value == "runner" && e.Attribute("value").Value == (runner ?? string.Empty))
                 .And
-                .Contain(e => e.Attribute("key").Value == "entryPoint" && e.Attribute("value").Value == entryPoint);
+                .Contain(e => e.Attribute("key").Value == "entryPoint" && e.Attribute("value").Value == entryPoint.Value);
         }
 
         [Fact]
@@ -63,7 +65,7 @@ public void GivenAnExecutablePathItCanGenerateShimFile()
             var shellCommandName = nameof(ShellShimMakerTests) + Path.GetRandomFileName();
 
             shellShimMaker.CreateShim(
-                outputDll.FullName,
+                new FilePath(outputDll.FullName),
                 shellCommandName);
             var stdOut = ExecuteInShell(shellCommandName);
 
@@ -82,7 +84,7 @@ public void GivenAShimItPassesThroughArguments(string arguments, string[] expect
             var shellCommandName = nameof(ShellShimMakerTests) + Path.GetRandomFileName();
 
             shellShimMaker.CreateShim(
-                outputDll.FullName,
+                new FilePath(outputDll.FullName),
                 shellCommandName);
 
             var stdOut = ExecuteInShell(shellCommandName, arguments);

test/Microsoft.DotNet.Tools.Tests.ComponentMocks/ShellShimMakerMock.cs

@@ -23,11 +23,8 @@ public ShellShimMakerMock(string pathToPlaceShim, IFileSystem fileSystem = null)
             _fileSystem = fileSystem ?? new FileSystemWrapper();
         }
 
-        public void CreateShim(string packageExecutablePath, string shellCommandName)
+        public void CreateShim(FilePath packageExecutable, string shellCommandName)
         {
-            var packageExecutable = new FilePath(packageExecutablePath);
-
-
             var fakeshim = new FakeShim
             {
                 Runner = "dotnet",