From ea3803ddf1a59af564f1678060768c3170ec4332 Mon Sep 17 00:00:00 2001
From: William Li <wul@microsoft.com>
Date: Sun, 12 Apr 2020 20:47:01 -0700
Subject: [PATCH] Correct tool path append

---
 src/redist/targets/packaging/windows/clisdk/dotnet.wxs | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
index e3be35ece..0474cb9e0 100644
--- a/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
+++ b/src/redist/targets/packaging/windows/clisdk/dotnet.wxs
@@ -14,6 +14,7 @@
     <Feature Id="MainFeature" Title="Main Feature" Level="1">
       <ComponentGroupRef Id="InstallFiles" />
       <ComponentGroupRef Id="AuthoredRegistryKeys_x86node"/>
+      <ComponentGroupRef Id="DotnetToolSetup"/>
     </Feature>
     <Feature Id="Provider" Absent="disallow" AllowAdvertise="no" Description="Used for Ref Counting" Display="hidden" Level="1" InstallDefault="local" Title="RefCounting" TypicalDefault="install">
       <ComponentRef Id="$(var.DependencyKeyId)" />
@@ -59,4 +60,11 @@
       </Directory>
     </Directory>
   </Fragment>
+  <Fragment>
+    <ComponentGroup Id="DotnetToolSetup">
+      <Component Id="AppendDotnetToolShimPath" Directory="TARGETDIR" Guid="{241B7B8D-7817-41C1-807F-5F4010BF583A}">
+        <Environment Id="E_PATH" Name="PATH" Value="%USERPROFILE%\.dotnet\tools" Part="last" Action="set" System="no" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
 </Wix>