Build environments for vs2017 and vs2019, with ability to exclude ARM builds (ARM tools are not installed by default on GitHub runners)

2020-06-23 19:04:10 -07:00 · 2020-06-23 19:04:10 -07:00 · d2ef1a9695
--- a/.github/workflows/build-windows-vs2017.yaml
+++ b/.github/workflows/build-windows-vs2017.yaml
@ -27,5 +27,7 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        GIT_PULL_TOKEN: ${{ secrets.GIT_PULL_TOKEN }}
+        SKIP_ARM_BUILD: 1
+        SKIP_ARM64_BUILD: 1
      shell: cmd
      run: build-all.bat
--- a/.github/workflows/build-windows-vs2019.yaml
+++ b/.github/workflows/build-windows-vs2019.yaml
@ -27,5 +27,8 @@ jobs:
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
        GIT_PULL_TOKEN: ${{ secrets.GIT_PULL_TOKEN }}
+        SKIP_ARM_BUILD: 1
+        SKIP_ARM64_BUILD: 1
+        PlatformToolset: v142
      shell: cmd
      run: build-all.bat
--- a/README.md
+++ b/README.md
@ -40,7 +40,8 @@ To build the SDK, please refer to [How to build the SDK](CONTRIBUTING.md#How_to_
  | Ubuntu 14.04.1 LTS            | GCC 5.x.x                        |
  | Ubuntu 16.04 LTS              | GCC 5.x.x (armv7l)               |
  | Windows 10                    | Android Studio/Gradle            |
-  | Windows Server 2016           | Visual Studio 2017               |
+  | Windows Server 2016           | Visual Studio 2017 (vc141)       |
+  | Windows Server 2019           | Visual Studio 2019 (vc142)       |
 </details>

 <details>
@ -48,7 +49,7 @@ To build the SDK, please refer to [How to build the SDK](CONTRIBUTING.md#How_to_
  
  | Target Platform                | Supported          | Covered by CI      |
  | ------------------------------ | ------------------ | ------------------ |
-  | Android                        | partial&dagger;    |                    |
+  | Android                        | partial&dagger;    | :white_check_mark: |
  | iOS 10+ (simulator)            | :white_check_mark: | :white_check_mark: |
  | iOS 10+ (arm64, arm64e)        | :white_check_mark: |                    |
  | Linux (x86, x64, arm, aarch64) | :white_check_mark: |                    |
@ -57,10 +58,11 @@ To build the SDK, please refer to [How to build the SDK](CONTRIBUTING.md#How_to_
  | Ubuntu 14.04.x LTS             | :white_check_mark: | :white_check_mark: |
  | Ubuntu (latest)                | :white_check_mark: | :white_check_mark: |
  | Windows 7.1                    | :white_check_mark: |                    |
-  | Windows 8.1                    | :white_check_mark: | :white_check_mark: |
+  | Windows 8.1                    | :white_check_mark: |                    |
  | Windows 10.x                   | :white_check_mark: |                    |
  | Windows Server 2012            | :white_check_mark: |                    |
  | Windows Server 2016            | :white_check_mark: | :white_check_mark: |
+  | Windows Server 2019            | :white_check_mark: |                    |
  
  * **Supported** - these platforms are known to work well with the SDK in
    production.
--- a/Solutions/before.targets
+++ b/Solutions/before.targets
@ -3,7 +3,9 @@
    <CustomIncludePath>$(SolutionDir)\..\third_party\krabsetw\krabs;$(CustomIncludePath)</CustomIncludePath>
  </PropertyGroup>
  <PropertyGroup Label="Globals">
-    <PlatformToolset>v141</PlatformToolset>
+    <!-- Use Visual Studio 2017 v141 toolset as default -->
+    <PlatformToolset Condition="'$(PlatformToolset)' == ''">v141</PlatformToolset>
+    <PlatformToolset Condition="'$(PlatformToolset)' != ''">$(PlatformToolset)</PlatformToolset>
    <!-- Customers may override WindowsTargetPlatformVersion before auto-detection of latest Win 10 SDK -->
    <LatestTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</LatestTargetPlatformVersion>
    <WindowsTargetPlatformVersion Condition="'$(WindowsTargetPlatformVersion)' == ''">$(LatestTargetPlatformVersion)</WindowsTargetPlatformVersion>
--- a/build-all-v142.bat
+++ b/build-all-v142.bat
@ -0,0 +1,55 @@
+@echo off
+
+set VSTOOLS_VERSION=vs2019
+set PlatformToolset=v142
+
+cd %~dp0
+call tools\gen-version.cmd
+@setlocal ENABLEEXTENSIONS
+
+echo Update all public submodules...
+git -c submodule."lib/modules".update=none submodule update --init --recursive
+
+if DEFINED GIT_PULL_TOKEN (
+  rd /s /q lib\modules
+  git clone https://%GIT_PULL_TOKEN%:x-oauth-basic@github.com/microsoft/cpp_client_telemetry_modules.git lib\modules
+)
+
+call tools\vcvars.cmd
+
+set MAXCPUCOUNT=%NUMBER_OF_PROCESSORS%
+set platform=
+set SOLUTION=Solutions\MSTelemetrySDK.sln
+
+set CUSTOM_PROPS=
+if ("%1"=="") goto skip
+set CUSTOM_PROPS="/p:ForceImportBeforeCppTargets=%1"
+echo Using custom properties file for the build:
+echo %CUSTOM_PROPS%
+:skip
+
+REM DLL and static /MD build
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=Win32 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=Win32 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=x64 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,net40,win10-cs,win10-dll,Tests\gmock,Tests\gtest,Tests\UnitTests,Tests\FuncTests /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=x64 %CUSTOM_PROPS%
+
+REM Static /MT build
+msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug.vs2015.MT-sqlite /p:Platform=Win32 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release.vs2015.MT-sqlite /p:Platform=Win32 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug.vs2015.MT-sqlite /p:Platform=x64 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release.vs2015.MT-sqlite /p:Platform=x64 %CUSTOM_PROPS%
+
+if NOT DEFINED SKIP_ARM_BUILD (
+REM ARM DLL build
+call tools\vcvars-ext.cmd arm
+msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
+)
+
+if NOT DEFINED SKIP_ARM64_BUILD (
+REM ARM64 DLL build
+call tools\vcvars-ext.cmd arm64
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
+msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%
+)
--- a/build-all.bat
+++ b/build-all.bat
@ -37,12 +37,16 @@ msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true
 msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug.vs2015.MT-sqlite /p:Platform=x64 %CUSTOM_PROPS%
 msbuild %SOLUTION% /target:sqlite,zlib,win32-lib /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release.vs2015.MT-sqlite /p:Platform=x64 %CUSTOM_PROPS%

+if NOT DEFINED SKIP_ARM_BUILD (
 REM ARM DLL build
 call tools\vcvars-ext.cmd arm
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM %CUSTOM_PROPS%
 msbuild %SOLUTION% /target:zlib,sqlite-uwp,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM %CUSTOM_PROPS%
+)

+if NOT DEFINED SKIP_ARM64_BUILD (
 REM ARM64 DLL build
 call tools\vcvars-ext.cmd arm64
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Debug /p:Platform=ARM64 %CUSTOM_PROPS%
 msbuild %SOLUTION% /target:sqlite,zlib,sqlite-uwp,win32-dll,win32-lib,win10-cs,win10-dll /p:BuildProjectReferences=true /maxcpucount:%MAXCPUCOUNT% /p:Configuration=Release /p:Platform=ARM64 %CUSTOM_PROPS%
+)
--- a/lib/include/public/Version.hpp
+++ b/lib/include/public/Version.hpp
@ -3,8 +3,8 @@
 #define MAT_VERSION_HPP
 // WARNING: DO NOT MODIFY THIS FILE!
 // This file has been automatically generated, manual changes will be lost.
-#define BUILD_VERSION_STR "3.3.170.1"
-#define BUILD_VERSION 3,3,170,1
+#define BUILD_VERSION_STR "3.3.175.1"
+#define BUILD_VERSION 3,3,175,1

 #ifndef RESOURCE_COMPILER_INVOKED
 #include <stdint.h>
@ -30,7 +30,7 @@ namespace ARIASDK_NS_BEGIN {
 uint64_t const Version =
    ((uint64_t)3 << 48) |
    ((uint64_t)3 << 32) |
-    ((uint64_t)170 << 16) |
+    ((uint64_t)175 << 16) |
    ((uint64_t)1);

 } ARIASDK_NS_END