From bbfb775711bd351651121fc4a4b35c21132b0f97 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Thu, 26 Mar 2026 17:06:02 +0000
Subject: [PATCH 1/4] gh-355: Fixes source path for copying signed Activate
 script

---
 windows-release/msi-steps.yml | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/windows-release/msi-steps.yml b/windows-release/msi-steps.yml
index fb096c79..15ee1bba 100644
--- a/windows-release/msi-steps.yml
+++ b/windows-release/msi-steps.yml
@@ -31,10 +31,20 @@ steps:
         ${{ else }}:
           targetPath: $(Pipeline.Workspace)\${{ a.artifact }}
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy $(Py_OutDir)\amd64\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+    # Assuming we'll always run the amd64 build
+    - ${{ if and(parameters.SigningCertificate, eq(a.artifact, 'bin_amd64')) }}:
+      - powershell: >
+          copy
+          "${env:TARGET_PATH}\Activate.ps1"
+          "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1
+          -Force
+          -Verbose
+        displayName: 'Copy signed files into sources'
+        env:
+          ${{ if a.target }}:
+            TARGET_PATH: ${{ a.target }}
+          ${{ else }}:
+            TARGET_PATH: $(Pipeline.Workspace)\${{ a.artifact }}
 
   - script: |
       call PCbuild\find_python.bat "%PYTHON%"

From 878c3c8b2265e6e203117cf092fc21c516cbbdbe Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Thu, 26 Mar 2026 17:08:01 +0000
Subject: [PATCH 2/4] Skip signing check for testing

---
 windows-release/msi-steps.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/windows-release/msi-steps.yml b/windows-release/msi-steps.yml
index 15ee1bba..503f3193 100644
--- a/windows-release/msi-steps.yml
+++ b/windows-release/msi-steps.yml
@@ -32,7 +32,9 @@ steps:
           targetPath: $(Pipeline.Workspace)\${{ a.artifact }}
 
     # Assuming we'll always run the amd64 build
-    - ${{ if and(parameters.SigningCertificate, eq(a.artifact, 'bin_amd64')) }}:
+    #- ${{ if and(parameters.SigningCertificate, eq(a.artifact, 'bin_amd64')) }}:
+    # DO NOT MERGE: skipping signing check for testing
+    - ${{ if eq(a.artifact, 'bin_amd64') }}:
       - powershell: >
           copy
           "${env:TARGET_PATH}\Activate.ps1"

From 188af534ffda9df00c68bf345e10463fb5909a41 Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Thu, 26 Mar 2026 17:23:44 +0000
Subject: [PATCH 3/4] Missed quote

---
 windows-release/msi-steps.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/windows-release/msi-steps.yml b/windows-release/msi-steps.yml
index 503f3193..1f00191b 100644
--- a/windows-release/msi-steps.yml
+++ b/windows-release/msi-steps.yml
@@ -38,7 +38,7 @@ steps:
       - powershell: >
           copy
           "${env:TARGET_PATH}\Activate.ps1"
-          "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1
+          "$(Build.SourcesDirectory)\Lib\venv\scripts\common\Activate.ps1"
           -Force
           -Verbose
         displayName: 'Copy signed files into sources'

From a180cc50fae3b71f17c04c6258c5328da0c470ee Mon Sep 17 00:00:00 2001
From: Steve Dower <steve.dower@python.org>
Date: Thu, 26 Mar 2026 19:06:47 +0000
Subject: [PATCH 4/4] Copy Activate.ps1 script unconditionally between build
 stages

---
 windows-release/msi-steps.yml              | 2 --
 windows-release/stage-layout-full.yml      | 7 +++----
 windows-release/stage-layout-msix.yml      | 6 +++---
 windows-release/stage-layout-nuget.yml     | 7 +++----
 windows-release/stage-layout-pymanager.yml | 9 ++++-----
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/windows-release/msi-steps.yml b/windows-release/msi-steps.yml
index 1f00191b..41f42961 100644
--- a/windows-release/msi-steps.yml
+++ b/windows-release/msi-steps.yml
@@ -32,8 +32,6 @@ steps:
           targetPath: $(Pipeline.Workspace)\${{ a.artifact }}
 
     # Assuming we'll always run the amd64 build
-    #- ${{ if and(parameters.SigningCertificate, eq(a.artifact, 'bin_amd64')) }}:
-    # DO NOT MERGE: skipping signing check for testing
     - ${{ if eq(a.artifact, 'bin_amd64') }}:
       - powershell: >
           copy
diff --git a/windows-release/stage-layout-full.yml b/windows-release/stage-layout-full.yml
index 4839666e..c092a558 100644
--- a/windows-release/stage-layout-full.yml
+++ b/windows-release/stage-layout-full.yml
@@ -129,10 +129,9 @@ jobs:
     displayName: 'Update TCL_LIBRARY'
     condition: and(succeeded(), variables['TclLibrary'])
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:
diff --git a/windows-release/stage-layout-msix.yml b/windows-release/stage-layout-msix.yml
index 16df4133..d5e4cbd8 100644
--- a/windows-release/stage-layout-msix.yml
+++ b/windows-release/stage-layout-msix.yml
@@ -82,9 +82,9 @@ jobs:
         artifact: cert
         targetPath: $(Pipeline.Workspace)\cert
 
-    - powershell: |
-        copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy "$(Pipeline.Workspace)\bin_$(Name)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:
diff --git a/windows-release/stage-layout-nuget.yml b/windows-release/stage-layout-nuget.yml
index a1fb8782..314889da 100644
--- a/windows-release/stage-layout-nuget.yml
+++ b/windows-release/stage-layout-nuget.yml
@@ -62,10 +62,9 @@ jobs:
       artifact: bin_$(Name)
       targetPath: $(Pipeline.Workspace)\bin_$(Name)
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
+  - powershell: |
+      copy $(Pipeline.Workspace)\bin_$(Name)\Activate.ps1 Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
 
   - template: ./layout-command.yml
     parameters:
diff --git a/windows-release/stage-layout-pymanager.yml b/windows-release/stage-layout-pymanager.yml
index 2aeaf143..d64748a3 100644
--- a/windows-release/stage-layout-pymanager.yml
+++ b/windows-release/stage-layout-pymanager.yml
@@ -173,11 +173,10 @@ jobs:
     displayName: 'Update TCL_LIBRARY'
     condition: and(succeeded(), variables['TclLibrary'])
 
-  - ${{ if parameters.SigningCertificate }}:
-    - powershell: |
-        copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force
-      displayName: 'Copy signed files into sources'
-      workingDirectory: $(Build.SourcesDirectory)\cpython
+  - powershell: |
+      copy "$(Pipeline.Workspace)\$(BinArtifact)\Activate.ps1" Lib\venv\scripts\common\Activate.ps1 -Force -Verbose
+    displayName: 'Copy signed files into sources'
+    workingDirectory: $(Build.SourcesDirectory)\cpython
 
   - template: ./layout-command.yml
     parameters: