From 6659ebc0755bb3ad86cc90ff1bf144d4a9954323 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 22:42:36 +0000 Subject: [PATCH 1/6] Update Windows release build machines to latest versions --- .azure-pipelines/windows-release/stage-build.yml | 6 +++--- .azure-pipelines/windows-release/stage-layout-embed.yml | 2 +- .azure-pipelines/windows-release/stage-layout-full.yml | 2 +- .azure-pipelines/windows-release/stage-layout-msix.yml | 2 +- .azure-pipelines/windows-release/stage-layout-nuget.yml | 2 +- .azure-pipelines/windows-release/stage-msi.yml | 2 +- .azure-pipelines/windows-release/stage-pack-msix.yml | 2 +- .azure-pipelines/windows-release/stage-pack-nuget.yml | 2 +- .azure-pipelines/windows-release/stage-publish-nugetorg.yml | 2 +- .../windows-release/stage-publish-pythonorg.yml | 2 +- .azure-pipelines/windows-release/stage-publish-store.yml | 2 +- .azure-pipelines/windows-release/stage-sign.yml | 2 +- .azure-pipelines/windows-release/stage-test-embed.yml | 2 +- .azure-pipelines/windows-release/stage-test-msi.yml | 2 +- .azure-pipelines/windows-release/stage-test-nuget.yml | 2 +- 15 files changed, 17 insertions(+), 17 deletions(-) diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 9391a91e30b5e68..9ecbaf23d95323b 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -3,7 +3,7 @@ jobs: displayName: Docs build pool: name: 'Windows Release' - #vmName: win2016-vs2017 + #vmName: windows-latest workspace: clean: all @@ -45,7 +45,7 @@ jobs: displayName: Python build pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all @@ -91,7 +91,7 @@ jobs: condition: and(succeeded(), ne(variables['DoPGO'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-embed.yml b/.azure-pipelines/windows-release/stage-layout-embed.yml index 3306e1cbc49d981..e9fc86ca16ef2a5 100644 --- a/.azure-pipelines/windows-release/stage-layout-embed.yml +++ b/.azure-pipelines/windows-release/stage-layout-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-full.yml b/.azure-pipelines/windows-release/stage-layout-full.yml index 78bc1b3975e93db..1fedde75345ca61 100644 --- a/.azure-pipelines/windows-release/stage-layout-full.yml +++ b/.azure-pipelines/windows-release/stage-layout-full.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoLayout'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-msix.yml b/.azure-pipelines/windows-release/stage-layout-msix.yml index 60a5c9ea5435c80..5a2b9086116bc4c 100644 --- a/.azure-pipelines/windows-release/stage-layout-msix.yml +++ b/.azure-pipelines/windows-release/stage-layout-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Make MSIX layout pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-nuget.yml b/.azure-pipelines/windows-release/stage-layout-nuget.yml index 7e20f89530349c7..7c27a8854eb47e3 100644 --- a/.azure-pipelines/windows-release/stage-layout-nuget.yml +++ b/.azure-pipelines/windows-release/stage-layout-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-msi.yml b/.azure-pipelines/windows-release/stage-msi.yml index 7afc816a0c6e9c7..65bd2077a76ca68 100644 --- a/.azure-pipelines/windows-release/stage-msi.yml +++ b/.azure-pipelines/windows-release/stage-msi.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: win2016-vs2017 + vmName: windows-latest variables: ReleaseUri: http://www.python.org/{arch} diff --git a/.azure-pipelines/windows-release/stage-pack-msix.yml b/.azure-pipelines/windows-release/stage-pack-msix.yml index f17ba9628e21b03..62bed98db945206 100644 --- a/.azure-pipelines/windows-release/stage-pack-msix.yml +++ b/.azure-pipelines/windows-release/stage-pack-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Pack MSIX bundles pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-pack-nuget.yml b/.azure-pipelines/windows-release/stage-pack-nuget.yml index 34619fc5fdc3187..e2150ef30844b6c 100644 --- a/.azure-pipelines/windows-release/stage-pack-nuget.yml +++ b/.azure-pipelines/windows-release/stage-pack-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml index b78bd493a0fd1bb..6f1da0e23869aa8 100644 --- a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index 0474d40e4bc026d..5f7b1e965e36b20 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true'))) pool: - #vmName: win2016-vs2017 + #vmName: windows-latest name: 'Windows Release' workspace: diff --git a/.azure-pipelines/windows-release/stage-publish-store.yml b/.azure-pipelines/windows-release/stage-publish-store.yml index b22147b1ab45e79..f4532405f37bdfa 100644 --- a/.azure-pipelines/windows-release/stage-publish-store.yml +++ b/.azure-pipelines/windows-release/stage-publish-store.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoMSIX'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-sign.yml b/.azure-pipelines/windows-release/stage-sign.yml index a0adc0581229d9a..96d847a2452a8fd 100644 --- a/.azure-pipelines/windows-release/stage-sign.yml +++ b/.azure-pipelines/windows-release/stage-sign.yml @@ -114,7 +114,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: win2016-vs2017 + vmName: windows-latest steps: - checkout: none diff --git a/.azure-pipelines/windows-release/stage-test-embed.yml b/.azure-pipelines/windows-release/stage-test-embed.yml index b33176266a20da4..d941ccf522d05bb 100644 --- a/.azure-pipelines/windows-release/stage-test-embed.yml +++ b/.azure-pipelines/windows-release/stage-test-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-msi.yml b/.azure-pipelines/windows-release/stage-test-msi.yml index 27b0c96987a7a0a..7f83553d460f3c3 100644 --- a/.azure-pipelines/windows-release/stage-test-msi.yml +++ b/.azure-pipelines/windows-release/stage-test-msi.yml @@ -3,7 +3,7 @@ jobs: displayName: Test MSI pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-nuget.yml b/.azure-pipelines/windows-release/stage-test-nuget.yml index 1f8b601d0d023bd..01c18d911730cdb 100644 --- a/.azure-pipelines/windows-release/stage-test-nuget.yml +++ b/.azure-pipelines/windows-release/stage-test-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: win2016-vs2017 + vmName: windows-latest workspace: clean: all From d3544fc0994cececb0382148fe3f4b52db6884f3 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 22:46:15 +0000 Subject: [PATCH 2/6] Add NEWS --- .../NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst | 1 + 1 file changed, 1 insertion(+) create mode 100644 Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst diff --git a/Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst b/Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst new file mode 100644 index 000000000000000..077b0afcba3c10e --- /dev/null +++ b/Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst @@ -0,0 +1 @@ +Update Windows release build machines to Visual Studio 2019 (MSVC 14.2). From a01547662c76b1d1eb517f8d3321257cbbb92bcc Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 22:53:44 +0000 Subject: [PATCH 3/6] Needs to be windows-2019 --- .azure-pipelines/windows-release/stage-build.yml | 8 ++++---- .azure-pipelines/windows-release/stage-layout-embed.yml | 2 +- .azure-pipelines/windows-release/stage-layout-full.yml | 2 +- .azure-pipelines/windows-release/stage-layout-msix.yml | 2 +- .azure-pipelines/windows-release/stage-layout-nuget.yml | 2 +- .azure-pipelines/windows-release/stage-msi.yml | 2 +- .azure-pipelines/windows-release/stage-pack-msix.yml | 2 +- .azure-pipelines/windows-release/stage-pack-nuget.yml | 2 +- .../windows-release/stage-publish-nugetorg.yml | 2 +- .../windows-release/stage-publish-pythonorg.yml | 2 +- .azure-pipelines/windows-release/stage-publish-store.yml | 2 +- .azure-pipelines/windows-release/stage-sign.yml | 2 +- .azure-pipelines/windows-release/stage-test-embed.yml | 2 +- .azure-pipelines/windows-release/stage-test-msi.yml | 2 +- .azure-pipelines/windows-release/stage-test-nuget.yml | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index 9ecbaf23d95323b..b0bb7f6229579e3 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -3,7 +3,7 @@ jobs: displayName: Docs build pool: name: 'Windows Release' - #vmName: windows-latest + #vmName: windows-2019 workspace: clean: all @@ -45,7 +45,7 @@ jobs: displayName: Python build pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all @@ -91,7 +91,7 @@ jobs: condition: and(succeeded(), ne(variables['DoPGO'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all @@ -141,7 +141,7 @@ jobs: displayName: Publish Tcl/Tk Library pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-embed.yml b/.azure-pipelines/windows-release/stage-layout-embed.yml index e9fc86ca16ef2a5..3a36ce1612dd11a 100644 --- a/.azure-pipelines/windows-release/stage-layout-embed.yml +++ b/.azure-pipelines/windows-release/stage-layout-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-full.yml b/.azure-pipelines/windows-release/stage-layout-full.yml index 1fedde75345ca61..3b7e61a9fd0717c 100644 --- a/.azure-pipelines/windows-release/stage-layout-full.yml +++ b/.azure-pipelines/windows-release/stage-layout-full.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoLayout'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-msix.yml b/.azure-pipelines/windows-release/stage-layout-msix.yml index 5a2b9086116bc4c..d1aab293e394fa0 100644 --- a/.azure-pipelines/windows-release/stage-layout-msix.yml +++ b/.azure-pipelines/windows-release/stage-layout-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Make MSIX layout pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-nuget.yml b/.azure-pipelines/windows-release/stage-layout-nuget.yml index 7c27a8854eb47e3..b10a19d6c57709d 100644 --- a/.azure-pipelines/windows-release/stage-layout-nuget.yml +++ b/.azure-pipelines/windows-release/stage-layout-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-msi.yml b/.azure-pipelines/windows-release/stage-msi.yml index 65bd2077a76ca68..3cac99431cd038d 100644 --- a/.azure-pipelines/windows-release/stage-msi.yml +++ b/.azure-pipelines/windows-release/stage-msi.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: windows-latest + vmName: windows-2019 variables: ReleaseUri: http://www.python.org/{arch} diff --git a/.azure-pipelines/windows-release/stage-pack-msix.yml b/.azure-pipelines/windows-release/stage-pack-msix.yml index 62bed98db945206..a5f24b9fe6cabaa 100644 --- a/.azure-pipelines/windows-release/stage-pack-msix.yml +++ b/.azure-pipelines/windows-release/stage-pack-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Pack MSIX bundles pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-pack-nuget.yml b/.azure-pipelines/windows-release/stage-pack-nuget.yml index e2150ef30844b6c..ebb3fb62dee793b 100644 --- a/.azure-pipelines/windows-release/stage-pack-nuget.yml +++ b/.azure-pipelines/windows-release/stage-pack-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml index 6f1da0e23869aa8..5d4b5c459445850 100644 --- a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index 5f7b1e965e36b20..0d3fb6de4c862f7 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true'))) pool: - #vmName: windows-latest + #vmName: windows-2019 name: 'Windows Release' workspace: diff --git a/.azure-pipelines/windows-release/stage-publish-store.yml b/.azure-pipelines/windows-release/stage-publish-store.yml index f4532405f37bdfa..39cb69a6674a0a9 100644 --- a/.azure-pipelines/windows-release/stage-publish-store.yml +++ b/.azure-pipelines/windows-release/stage-publish-store.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoMSIX'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-sign.yml b/.azure-pipelines/windows-release/stage-sign.yml index 96d847a2452a8fd..0a2cd15545fbba7 100644 --- a/.azure-pipelines/windows-release/stage-sign.yml +++ b/.azure-pipelines/windows-release/stage-sign.yml @@ -114,7 +114,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: windows-latest + vmName: windows-2019 steps: - checkout: none diff --git a/.azure-pipelines/windows-release/stage-test-embed.yml b/.azure-pipelines/windows-release/stage-test-embed.yml index d941ccf522d05bb..d6130b0dc25b472 100644 --- a/.azure-pipelines/windows-release/stage-test-embed.yml +++ b/.azure-pipelines/windows-release/stage-test-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-msi.yml b/.azure-pipelines/windows-release/stage-test-msi.yml index 7f83553d460f3c3..be9b8a5a47ad944 100644 --- a/.azure-pipelines/windows-release/stage-test-msi.yml +++ b/.azure-pipelines/windows-release/stage-test-msi.yml @@ -3,7 +3,7 @@ jobs: displayName: Test MSI pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-nuget.yml b/.azure-pipelines/windows-release/stage-test-nuget.yml index 01c18d911730cdb..3f8d9fc8add98c3 100644 --- a/.azure-pipelines/windows-release/stage-test-nuget.yml +++ b/.azure-pipelines/windows-release/stage-test-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-latest + vmName: windows-2019 workspace: clean: all From 0c99db237033876cae42a60d167cb09796b54d49 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 23:07:31 +0000 Subject: [PATCH 4/6] Oh, it's vmImage --- .azure-pipelines/windows-release/stage-build.yml | 8 ++++---- .azure-pipelines/windows-release/stage-layout-embed.yml | 2 +- .azure-pipelines/windows-release/stage-layout-full.yml | 2 +- .azure-pipelines/windows-release/stage-layout-msix.yml | 2 +- .azure-pipelines/windows-release/stage-layout-nuget.yml | 2 +- .azure-pipelines/windows-release/stage-msi.yml | 2 +- .azure-pipelines/windows-release/stage-pack-msix.yml | 2 +- .azure-pipelines/windows-release/stage-pack-nuget.yml | 2 +- .../windows-release/stage-publish-nugetorg.yml | 2 +- .../windows-release/stage-publish-pythonorg.yml | 2 +- .azure-pipelines/windows-release/stage-publish-store.yml | 2 +- .azure-pipelines/windows-release/stage-sign.yml | 2 +- .azure-pipelines/windows-release/stage-test-embed.yml | 2 +- .azure-pipelines/windows-release/stage-test-msi.yml | 2 +- .azure-pipelines/windows-release/stage-test-nuget.yml | 2 +- 15 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.azure-pipelines/windows-release/stage-build.yml b/.azure-pipelines/windows-release/stage-build.yml index b0bb7f6229579e3..69f3b1e16451ec5 100644 --- a/.azure-pipelines/windows-release/stage-build.yml +++ b/.azure-pipelines/windows-release/stage-build.yml @@ -3,7 +3,7 @@ jobs: displayName: Docs build pool: name: 'Windows Release' - #vmName: windows-2019 + #vmImage: windows-2019 workspace: clean: all @@ -45,7 +45,7 @@ jobs: displayName: Python build pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all @@ -91,7 +91,7 @@ jobs: condition: and(succeeded(), ne(variables['DoPGO'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all @@ -141,7 +141,7 @@ jobs: displayName: Publish Tcl/Tk Library pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-embed.yml b/.azure-pipelines/windows-release/stage-layout-embed.yml index 3a36ce1612dd11a..dbccdead143b214 100644 --- a/.azure-pipelines/windows-release/stage-layout-embed.yml +++ b/.azure-pipelines/windows-release/stage-layout-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-full.yml b/.azure-pipelines/windows-release/stage-layout-full.yml index 3b7e61a9fd0717c..8fc8da3e52fe036 100644 --- a/.azure-pipelines/windows-release/stage-layout-full.yml +++ b/.azure-pipelines/windows-release/stage-layout-full.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoLayout'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-msix.yml b/.azure-pipelines/windows-release/stage-layout-msix.yml index d1aab293e394fa0..def4f7d3c6bee5f 100644 --- a/.azure-pipelines/windows-release/stage-layout-msix.yml +++ b/.azure-pipelines/windows-release/stage-layout-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Make MSIX layout pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-layout-nuget.yml b/.azure-pipelines/windows-release/stage-layout-nuget.yml index b10a19d6c57709d..41cdff850e83be3 100644 --- a/.azure-pipelines/windows-release/stage-layout-nuget.yml +++ b/.azure-pipelines/windows-release/stage-layout-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-msi.yml b/.azure-pipelines/windows-release/stage-msi.yml index 3cac99431cd038d..9b965b09c147481 100644 --- a/.azure-pipelines/windows-release/stage-msi.yml +++ b/.azure-pipelines/windows-release/stage-msi.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: windows-2019 + vmImage: windows-2019 variables: ReleaseUri: http://www.python.org/{arch} diff --git a/.azure-pipelines/windows-release/stage-pack-msix.yml b/.azure-pipelines/windows-release/stage-pack-msix.yml index a5f24b9fe6cabaa..07e343a0b4e0c78 100644 --- a/.azure-pipelines/windows-release/stage-pack-msix.yml +++ b/.azure-pipelines/windows-release/stage-pack-msix.yml @@ -3,7 +3,7 @@ jobs: displayName: Pack MSIX bundles pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-pack-nuget.yml b/.azure-pipelines/windows-release/stage-pack-nuget.yml index ebb3fb62dee793b..b100364820d95b6 100644 --- a/.azure-pipelines/windows-release/stage-pack-nuget.yml +++ b/.azure-pipelines/windows-release/stage-pack-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml index 5d4b5c459445850..d5edf44ef5c2ec2 100644 --- a/.azure-pipelines/windows-release/stage-publish-nugetorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-nugetorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml index 0d3fb6de4c862f7..4b88bdebf8cc413 100644 --- a/.azure-pipelines/windows-release/stage-publish-pythonorg.yml +++ b/.azure-pipelines/windows-release/stage-publish-pythonorg.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true'))) pool: - #vmName: windows-2019 + #vmImage: windows-2019 name: 'Windows Release' workspace: diff --git a/.azure-pipelines/windows-release/stage-publish-store.yml b/.azure-pipelines/windows-release/stage-publish-store.yml index 39cb69a6674a0a9..e0512b95f27da82 100644 --- a/.azure-pipelines/windows-release/stage-publish-store.yml +++ b/.azure-pipelines/windows-release/stage-publish-store.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoMSIX'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-sign.yml b/.azure-pipelines/windows-release/stage-sign.yml index 0a2cd15545fbba7..4d757ae8fca0325 100644 --- a/.azure-pipelines/windows-release/stage-sign.yml +++ b/.azure-pipelines/windows-release/stage-sign.yml @@ -114,7 +114,7 @@ jobs: condition: and(succeeded(), not(variables['SigningCertificate'])) pool: - vmName: windows-2019 + vmImage: windows-2019 steps: - checkout: none diff --git a/.azure-pipelines/windows-release/stage-test-embed.yml b/.azure-pipelines/windows-release/stage-test-embed.yml index d6130b0dc25b472..d99bd74722bacb5 100644 --- a/.azure-pipelines/windows-release/stage-test-embed.yml +++ b/.azure-pipelines/windows-release/stage-test-embed.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoEmbed'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-msi.yml b/.azure-pipelines/windows-release/stage-test-msi.yml index be9b8a5a47ad944..21e38c39590f701 100644 --- a/.azure-pipelines/windows-release/stage-test-msi.yml +++ b/.azure-pipelines/windows-release/stage-test-msi.yml @@ -3,7 +3,7 @@ jobs: displayName: Test MSI pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all diff --git a/.azure-pipelines/windows-release/stage-test-nuget.yml b/.azure-pipelines/windows-release/stage-test-nuget.yml index 3f8d9fc8add98c3..94d815e95226ef3 100644 --- a/.azure-pipelines/windows-release/stage-test-nuget.yml +++ b/.azure-pipelines/windows-release/stage-test-nuget.yml @@ -4,7 +4,7 @@ jobs: condition: and(succeeded(), eq(variables['DoNuget'], 'true')) pool: - vmName: windows-2019 + vmImage: windows-2019 workspace: clean: all From aa1caf73452cf135428aafac4c04314db8005555 Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 23:47:12 +0000 Subject: [PATCH 5/6] Fix nuget icon disappearing between build steps --- PC/layout/support/nuspec.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/PC/layout/support/nuspec.py b/PC/layout/support/nuspec.py index 9c6a9a915950980..dbcb713ef9d0c00 100644 --- a/PC/layout/support/nuspec.py +++ b/PC/layout/support/nuspec.py @@ -14,7 +14,7 @@ NUSPEC_DATA = { "PYTHON_TAG": VER_DOT, "PYTHON_VERSION": os.getenv("PYTHON_NUSPEC_VERSION"), - "FILELIST": r' ', + "FILELIST": r' ', "GIT": sys._git, } @@ -31,7 +31,7 @@ VER_DOT, VER_MICRO, "-" if VER_SUFFIX else "", VER_SUFFIX ) -FILELIST_WITH_PROPS = r""" +FILELIST_WITH_PROPS = r""" """ NUSPEC_TEMPLATE = r""" @@ -44,13 +44,13 @@ tools\LICENSE.txt https://www.python.org/ Installs {PYTHON_BITNESS} Python for use in build scenarios. - images\logox128.png + images\python.png https://www.python.org/static/favicon.ico python - + {FILELIST} @@ -73,6 +73,6 @@ def get_nuspec_layout(ns): data[k] = v if ns.include_all or ns.include_props: data["FILELIST"] = FILELIST_WITH_PROPS - data["LOGO"] = ns.source / "PC" / "icons" / "logox128.png" nuspec = NUSPEC_TEMPLATE.format_map(data) yield "python.nuspec", ("python.nuspec", nuspec.encode("utf-8")) + yield "python.png", ns.source / "PC" / "icons" / "logox128.png" From f59357d2ae8184ac763541a0380cff6180254a4e Mon Sep 17 00:00:00 2001 From: Steve Dower Date: Fri, 28 Feb 2020 23:57:18 +0000 Subject: [PATCH 6/6] Fix old build script for Nuget build --- Tools/nuget/make_pkg.proj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Tools/nuget/make_pkg.proj b/Tools/nuget/make_pkg.proj index b387b8eef5423c9..710ef3dcb5c01de 100644 --- a/Tools/nuget/make_pkg.proj +++ b/Tools/nuget/make_pkg.proj @@ -33,7 +33,7 @@ "$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages) - "$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" -BasePath "$(IntermediateOutputPath)pkg" + "$(Nuget)" pack "$(IntermediateOutputPath)pkg\python.nuspec" -BasePath "$(IntermediateOutputPath)pkg" "$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec" -BasePath "$(BuildPath.TrimEnd(`\`))" $(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))" $(NugetArguments) -Version "$(NuspecVersion)"