Merge branch 'release/2.1.3xx' into release/2.1.3xx-UpdateDependencies

Microsoft.DotNet.Cli.sln

@@ -22,12 +22,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestPackages", "TestPackage
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{89905EC4-BC0F-443B-8ADF-691321F10108}"
 	ProjectSection(SolutionItems) = preProject
+		build\AppHostTemplate.proj = build\AppHostTemplate.proj
 		build\AzureInfo.props = build\AzureInfo.props
 		build\BackwardsCompatibilityRuntimes.props = build\BackwardsCompatibilityRuntimes.props
 		build\BranchInfo.props = build\BranchInfo.props
 		build\Branding.props = build\Branding.props
 		build\BuildDefaults.props = build\BuildDefaults.props
 		build\BuildInfo.targets = build\BuildInfo.targets
+		build\BundledDotnetTools.proj = build\BundledDotnetTools.proj
+		build\BundledDotnetTools.props = build\BundledDotnetTools.props
 		build\BundledRuntimes.props = build\BundledRuntimes.props
 		build\BundledSdks.props = build\BundledSdks.props
 		build\BundledTemplates.proj = build\BundledTemplates.proj

build/AppHostTemplate.proj

@@ -0,0 +1,49 @@
+<Project ToolsVersion="15.0" DefaultTargets="ExtractAppHostToOutput">
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
+  <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.tasks))\dir.tasks" />
+
+  <PropertyGroup>
+    <NativeExecutableExtension Condition=" $(Rid.StartsWith('win'))">.exe</NativeExecutableExtension>
+    <AppHostExecutableName>AppHost$(NativeExecutableExtension)</AppHostExecutableName>
+  </PropertyGroup>
+
+  <Target Name="ExtractAppHostToOutput"
+          Condition="!Exists('$(AppHostTemplatePath)/$(AppHostExecutableName)')"
+          DependsOnTargets="EnsureAppHostPackageRestored">
+
+    <Message Text="Restore $(TemplateFillInPackageName) from $(AppHostTemplatePath) to $(AppHostTemplateRestoreAdditionalParameters)."
+             Importance="High" />
+
+    <ItemGroup>
+      <AllFileOfRestoredAppHostPackage Include="$(AppHostIntermediateDirectory)\**\*.*" />
+      <NativeRestoredAppHostNETCore
+          Include="@(AllFileOfRestoredAppHostPackage)"
+          Condition="'%(FileName)%(Extension)' == '$(AppHostExecutableName)'"/>
+    </ItemGroup>
+
+    <Error Condition="@(NativeRestoredAppHostNETCore->Distinct()->Count()) != 1"
+           Text="Failed to determine the $(_NETCoreDotNetAppHostPackageName) executable in $(AllFileOfRestoredAppHostPackage)" />
+
+    <Copy
+        SourceFiles="@(NativeRestoredAppHostNETCore)"
+        DestinationFolder="$(AppHostTemplatePath)" />
+
+    <Message Text="Copy from @(NativeRestoredAppHostNETCore) to $(AppHostTemplatePath)."
+             Importance="High" />
+
+  </Target>
+
+  <Target Name="EnsureAppHostPackageRestored">
+    <PropertyGroup>
+      <AppHostTemplateRestoreAdditionalParameters>--runtime $(Rid)</AppHostTemplateRestoreAdditionalParameters>
+      <AppHostTemplateRestoreAdditionalParameters>$(AppHostTemplateRestoreAdditionalParameters) /p:TargetFramework=$(CliTargetFramework)</AppHostTemplateRestoreAdditionalParameters>
+      <AppHostTemplateRestoreAdditionalParameters>$(AppHostTemplateRestoreAdditionalParameters) /p:TemplateFillInPackageName=$(TemplateFillInPackageName)</AppHostTemplateRestoreAdditionalParameters>
+      <AppHostTemplateRestoreAdditionalParameters>$(AppHostTemplateRestoreAdditionalParameters) /p:TemplateFillInPackageVersion=$(TemplateFillInPackageVersion)</AppHostTemplateRestoreAdditionalParameters>
+      <AppHostTemplateRestoreAdditionalParameters>$(AppHostTemplateRestoreAdditionalParameters) /p:RestorePackagesPath=$(AppHostIntermediateDirectory)</AppHostTemplateRestoreAdditionalParameters>
+    </PropertyGroup>
+
+    <DotNetRestore ToolPath="$(PreviousStageDirectory)"
+                   ProjectPath="$(MSBuildThisFileDirectory)/templates/templates.csproj"
+                   AdditionalParameters="$(AppHostTemplateRestoreAdditionalParameters)" />
+  </Target>
+</Project>

build/DependencyVersions.props

@@ -14,7 +14,7 @@
     <MicrosoftNETCoreCompilersPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNETCoreCompilersPackageVersion>
     <MicrosoftCodeAnalysisBuildTasksPackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftCodeAnalysisBuildTasksPackageVersion>
     <MicrosoftNetCompilersNetcorePackageVersion>$(MicrosoftCodeAnalysisCSharpPackageVersion)</MicrosoftNetCompilersNetcorePackageVersion>
-    <MicrosoftNETSdkPackageVersion>2.1.300-preview2-62730-09</MicrosoftNETSdkPackageVersion>
+    <MicrosoftNETSdkPackageVersion>2.1.300-preview2-62731-04</MicrosoftNETSdkPackageVersion>
     <MicrosoftNETBuildExtensionsPackageVersion>$(MicrosoftNETSdkPackageVersion)</MicrosoftNETBuildExtensionsPackageVersion>
     <MicrosoftNETSdkRazorPackageVersion>$(MicrosoftAspNetCoreAppPackageVersion)</MicrosoftNETSdkRazorPackageVersion>
     <MicrosoftNETSdkWebPackageVersion>2.1.300-preview2-20180330-1538569</MicrosoftNETSdkWebPackageVersion>

src/Microsoft.DotNet.Cli.Utils/EmbedAppNameInHost.cs

@@ -0,0 +1,145 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using System.Text;
+
+namespace Microsoft.DotNet.Cli.Utils
+{
+    /// <summary>
+    /// Embeds the App Name into the AppHost.exe
+    /// </summary>
+    public static class EmbedAppNameInHost
+    {
+        private static string _placeHolder = "c3ab8ff13720e8ad9047dd39466b3c8974e592c2fa383d4a3960714caef0c4f2"; //hash value embedded in default apphost executable
+        private static byte[] _bytesToSearch = Encoding.UTF8.GetBytes(_placeHolder);
+        public static void EmbedAndReturnModifiedAppHostPath(
+            string appHostSourceFilePath,
+            string appHostDestinationFilePath,
+            string appBinaryName)
+        {
+            var hostExtension = Path.GetExtension(appHostSourceFilePath);
+            var appbaseName = Path.GetFileNameWithoutExtension(appBinaryName);
+            var bytesToWrite = Encoding.UTF8.GetBytes(appBinaryName);
+            var destinationDirectory = new FileInfo(appHostDestinationFilePath).Directory.FullName;
+
+            if (File.Exists(appHostDestinationFilePath))
+            {
+                //We have already done the required modification to apphost.exe
+                return;
+            }
+
+            if (bytesToWrite.Length > 1024)
+            {
+                throw new EmbedAppNameInHostException(string.Format(LocalizableStrings.EmbedAppNameInHostFileNameIsTooLong, appBinaryName));
+            }
+
+            var array = File.ReadAllBytes(appHostSourceFilePath);
+
+            SearchAndReplace(array, _bytesToSearch, bytesToWrite, appHostSourceFilePath);
+
+            if (!Directory.Exists(destinationDirectory))
+            {
+                Directory.CreateDirectory(destinationDirectory);
+            }
+
+            // Copy AppHostSourcePath to ModifiedAppHostPath so it inherits the same attributes\permissions.
+            File.Copy(appHostSourceFilePath, appHostDestinationFilePath);
+
+            // Re-write ModifiedAppHostPath with the proper contents.
+            using (FileStream fs = new FileStream(appHostDestinationFilePath, FileMode.Truncate, FileAccess.ReadWrite, FileShare.Read))
+            {
+                fs.Write(array, 0, array.Length);
+            }
+        }
+
+        // See: https://en.wikipedia.org/wiki/Knuth%E2%80%93Morris%E2%80%93Pratt_algorithm
+        private static int[] ComputeKMPFailureFunction(byte[] pattern)
+        {
+            int[] table = new int[pattern.Length];
+            if (pattern.Length >= 1)
+            {
+                table[0] = -1;
+            }
+            if (pattern.Length >= 2)
+            {
+                table[1] = 0;
+            }
+
+            int pos = 2;
+            int cnd = 0;
+            while (pos < pattern.Length)
+            {
+                if (pattern[pos - 1] == pattern[cnd])
+                {
+                    table[pos] = cnd + 1;
+                    cnd++;
+                    pos++;
+                }
+                else if (cnd > 0)
+                {
+                    cnd = table[cnd];
+                }
+                else
+                {
+                    table[pos] = 0;
+                    pos++;
+                }
+            }
+            return table;
+        }
+
+        // See: https://en.wikipedia.org/wiki/Knuth%E2%80%93Morris%E2%80%93Pratt_algorithm
+        private static int KMPSearch(byte[] pattern, byte[] bytes)
+        {
+            int m = 0;
+            int i = 0;
+            int[] table = ComputeKMPFailureFunction(pattern);
+
+            while (m + i < bytes.Length)
+            {
+                if (pattern[i] == bytes[m + i])
+                {
+                    if (i == pattern.Length - 1)
+                    {
+                        return m;
+                    }
+                    i++;
+                }
+                else
+                {
+                    if (table[i] > -1)
+                    {
+                        m = m + i - table[i];
+                        i = table[i];
+                    }
+                    else
+                    {
+                        m++;
+                        i = 0;
+                    }
+                }
+            }
+            return -1;
+        }
+
+        private static void SearchAndReplace(byte[] array, byte[] searchPattern, byte[] patternToReplace, string appHostSourcePath)
+        {
+            int offset = KMPSearch(searchPattern, array);
+            if (offset < 0)
+            {
+                throw new EmbedAppNameInHostException(string.Format(LocalizableStrings.EmbedAppNameInHostAppHostHasBeenModified, appHostSourcePath, _placeHolder));
+            }
+
+            patternToReplace.CopyTo(array, offset);
+
+            if (patternToReplace.Length < searchPattern.Length)
+            {
+                for (int i = patternToReplace.Length; i < searchPattern.Length; i++)
+                {
+                    array[i + offset] = 0x0;
+                }
+            }
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/EmbedAppNameInHostException.cs

@@ -0,0 +1,22 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.DotNet.Cli.Utils
+{
+    public class EmbedAppNameInHostException : Exception
+    {
+        public EmbedAppNameInHostException()
+        {
+        }
+
+        public EmbedAppNameInHostException(string message) : base(message)
+        {
+        }
+
+        public EmbedAppNameInHostException(string message, Exception innerException) : base(message, innerException)
+        {
+        }
+    }
+}

src/Microsoft.DotNet.Cli.Utils/EnvironmentProvider.cs

@@ -142,5 +142,14 @@ namespace Microsoft.DotNet.Cli.Utils
             }
         }
 
+        public string GetEnvironmentVariable(string variable, EnvironmentVariableTarget target)
+        {
+            return Environment.GetEnvironmentVariable(variable, target);
+        }
+
+        public void SetEnvironmentVariable(string variable, string value, EnvironmentVariableTarget target)
+        {
+            Environment.SetEnvironmentVariable(variable, value, target);
+        }
     }
 }

