Skip to content

[3.8] bpo-39789: Update Windows release build machines to VS 2019 (GH-18695) #18697

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 29, 2020
Merged

[3.8] bpo-39789: Update Windows release build machines to VS 2019 (GH-18695) #18697

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .azure-pipelines/windows-release/stage-build.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
displayName: Docs build
pool:
name: 'Windows Release'
#vmName: win2016-vs2017
#vmImage: windows-2019

workspace:
clean: all
Expand Down Expand Up @@ -45,7 +45,7 @@ jobs:
displayName: Python build

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down Expand Up @@ -91,7 +91,7 @@ jobs:
condition: and(succeeded(), ne(variables['DoPGO'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
displayName: Publish Tcl/Tk Library

pool:
vmName: windows-latest
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-layout-embed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoEmbed'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-layout-full.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoLayout'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-layout-msix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
displayName: Make MSIX layout

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-layout-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-msi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), not(variables['SigningCertificate']))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

variables:
ReleaseUri: http://www.python.org/{arch}
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-pack-msix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
displayName: Pack MSIX bundles

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-pack-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-publish-nugetorg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-publish-pythonorg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), and(eq(variables['DoMSI'], 'true'), eq(variables['DoEmbed'], 'true')))

pool:
#vmName: win2016-vs2017
#vmImage: windows-2019
name: 'Windows Release'

workspace:
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-publish-store.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoMSIX'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-sign.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -114,7 +114,7 @@ jobs:
condition: and(succeeded(), not(variables['SigningCertificate']))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

steps:
- checkout: none
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-test-embed.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoEmbed'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-test-msi.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ jobs:
displayName: Test MSI

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
2 changes: 1 addition & 1 deletion .azure-pipelines/windows-release/stage-test-nuget.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
condition: and(succeeded(), eq(variables['DoNuget'], 'true'))

pool:
vmName: win2016-vs2017
vmImage: windows-2019

workspace:
clean: all
Expand Down
1 change: 1 addition & 0 deletions Misc/NEWS.d/next/Windows/2020-02-28-22-46-09.bpo-39789.67XRoP.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Update Windows release build machines to Visual Studio 2019 (MSVC 14.2).
10 changes: 5 additions & 5 deletions PC/layout/support/nuspec.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
NUSPEC_DATA = {
"PYTHON_TAG": VER_DOT,
"PYTHON_VERSION": os.getenv("PYTHON_NUSPEC_VERSION"),
"FILELIST": r' <file src="**\*" target="tools" />',
"FILELIST": r' <file src="**\*" exclude="python.png" target="tools" />',
"GIT": sys._git,
}

Expand All @@ -31,7 +31,7 @@
VER_DOT, VER_MICRO, "-" if VER_SUFFIX else "", VER_SUFFIX
)

FILELIST_WITH_PROPS = r""" <file src="**\*" exclude="python.props" target="tools" />
FILELIST_WITH_PROPS = r""" <file src="**\*" exclude="python.png;python.props" target="tools" />
<file src="python.props" target="build\native" />"""

NUSPEC_TEMPLATE = r"""<?xml version="1.0"?>
Expand All @@ -44,13 +44,13 @@
<license type="file">tools\LICENSE.txt</license>
<projectUrl>https://www.python.org/</projectUrl>
<description>Installs {PYTHON_BITNESS} Python for use in build scenarios.</description>
<icon>images\logox128.png</icon>
<icon>images\python.png</icon>
<iconUrl>https://www.python.org/static/favicon.ico</iconUrl>
<tags>python</tags>
<repository type="git" url="https://github.com/Python/CPython.git" commit="{GIT[2]}" />
</metadata>
<files>
<file src="{LOGO}" target="images" />
<file src="python.png" target="images" />
{FILELIST}
</files>
</package>
Expand All @@ -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"
2 changes: 1 addition & 1 deletion Tools/nuget/make_pkg.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@

<PackageArguments Condition="$(Packages) != ''">"$(IntermediateOutputPath)pkg\pip.exe" -B -m pip install -U $(Packages)</PackageArguments>

<NugetPackCommand>"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).nuspec" -BasePath "$(IntermediateOutputPath)pkg"</NugetPackCommand>
<NugetPackCommand>"$(Nuget)" pack "$(IntermediateOutputPath)pkg\python.nuspec" -BasePath "$(IntermediateOutputPath)pkg"</NugetPackCommand>
<NugetPackSymbolsCommand Condition="Exists('$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec')">"$(Nuget)" pack "$(MSBuildThisFileDirectory)\$(OutputName).symbols.nuspec" -BasePath "$(BuildPath.TrimEnd(`\`))"</NugetPackSymbolsCommand>
<NugetArguments>$(NugetArguments) -OutputDirectory "$(OutputPath.Trim(`\`))"</NugetArguments>
<NugetArguments>$(NugetArguments) -Version "$(NuspecVersion)"</NugetArguments>
Expand Down