You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by mm...@apache.org on 2021/10/26 19:27:12 UTC

[geode-native] branch develop updated: GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI Pipeline (#884)

This is an automated email from the ASF dual-hosted git repository.

mmartell pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/geode-native.git


The following commit(s) were added to refs/heads/develop by this push:
     new e7ff147  GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI Pipeline (#884)
e7ff147 is described below

commit e7ff1475fa9cc03dd1653d31c5ffdea1a1cf638a
Author: Michael Martell <mm...@pivotal.io>
AuthorDate: Tue Oct 26 12:27:06 2021 -0700

    GEODE-9741: Use v142 Toolchain in Visual Studio 2019 CI Pipeline (#884)
    
    * Add v142 to VS 2019 and build with it
    * Use explicit versions
    * Use lowest versions for tools & sdk
---
 ci/base/base.yml                             | 2 +-
 packer/windows/install-vs-2019-community.ps1 | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/ci/base/base.yml b/ci/base/base.yml
index c336540..a07224e 100644
--- a/ci/base/base.yml
+++ b/ci/base/base.yml
@@ -72,7 +72,7 @@ builds:
     with_dot_net: #@ True
     #@yaml/map-key-override
     params:
-      CMAKE_CONFIGURE_FLAGS: "-A x64 -Tv141,version=14.16,host=x64 -DCMAKE_SYSTEM_VERSION=10.0.16299.0"
+      CMAKE_CONFIGURE_FLAGS: "-A x64 -Tv142,version=14.20,host=x64 -DCMAKE_SYSTEM_VERSION=10.0.16299.0"
       CMAKE_BUILD_FLAGS: "/m"
       CPACK_GENERATORS: "ZIP"
 
diff --git a/packer/windows/install-vs-2019-community.ps1 b/packer/windows/install-vs-2019-community.ps1
index 460dfd1..7f2580b 100644
--- a/packer/windows/install-vs-2019-community.ps1
+++ b/packer/windows/install-vs-2019-community.ps1
@@ -29,13 +29,14 @@ $args = @('--add Microsoft.VisualStudio.Component.CoreEditor',
           '--add Microsoft.Net.Component.4.5.2.TargetingPack',
           '--add Microsoft.VisualStudio.Component.IntelliCode',
           '--add Microsoft.VisualStudio.Component.VC.CoreIde',
+          '--add Microsoft.VisualStudio.Component.VC.Tools.x86.x64',
           '--add Microsoft.VisualStudio.Component.VC.Redist.14.Latest',
           '--add Microsoft.VisualStudio.ComponentGroup.NativeDesktop.Core',
           '--add Microsoft.VisualStudio.Component.VC.ATL',
           '--add Microsoft.VisualStudio.Component.Windows10SDK.16299',
-          '--add Microsoft.VisualStudio.Component.VC.v141.x86.x64',
+          '--add Microsoft.VisualStudio.Component.VC.14.20.x86.x64',
           '--add Microsoft.VisualStudio.Workload.NativeDesktop',
-          '--add Microsoft.VisualStudio.Component.VC.v141.CLI.Support',
+          '--add Microsoft.VisualStudio.Component.VC.14.20.CLI.Support',
           '--add Microsoft.Net.Component.4.6.1.SDK',
 		  '--quiet')