src/Microsoft.DotNet.Cli.Utils/IEnvironmentProvider.cs

@@ -1,6 +1,7 @@
 // Copyright (c) .NET Foundation and contributors. All rights reserved.
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
+using System;
 using System.Collections.Generic;
 
 namespace Microsoft.DotNet.Cli.Utils
@@ -18,5 +19,9 @@ namespace Microsoft.DotNet.Cli.Utils
         bool GetEnvironmentVariableAsBool(string name, bool defaultValue);
 
         string GetEnvironmentVariable(string name);
+
+        string GetEnvironmentVariable(string variable, EnvironmentVariableTarget target);
+
+        void SetEnvironmentVariable(string variable, string value, EnvironmentVariableTarget target);
     }
 }

src/Microsoft.DotNet.Cli.Utils/LocalizableStrings.resx

@@ -265,4 +265,10 @@
   <data name="MSBuildArgs" xml:space="preserve">
     <value>MSBuild arguments: {0}</value>
   </data>
+  <data name="EmbedAppNameInHostAppHostHasBeenModified" xml:space="preserve">
+    <value>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</value>
+  </data>
+  <data name="EmbedAppNameInHostFileNameIsTooLong" xml:space="preserve">
+    <value>Given file name '{0}' is longer than 1024 bytes</value>
+  </data>
 </root>

src/Microsoft.DotNet.Cli.Utils/Microsoft.DotNet.Cli.Utils.csproj

@@ -29,7 +29,6 @@
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETStandard' ">
     <PackageReference Include="NETStandard.Library" Version="2.0.0" />
-    <PackageReference Include="System.Diagnostics.Process" Version="4.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" '$(TargetFrameworkIdentifier)' == '.NETFramework' ">

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.cs.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.de.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.es.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.fr.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.it.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ja.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ko.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pl.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.pt-BR.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.ru.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.tr.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hans.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Cli.Utils/xlf/LocalizableStrings.zh-Hant.xlf

@@ -249,6 +249,16 @@
         <target state="new">MSBuild arguments: {0}</target>
         <note />
       </trans-unit>
+      <trans-unit id="EmbedAppNameInHostAppHostHasBeenModified">
+        <source>Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</source>
+        <target state="new">Unable to use '{0}' as application host executable as it does not contain the expected placeholder byte sequence '{1}' that would mark where the application name would be written.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="EmbedAppNameInHostFileNameIsTooLong">
+        <source>Given file name '{0}' is longer than 1024 bytes</source>
+        <target state="new">Given file name '{0}' is longer than 1024 bytes</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/Microsoft.DotNet.Configurer/DotnetFirstTimeUseConfigurer.cs

@@ -18,6 +18,7 @@ namespace Microsoft.DotNet.Configurer
         private IFirstTimeUseNoticeSentinel _firstTimeUseNoticeSentinel;
         private IAspNetCertificateSentinel _aspNetCertificateSentinel;
         private IAspNetCoreCertificateGenerator _aspNetCoreCertificateGenerator;
+        private IFileSentinel _toolPathSentinel;
         private string _cliFallbackFolderPath;
         private readonly IEnvironmentPath _pathAdder;
 
@@ -27,6 +28,7 @@ namespace Microsoft.DotNet.Configurer
             IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel,
             IAspNetCertificateSentinel aspNetCertificateSentinel,
             IAspNetCoreCertificateGenerator aspNetCoreCertificateGenerator,
+            IFileSentinel toolPathSentinel,
             IEnvironmentProvider environmentProvider,
             IReporter reporter,
             string cliFallbackFolderPath,
@@ -37,6 +39,7 @@ namespace Microsoft.DotNet.Configurer
             _firstTimeUseNoticeSentinel = firstTimeUseNoticeSentinel;
             _aspNetCertificateSentinel = aspNetCertificateSentinel;
             _aspNetCoreCertificateGenerator = aspNetCoreCertificateGenerator;
+            _toolPathSentinel = toolPathSentinel;
             _environmentProvider = environmentProvider;
             _reporter = reporter;
             _cliFallbackFolderPath = cliFallbackFolderPath;
@@ -44,8 +47,11 @@ namespace Microsoft.DotNet.Configurer
         }
 
         public void Configure()
+        {
+            if (ShouldAddPackageExecutablePath())
             {
                 AddPackageExecutablePath();
+            }
 
             if (ShouldPrintFirstTimeUseNotice())
             {
@@ -92,21 +98,16 @@ namespace Microsoft.DotNet.Configurer
                 !_aspNetCertificateSentinel.Exists();
         }
 
+        private bool ShouldAddPackageExecutablePath()
+        {
+            return ShouldRunFirstRunExperience() && !_toolPathSentinel.Exists();
+        }
+
         private void AddPackageExecutablePath()
         {
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                if (!_firstTimeUseNoticeSentinel.Exists())
-                { 
-                    // Invoke when Windows first run
             _pathAdder.AddPackageExecutablePathToUserPath();
-                }
+
-            }
+            _toolPathSentinel.Create();
-            else
-            {
-                // Invoke during installer, otherwise, _pathAdder will be no op object that this point
-                _pathAdder.AddPackageExecutablePathToUserPath();
-            }
         }
 
         private bool ShouldPrintFirstTimeUseNotice()

src/Microsoft.DotNet.Configurer/FileSentinel.cs

@@ -0,0 +1,46 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+using Microsoft.Extensions.EnvironmentAbstractions;
+
+namespace Microsoft.DotNet.Configurer
+{
+    public class FileSentinel : IFileSentinel
+    {
+        private readonly FilePath _file;
+        private readonly IFileSystem _fileSystem;
+
+        public FileSentinel(FilePath file) :
+            this(file, fileSystem: null)
+        {
+        }
+
+        internal FileSentinel(FilePath file, IFileSystem fileSystem)
+        {
+            _file = file;
+            _fileSystem = fileSystem ?? FileSystemWrapper.Default;
+        }
+
+        public bool Exists()
+        {
+            return _fileSystem.File.Exists(_file.Value);
+        }
+
+        public void Create()
+        {
+            if (Exists())
+            {
+                return;
+            }
+
+            var directory = _file.GetDirectoryPath();
+            if (!_fileSystem.Directory.Exists(directory.Value))
+            {
+                _fileSystem.Directory.CreateDirectory(directory.Value);
+            }
+
+            _fileSystem.File.CreateEmptyFile(_file.Value);
+        }
+    }
+}

src/Microsoft.DotNet.Configurer/IFileSentinel.cs

@@ -0,0 +1,14 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+
+namespace Microsoft.DotNet.Configurer
+{
+    public interface IFileSentinel
+    {
+        bool Exists();
+
+        void Create();
+    }
+}

src/Microsoft.DotNet.Configurer/LocalizableStrings.resx

@@ -151,7 +151,7 @@ Here are some options to fix this error:
     <value>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value>
   </data>
 </root>

src/Microsoft.DotNet.Configurer/NoOpFileSentinel.cs

@@ -0,0 +1,19 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System.IO;
+
+namespace Microsoft.DotNet.Configurer
+{
+    public class NoOpFileSentinel : IFileSentinel
+    {
+        public bool Exists()
+        {
+            return true;
+        }
+
+        public void Create()
+        {
+        }
+    }
+}

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.cs.xlf

@@ -62,7 +62,7 @@ Tuto chybu můžete opravit pomocí některé z těchto možností:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.de.xlf

@@ -62,7 +62,7 @@ Im Folgenden finden Sie einige Optionen, um diesen Fehler zu beheben:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.es.xlf

@@ -61,7 +61,7 @@ Estas son algunas opciones para corregir este error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.fr.xlf

@@ -62,7 +62,7 @@ Voici quelques options pour corriger cette erreur :
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.it.xlf

@@ -62,7 +62,7 @@ Ecco alcune opzioni per correggere questo errore:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ja.xlf

@@ -62,7 +62,7 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ko.xlf

@@ -62,7 +62,7 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pl.xlf

@@ -62,7 +62,7 @@ Oto kilka opcji naprawiania tego błędu:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.pt-BR.xlf

@@ -62,7 +62,7 @@ Aqui estão algumas opções para corrigir este erro:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.ru.xlf

@@ -62,7 +62,7 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.tr.xlf

@@ -62,7 +62,7 @@ Bu hatayı düzeltmek için bazı seçenekler:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hans.xlf

@@ -62,7 +62,7 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/Microsoft.DotNet.Configurer/xlf/LocalizableStrings.zh-Hant.xlf

@@ -62,7 +62,7 @@ Here are some options to fix this error:
         <source>ASP.NET Core
 ------------
 Successfully installed the ASP.NET Core HTTPS Development Certificate.
-To trust the certificate (Windows and macOS only) first install the dev-certs tool by running 'dotnet tool install dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https --trust'.
+To trust the certificate run 'dotnet dev-certs https --trust' (Windows and macOS only).
 For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</source>
         <target state="needs-review-translation">ASP.NET Core
 ------------

src/dotnet/CommonLocalizableStrings.resx

@@ -595,6 +595,9 @@ setx PATH "%PATH%;{0}"
   <data name="EnvironmentPathWindowsNeedReopen" xml:space="preserve">
     <value>Since you just installed the .NET Core SDK, you will need to reopen the Command Prompt window before running the tool you installed.</value>
   </data>
+  <data name="FailedToSetToolsPathEnvironmentVariable" xml:space="preserve">
+    <value>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</value>
+  </data>
   <data name="FailedToCreateShellShim" xml:space="preserve">
     <value>Failed to create tool shim for command '{0}': {1}</value>
   </data>

src/dotnet/Program.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Text;
@@ -23,6 +24,8 @@ namespace Microsoft.DotNet.Cli
 {
     public class Program
     {
+        private static readonly string ToolPathSentinelFileName = $"{Product.Version}.toolpath.sentinel";
+
         public static int Main(string[] args)
         {
             DebugHelper.HandleDebugSwitch(ref args);
@@ -94,6 +97,12 @@ namespace Microsoft.DotNet.Cli
             {
                 IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel = disposableFirstTimeUseNoticeSentinel;
                 IAspNetCertificateSentinel aspNetCertificateSentinel = new AspNetCertificateSentinel(cliFallbackFolderPathCalculator);
+                IFileSentinel toolPathSentinel = new FileSentinel(
+                    new FilePath(
+                        Path.Combine(
+                            CliFolderPathCalculator.DotnetUserProfileFolderPath,
+                            ToolPathSentinelFileName)));
+
                 for (; lastArg < args.Length; lastArg++)
                 {
                     if (IsArg(args[lastArg], "d", "diagnostics"))
@@ -138,6 +147,7 @@ namespace Microsoft.DotNet.Cli
                         {
                             aspNetCertificateSentinel = new NoOpAspNetCertificateSentinel();
                             firstTimeUseNoticeSentinel = new NoOpFirstTimeUseNoticeSentinel();
+                            toolPathSentinel = new NoOpFileSentinel();
                             hasSuperUserAccess = true;
                         }
 
@@ -145,6 +155,7 @@ namespace Microsoft.DotNet.Cli
                             nugetCacheSentinel,
                             firstTimeUseNoticeSentinel,
                             aspNetCertificateSentinel,
+                            toolPathSentinel,
                             cliFallbackFolderPathCalculator,
                             hasSuperUserAccess);
 
@@ -209,6 +220,7 @@ namespace Microsoft.DotNet.Cli
             INuGetCacheSentinel nugetCacheSentinel,
             IFirstTimeUseNoticeSentinel firstTimeUseNoticeSentinel,
             IAspNetCertificateSentinel aspNetCertificateSentinel,
+            IFileSentinel toolPathSentinel,
             CliFolderPathCalculator cliFolderPathCalculator,
             bool hasSuperUserAccess)
         {
@@ -231,6 +243,7 @@ namespace Microsoft.DotNet.Cli
                     firstTimeUseNoticeSentinel,
                     aspNetCertificateSentinel,
                     aspnetCertificateGenerator,
+                    toolPathSentinel,
                     environmentProvider,
                     Reporter.Output,
                     cliFolderPathCalculator.CliFallbackFolderPath,

src/dotnet/ShellShim/EnvironmentPathFactory.cs

@@ -33,14 +33,16 @@ namespace Microsoft.DotNet.ShellShim
             {
                 environmentPath = new WindowsEnvironmentPath(
                     cliFolderPathCalculator.ToolsShimPath,
-                    Reporter.Output);
+                    Reporter.Output,
+                    environmentProvider);
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) && hasSuperUserAccess)
             {
                 environmentPath = new LinuxEnvironmentPath(
                     cliFolderPathCalculator.ToolsShimPathInUnix,
                     Reporter.Output,
-                    environmentProvider, new FileWrapper());
+                    environmentProvider,
+                    new FileWrapper());
             }
             else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX) && hasSuperUserAccess)
             {

src/dotnet/ShellShim/LinuxEnvironmentPath.cs

@@ -18,9 +18,9 @@ namespace Microsoft.DotNet.ShellShim
         private const string PathName = "PATH";
         private readonly BashPathUnderHomeDirectory _packageExecutablePath;
 
-        private readonly string _profiledDotnetCliToolsPath
+        internal static readonly string DotnetCliToolsProfilePath =
-            = Environment.GetEnvironmentVariable("DOTNET_CLI_TEST_LINUX_PROFILED_PATH")
+            Environment.GetEnvironmentVariable("DOTNET_CLI_TEST_LINUX_PROFILED_PATH") ??
-              ?? @"/etc/profile.d/dotnet-cli-tools-bin-path.sh";
+            @"/etc/profile.d/dotnet-cli-tools-bin-path.sh";
 
         internal LinuxEnvironmentPath(
             BashPathUnderHomeDirectory packageExecutablePath,
@@ -44,28 +44,27 @@ namespace Microsoft.DotNet.ShellShim
             }
 
             var script = $"export PATH=\"$PATH:{_packageExecutablePath.PathWithDollar}\"";
-            _fileSystem.WriteAllText(_profiledDotnetCliToolsPath, script);
+            _fileSystem.WriteAllText(DotnetCliToolsProfilePath, script);
         }
 
         private bool PackageExecutablePathExists()
         {
-            var environmentVariable = _environmentProvider
+            var value = _environmentProvider.GetEnvironmentVariable(PathName);
-                .GetEnvironmentVariable(PathName);
+            if (value == null)
-
-            if (environmentVariable == null)
             {
                 return false;
             }
 
-            return environmentVariable
+            return value
-                .Split(':').Contains(_packageExecutablePath.Path);
+                .Split(':')
+                .Any(p => p == _packageExecutablePath.Path || p == _packageExecutablePath.PathWithTilde);
         }
 
         public void PrintAddPathInstructionIfPathDoesNotExist()
         {
             if (!PackageExecutablePathExists())
             {
-                if (_fileSystem.Exists(_profiledDotnetCliToolsPath))
+                if (_fileSystem.Exists(DotnetCliToolsProfilePath))
                 {
                     _reporter.WriteLine(
                         CommonLocalizableStrings.EnvironmentPathLinuxNeedLogout);

src/dotnet/ShellShim/OsxEnvironmentPath.cs

@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.ShellShim
         private readonly IEnvironmentProvider _environmentProvider;
         private readonly IReporter _reporter;
 
-        private static readonly string PathDDotnetCliToolsPath
+        internal static readonly string DotnetCliToolsPathsDPath
             = Environment.GetEnvironmentVariable("DOTNET_CLI_TEST_OSX_PATHSD_PATH")
               ?? @"/etc/paths.d/dotnet-cli-tools";
 
@@ -44,28 +44,27 @@ namespace Microsoft.DotNet.ShellShim
                 return;
             }
 
-            var script = $"{_packageExecutablePath.PathWithTilde}";
+            _fileSystem.WriteAllText(DotnetCliToolsPathsDPath, _packageExecutablePath.PathWithTilde);
-            _fileSystem.WriteAllText(PathDDotnetCliToolsPath, script);
         }
 
         private bool PackageExecutablePathExists()
         {
-            var environmentVariable = _environmentProvider.GetEnvironmentVariable(PathName);
+            var value = _environmentProvider.GetEnvironmentVariable(PathName);
-
+            if (value == null)
-            if (environmentVariable == null)
             {
                 return false;
             }
 
-            return environmentVariable.Split(':').Contains(_packageExecutablePath.PathWithTilde)
+            return value
-                || environmentVariable.Split(':').Contains(_packageExecutablePath.Path);
+                .Split(':')
+                .Any(p => p == _packageExecutablePath.Path || p == _packageExecutablePath.PathWithTilde);
         }
 
         public void PrintAddPathInstructionIfPathDoesNotExist()
         {
             if (!PackageExecutablePathExists())
             {
-                if (_fileSystem.Exists(PathDDotnetCliToolsPath))
+                if (_fileSystem.Exists(DotnetCliToolsPathsDPath))
                 {
                     _reporter.WriteLine(
                         CommonLocalizableStrings.EnvironmentPathOSXNeedReopen);

src/dotnet/ShellShim/ShellShimRepository.cs

@@ -6,25 +6,27 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Xml.Linq;
 using Microsoft.DotNet.Cli;
 using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.PlatformAbstractions;
 using Microsoft.DotNet.Tools;
 using Microsoft.Extensions.EnvironmentAbstractions;
+using Newtonsoft.Json;
 
 namespace Microsoft.DotNet.ShellShim
 {
     internal class ShellShimRepository : IShellShimRepository
     {
-        private const string LauncherExeResourceName = "Microsoft.DotNet.Tools.Launcher.Executable";
+        private const string ApphostNameWithoutExtension = "apphost";
-        private const string LauncherConfigResourceName = "Microsoft.DotNet.Tools.Launcher.Config";
 
         private readonly DirectoryPath _shimsDirectory;
+        private readonly string _appHostSourceDirectory;
 
-        public ShellShimRepository(DirectoryPath shimsDirectory)
+        public ShellShimRepository(DirectoryPath shimsDirectory, string appHostSourcePath = null)
         {
             _shimsDirectory = shimsDirectory;
+            _appHostSourceDirectory = appHostSourcePath ?? Path.Combine(ApplicationEnvironment.ApplicationBasePath,
+                    "AppHostTemplate");
         }
 
         public void CreateShim(FilePath targetExecutablePath, string commandName)
@@ -47,7 +49,8 @@ namespace Microsoft.DotNet.ShellShim
             }
 
             TransactionalAction.Run(
-                action: () => {
+                action: () =>
+                {
                     try
                     {
                         if (!Directory.Exists(_shimsDirectory.Value))
@@ -55,29 +58,13 @@ namespace Microsoft.DotNet.ShellShim
                             Directory.CreateDirectory(_shimsDirectory.Value);
                         }
 
-                        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+                        CreateApphostShimAndConfigFile(
-                        {
+                                   commandName,
-                            CreateConfigFile(
+                                   entryPoint: targetExecutablePath);
-                                outputPath: GetWindowsConfigPath(commandName),
-                                entryPoint: targetExecutablePath,
-                                runner: "dotnet");
 
-                            using (var shim = File.Create(GetWindowsShimPath(commandName).Value))
+                        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                            using (var resource = typeof(ShellShimRepository).Assembly.GetManifestResourceStream(LauncherExeResourceName))
                         {
-                                resource.CopyTo(shim);
+                            SetUserExecutionPermission(GetShimPath(commandName));
-                            }
-                        }
-                        else
-                        {
-                            var script = new StringBuilder();
-                            script.AppendLine("#!/bin/sh");
-                            script.AppendLine($"dotnet {targetExecutablePath.ToQuotedString()} \"$@\"");
-
-                            var shimPath = GetPosixShimPath(commandName);
-                            File.WriteAllText(shimPath.Value, script.ToString());
-
-                            SetUserExecutionPermission(shimPath);
                         }
                     }
                     catch (Exception ex) when (ex is UnauthorizedAccessException || ex is IOException)
@@ -138,18 +125,43 @@ namespace Microsoft.DotNet.ShellShim
                 });
         }
 
-        internal void CreateConfigFile(FilePath outputPath, FilePath entryPoint, string runner)
+        private void CreateApphostShimAndConfigFile(string commandName, FilePath entryPoint)
         {
-            XDocument config;
+            string appHostSourcePath;
-            using (var resource = typeof(ShellShimRepository).Assembly.GetManifestResourceStream(LauncherConfigResourceName))
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
             {
-                config = XDocument.Load(resource);
+                appHostSourcePath = Path.Combine(_appHostSourceDirectory, ApphostNameWithoutExtension + ".exe");
+            }
+            else
+            {
+                appHostSourcePath = Path.Combine(_appHostSourceDirectory, ApphostNameWithoutExtension);
             }
 
-            var appSettings = config.Descendants("appSettings").First();
+            EmbedAppNameInHost.EmbedAndReturnModifiedAppHostPath(
-            appSettings.Add(new XElement("add", new XAttribute("key", "entryPoint"), new XAttribute("value", entryPoint.Value)));
+                appHostSourceFilePath: appHostSourcePath,
-            appSettings.Add(new XElement("add", new XAttribute("key", "runner"), new XAttribute("value", runner ?? string.Empty)));
+                appHostDestinationFilePath: GetShimPath(commandName).Value,
-            config.Save(outputPath.Value);
+                appBinaryName: Path.GetFileName(entryPoint.Value));
+
+            var config = JsonConvert.SerializeObject(
+                new RootObject
+                {
+                    startupOptions = new StartupOptions
+                    {
+                        appRoot = entryPoint.GetDirectoryPath().Value
+                    }
+                });
+
+            File.WriteAllText(GetConfigPath(commandName).Value, config);
+        }
+
+        private class StartupOptions
+        {
+            public string appRoot { get; set; }
+        }
+
+        private class RootObject
+        {
+            public StartupOptions startupOptions { get; set; }
         }
 
         private bool ShimExists(string commandName)
@@ -164,30 +176,25 @@ namespace Microsoft.DotNet.ShellShim
                 yield break;
             }
 
+            yield return GetShimPath(commandName);
+            yield return GetConfigPath(commandName);
+        }
+
+        private FilePath GetShimPath(string commandName)
+        {
             if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-            {
-                yield return GetWindowsShimPath(commandName);
-                yield return GetWindowsConfigPath(commandName);
-            }
-            else
-            {
-                yield return GetPosixShimPath(commandName);
-            }
-        }
-
-        private FilePath GetPosixShimPath(string commandName)
-        {
-            return _shimsDirectory.WithFile(commandName);
-        }
-
-        private FilePath GetWindowsShimPath(string commandName)
             {
                 return new FilePath(_shimsDirectory.WithFile(commandName).Value +".exe");
             }
-
+            else
-        private FilePath GetWindowsConfigPath(string commandName)
             {
-            return new FilePath(GetWindowsShimPath(commandName).Value + ".config");
+                return _shimsDirectory.WithFile(commandName);
+            }
+        }
+
+        private FilePath GetConfigPath(string commandName)
+        {
+            return _shimsDirectory.WithFile(commandName + ".startupconfig.json");
         }
 
         private static void SetUserExecutionPermission(FilePath path)

src/dotnet/ShellShim/WindowsEnvironmentPath.cs

@@ -14,14 +14,13 @@ namespace Microsoft.DotNet.ShellShim
         private readonly IReporter _reporter;
         private const string PathName = "PATH";
         private readonly string _packageExecutablePath;
+        private readonly IEnvironmentProvider _environmentProvider;
 
-        public WindowsEnvironmentPath(
+        public WindowsEnvironmentPath(string packageExecutablePath, IReporter reporter, IEnvironmentProvider environmentProvider)
-            string packageExecutablePath, IReporter reporter)
         {
-            _packageExecutablePath
+            _packageExecutablePath = packageExecutablePath ?? throw new ArgumentNullException(nameof(packageExecutablePath));
-                = packageExecutablePath ?? throw new ArgumentNullException(nameof(packageExecutablePath));
+            _reporter = reporter ?? throw new ArgumentNullException(nameof(reporter));
-            _reporter
+            _environmentProvider = environmentProvider ?? throw new ArgumentNullException(nameof(environmentProvider));
-                = reporter ?? throw new ArgumentNullException(nameof(reporter));
         }
 
         public void AddPackageExecutablePathToUserPath()
@@ -31,18 +30,38 @@ namespace Microsoft.DotNet.ShellShim
                 return;
             }
 
