From 5b8c77235206b83dc950d81761b32e2533c72add Mon Sep 17 00:00:00 2001
From: avdunn <avdunn@microsoft.com>
Date: Fri, 21 Aug 2026 08:56:27 -0700
Subject: [PATCH 1/2] Add WindowsContainerImage definition

---
 .Pipelines/pipeline-publish.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.Pipelines/pipeline-publish.yml b/.Pipelines/pipeline-publish.yml
index e4d709b2..1724f8c0 100644
--- a/.Pipelines/pipeline-publish.yml
+++ b/.Pipelines/pipeline-publish.yml
@@ -36,6 +36,7 @@ pr: none
 variables:
   CDP_DEFINITION_BUILD_COUNT: $[counter('', 0)]
   system.debug: ${{ parameters.debug }}
+  WindowsContainerImage: 'onebranch.azurecr.io/windows/ltsc2022/vse2022:latest' # https://aka.ms/obpipelines/containers
 
 resources:
   repositories:

From 584b96bd8c8659d9c70504650e336b5202cac6ed Mon Sep 17 00:00:00 2001
From: avdunn <avdunn@microsoft.com>
Date: Fri, 21 Aug 2026 10:40:05 -0700
Subject: [PATCH 2/2] Finish onebranch migration

---
 .Pipelines/pipeline-publish.yml | 47 +++++++++++++++------------------
 1 file changed, 21 insertions(+), 26 deletions(-)

diff --git a/.Pipelines/pipeline-publish.yml b/.Pipelines/pipeline-publish.yml
index 1724f8c0..18d4767d 100644
--- a/.Pipelines/pipeline-publish.yml
+++ b/.Pipelines/pipeline-publish.yml
@@ -65,6 +65,7 @@ extends:
         tsaEnabled: true
     featureFlags:
       EnableCDPxPAT: false
+      WindowsHostVersion: '1ESWindows2022'
 
     stages:
 
@@ -83,34 +84,26 @@ extends:
       condition: eq(dependencies.E2ETests.result, 'Succeeded')
       jobs:
       - job: BuildDist
-        displayName: 'Build sdist + wheel (Python 3.12)'
+        displayName: 'Build sdist + wheel'
         pool:
-          type: linux
-          isCustom: true
-          vmImage: 'ubuntu-22.04'
+          type: windows
         variables:
           ob_outputDirectory: '$(Build.ArtifactStagingDirectory)'
         steps:
-        - task: UsePythonVersion@0
-          inputs:
-            versionSpec: '3.12'
-          displayName: 'Use Python 3.12'
+        - script: python --version
+          displayName: 'Check Python version'
 
-        - script: |
-            python -m pip install --upgrade pip build twine
-          displayName: 'Install build toolchain'
-
-        - script: |
-            python -m build
+        - script: python setup.py sdist bdist_wheel
           displayName: 'Build sdist and wheel'
 
-        - script: |
-            python -m twine check dist/*
-          displayName: 'Verify distribution (twine check)'
-
-        - script: |
-            cp -r dist/* $(ob_outputDirectory)/
+        - task: CopyFiles@2
           displayName: 'Copy dist to output directory'
+          inputs:
+            SourceFolder: '$(Build.SourcesDirectory)\dist'
+            Contents: |
+              *.whl
+              *.tar.gz
+            TargetFolder: '$(ob_outputDirectory)'
 
     # ========================================================================
     # Stage 5a - Publish to test.pypi.org (Preview / RC)
@@ -136,8 +129,9 @@ extends:
         - task: DownloadPipelineArtifact@2
           displayName: 'Download build artifact'
           inputs:
-            artifactName: drop_Build_BuildDist
-            targetPath: $(Pipeline.Workspace)/python-dist
+            buildType: 'current'
+            artifactName: 'drop_Build_BuildDist'
+            targetPath: $(Pipeline.Workspace)\python-dist
 
         - task: UsePythonVersion@0
           inputs:
@@ -212,8 +206,9 @@ extends:
         - task: DownloadPipelineArtifact@2
           displayName: 'Download python-dist artifact'
           inputs:
-            artifactName: drop_Build_BuildDist
-            targetPath: $(Pipeline.Workspace)/python-dist
+            buildType: 'current'
+            artifactName: 'drop_Build_BuildDist'
+            targetPath: $(Pipeline.Workspace)\python-dist
 
         - task: EsrpRelease@12
           displayName: 'Publish to PyPI via ESRP'
@@ -226,9 +221,9 @@ extends:
             intent: 'PackageDistribution'
             contenttype: 'PyPi'
             contentsource: 'Folder'
-            folderlocation: '$(Pipeline.Workspace)/python-dist'
+            folderlocation: '$(Pipeline.Workspace)\python-dist'
             waitforreleasecompletion: true
-            owners: 'ryauld@microsoft.com,avdunn@microsoft.com'
+            owners: 'avdunn@microsoft.com,bogavril@microsoft.com'
             approvers: 'avdunn@microsoft.com,bogavril@microsoft.com'
             serviceendpointurl: 'https://api.esrp.microsoft.com'
             mainpublisher: 'ESRPRELPACMAN'