From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Fri, 4 Sep 2020 19:35:50 +0000 (-0700)
Subject: ICU-21108 Add build using VS2015 toolset, fix job names.
X-Git-Tag: cldr/2020-09-22~60
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=941fddc19d6632098e1f3653353f066ed02ce333;p=icu

ICU-21108 Add build using VS2015 toolset, fix job names.
---

diff --git a/.ci-builds/.azure-pipelines.yml b/.ci-builds/.azure-pipelines.yml
index e1e109ab68e..40ca078beb0 100644
--- a/.ci-builds/.azure-pipelines.yml
+++ b/.ci-builds/.azure-pipelines.yml
@@ -243,7 +243,7 @@ jobs:
 #-------------------------------------------------------------------------
 # VS 2017 Builds
 #-------------------------------------------------------------------------
-- job: ICU4C_MSVC_x64_Release
+- job: ICU4C_MSVC_x64_Release_VS2017
   displayName: 'C: MSVC 64-bit Release (VS 2017)'
   timeoutInMinutes: 30
   pool:
@@ -268,7 +268,7 @@ jobs:
         filename: icu4c/source/allinone/icucheck.bat
         arguments: 'x64 Release'
 #-------------------------------------------------------------------------
-- job: ICU4C_MSVC_x86_Debug
+- job: ICU4C_MSVC_x86_Debug_VS2017
   displayName: 'C: MSVC 32-bit Debug (VS 2017)'
   timeoutInMinutes: 60
   pool:
@@ -293,6 +293,34 @@ jobs:
         filename: icu4c/source/allinone/icucheck.bat
         arguments: 'x86 Debug'
 #-------------------------------------------------------------------------
+# VS2019 using the VS2015 toolset
+#-------------------------------------------------------------------------
+- job: ICU4C_MSVC_x64_Release_VS2015
+  displayName: 'C: MSVC 64-bit Release (VS 2015)'
+  timeoutInMinutes: 30
+  pool:
+    vmImage: 'windows-2019'
+    demands: 
+      - msbuild
+      - visualstudio
+      - Cmd
+  steps:
+    - checkout: self
+      lfs: true
+      fetchDepth: 10
+    - task: VSBuild@1
+      displayName: 'Build Solution'
+      inputs:
+        solution: icu4c/source/allinone/allinone.sln
+        platform: x64
+        configuration: Release
+        msbuildArgs: /p:SkipUWP=true /p:DefaultPlatformToolset=v140 /p:AutodetectWin10SDK=true
+    - task: BatchScript@1
+      displayName: 'Run Tests (icucheck.bat)'
+      inputs:
+        filename: icu4c/source/allinone/icucheck.bat
+        arguments: 'x64 Release'
+#-------------------------------------------------------------------------
 - job: ICU4C_MSYS2_GCC_x86_64_Release
   displayName: 'C: MSYS2 GCC x86_64 Release'
   timeoutInMinutes: 45
diff --git a/icu4c/source/allinone/Build.Windows.PlatformToolset.props b/icu4c/source/allinone/Build.Windows.PlatformToolset.props
index 5f600c89236..adee8f67191 100644
--- a/icu4c/source/allinone/Build.Windows.PlatformToolset.props
+++ b/icu4c/source/allinone/Build.Windows.PlatformToolset.props
@@ -37,7 +37,7 @@
   <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(PlatformToolset)'=='v142'">
     <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and '$(PlatformToolset)'=='v141'">
+  <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' and ('$(PlatformToolset)'=='v141' or '$(AutodetectWin10SDK)'=='true')">
     <!-- Detect the SDK version. -->
     <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>
     <WindowsSdkInstallFolder_10 Condition="'$(WindowsSdkInstallFolder_10)' == ''">$(Registry:HKEY_LOCAL_MACHINE\SOFTWARE\Wow6432Node\Microsoft\Microsoft SDKs\Windows\v10.0@InstallationFolder)</WindowsSdkInstallFolder_10>