-            var existingUserEnvPath = Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User);
+            var existingUserEnvPath = _environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User);
 
+            try
+            {
+                if (existingUserEnvPath == null)
+                {
+                    _environmentProvider.SetEnvironmentVariable(
+                        PathName,
+                        _packageExecutablePath,
+                        EnvironmentVariableTarget.User);
+                }
+                else
+                {
                     if (existingUserEnvPath.EndsWith(';'))
                     {
                         existingUserEnvPath = existingUserEnvPath.Substring(0, (existingUserEnvPath.Length - 1));
                     }
 
-            Environment.SetEnvironmentVariable(
+                    _environmentProvider.SetEnvironmentVariable(
                         PathName,
                         $"{existingUserEnvPath};{_packageExecutablePath}",
                         EnvironmentVariableTarget.User);
                 }
+            }
+            catch (System.Security.SecurityException)
+            {
+                _reporter.WriteLine(
+                    string.Format(
+                        CommonLocalizableStrings.FailedToSetToolsPathEnvironmentVariable,
+                        _packageExecutablePath).Yellow());
+            }
+        }
 
         private bool PackageExecutablePathExists()
         {
@@ -51,13 +70,13 @@ namespace Microsoft.DotNet.ShellShim
 
         private bool PackageExecutablePathWillExistForFutureNewProcess()
         {
-            return EnvironmentVariableConatinsPackageExecutablePath(Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User))
+            return EnvironmentVariableConatinsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.User))
-                   || EnvironmentVariableConatinsPackageExecutablePath(Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Machine));
+                   || EnvironmentVariableConatinsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Machine));
         }
 
         private bool PackageExecutablePathExistsForCurrentProcess()
         {
-            return EnvironmentVariableConatinsPackageExecutablePath(Environment.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Process));
+            return EnvironmentVariableConatinsPackageExecutablePath(_environmentProvider.GetEnvironmentVariable(PathName, EnvironmentVariableTarget.Process));
         }
 
         private bool EnvironmentVariableConatinsPackageExecutablePath(string environmentVariable)
@@ -67,15 +86,16 @@ namespace Microsoft.DotNet.ShellShim
                 return false;
             }
 
-            return environmentVariable.Split(';').Contains(_packageExecutablePath);
+            return environmentVariable
+                .Split(';')
+                .Any(p => string.Equals(p, _packageExecutablePath, StringComparison.OrdinalIgnoreCase));
         }
 
         public void PrintAddPathInstructionIfPathDoesNotExist()
         {
             if (!PackageExecutablePathExistsForCurrentProcess() && PackageExecutablePathWillExistForFutureNewProcess())
             {
-                _reporter.WriteLine(
+                _reporter.WriteLine(CommonLocalizableStrings.EnvironmentPathWindowsNeedReopen);
-                    CommonLocalizableStrings.EnvironmentPathWindowsNeedReopen);
             }
             else if (!PackageExecutablePathWillExistForFutureNewProcess())
             {

src/dotnet/commands/dotnet-tool/install/LocalizableStrings.resx

@@ -161,6 +161,9 @@ Tool '{1}' (version '{2}') was successfully installed.</value>
     <value>The settings file in the tool's NuGet package is invalid: {0}</value>
   </data>
   <data name="ToolInstallationFailed" xml:space="preserve">
+    <value>Tool '{0}' failed to install.</value>
+  </data>
+  <data name="ToolInstallationFailedWithExplicitVersionGuide" xml:space="preserve">
     <value>Tool '{0}' failed to install. You may need to specify the version using
 
    dotnet tool install -g {0} --version &lt;version&gt;</value>

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

@@ -18,7 +18,7 @@ namespace Microsoft.DotNet.Tools.Tool.Install
                 userFacingMessages = new[]
                 {
                     ex.Message,
-                    string.Format(LocalizableStrings.ToolInstallationFailed, packageId),
+                    string.Format(LocalizableStrings.ToolInstallationFailedWithExplicitVersionGuide, packageId),
                 };
             }
             else if (ex is ToolConfigurationException)

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.cs.xlf

@@ -59,13 +59,6 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován.</target>
         <target state="translated">Soubor nastavení v balíčku NuGet nástroje je neplatný: {0}.</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Nástroj {0} se nepodařilo nainstalovat.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Nástroj {0} se nepodařilo nainstalovat. Obraťte se prosím s žádostí o pomoc na autora nástroje.</target>
@@ -121,6 +114,20 @@ Nástroj {1} (verze {2}) byl úspěšně nainstalován.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.de.xlf

@@ -59,13 +59,6 @@ Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert.</target>
         <target state="translated">Die Einstellungsdatei im NuGet-Paket des Tools ist ungültig: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Fehler bei der Installation des Tools "{0}".</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Fehler bei der Installation des Tools "{0}". Wenden Sie sich an den Verfasser des Tools, um Unterstützung zu erhalten.</target>
@@ -121,6 +114,20 @@ Das Tool "{1}" (Version "{2}") wurde erfolgreich installiert.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.es.xlf

@@ -59,13 +59,6 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente.</target>
         <target state="translated">El archivo de configuración del paquete NuGet de la herramienta no es válido: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">No se pudo instalar la herramienta “{0}”.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">No se pudo instalar la herramienta “{0}”. Póngase en contacto con su creador para obtener asistencia.</target>
@@ -121,6 +114,20 @@ La herramienta "{1}" (versión "{2}") se instaló correctamente.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.fr.xlf

@@ -59,13 +59,6 @@ L'outil '{1}' (version '{2}') a été installé.</target>
         <target state="translated">Le fichier de paramètres dans le package NuGet de l'outil n'est pas valide : {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Impossible d'installer l'outil '{0}'.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Impossible d'installer l'outil '{0}'. Contactez le créateur de l'outil pour obtenir de l'aide.</target>
@@ -121,6 +114,20 @@ L'outil '{1}' (version '{2}') a été installé.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.it.xlf

@@ -59,13 +59,6 @@ Lo strumento '{1}' (versione '{2}') è stato installato.</target>
         <target state="translated">Il file di impostazioni nel pacchetto NuGet dello strumento non è valido: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Non è stato possibile installare lo strumento '{0}'.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Non è stato possibile installare lo strumento '{0}'. Per assistenza, contattare l'autore dello strumento.</target>
@@ -121,6 +114,20 @@ Lo strumento '{1}' (versione '{2}') è stato installato.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ja.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">ツールの NuGet パッケージ内の設定ファイルが無効です: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">ツール '{0}' をインストールできませんでした。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">ツール '{0}' をインストールできませんでした。ツールの作成者にお問い合わせください。</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ko.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">도구의 NuGet 패키지에 있는 설정 파일이 잘못되었습니다. {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">'{0}' 도구를 설치하지 못했습니다.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">'{0}' 도구를 설치하지 못했습니다. 도구 작성자에게 문의하세요.</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pl.xlf

@@ -59,13 +59,6 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”).</target>
         <target state="translated">Plik ustawień w pakiecie NuGet narzędzia jest nieprawidłowy: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Zainstalowanie narzędzia „{0}” nie powiodło się.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Zainstalowanie narzędzia „{0}” nie powiodło się. Skontaktuj się z autorem narzędzia w celu uzyskania pomocy.</target>
@@ -121,6 +114,20 @@ Pomyślnie zainstalowano narzędzie „{1}” (wersja: „{2}”).</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.pt-BR.xlf

@@ -59,13 +59,6 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito.</target>
         <target state="translated">O arquivo de configurações no pacote NuGet da ferramenta é inválido: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Não foi possível instalar a ferramenta '{0}'.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Não foi possível instalar a ferramenta '{0}'. Entre em contato com o autor da ferramenta para obter assistência.</target>
@@ -121,6 +114,20 @@ A ferramenta '{1}' (versão '{2}') foi instalada com êxito.</target>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.ru.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">Недопустимый файл параметров в пакете NuGet инструмента: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">Не удалось установить инструмент "{0}".</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">Не удалось установить инструмент "{0}". Обратитесь за помощью к его разработчику.</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.tr.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">Aracın NuGet paketindeki ayar dosyası geçersiz: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">'{0}' aracı yüklenemedi.</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">'{0}' aracı yüklenemedi. Lütfen yardım için araç sahibiyle iletişime geçin.</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hans.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">工具的 NuGet 包中的设置文件无效: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">工具“{0}”安装失败。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">工具“{0}”安装失败。请联系工具作者获取帮助。</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/commands/dotnet-tool/install/xlf/LocalizableStrings.zh-Hant.xlf

@@ -59,13 +59,6 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="translated">工具之 NuGet 套件中的設定檔案無效: {0}</target>
         <note />
       </trans-unit>
-      <trans-unit id="ToolInstallationFailed">
-        <source>Tool '{0}' failed to install. You may need to specify the version using
-
-   dotnet tool install -g {0} --version &lt;version&gt;</source>
-        <target state="needs-review-translation">工具 '{0}' 無法安裝。</target>
-        <note />
-      </trans-unit>
       <trans-unit id="ToolInstallationFailedContactAuthor">
         <source>Tool '{0}' failed to install. Please contact the tool author for assistance.</source>
         <target state="translated">工具 '{0}' 無法安裝。請連絡工具作者尋求協助。</target>
@@ -121,6 +114,20 @@ Tool '{1}' (version '{2}') was successfully installed.</source>
         <target state="new">SOURCE_FEED</target>
         <note />
       </trans-unit>
+      <trans-unit id="ToolInstallationFailed">
+        <source>Tool '{0}' failed to install.</source>
+        <target state="new">Tool '{0}' failed to install.</target>
+        <note />
+      </trans-unit>
+      <trans-unit id="ToolInstallationFailedWithExplicitVersionGuide">
+        <source>Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</source>
+        <target state="new">Tool '{0}' failed to install. You may need to specify the version using
+
+   dotnet tool install -g {0} --version &lt;version&gt;</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/dotnet.csproj

@@ -79,5 +79,5 @@
     <Folder Include="commands\dotnet-migrate\xlf" />
     <Folder Include="dotnet-complete\commands\" />
   </ItemGroup>
-  <Import Project="dotnet.win.targets" Condition="'$(OS)' == 'Windows_NT'" />
+
 </Project>

src/dotnet/dotnet.win.targets

@@ -1,25 +0,0 @@
-<!-- This file should only be used when building dotnet for windows. -->
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- Only included to ensure this is built first. -->
-    <ProjectReference Include="..\tool_launcher\tool_launcher.csproj"
-      ReferenceOutputAssembly="false"
-      SkipGetTargetFrameworkProperties="true"
-      PrivateAssets="All" />
-  </ItemGroup>
-
-  <Target Name="EmbedDotnetLauncher" BeforeTargets="PrepareForBuild">
-    <MSBuild Projects="..\tool_launcher\tool_launcher.csproj" Targets="GetTargetPath" Properties="Configuration=$(Configuration)">
-      <Output TaskParameter="TargetOutputs" PropertyName="DotnetLauncherFullPath" />
-    </MSBuild>
-    <ItemGroup>
-      <EmbeddedResource Include="$(DotnetLauncherFullPath)" LogicalName="Microsoft.DotNet.Tools.Launcher.Executable" />
-      <EmbeddedResource Include="$(DotnetLauncherFullPath).config" LogicalName="Microsoft.DotNet.Tools.Launcher.Config" />
-    </ItemGroup>
-  </Target>
-
-</Project>

src/dotnet/xlf/CommonLocalizableStrings.cs.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.de.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.es.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.fr.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.it.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.ja.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.ko.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.pl.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.pt-BR.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.ru.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.tr.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.zh-Hans.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/dotnet/xlf/CommonLocalizableStrings.zh-Hant.xlf

@@ -878,6 +878,11 @@ setx PATH "%PATH%;{0}"
         <target state="new">Format version is missing. This tool may not be supported in this SDK version. Please contact the author of the tool.</target>
         <note />
       </trans-unit>
+      <trans-unit id="FailedToSetToolsPathEnvironmentVariable">
+        <source>Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</source>
+        <target state="new">Failed to add '{0}' to the PATH environment variable. Please add this directory to your PATH to use tools installed with 'dotnet tool install'.</target>
+        <note />
+      </trans-unit>
     </body>
   </file>
 </xliff>

src/redist/redist.csproj

@@ -193,6 +193,7 @@
   </Target>
 
   <Target Name="PublishDotnetTools"
+          Condition="'$(CLIBUILD_SKIP_BUNDLEDDOTNETTOOLS)' != 'true'"
           AfterTargets="Publish">
     <ItemGroup>
       <DotnetToolsToBundle Include="$(RepoRoot)/build/BundledDotnetTools.proj">
@@ -211,6 +212,44 @@
     </MSBuild>
   </Target>
 
+  <Target Name="PublishAppHostTemplate"
+          AfterTargets="Publish">
+
+    <PropertyGroup>
+      <NETCoreDotNetAppHostPackageName>Microsoft.NETCore.DotNetAppHost</NETCoreDotNetAppHostPackageName>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <NETCoreDotNetAppHostPackageVersions Include="@(PackageDefinitions->'%(Version)')"
+                                           Condition="%(PackageDefinitions.Name) == $(NETCoreDotNetAppHostPackageName)" />
+    </ItemGroup>
+
+    <Error Condition="@(NETCoreDotNetAppHostPackageVersions->Distinct()->Count()) != 1"
+           Text="Failed to determine the $(NETCoreDotNetAppHostPackageName) version pulled in Microsoft.NETCore.App" />
+
+    <PropertyGroup>
+      <_NETCoreDotNetAppHostPackageVersion>@(NETCoreDotNetAppHostPackageVersions->Distinct())</_NETCoreDotNetAppHostPackageVersion>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <AppHostTemplate Include="$(RepoRoot)/build/AppHostTemplate.proj">
+        <Properties>
+          AppHostTemplatePath=$(SdkOutputDirectory)/AppHostTemplate;
+          TemplateFillInPackageName=$(NETCoreDotNetAppHostPackageName);
+          TemplateFillInPackageVersion=$(_NETCoreDotNetAppHostPackageVersion);
+          PreviousStageDirectory=$(PreviousStageDirectory);
+          AppHostIntermediateDirectory=$(IntermediateDirectory)/AppHostIntermediate
+        </Properties>
+      </AppHostTemplate>
+    </ItemGroup>
+
+    <MSBuild
+      BuildInParallel="False"
+      Projects="@(AppHostTemplate)">
+    </MSBuild>
+
+  </Target>
+
   <Target Name="PublishLzmaArchive"
           Condition="'$(CLIBUILD_SKIP_LZMA)' != 'true'"
           DependsOnTargets="GetNuGetPackagesArchive"

src/tool_launcher/Program.cs

@@ -1,116 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Configuration;
-using System.Diagnostics;
-using Microsoft.DotNet.Cli.Utils;
-
-namespace Microsoft.DotNet.Tools.Launcher
-{
-    /// <summary>
-    /// The app is simple shim into launching arbitrary command line processes.
-    /// It is configured via app settings .NET config file. (See app.config).
-    /// </summary>
-    /// <remarks>
-    /// Launching new processes using cmd.exe and .cmd files causes issues for long-running process
-    /// because CTRL+C always hangs on interrupt with the prompt "Terminate Y/N". This can lead to
-    /// orphaned processes.
-    /// </remarks>
-    class Program
-    {
-        private const string TRACE = "DOTNET_LAUNCHER_TRACE";
-        private const int ERR_FAILED = -1;
-        private static bool _trace;
-
-        public static int Main(string[] argsToForward)
-        {
-            bool.TryParse(Environment.GetEnvironmentVariable(TRACE), out _trace);
-
-            try
-            {
-                var appSettings = ConfigurationManager.AppSettings;
-
-                var entryPoint = appSettings["entryPoint"];
-                if (string.IsNullOrEmpty(entryPoint))
-                {
-                    LogError("The launcher must specify a non-empty appSetting value for 'entryPoint'.");
-                    return ERR_FAILED;
-                }
-
-                var exePath = entryPoint;
-                var runner = appSettings["runner"];
-
-                var args = new List<string>();
-
-                if (!string.IsNullOrEmpty(runner))
-                {
-                    args.Add(entryPoint);
-                    exePath = runner;
-                }
-
-                args.AddRange(argsToForward);
-
-                var argString = ArgumentEscaper.EscapeAndConcatenateArgArrayForProcessStart(args);
-
-                using (var process = new Process
-                {
-                    StartInfo =
-                    {
-                        FileName = exePath,
-                        Arguments = argString,
-                        CreateNoWindow = false,
-                        UseShellExecute = false,
-                    }
-                })
-                {
-                    LogTrace("Starting a new process.");
-                    LogTrace("filename = " + process.StartInfo.FileName);
-                    LogTrace("args = " + process.StartInfo.Arguments);
-                    LogTrace("cwd = " + process.StartInfo.WorkingDirectory);
-
-                    try
-                    {
-                        process.Start();
-                    }
-                    catch (Win32Exception ex)
-                    {
-                        LogTrace(ex.ToString());
-                        LogError($"Failed to start '{process.StartInfo.FileName}'. " + ex.Message);
-                        return ERR_FAILED;
-                    }
-
-                    process.WaitForExit();
-
-                    LogTrace("Exited code " + process.ExitCode);
-
-                    return process.ExitCode;
-                }
-            }
-            catch (Exception ex)
-            {
-                LogError("Unexpected error launching a new process. Run with the environment variable " + TRACE + "='true' for details.");
-                LogTrace(ex.ToString());
-                return ERR_FAILED;
-            }
-        }
-
-        private static void LogError(string message)
-        {
-            Console.ForegroundColor = ConsoleColor.Red;
-            Console.BackgroundColor = ConsoleColor.Black;
-            Console.Error.WriteLine("ERROR: " + message);
-            Console.ResetColor();
-        }
-
-        private static void LogTrace(string message)
-        {
-            if (!_trace)
-                return;
-
-            Console.ForegroundColor = ConsoleColor.DarkGray;
-            Console.BackgroundColor = ConsoleColor.Black;
-            Console.WriteLine("[dotnet-launcher] " + message);
-            Console.ResetColor();
-        }
-    }
-}

src/tool_launcher/app.config

@@ -1,19 +0,0 @@
-<!--
-Generated by the .NET Core Command Line.
--->
-<configuration>
-  <startup>
-    <supportedRuntime version="v2.0.50727" />
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
-  </startup>
-  <appSettings>
-    <!--
-    To use this launcher, this value must be set. It is a file path or name of the new process being launched.
-    <add key="entryPoint" value="%entrypoint%" />
-
-    This value may also be set. It is an path to another executable used to launch the entry point.
-    It is treated as single argument.
-    <add key="runner" value="%runner%" />
-    -->
-  </appSettings>
-</configuration>

src/tool_launcher/tool_launcher.csproj

@@ -1,30 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <!-- Targets .NET Framework 3.5 because .NET Framework 4.5 is not bundled in Windows 7. -->
-    <TargetFramework>net35</TargetFramework>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <OutputType>exe</OutputType>
-    <IsPackable>false</IsPackable>
-    <AssemblyName>Microsoft.DotNet.Tools.Launcher</AssemblyName>
-    <Title>dotnet-tool-launcher</Title>
-    <Description>
-      A simple Windows-only shim for launching new processes.
-    </Description>
-  </PropertyGroup>
-
-  <!-- This project must not have any package references. It must be a standalone .exe file -->
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core" />
-  </ItemGroup>
-
-  <!-- Workaround https://github.com/Microsoft/msbuild/issues/1333 -->
-  <PropertyGroup>
-    <FrameworkPathOverride>$(MSBuildProgramFiles32)\Reference Assemblies\Microsoft\Framework\.NETFramework\v3.5\Profile\Client</FrameworkPathOverride>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <Compile Include="..\Microsoft.DotNet.Cli.Utils\ArgumentEscaper.cs" />
-  </ItemGroup>
-</Project>

test/Microsoft.DotNet.Configurer.UnitTests/GivenADotnetFirstTimeUseConfigurer.cs

@@ -20,9 +20,10 @@ namespace Microsoft.DotNet.Configurer.UnitTests
         private Mock<IFirstTimeUseNoticeSentinel> _firstTimeUseNoticeSentinelMock;
         private Mock<IAspNetCertificateSentinel> _aspNetCertificateSentinelMock;
         private Mock<IAspNetCoreCertificateGenerator> _aspNetCoreCertificateGeneratorMock;
+        private Mock<IFileSentinel> _toolPathSentinelMock;
         private Mock<IEnvironmentProvider> _environmentProviderMock;
         private Mock<IReporter> _reporterMock;
-        private Mock<IEnvironmentPath> _pathAdder;
+        private Mock<IEnvironmentPath> _pathAdderMock;
 
         public GivenADotnetFirstTimeUseConfigurer()
         {
@@ -31,9 +32,10 @@ namespace Microsoft.DotNet.Configurer.UnitTests
             _firstTimeUseNoticeSentinelMock = new Mock<IFirstTimeUseNoticeSentinel>();
             _aspNetCertificateSentinelMock = new Mock<IAspNetCertificateSentinel>();
             _aspNetCoreCertificateGeneratorMock = new Mock<IAspNetCoreCertificateGenerator>();
+            _toolPathSentinelMock = new Mock<IFileSentinel>();
             _environmentProviderMock = new Mock<IEnvironmentProvider>();
             _reporterMock = new Mock<IReporter>();
-            _pathAdder = new Mock<IEnvironmentPath>();
+            _pathAdderMock = new Mock<IEnvironmentPath>();
 
             _environmentProviderMock
                 .Setup(e => e.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false))
@@ -54,10 +56,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -79,10 +82,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -104,10 +108,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -126,10 +131,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -148,10 +154,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -169,10 +176,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -190,10 +198,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -214,10 +223,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -235,10 +245,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -257,10 +268,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -282,10 +294,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -298,25 +311,49 @@ namespace Microsoft.DotNet.Configurer.UnitTests
         }
 
         [Fact]
-        public void It_adds_executable_package_path_to_environment_path_when_the_first_notice_sentinel_does_not_exist()
+        public void It_adds_the_tool_path_to_the_environment_if_the_tool_path_sentinel_does_not_exist()
         {
-            _nugetCacheSentinelMock.Setup(n => n.Exists()).Returns(true);
+            _toolPathSentinelMock.Setup(s => s.Exists()).Returns(false);
-            _firstTimeUseNoticeSentinelMock.Setup(n => n.Exists()).Returns(false);
 
             var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer(
                 _nugetCachePrimerMock.Object,
-                new FakeCreateWillExistNuGetCacheSentinel(false, true), 
+                _nugetCacheSentinelMock.Object,
-                new FakeCreateWillExistFirstTimeUseNoticeSentinel(false),
+                _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
             
-            _pathAdder.Verify(p => p.AddPackageExecutablePathToUserPath(), Times.AtLeastOnce);
+            _toolPathSentinelMock.Verify(s => s.Create(), Times.Once);
+            _pathAdderMock.Verify(p => p.AddPackageExecutablePathToUserPath(), Times.Once);
+        }
+
+        [Fact]
+        public void It_does_not_add_the_tool_path_to_the_environment_if_the_tool_path_sentinel_exists()
+        {
+            _toolPathSentinelMock.Setup(s => s.Exists()).Returns(true);
+
+            var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer(
+                _nugetCachePrimerMock.Object,
+                _nugetCacheSentinelMock.Object,
+                _firstTimeUseNoticeSentinelMock.Object,
+                _aspNetCertificateSentinelMock.Object,
+                _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
+                _environmentProviderMock.Object,
+                _reporterMock.Object,
+                CliFallbackFolderPath,
+                _pathAdderMock.Object);
+
+            dotnetFirstTimeUseConfigurer.Configure();
+
+            _toolPathSentinelMock.Verify(s => s.Create(), Times.Never);
+            _pathAdderMock.Verify(p => p.AddPackageExecutablePathToUserPath(), Times.Never);
         }
 
         [Fact]
@@ -330,10 +367,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -359,10 +397,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -380,10 +419,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -405,10 +445,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -430,10 +471,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -454,10 +496,11 @@ namespace Microsoft.DotNet.Configurer.UnitTests
                 _firstTimeUseNoticeSentinelMock.Object,
                 _aspNetCertificateSentinelMock.Object,
                 _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
                 _environmentProviderMock.Object,
                 _reporterMock.Object,
                 CliFallbackFolderPath,
-                _pathAdder.Object);
+                _pathAdderMock.Object);
 
             dotnetFirstTimeUseConfigurer.Configure();
 
