Update Visual Studio tools to 2026 and add .NET 10 Runtime to SDK images

.portal-docs/docker-hub/README.sdk.md

@@ -13,7 +13,6 @@ This image contains the .NET Framework SDK which is comprised of the following p
 
 1. .NET Framework Runtime
 1. Visual Studio Build Tools
-1. Visual Studio Test Agent
 1. NuGet CLI
 1. .NET Framework Targeting Packs
 1. ASP.NET Web Targets

.portal-docs/mar/README.sdk.portal.md

@@ -4,7 +4,6 @@ This image contains the .NET Framework SDK which is comprised of the following p
 
 1. .NET Framework Runtime
 1. Visual Studio Build Tools
-1. Visual Studio Test Agent
 1. NuGet CLI
 1. .NET Framework Targeting Packs
 1. ASP.NET Web Targets

README.sdk.md

@@ -15,7 +15,6 @@ This image contains the .NET Framework SDK which is comprised of the following p
 
 1. .NET Framework Runtime
 1. Visual Studio Build Tools
-1. Visual Studio Test Agent
 1. NuGet CLI
 1. .NET Framework Targeting Packs
 1. ASP.NET Web Targets
@@ -65,25 +64,25 @@ Additionally, .NET Framework 4.8 and 4.8.1 can run apps that were built targetin
 
 Tag | Dockerfile
 ---------| ---------------
-4.8.1-20251014-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile)
+4.8.1-20251111-windowsservercore-ltsc2025, 4.8.1-windowsservercore-ltsc2025, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2025/Dockerfile)
 
 ### Windows Server Core 2022 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-4.8.1-20251014-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
+4.8.1-20251111-windowsservercore-ltsc2022, 4.8.1-windowsservercore-ltsc2022, 4.8.1 | [Dockerfile](src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile)
 
 ### Windows Server Core 2019 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-4.8-20251014-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile)
+4.8-20251111-windowsservercore-ltsc2019, 4.8-windowsservercore-ltsc2019, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2019/Dockerfile)
 
 ### Windows Server Core 2016 amd64 Tags
 
 Tag | Dockerfile
 ---------| ---------------
-4.8-20251014-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
+4.8-20251111-windowsservercore-ltsc2016, 4.8-windowsservercore-ltsc2016, 4.8, latest | [Dockerfile](src/sdk/4.8/windowsservercore-ltsc2016/Dockerfile)
 <!--End of generated tags-->
 
 *Tags not listed in the table above are not supported. See the [Supported Tags Policy](https://github.com/dotnet/dotnet-docker/blob/main/documentation/supported-tags.md).

eng/dockerfile-templates/sdk/Dockerfile

@@ -13,7 +13,7 @@ ENV `
     }}# NuGet version to install
     NUGET_VERSION={{VARIABLES[cat("nuget|version")]}} `
     # Install location of Roslyn
-    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn"
+    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\Roslyn"
 {{if OS_VERSION_NUMBER = "ltsc2019" && PRODUCT_VERSION = "3.5"
 :
 RUN `
@@ -41,14 +41,7 @@ RUN mkdir "%ProgramFiles%\NuGet\latest" `
     && mklink "%ProgramFiles%\NuGet\latest\nuget.exe" "%ProgramFiles%\NuGet\nuget.exe"
 
 # Install VS components
-RUN `
-    # Install VS Test Agent
-    curl -fSLo vs_TestAgent.exe {{VARIABLES["vs|testAgentUrl"]}} `
-    && start /w vs_TestAgent --quiet --norestart --nocache --wait --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\TestAgent" `
-    && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
-    && del vs_TestAgent.exe `
-    `
-    {{InsertTemplate("Dockerfile.install-vs-buildtools", [], "    ")}}
+RUN {{InsertTemplate("Dockerfile.install-vs-buildtools", [], "    ")}}
     `
     # Trigger dotnet first run experience by running arbitrary cmd
     && "%ProgramFiles%\dotnet\dotnet" help `
@@ -65,14 +58,13 @@ RUN `
     # Cleanup
     && (for /D %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do rmdir /S /Q "%i") `
     && (for %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do if not "%~nxi" == "vswhere.exe" del "%~i") `
-    && powershell Remove-Item -Force -Recurse "%TEMP%\*" `
-    && rmdir /S /Q "%ProgramData%\Package Cache"
+    && powershell Remove-Item -Force -Recurse "%TEMP%\*"
 
 # Set PATH in one layer to keep image size down.
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${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

@@ -3,30 +3,42 @@
     _ ARGS:
         usePowerShell: whether to use PowerShell to download and remove files ^
 
-    set sdkVersion to when(PRODUCT_VERSION = "4.8.1", "4.8.1", "4.8")
+    set sdkVersion to when(PRODUCT_VERSION = "4.8.1", "4.8.1", "4.8") ^
+    set is2016 to OS_VERSION_NUMBER = "ltsc2016" ^
 
-}}# Install VS Build Tools{{
-if ARGS.usePowerShell:
-&& powershell -Command `
+    _ VS 2026 does not support Windows Server LTSC 2016
+      https://learn.microsoft.com/en-us/visualstudio/releases/2026/vs-system-requirements ^
+    set vsBuildToolsUrl to
+        when(is2016,
+            VARIABLES["vs|ltsc2016|buildToolsUrl"],
+            VARIABLES["vs|buildToolsUrl"]) ^
+    set vsPath to
+        when(is2016,
+            "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools",
+            "%ProgramFiles(x86)%\Microsoft Visual Studio\18\BuildTools")
+
+}}{{
+if ARGS.usePowerShell:powershell -Command `
     $ProgressPreference = 'SilentlyContinue'; `
     [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
     Invoke-WebRequest `
         -UseBasicParsing `
-        -Uri {{VARIABLES["vs|buildToolsUrl"]}} `
+        -Uri {{vsBuildToolsUrl}} `
         -OutFile vs_BuildTools.exe `^
-else:
-&& curl -fSLo vs_BuildTools.exe {{VARIABLES["vs|buildToolsUrl"]}} `}}
+else:curl -fSLo vs_BuildTools.exe {{vsBuildToolsUrl}} `}}
 && start /w vs_BuildTools @^ `
-    --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" @^ `
+    --installPath "{{vsPath}}" @^ `
     --add Microsoft.Component.ClickOnce.MSBuild @^ `
     --add Microsoft.Net.Component.{{sdkVersion}}.SDK @^ `
     --add Microsoft.NetCore.Component.Runtime.8.0 @^ `
     --add Microsoft.NetCore.Component.Runtime.9.0 @^ `
+    --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 `
 && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
-&& del vs_BuildTools.exe `
+&& del vs_BuildTools.exe `

eng/dockerfile-templates/sdk/Dockerfile.ltsc2016

@@ -59,13 +59,14 @@ RUN `
         [Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; `
         Invoke-WebRequest `
             -UseBasicParsing `
-            -Uri {{VARIABLES["vs|testAgentUrl"]}} `
+            -Uri {{VARIABLES["vs|ltsc2016|testAgentUrl"]}} `
             -OutFile vs_TestAgent.exe `
     && start /w vs_TestAgent --quiet --norestart --nocache --wait --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\TestAgent" `
     && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
     && del vs_TestAgent.exe `
     `
-    {{InsertTemplate("Dockerfile.install-vs-buildtools", [ "usePowerShell": "true" ], "    ")}}
+    # Install VS Build Tools
+    && {{InsertTemplate("Dockerfile.install-vs-buildtools", [ "usePowerShell": "true" ], "    ")}}
     `
     # Trigger dotnet first run experience by running arbitrary cmd
     && "%ProgramFiles%\dotnet\dotnet" help `

eng/readme-templates/About.sdk.md

@@ -2,7 +2,6 @@ This image contains the .NET Framework SDK which is comprised of the following p
 
 1. .NET Framework Runtime
 1. Visual Studio Build Tools
-1. Visual Studio Test Agent
 1. NuGet CLI
 1. .NET Framework Targeting Packs
 1. ASP.NET Web Targets

manifest.datestamps.json

