From f6c75cc533ecaac6acdff78c26f5c840058ebfce Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@microsoft.com>
Date: Fri, 6 Oct 2023 14:18:38 +0100
Subject: [PATCH] Now pulls redistributable VC files from cpython-bin-deps

---
 windows-release/acquire-vcruntime.yml | 10 ++++++++++
 windows-release/build-steps-pgo.yml   |  2 ++
 windows-release/build-steps.yml       |  1 +
 3 files changed, 13 insertions(+)
 create mode 100644 windows-release/acquire-vcruntime.yml

diff --git a/windows-release/acquire-vcruntime.yml b/windows-release/acquire-vcruntime.yml
new file mode 100644
index 00000000..cd55970f
--- /dev/null
+++ b/windows-release/acquire-vcruntime.yml
@@ -0,0 +1,10 @@
+parameters:
+  Remote: https://github.com/python/cpython-bin-deps
+  Ref: vcruntime
+
+steps:
+- powershell: |
+    git clone --progress -v --depth 1 --branch ${{ parameters.Ref }} --single-branch ${{ parameters.Remote }} vcruntime
+    $files = (dir "vcruntime\$(arch)\*.dll").FullName -join ";"
+    "##vso[task.setvariable variable=VCRuntimeDLL]$files"
+  displayName: 'Import VC redist'
diff --git a/windows-release/build-steps-pgo.yml b/windows-release/build-steps-pgo.yml
index 18aa6423..32c8a670 100644
--- a/windows-release/build-steps-pgo.yml
+++ b/windows-release/build-steps-pgo.yml
@@ -7,6 +7,8 @@ steps:
 - template: ./checkout.yml
 
 - ${{ if or(eq(parameters.PGInstrument, 'true'), eq(parameters.PGUpdate, 'true')) }}:
+  - template: ./acquire-vcruntime.yml
+
   - powershell: |
       $d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};
       Write-Host "##vso[task.setvariable variable=VersionText]$($d.PythonVersion)"
diff --git a/windows-release/build-steps.yml b/windows-release/build-steps.yml
index 963746e1..228b93a4 100644
--- a/windows-release/build-steps.yml
+++ b/windows-release/build-steps.yml
@@ -3,6 +3,7 @@ parameters:
 
 steps:
 - template: ./checkout.yml
+- template: ./acquire-vcruntime.yml
 
 - powershell: |
     $d = (.\PCbuild\build.bat -V) | %{ if($_ -match '\s+(\w+):\s*(.+)\s*$') { @{$Matches[1] = $Matches[2];} }};