@@ -467,61 +510,48 @@ namespace Microsoft.DotNet.Configurer.UnitTests
             _aspNetCoreCertificateGeneratorMock.Verify(s => s.GenerateAspNetCoreDevelopmentCertificate(), Times.Once);
         }
 
-        private class FakeCreateWillExistFirstTimeUseNoticeSentinel : IFirstTimeUseNoticeSentinel
+        [Fact]
+        public void It_adds_the_tool_path_to_the_environment_if_the_first_run_experience_is_not_skipped()
         {
-            private bool _exists;
+            var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer(
+                _nugetCachePrimerMock.Object,
+                _nugetCacheSentinelMock.Object,
+                _firstTimeUseNoticeSentinelMock.Object,
+                _aspNetCertificateSentinelMock.Object,
+                _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
+                _environmentProviderMock.Object,
+                _reporterMock.Object,
+                CliFallbackFolderPath,
+                _pathAdderMock.Object);
 
-            public FakeCreateWillExistFirstTimeUseNoticeSentinel(bool exists)
+            dotnetFirstTimeUseConfigurer.Configure();
-            {
+
-                _exists = exists;
+            _pathAdderMock.Verify(p => p.AddPackageExecutablePathToUserPath(), Times.Once);
         }
 
-            public void Dispose()
+        [Fact]
+        public void It_does_not_add_the_tool_path_to_the_environment_if_the_first_run_experience_is_skipped()
         {
-            }
+            _environmentProviderMock
+                .Setup(e => e.GetEnvironmentVariableAsBool("DOTNET_SKIP_FIRST_TIME_EXPERIENCE", false))
+                .Returns(true);
 
-            public bool Exists()
+            var dotnetFirstTimeUseConfigurer = new DotnetFirstTimeUseConfigurer(
-            {
+                _nugetCachePrimerMock.Object,
-                return _exists;
+                _nugetCacheSentinelMock.Object,
-            }
+                _firstTimeUseNoticeSentinelMock.Object,
+                _aspNetCertificateSentinelMock.Object,
+                _aspNetCoreCertificateGeneratorMock.Object,
+                _toolPathSentinelMock.Object,
+                _environmentProviderMock.Object,
+                _reporterMock.Object,
+                CliFallbackFolderPath,
+                _pathAdderMock.Object);
 
-            public void CreateIfNotExists()
+            dotnetFirstTimeUseConfigurer.Configure();
-            {
-                _exists = true;
-            }
-        }
 
-        private class FakeCreateWillExistNuGetCacheSentinel : INuGetCacheSentinel
+            _pathAdderMock.Verify(p => p.AddPackageExecutablePathToUserPath(), Times.Never);
-        {
-            private bool _inProgressSentinelAlreadyExists;
-            private bool _exists;
-
-            public FakeCreateWillExistNuGetCacheSentinel(bool inProgressSentinelAlreadyExists, bool exists)
-            {
-                _inProgressSentinelAlreadyExists = inProgressSentinelAlreadyExists;
-                _exists = exists;
-            }
-
-            public void Dispose()
-            {
-            }
-
-            public bool InProgressSentinelAlreadyExists()
-            {
-                return _inProgressSentinelAlreadyExists;
-            }
-
-            public bool Exists()
-            {
-                return _exists;
-            }
-
-            public void CreateIfNotExists()
-            {
-                _exists = true;
-            }
-
-            public bool UnauthorizedAccess { get; set; }
         }
     }
 }

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

@@ -1,48 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using Microsoft.DotNet.Cli.Utils;
-
-namespace Microsoft.DotNet.ShellShim.Tests
-{
-    internal class FakeEnvironmentProvider : IEnvironmentProvider
-    {
-        private readonly Dictionary<string, string> _environmentVariables;
-
-        public FakeEnvironmentProvider(Dictionary<string, string> environmentVariables)
-        {
-            _environmentVariables =
-                environmentVariables ?? throw new ArgumentNullException(nameof(environmentVariables));
-        }
-
-        public IEnumerable<string> ExecutableExtensions { get; }
-
-        public string GetCommandPath(string commandName, params string[] extensions)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetCommandPathFromRootPath(string rootPath, string commandName, params string[] extensions)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetCommandPathFromRootPath(string rootPath, string commandName,
-            IEnumerable<string> extensions)
-        {
-            throw new NotImplementedException();
-        }
-
-        public bool GetEnvironmentVariableAsBool(string name, bool defaultValue)
-        {
-            throw new NotImplementedException();
-        }
-
-        public string GetEnvironmentVariable(string name)
-        {
-            return _environmentVariables.ContainsKey(name) ? _environmentVariables[name] : "";
-        }
-    }
-}

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

@@ -1,64 +0,0 @@
-// Copyright (c) .NET Foundation and contributors. All rights reserved.
-// Licensed under the MIT license. See LICENSE file in the project root for full license information.
-
-using System;
-using System.Collections.Generic;
-using System.IO;
-using Microsoft.Extensions.EnvironmentAbstractions;
-
-namespace Microsoft.DotNet.ShellShim.Tests
-{
-    internal class FakeFile : IFile
-    {
-        private Dictionary<string, string> _files;
-
-        public FakeFile(Dictionary<string, string> files)
-        {
-            _files = files;
-        }
-
-        public bool Exists(string path)
-        {
-            return _files.ContainsKey(path);
-        }
-
-        public string ReadAllText(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Stream OpenRead(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        public Stream OpenFile(string path, FileMode fileMode, FileAccess fileAccess, FileShare fileShare,
-            int bufferSize,
-            FileOptions fileOptions)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void CreateEmptyFile(string path)
-        {
-            _files.Add(path, String.Empty);
-        }
-
-        public void WriteAllText(string path, string content)
-        {
-            _files[path] = content;
-        }
-
-        public void Move(string source, string destination)
-        {
-            throw new NotImplementedException();
-        }
-
-        public void Delete(string path)
-        {
-            throw new NotImplementedException();
-        }
-
-        public static FakeFile Empty => new FakeFile(new Dictionary<string, string>());
-    }
-}

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

@@ -2,14 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Microsoft.Extensions.DependencyModel.Tests;
+using Moq;
 using Xunit;
 
 namespace Microsoft.DotNet.ShellShim.Tests
@@ -17,66 +16,138 @@ namespace Microsoft.DotNet.ShellShim.Tests
     public class LinuxEnvironmentPathTests
     {
         [Fact]
-        public void GivenEnvironmentAndReporterItCanPrintOutInstructionToAddPath()
+        public void GivenPathNotSetItPrintsManualInstructions()
         {
             var reporter = new BufferedReporter();
-            var linuxEnvironmentPath = new LinuxEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
+
+            var environmentPath = new LinuxEnvironmentPath(
+                toolsPath,
                 reporter,
-                new FakeEnvironmentProvider(
+                provider.Object,
-                    new Dictionary<string, string>
+                FileSystemMockBuilder.Empty.File);
-                    {
-                        {"PATH", ""}
-                    }),
-                FakeFile.Empty);
 
-            linuxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
 
-            // similar to https://code.visualstudio.com/docs/setup/mac
             reporter.Lines.Should().Equal(
                 string.Format(
                     CommonLocalizableStrings.EnvironmentPathLinuxManualInstructions,
-                    "/myhome/executable/path"));
+                    toolsPath.Path));
         }
 
         [Fact]
-        public void GivenEnvironmentAndReporterItPrintsNothingWhenenvironmentExists()
+        public void GivenPathNotSetAndProfileExistsItPrintsLogoutMessage()
         {
             var reporter = new BufferedReporter();
-            var linuxEnvironmentPath = new LinuxEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
-                reporter,
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
-                new FakeEnvironmentProvider(
-                    new Dictionary<string, string>
-                    {
-                        {"PATH", @"/myhome/executable/path"}
-                    }),
-                FakeFile.Empty);
 
-            linuxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
+
+            var environmentPath = new LinuxEnvironmentPath(
+                toolsPath,
+                reporter,
+                provider.Object,
+                new FileSystemMockBuilder()
+                    .AddFile(LinuxEnvironmentPath.DotnetCliToolsProfilePath, "")
+                    .Build()
+                    .File);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+
+            reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathLinuxNeedLogout);
+        }
+
+        [Theory]
+        [InlineData("/home/user/.dotnet/tools")]
+        [InlineData("~/.dotnet/tools")]
+        public void GivenPathSetItPrintsNothing(string toolsDiretoryOnPath)
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue + ":" + toolsDiretoryOnPath);
+
+            var environmentPath = new LinuxEnvironmentPath(
+                toolsPath,
+                reporter,
+                provider.Object,
+                FileSystemMockBuilder.Empty.File);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
 
             reporter.Lines.Should().BeEmpty();
         }
 
         [Fact]
-        public void GivenAddPackageExecutablePathToUserPathJustRunItPrintsInstructionToLogout()
+        public void GivenPathSetItDoesNotAddPathToEnvironment()
         {
             var reporter = new BufferedReporter();
-            var linuxEnvironmentPath = new LinuxEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+            var fileSystem = new FileSystemMockBuilder().Build().File;
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue + ":" + toolsPath.Path);
+
+            var environmentPath = new LinuxEnvironmentPath(
+                toolsPath,
                 reporter,
-                new FakeEnvironmentProvider(
+                provider.Object,
-                    new Dictionary<string, string>
+                fileSystem);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+
+            fileSystem
+                .Exists(LinuxEnvironmentPath.DotnetCliToolsProfilePath)
+                .Should()
+                .Be(false);
+        }
+
+        [Fact]
+        public void GivenPathNotSetItAddsToEnvironment()
         {
-                        {"PATH", @""}
+            var reporter = new BufferedReporter();
-                    }),
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                FakeFile.Empty);
+            var pathValue = @"/usr/bin";
-            linuxEnvironmentPath.AddPackageExecutablePathToUserPath();
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+            var fileSystem = new FileSystemMockBuilder().Build().File;
 
-            linuxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
 
-            reporter.Lines.Should()
+            var environmentPath = new LinuxEnvironmentPath(
-                .Equal(CommonLocalizableStrings.EnvironmentPathLinuxNeedLogout);
+                toolsPath,
+                reporter,
+                provider.Object,
+                fileSystem);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+
+            fileSystem
+                .ReadAllText(LinuxEnvironmentPath.DotnetCliToolsProfilePath)
+                .Should()
+                .Be($"export PATH=\"$PATH:{toolsPath.PathWithDollar}\"");
         }
     }
 }

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

@@ -2,14 +2,13 @@
 // Licensed under the MIT license. See LICENSE file in the project root for full license information.
 
 using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.Runtime.InteropServices;
 using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
 using Microsoft.DotNet.Configurer;
 using Microsoft.DotNet.Tools;
 using Microsoft.DotNet.Tools.Test.Utilities;
 using Microsoft.Extensions.DependencyModel.Tests;
+using Moq;
 using Xunit;
 
 namespace Microsoft.DotNet.ShellShim.Tests
@@ -17,67 +16,138 @@ namespace Microsoft.DotNet.ShellShim.Tests
     public class OsxEnvironmentPathTests
     {
         [Fact]
-        public void GivenEnvironmentAndReporterItCanPrintOutInstructionToAddPath()
+        public void GivenPathNotSetItPrintsManualInstructions()
         {
             var reporter = new BufferedReporter();
-            var osxEnvironmentPath = new OSXEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
+
+            var environmentPath = new OSXEnvironmentPath(
+                toolsPath,
                 reporter,
-                new FakeEnvironmentProvider(
+                provider.Object,
-                    new Dictionary<string, string>
+                FileSystemMockBuilder.Empty.File);
-                    {
-                        {"PATH", ""}
-                    }),
-                FakeFile.Empty);
 
-            osxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
 
-            // similar to https://code.visualstudio.com/docs/setup/mac
             reporter.Lines.Should().Equal(
                 string.Format(
                     CommonLocalizableStrings.EnvironmentPathOSXManualInstructions,
-                    "/myhome/executable/path"));
+                    toolsPath.Path));
+        }
+
+        [Fact]
+        public void GivenPathNotSetAndProfileExistsItPrintsReopenMessage()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
+
+            var environmentPath = new OSXEnvironmentPath(
+                toolsPath,
+                reporter,
+                provider.Object,
+                new FileSystemMockBuilder()
+                    .AddFile(OSXEnvironmentPath.DotnetCliToolsPathsDPath, "")
+                    .Build()
+                    .File);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+
+            reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathOSXNeedReopen);
         }
 
         [Theory]
-        [InlineData("/myhome/executable/path")]
+        [InlineData("/home/user/.dotnet/tools")]
-        [InlineData("~/executable/path")]
+        [InlineData("~/.dotnet/tools")]
-        public void GivenEnvironmentAndReporterItPrintsNothingWhenenvironmentExists(string existingPath)
+        public void GivenPathSetItPrintsNothing(string toolsDiretoryOnPath)
         {
             var reporter = new BufferedReporter();
-            var osxEnvironmentPath = new OSXEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
-                reporter,
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
-                new FakeEnvironmentProvider(
-                    new Dictionary<string, string>
-                    {
-                        {"PATH", existingPath}
-                    }),
-                FakeFile.Empty);
 
-            osxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue + ":" + toolsDiretoryOnPath);
+
+            var environmentPath = new OSXEnvironmentPath(
+                toolsPath,
+                reporter,
+                provider.Object,
+                FileSystemMockBuilder.Empty.File);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
 
             reporter.Lines.Should().BeEmpty();
         }
 
         [Fact]
-        public void GivenAddPackageExecutablePathToUserPathJustRunItPrintsInstructionToLogout()
+        public void GivenPathSetItDoesNotAddPathToEnvironment()
         {
             var reporter = new BufferedReporter();
-            var osxEnvironmentPath = new OSXEnvironmentPath(
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                new BashPathUnderHomeDirectory("/myhome", "executable/path"),
+            var pathValue = @"/usr/bin";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+            var fileSystem = new FileSystemMockBuilder().Build().File;
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue + ":" + toolsPath.Path);
+
+            var environmentPath = new OSXEnvironmentPath(
+                toolsPath,
                 reporter,
-                new FakeEnvironmentProvider(
+                provider.Object,
-                    new Dictionary<string, string>
+                fileSystem);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+
+            fileSystem
+                .Exists(OSXEnvironmentPath.DotnetCliToolsPathsDPath)
+                .Should()
+                .Be(false);
+        }
+
+        [Fact]
+        public void GivenPathNotSetItAddsToEnvironment()
         {
-                        {"PATH", @""}
+            var reporter = new BufferedReporter();
-                    }),
+            var toolsPath = new BashPathUnderHomeDirectory("/home/user", ".dotnet/tools");
-                FakeFile.Empty);
+            var pathValue = @"/usr/bin";
-            osxEnvironmentPath.AddPackageExecutablePathToUserPath();
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+            var fileSystem = new FileSystemMockBuilder().Build().File;
 
-            osxEnvironmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH"))
+                .Returns(pathValue);
 
-            reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathOSXNeedReopen);
+            var environmentPath = new OSXEnvironmentPath(
+                toolsPath,
+                reporter,
+                provider.Object,
+                fileSystem);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+
+            fileSystem
+                .ReadAllText(OSXEnvironmentPath.DotnetCliToolsPathsDPath)
+                .Should()
+                .Be(toolsPath.PathWithTilde);
         }
     }
 }

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

@@ -30,36 +30,12 @@ namespace Microsoft.DotNet.ShellShim.Tests
             _output = output;
         }
 
-        [WindowsOnlyTheory]
-        [InlineData("my_native_app.exe", null)]
-        [InlineData("./my_native_app.js", "nodejs")]
-        [InlineData(@"C:\tools\my_native_app.dll", "dotnet")]
-        public void GivenAnRunnerOrEntryPointItCanCreateConfig(string entryPointPath, string runner)
-        {
-            var pathToShim = GetNewCleanFolderUnderTempRoot();
-            var shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
-            var tmpFile = new FilePath(Path.Combine(pathToShim, Path.GetRandomFileName()));
-
-            shellShimRepository.CreateConfigFile(tmpFile, new FilePath(entryPointPath), runner);
-
-            new FileInfo(tmpFile.Value).Should().Exist();
-
-            var generated = XDocument.Load(tmpFile.Value);
-
-            generated.Descendants("appSettings")
-                .Descendants("add")
-                .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 == entryPointPath);
-        }
-
         [Fact]
         public void GivenAnExecutablePathItCanGenerateShimFile()
         {
             var outputDll = MakeHelloWorldExecutableDll();
             var pathToShim = GetNewCleanFolderUnderTempRoot();
-            var shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+            ShellShimRepository shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
 
             shellShimRepository.CreateShim(outputDll, shellCommandName);
@@ -69,12 +45,19 @@ namespace Microsoft.DotNet.ShellShim.Tests
             stdOut.Should().Contain("Hello World");
         }
 
