Add Microsoft.VisualStudio.Component.TestTools.BuildTools to VS18 images

Author: lbussell

eng/dockerfile-templates/sdk/Dockerfile

@@ -64,6 +64,7 @@ RUN {{InsertTemplate("Dockerfile.install-vs-buildtools", [], "    ")}}
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\Common7\IDE\Extensions\TestPlatform\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX {{sdkVersion}} Tools\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
 

eng/dockerfile-templates/sdk/Dockerfile.install-vs-buildtools

@@ -35,7 +35,8 @@ else:curl -fSLo vs_BuildTools.exe {{vsBuildToolsUrl}} `}}
     --add Microsoft.NetCore.Component.Runtime.10.0 @^ `
     --add Microsoft.NetCore.Component.SDK @^ `
     --add Microsoft.VisualStudio.Component.NuGet.BuildTools @^ `
-    --add Microsoft.VisualStudio.Component.WebDeploy @^ `
+    --add Microsoft.VisualStudio.Component.WebDeploy @^ `{{if !is2016:
+    --add Microsoft.VisualStudio.Component.TestTools.BuildTools @^ `}}
     --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup @^ `
     --add Microsoft.VisualStudio.Workload.MSBuildTools @^ `
     --quiet --norestart --nocache --wait `

src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile

@@ -30,6 +30,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
         --add Microsoft.NetCore.Component.SDK ^ `
         --add Microsoft.VisualStudio.Component.NuGet.BuildTools ^ `
         --add Microsoft.VisualStudio.Component.WebDeploy ^ `
+        --add Microsoft.VisualStudio.Component.TestTools.BuildTools ^ `
         --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup ^ `
         --add Microsoft.VisualStudio.Workload.MSBuildTools ^ `
         --quiet --norestart --nocache --wait `
@@ -55,6 +56,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\Common7\IDE\Extensions\TestPlatform\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8.1 Tools\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
 

src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile

@@ -30,6 +30,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
         --add Microsoft.NetCore.Component.SDK ^ `
         --add Microsoft.VisualStudio.Component.NuGet.BuildTools ^ `
         --add Microsoft.VisualStudio.Component.WebDeploy ^ `
+        --add Microsoft.VisualStudio.Component.TestTools.BuildTools ^ `
         --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup ^ `
         --add Microsoft.VisualStudio.Workload.MSBuildTools ^ `
         --quiet --norestart --nocache --wait `
@@ -55,6 +56,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\Common7\IDE\Extensions\TestPlatform\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8.1 Tools\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")
 

src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile

@@ -28,6 +28,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
         --add Microsoft.NetCore.Component.SDK ^ `
         --add Microsoft.VisualStudio.Component.NuGet.BuildTools ^ `
         --add Microsoft.VisualStudio.Component.WebDeploy ^ `
+        --add Microsoft.VisualStudio.Component.TestTools.BuildTools ^ `
         --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup ^ `
         --add Microsoft.VisualStudio.Workload.MSBuildTools ^ `
         --quiet --norestart --nocache --wait `
@@ -54,6 +55,7 @@ RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\18\BuildTools\Common7\IDE\Extensions\TestPlatform\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\Windows\v10.0A\bin\NETFX 4.8 Tools\" `
     + \";${Env:ProgramFiles(x86)}\Microsoft SDKs\ClickOnce\SignTool\")