From 06db27454c10111d8b8ec36d81900458a49634e2 Mon Sep 17 00:00:00 2001
From: Mikhail Goncharov <goncharov.mikhail@gmail.com>
Date: Wed, 12 Aug 2020 17:32:55 +0000
Subject: [PATCH] add ATL component, build windows image without cache

---
 containers/agent-windows-buildkite/VERSION | Bin 8 -> 3 bytes
 containers/agent-windows-vs2019/Dockerfile |   4 +++-
 containers/agent-windows-vs2019/VERSION    | Bin 8 -> 2 bytes
 containers/build_deploy.ps1                |   2 +-
 4 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/containers/agent-windows-buildkite/VERSION b/containers/agent-windows-buildkite/VERSION
index 9a5fce66dfe976e22015817718e338746049d317..b4de3947675361a7770d29b8982c407b0ec6b2a0 100644
GIT binary patch
literal 3
KcmXps<N^Qz0sw6Q

literal 8
PcmezW&w_!Mfr|kE5Q+j#

diff --git a/containers/agent-windows-vs2019/Dockerfile b/containers/agent-windows-vs2019/Dockerfile
index 3835f43..69b7cd2 100644
--- a/containers/agent-windows-vs2019/Dockerfile
+++ b/containers/agent-windows-vs2019/Dockerfile
@@ -22,7 +22,9 @@ RUN C:\TEMP\vs_buildtools.exe --quiet --wait --norestart --nocache `
     --channelUri C:\TEMP\VisualStudio.chman `
     --installChannelUri C:\TEMP\VisualStudio.chman `
     --installPath C:\BuildTools `
-    --add Microsoft.VisualStudio.Workload.VCTools --includeRecommended `
+    --add Microsoft.VisualStudio.Workload.VCTools `
+    --add Microsoft.VisualStudio.Component.VC.ATL `
+    --includeRecommended `
     || IF "%ERRORLEVEL%"=="3010" EXIT 0
 
 # Register DIA dll (Debug Interface Access) so it can be used to symbolize 
diff --git a/containers/agent-windows-vs2019/VERSION b/containers/agent-windows-vs2019/VERSION
index b1b10c2afe5014e75720b5ffd5f9cfd92d729189..7f8f011eb73d6043d2e6db9d2c101195ae2801f2 100644
GIT binary patch
literal 2
JcmXr#0ssJd073u&

literal 8
PcmezW&xC=Ofr|kE5OM-Z

diff --git a/containers/build_deploy.ps1 b/containers/build_deploy.ps1
index 7df615a..1e5e748 100644
--- a/containers/build_deploy.ps1
+++ b/containers/build_deploy.ps1
@@ -40,7 +40,7 @@ Write-Host "Building ${IMAGE_NAME}:${container_version}..."
 Write-Host "Using windows-agent ${agent_windows_version}"
 
 Invoke-Call -ScriptBlock {
-    docker build . `
+    docker build . --no-cache `
         -t ${IMAGE_NAME}:${container_version} `
         -t ${IMAGE_NAME}:latest `
         --build-arg agent_windows_version=$agent_windows_version