@@ -1,9 +1,10 @@
 {
   "variables": {
-    "CurrentReleaseDateStamp": "20251014",
-    "RuntimeReleaseDateStamp": "$(CurrentReleaseDateStamp)",
-    "AspnetReleaseDateStamp": "$(CurrentReleaseDateStamp)",
-    "WcfReleaseDateStamp": "$(CurrentReleaseDateStamp)",
+    "CurrentReleaseDateStamp": "20251111",
+    "PreviousReleaseDateStamp": "20251014",
+    "RuntimeReleaseDateStamp": "$(PreviousReleaseDateStamp)",
+    "AspnetReleaseDateStamp": "$(PreviousReleaseDateStamp)",
+    "WcfReleaseDateStamp": "$(PreviousReleaseDateStamp)",
     "SdkReleaseDateStamp": "$(CurrentReleaseDateStamp)",
 
     "4.8-ltsc2016-Runtime-DateStamp": "$(RuntimeReleaseDateStamp)",

manifest.versions.json

@@ -13,9 +13,11 @@
     "referenceassemblies|version": "1.0.3",
     "servicemonitor|version": "2.0.1.10",
     "servicemonitor|url": "https://github.com/microsoft/IIS.ServiceMonitor/releases/download/v$(servicemonitor|version)/ServiceMonitor.exe",
-    "vs|version": "17.14",
-    "vs|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe",
-    "vs|buildToolsUrl": "https://aka.ms/vs/17/release/vs_BuildTools.exe",
+    "vs|version": "18.0",
+    "vs|buildToolsUrl": "https://aka.ms/vs/stable/vs_BuildTools.exe",
+    "vs|ltsc2016|version": "17.14",
+    "vs|ltsc2016|testAgentUrl": "https://aka.ms/vs/17/release/vs_TestAgent.exe",
+    "vs|ltsc2016|buildToolsUrl": "https://aka.ms/vs/17/release/vs_BuildTools.exe",
     "4.8|url": "https://download.visualstudio.microsoft.com/download/pr/2d6bb6b2-226a-4baa-bdec-798822606ff1/8494001c276a4b96804cde7829c04d7f/ndp48-x86-x64-allos-enu.exe",
     "4.8.1|url": "https://download.visualstudio.microsoft.com/download/pr/6f083c7e-bd40-44d4-9e3f-ffba71ec8b09/3951fd5af6098f2c7e8ff5c331a0679c/ndp481-x86-x64-allos-enu.exe"
   }

src/sdk/4.8.1/windowsservercore-ltsc2022/Dockerfile

@@ -11,32 +11,26 @@ ENV `
     # NuGet version to install
     NUGET_VERSION=6.14.0 `
     # Install location of Roslyn
-    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn"
+    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\Roslyn"
 
 # Install NuGet CLI
 RUN mkdir "%ProgramFiles%\NuGet\latest" `
     && curl -fSLo "%ProgramFiles%\NuGet\nuget.exe" https://dist.nuget.org/win-x86-commandline/v%NUGET_VERSION%/nuget.exe `
     && mklink "%ProgramFiles%\NuGet\latest\nuget.exe" "%ProgramFiles%\NuGet\nuget.exe"
 
 # Install VS components
-RUN `
-    # Install VS Test Agent
-    curl -fSLo vs_TestAgent.exe https://aka.ms/vs/17/release/vs_TestAgent.exe `
-    && start /w vs_TestAgent --quiet --norestart --nocache --wait --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\TestAgent" `
-    && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
-    && del vs_TestAgent.exe `
-    `
-    # Install VS Build Tools
-    && curl -fSLo vs_BuildTools.exe https://aka.ms/vs/17/release/vs_BuildTools.exe `
+RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
     && start /w vs_BuildTools ^ `
-        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^ `
+        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\18\BuildTools" ^ `
         --add Microsoft.Component.ClickOnce.MSBuild ^ `
         --add Microsoft.Net.Component.4.8.1.SDK ^ `
         --add Microsoft.NetCore.Component.Runtime.8.0 ^ `
         --add Microsoft.NetCore.Component.Runtime.9.0 ^ `
+        --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.TestTools.BuildTools ^ `
         --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup ^ `
         --add Microsoft.VisualStudio.Workload.MSBuildTools ^ `
         --quiet --norestart --nocache --wait `
@@ -56,14 +50,13 @@ RUN `
     # Cleanup
     && (for /D %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do rmdir /S /Q "%i") `
     && (for %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do if not "%~nxi" == "vswhere.exe" del "%~i") `
-    && powershell Remove-Item -Force -Recurse "%TEMP%\*" `
-    && rmdir /S /Q "%ProgramData%\Package Cache"
+    && powershell Remove-Item -Force -Recurse "%TEMP%\*"
 
 # Set PATH in one layer to keep image size down.
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${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

@@ -11,32 +11,26 @@ ENV `
     # NuGet version to install
     NUGET_VERSION=6.14.0 `
     # Install location of Roslyn
-    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\Roslyn"
+    ROSLYN_COMPILER_LOCATION="C:\Program Files (x86)\Microsoft Visual Studio\18\BuildTools\MSBuild\Current\Bin\Roslyn"
 
 # Install NuGet CLI
 RUN mkdir "%ProgramFiles%\NuGet\latest" `
     && curl -fSLo "%ProgramFiles%\NuGet\nuget.exe" https://dist.nuget.org/win-x86-commandline/v%NUGET_VERSION%/nuget.exe `
     && mklink "%ProgramFiles%\NuGet\latest\nuget.exe" "%ProgramFiles%\NuGet\nuget.exe"
 
 # Install VS components
-RUN `
-    # Install VS Test Agent
-    curl -fSLo vs_TestAgent.exe https://aka.ms/vs/17/release/vs_TestAgent.exe `
-    && start /w vs_TestAgent --quiet --norestart --nocache --wait --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\TestAgent" `
-    && powershell -Command "if ($err = dir $Env:TEMP -Filter dd_setup_*_errors.log | where Length -gt 0 | Get-Content) { throw $err }" `
-    && del vs_TestAgent.exe `
-    `
-    # Install VS Build Tools
-    && curl -fSLo vs_BuildTools.exe https://aka.ms/vs/17/release/vs_BuildTools.exe `
+RUN curl -fSLo vs_BuildTools.exe https://aka.ms/vs/stable/vs_BuildTools.exe `
     && start /w vs_BuildTools ^ `
-        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\2022\BuildTools" ^ `
+        --installPath "%ProgramFiles(x86)%\Microsoft Visual Studio\18\BuildTools" ^ `
         --add Microsoft.Component.ClickOnce.MSBuild ^ `
         --add Microsoft.Net.Component.4.8.1.SDK ^ `
         --add Microsoft.NetCore.Component.Runtime.8.0 ^ `
         --add Microsoft.NetCore.Component.Runtime.9.0 ^ `
+        --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.TestTools.BuildTools ^ `
         --add Microsoft.VisualStudio.Web.BuildTools.ComponentGroup ^ `
         --add Microsoft.VisualStudio.Workload.MSBuildTools ^ `
         --quiet --norestart --nocache --wait `
@@ -56,14 +50,13 @@ RUN `
     # Cleanup
     && (for /D %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do rmdir /S /Q "%i") `
     && (for %i in ("%ProgramFiles(x86)%\Microsoft Visual Studio\Installer\*") do if not "%~nxi" == "vswhere.exe" del "%~i") `
-    && powershell Remove-Item -Force -Recurse "%TEMP%\*" `
-    && rmdir /S /Q "%ProgramData%\Package Cache"
+    && powershell Remove-Item -Force -Recurse "%TEMP%\*"
 
 # Set PATH in one layer to keep image size down.
 RUN powershell setx /M PATH $(${Env:PATH} `
     + \";${Env:ProgramFiles}\NuGet\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\TestAgent\Common7\IDE\CommonExtensions\Microsoft\TestWindow\" `
-    + \";${Env:ProgramFiles(x86)}\Microsoft Visual Studio\2022\BuildTools\MSBuild\Current\Bin\amd64\" `
+    + \";${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-ltsc2016/Dockerfile

@@ -46,6 +46,7 @@ RUN `
         --add Microsoft.Net.Component.4.8.SDK ^ `
         --add Microsoft.NetCore.Component.Runtime.8.0 ^ `
         --add Microsoft.NetCore.Component.Runtime.9.0 ^ `
+        --add Microsoft.NetCore.Component.Runtime.10.0 ^ `
         --add Microsoft.NetCore.Component.SDK ^ `
         --add Microsoft.VisualStudio.Component.NuGet.BuildTools ^ `
         --add Microsoft.VisualStudio.Component.WebDeploy ^ `