From dcc130061350bfebca2bce8dc413d9b7bdba049c Mon Sep 17 00:00:00 2001
From: Jeff Genovy <jefgen@microsoft.com>
Date: Fri, 25 Jan 2019 16:12:27 -0800
Subject: [PATCH] ICU-20200 Fix mistaken move of MSB8012 warning suppression
 from shared props file to Library only props file.

---
 ...ndows.Library.WarningSettings.ProjectConfiguration.props | 6 ------
 icu4c/source/allinone/Build.Windows.PlatformToolset.props   | 5 +++++
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props
index d1b7f70ddbd..6e92e870ce7 100644
--- a/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props
@@ -21,10 +21,4 @@
       <TreatSpecificWarningsAsErrors>4251;4661;4715;4706;4005;4068;4267;%(TreatSpecificWarningsAsErrors)</TreatSpecificWarningsAsErrors>
     </ClCompile>
   </ItemDefinitionGroup>
-  
-  <PropertyGroup>
-    <!-- Disable MSBuild warning about Linker OutputFile. -->
-    <!-- Ex: MSBuild complains that the common project creates "icuuc62.dll" rather than "common.dll". However, this is intentional. -->
-    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
-  </PropertyGroup>
 </Project>
diff --git a/icu4c/source/allinone/Build.Windows.PlatformToolset.props b/icu4c/source/allinone/Build.Windows.PlatformToolset.props
index 778ee2676d0..b4777679b80 100644
--- a/icu4c/source/allinone/Build.Windows.PlatformToolset.props
+++ b/icu4c/source/allinone/Build.Windows.PlatformToolset.props
@@ -18,4 +18,9 @@
   <PropertyGroup Label="PlatformToolset">
     <PlatformToolset>$(DefaultPlatformToolset)</PlatformToolset>
   </PropertyGroup>
+  <PropertyGroup>
+    <!-- Disable MSBuild warning about Linker OutputFile. -->
+    <!-- Ex: MSBuild complains that the common project creates "icuuc62.dll" rather than "common.dll". However, this is intentional. -->
+    <MSBuildWarningsAsMessages>MSB8012</MSBuildWarningsAsMessages>
+  </PropertyGroup>
 </Project>