ICU-20200 Fix mistaken move of MSB8012 warning suppression from shared props file...

diff --git a/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.Library.WarningSettings.ProjectConfiguration.props
index d1b7f70ddbd1e121281e6e47644df256e06cbdf1..6e92e870ce749619b51ba1e3e6713729fb54b322 100644 (file)
--- 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 778ee2676d0f9e54b348370a90e6b43d8cf9a318..b4777679b80aa9c0b151e07b5cf3d3279a4759ab 100644 (file)
--- 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>