From 7756ee0446917e3a023975d2f877858a826dd067 Mon Sep 17 00:00:00 2001
From: Jeff Genovy <Jeff.Genovy@microsoft.com>
Date: Sun, 11 Nov 2018 21:30:52 -0800
Subject: [PATCH] ICU-20239 Add VS2015 build line to the Azure CI builds.

---
 .ci-builds/.azure-pipelines.yml        | 27 ++++++++++++++++++++++++--
 icu4c/source/common/common_uwp.vcxproj |  4 ++--
 icu4c/source/data/makedata_uwp.vcxproj |  4 ++--
 icu4c/source/i18n/i18n_uwp.vcxproj     |  4 ++--
 4 files changed, 31 insertions(+), 8 deletions(-)

diff --git a/.ci-builds/.azure-pipelines.yml b/.ci-builds/.azure-pipelines.yml
index 058a6015799..62ffa1341bd 100644
--- a/.ci-builds/.azure-pipelines.yml
+++ b/.ci-builds/.azure-pipelines.yml
@@ -38,7 +38,7 @@ jobs:
         CXX: clang++
 #-------------------------------------------------------------------------
 - job: ICU4C_MSVC_x64_Release
-  displayName: 'C: MSVC 64-bit Release (VS2017)'
+  displayName: 'C: MSVC 64-bit Release (VS 2017)'
   timeoutInMinutes: 30
   pool:
     vmImage: 'vs2017-win2016'
@@ -60,7 +60,7 @@ jobs:
         arguments: 'x64 Release'
 #-------------------------------------------------------------------------
 - job: ICU4C_MSVC_x86_Release
-  displayName: 'C: MSVC 32-bit Release (VS2017)'
+  displayName: 'C: MSVC 32-bit Release (VS 2017)'
   timeoutInMinutes: 30
   pool:
     vmImage: 'vs2017-win2016'
@@ -80,3 +80,26 @@ jobs:
       inputs:
         filename: icu4c/source/allinone/icucheck.bat
         arguments: 'x86 Release'
+#-------------------------------------------------------------------------
+- job: ICU4C_MSVC_x64_Release_VS2015
+  displayName: 'C: MSVC 64-bit Release (VS 2015)'
+  timeoutInMinutes: 30
+  pool:
+    vmImage: 'vs2015-win2012r2'
+    demands: 
+      - msbuild
+      - visualstudio
+      - Cmd
+  steps:
+    - task: VSBuild@1
+      displayName: 'Build Solution'
+      inputs:
+        solution: icu4c/source/allinone/allinone.sln
+        platform: x64
+        configuration: Release
+        msbuildArgs: '/p:SkipUWP=true'
+    - task: BatchScript@1
+      displayName: 'Run Tests (icucheck.bat)'
+      inputs:
+        filename: icu4c/source/allinone/icucheck.bat
+        arguments: 'x64 Release'
\ No newline at end of file
diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj
index c06ef3db39a..91c538d5177 100644
--- a/icu4c/source/common/common_uwp.vcxproj
+++ b/icu4c/source/common/common_uwp.vcxproj
@@ -574,10 +574,10 @@
   <ItemGroup>
     <ResourceCompile Include="common.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <Target Name="Build" Condition="'$(SkipUWP)'=='true'">
-    <Message Text="Skipping UWP project: $(MSBuildThisFile)" Importance="high" />
+    <Message Text="Skipping building the UWP project: $(MSBuildThisFile)" Importance="high" />
   </Target>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
diff --git a/icu4c/source/data/makedata_uwp.vcxproj b/icu4c/source/data/makedata_uwp.vcxproj
index 464ce27bad3..300c0c77107 100644
--- a/icu4c/source/data/makedata_uwp.vcxproj
+++ b/icu4c/source/data/makedata_uwp.vcxproj
@@ -127,10 +127,10 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
     </ProjectReference>
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <Target Name="Build" Condition="'$(SkipUWP)'=='true'">
-    <Message Text="Skipping UWP project: $(MSBuildThisFile)" Importance="high" />
+    <Message Text="Skipping building the UWP project: $(MSBuildThisFile)" Importance="high" />
   </Target>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index 367dbed3364..416ebcc39c1 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -666,10 +666,10 @@
   <ItemGroup>
     <ResourceCompile Include="i18n.rc" />
   </ItemGroup>
-  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <Target Name="Build" Condition="'$(SkipUWP)'=='true'">
-    <Message Text="Skipping UWP project: $(MSBuildThisFile)" Importance="high" />
+    <Message Text="Skipping building the UWP project: $(MSBuildThisFile)" Importance="high" />
   </Target>
+  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" Condition="'$(SkipUWP)'!='true'" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
 </Project>
\ No newline at end of file