+        private static ShellShimRepository ConfigBasicTestDependecyShellShimRepository(string pathToShim)
+        {
+            string stage2AppHostTemplateDirectory = GetAppHostTemplateFromStage2();
+
+            return new ShellShimRepository(new DirectoryPath(pathToShim), stage2AppHostTemplateDirectory);
+        }
+
         [Fact]
         public void GivenAnExecutablePathItCanGenerateShimFileInTransaction()
         {
             var outputDll = MakeHelloWorldExecutableDll();
             var pathToShim = GetNewCleanFolderUnderTempRoot();
-            var shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+            var shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
 
             using (var transactionScope = new TransactionScope(
@@ -95,7 +78,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
         {
             var outputDll = MakeHelloWorldExecutableDll();
             var extraNonExistDirectory = Path.GetRandomFileName();
-            var shellShimRepository = new ShellShimRepository(new DirectoryPath(Path.Combine(TempRoot.Root, extraNonExistDirectory)));
+            var shellShimRepository = new ShellShimRepository(new DirectoryPath(Path.Combine(TempRoot.Root, extraNonExistDirectory)), GetAppHostTemplateFromStage2());
             var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
 
             Action a = () => shellShimRepository.CreateShim(outputDll, shellCommandName);
@@ -111,7 +94,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
         {
             var outputDll = MakeHelloWorldExecutableDll();
             var pathToShim = GetNewCleanFolderUnderTempRoot();
-            var shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+            var shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             var shellCommandName = nameof(ShellShimRepositoryTests) + Path.GetRandomFileName();
 
             shellShimRepository.CreateShim(outputDll, shellCommandName);
@@ -140,7 +123,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Action a = () =>
@@ -182,7 +165,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Action intendedError = () => throw new ToolPackageException("simulated error");
@@ -219,7 +202,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Directory.EnumerateFileSystemEntries(pathToShim).Should().BeEmpty();
@@ -244,7 +227,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Directory.EnumerateFileSystemEntries(pathToShim).Should().BeEmpty();
@@ -273,7 +256,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Directory.EnumerateFileSystemEntries(pathToShim).Should().BeEmpty();
@@ -309,7 +292,7 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
-                shellShimRepository = new ShellShimRepository(new DirectoryPath(pathToShim));
+                shellShimRepository = ConfigBasicTestDependecyShellShimRepository(pathToShim);
             }
 
             Directory.EnumerateFileSystemEntries(pathToShim).Should().BeEmpty();
@@ -358,17 +341,28 @@ namespace Microsoft.DotNet.ShellShim.Tests
             }
             else
             {
+                var file = Path.Combine(cleanFolderUnderTempRoot, shellCommandName);
                 processStartInfo = new ProcessStartInfo
                 {
-                    FileName = "sh",
+                    FileName = file,
-                    Arguments = shellCommandName + " " + arguments,
+                    Arguments = arguments,
                     UseShellExecute = false
                 };
             }
 
             _output.WriteLine($"Launching '{processStartInfo.FileName} {processStartInfo.Arguments}'");
             processStartInfo.WorkingDirectory = cleanFolderUnderTempRoot;
-            processStartInfo.EnvironmentVariables["PATH"] = Path.GetDirectoryName(new Muxer().MuxerPath);
+
+            var environmentProvider = new EnvironmentProvider();
+            processStartInfo.EnvironmentVariables["PATH"] = environmentProvider.GetEnvironmentVariable("PATH");
+            if (Environment.Is64BitProcess)
+            {
+                processStartInfo.EnvironmentVariables["DOTNET_ROOT"] = new RepoDirectoriesProvider().DotnetRoot;
+            }
+            else
+            {
+                processStartInfo.EnvironmentVariables["DOTNET_ROOT(x86)"] = new RepoDirectoriesProvider().DotnetRoot;
+            }
 
             processStartInfo.ExecuteAndCaptureOutput(out var stdOut, out var stdErr);
 
@@ -377,6 +371,47 @@ namespace Microsoft.DotNet.ShellShim.Tests
             return stdOut ?? "";
         }
 
+        private static FileInfo GetStage2DotnetPath()
+        {
+            string stage2DotnetPath;
+
+            var environmentProvider = new EnvironmentProvider();
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                stage2DotnetPath = environmentProvider.GetCommandPath("dotnet", ".exe");
+            }
+            else
+            {
+                stage2DotnetPath = environmentProvider.GetCommandPath("dotnet");
+            }
+
+            var stage2Dotnet = new FileInfo(stage2DotnetPath);
+            return stage2Dotnet;
+        }
+
+        private static string GetAppHostTemplateFromStage2()
+        {
+            var environmentProvider = new EnvironmentProvider();
+            string stage2DotnetPath;
+
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+            {
+                stage2DotnetPath = environmentProvider.GetCommandPath("dotnet", ".exe");
+            }
+            else
+            {
+                stage2DotnetPath = environmentProvider.GetCommandPath("dotnet");
+            }
+
+            var stage2Dotnet = GetStage2DotnetPath();
+
+            var stage2AppHostTemplateDirectory =
+                new DirectoryInfo(new RepoDirectoriesProvider().Stage2Sdk)
+                .GetDirectory("AppHostTemplate").FullName;
+            return stage2AppHostTemplateDirectory;
+        }
+
         private static FilePath MakeHelloWorldExecutableDll()
         {
             const string testAppName = "TestAppSimple";

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

@@ -0,0 +1,175 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved.
+// Licensed under the MIT license. See LICENSE file in the project root for full license information.
+
+using System;
+using FluentAssertions;
+using Microsoft.DotNet.Cli.Utils;
+using Microsoft.DotNet.Configurer;
+using Microsoft.DotNet.Tools;
+using Microsoft.DotNet.Tools.Test.Utilities;
+using Moq;
+using Xunit;
+
+namespace Microsoft.DotNet.ShellShim.Tests
+{
+    public class WindowsEnvironmentPathTests
+    {
+        [Fact]
+        public void GivenPathNotSetItPrintsManualInstructions()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.Process ||
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue);
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+
+            reporter.Lines.Should().Equal(
+                string.Format(
+                    CommonLocalizableStrings.EnvironmentPathWindowsManualInstructions,
+                    toolsPath));
+        }
+
+        [Fact]
+        public void GivenPathNotSetInProcessItPrintsReopenNotice()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable("PATH", EnvironmentVariableTarget.Process))
+                .Returns(pathValue);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue + ";" + toolsPath);
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+
+            reporter.Lines.Should().Equal(CommonLocalizableStrings.EnvironmentPathWindowsNeedReopen);
+        }
+
+        [Fact]
+        public void GivenPathSetInProcessAndEnvironmentItPrintsNothing()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.Process ||
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue + ";" + toolsPath);
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.PrintAddPathInstructionIfPathDoesNotExist();
+
+            reporter.Lines.Should().BeEmpty();
+        }
+
+        [Fact]
+        public void GivenPathSetItDoesNotAddPathToEnvironment()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.Process ||
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue + ";" + toolsPath);
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+        }
+
+        [Fact]
+        public void GivenPathNotSetItAddsToEnvironment()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.Process ||
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue);
+            provider
+                .Setup(p => p.SetEnvironmentVariable("PATH", pathValue + ";" + toolsPath, EnvironmentVariableTarget.User));
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().BeEmpty();
+        }
+
+        [Fact]
+        public void GivenSecurityExceptionItPrintsWarning()
+        {
+            var reporter = new BufferedReporter();
+            var toolsPath = @"C:\Tools";
+            var pathValue = @"C:\Other";
+            var provider = new Mock<IEnvironmentProvider>(MockBehavior.Strict);
+
+            provider
+                .Setup(p => p.GetEnvironmentVariable(
+                    "PATH",
+                    It.Is<EnvironmentVariableTarget>(t =>
+                        t == EnvironmentVariableTarget.Process ||
+                        t == EnvironmentVariableTarget.User ||
+                        t == EnvironmentVariableTarget.Machine)))
+                .Returns(pathValue);
+            provider
+                .Setup(p => p.SetEnvironmentVariable("PATH", pathValue + ";" + toolsPath, EnvironmentVariableTarget.User))
+                .Throws(new System.Security.SecurityException());
+
+            var environmentPath = new WindowsEnvironmentPath(toolsPath, reporter, provider.Object);
+
+            environmentPath.AddPackageExecutablePathToUserPath();
+
+            reporter.Lines.Should().Equal(
+                string.Format(
+                    CommonLocalizableStrings.FailedToSetToolsPathEnvironmentVariable,
+                    toolsPath).Yellow());
+        }
+    }
+}

test/Microsoft.DotNet.Tools.Tests.Utilities/RepoDirectoriesProvider.cs

@@ -15,6 +15,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
         private static string s_buildRid;
 
         private string _artifacts;
+        private string _dotnetRoot;
         private string _builtDotnet;
         private string _nugetPackages;
         private string _stage2Sdk;
@@ -85,6 +86,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
 
         public string Artifacts => _artifacts;
         public string BuiltDotnet => _builtDotnet;
+        public string DotnetRoot => _dotnetRoot;
         public string NugetPackages => _nugetPackages;
         public string Stage2Sdk => _stage2Sdk;
         public string Stage2WithBackwardsCompatibleRuntimesDirectory => _stage2WithBackwardsCompatibleRuntimesDirectory;
@@ -106,6 +108,7 @@ namespace Microsoft.DotNet.Tools.Test.Utilities
                                                    previousStage.ToString(),
                                                    BuildRid);
             _builtDotnet = builtDotnet ?? Path.Combine(_artifacts, "intermediate", "sharedFrameworkPublish");
+            _dotnetRoot = Path.Combine(_artifacts, "dotnet");
             _nugetPackages = nugetPackages ?? Path.Combine(RepoRoot, ".nuget", "packages");
             _stage2Sdk = Directory
                 .EnumerateDirectories(Path.Combine(_artifacts, "dotnet", "sdk"))

test/dotnet.Tests/CommandTests/ToolInstallCommandTests.cs

@@ -360,7 +360,7 @@ namespace Microsoft.DotNet.Tests.Commands
             a.ShouldThrow<GracefulException>().And.Message
                 .Should().Contain(
                     LocalizableStrings.ToolInstallationRestoreFailed +
-                    Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailed, PackageId));
+                    Environment.NewLine + string.Format(LocalizableStrings.ToolInstallationFailedWithExplicitVersionGuide, PackageId));
 
             _fileSystem.Directory.Exists(Path.Combine(PathToPlacePackages, PackageId)).Should().BeFalse();
         }

testAsset.props

@@ -1,4 +1,8 @@
 <Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <RepoRoot>$(MSBuildThisFileDirectory)</RepoRoot>
+  </PropertyGroup>
+  <Import Project="build/InitRepo.props" />
   <Import Project="build/DependencyVersions.props" />
   <PropertyGroup>
     <RestoreAdditionalProjectSources Condition="'$(TEST_PACKAGES)' != ''">$(TEST_PACKAGES)</RestoreAdditionalProjectSources>