From: Jeff Genovy <29107334+jefgen@users.noreply.github.com>
Date: Fri, 6 Oct 2017 07:31:14 +0000 (+0000)
Subject: ICU-13126 Allow UWP builds to reuse makedata by undoing the disabling of renaming.
X-Git-Tag: release-60-rc~15
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=3bb0274f43e18a3d521ec8d7eb5708572f2ddd4a;p=icu

ICU-13126 Allow UWP builds to reuse makedata by undoing the disabling of renaming.

X-SVN-Rev: 40590
---

diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj
index a3d6a4c4c95..c69093133b7 100644
--- a/icu4c/source/common/common_uwp.vcxproj
+++ b/icu4c/source/common/common_uwp.vcxproj
@@ -70,15 +70,17 @@
     <LinkIncremental Condition="'$(Configuration)'=='Debug'">true</LinkIncremental>
   </PropertyGroup>
   <ItemDefinitionGroup>
+    <!-- Options that are common to *all* configurations -->
     <Midl>
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <!-- U_DISABLE_RENAMING -->
       <!-- U_HIDE_DRAFT_API & U_HIDE_DEPRECATED_API -->
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;U_ATTRIBUTE_DEPRECATED=;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;U_ATTRIBUTE_DEPRECATED=;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -93,7 +95,7 @@
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
@@ -108,6 +110,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Release'">
+    <!-- Options that are common to all 'Release' configurations -->
     <Midl>
       <PreprocessorDefinitions>NDEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </Midl>
@@ -120,9 +123,11 @@
     </ResourceCompile>
     <Link>
       <EnableCOMDATFolding>true</EnableCOMDATFolding>
+      <AdditionalDependencies>vccorlib.lib;WindowsApp.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)'=='Debug'">
+    <!-- Options that are common to all 'Debug' configurations -->
     <Midl>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </Midl>
@@ -137,8 +142,13 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+      <AdditionalDependencies>vccorlibd.lib;WindowsApp.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
+    <!-- Options that are common to all 32-bit configurations -->
     <Midl>
       <TargetEnvironment>Win32</TargetEnvironment>
     </Midl>
@@ -147,6 +157,7 @@
     </ClCompile>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='x64'">
+    <!-- Options that are common to all 64-bit configurations -->
     <Midl>
       <TargetEnvironment>X64</TargetEnvironment>
     </Midl>
@@ -158,6 +169,7 @@
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='ARM'">
+    <!-- Options that are common to all ARM configurations -->
     <Midl>
       <TargetEnvironment>ARM</TargetEnvironment>
     </Midl>
@@ -168,6 +180,7 @@
       <TargetMachine>MachineARM</TargetMachine>
     </Link>
   </ItemDefinitionGroup>
+  <!-- Options that are specific to a particular configuration -->
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
     <Midl>
       <TypeLibraryName>.\..\..\lib32uwp\icuuc.tlb</TypeLibraryName>
@@ -179,10 +192,9 @@
       <ProgramDataBaseFileName>.\x86\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin32uwp\icuuc.dll</OutputFile>
+      <OutputFile>..\..\bin32uwp\icuuc60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib32uwp\icuuc.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib32uwp\icuuc.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlib.lib;WindowsApp.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -196,10 +208,9 @@
       <ProgramDataBaseFileName>.\x86\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin32uwp\icuucd.dll</OutputFile>
+      <OutputFile>..\..\bin32uwp\icuuc60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib32uwp\icuucd.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib32uwp\icuucd.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlibd.lib;WindowsApp.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
@@ -213,10 +224,9 @@
       <ProgramDataBaseFileName>.\x64\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin64uwp\icuuc.dll</OutputFile>
+      <OutputFile>..\..\bin64uwp\icuuc60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib64uwp\icuuc.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib64uwp\icuuc.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlib.lib;WindowsApp.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
@@ -230,10 +240,9 @@
       <ProgramDataBaseFileName>.\x64\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin64uwp\icuucd.dll</OutputFile>
+      <OutputFile>..\..\bin64uwp\icuuc60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib64uwp\icuucd.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib64uwp\icuucd.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlibd.lib;WindowsApp.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|ARM'">
@@ -247,10 +256,9 @@
       <ProgramDataBaseFileName>.\ARM\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\binARMuwp\icuuc.dll</OutputFile>
+      <OutputFile>..\..\binARMuwp\icuuc60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\libARMuwp\icuuc.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\libARMuwp\icuuc.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlib.lib;WindowsApp.lib;msvcrt.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@@ -264,10 +272,9 @@
       <ProgramDataBaseFileName>.\ARM\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\binARMuwp\icuucd.dll</OutputFile>
+      <OutputFile>..\..\binARMuwp\icuuc60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\libARMuwp\icuucd.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\libARMuwp\icuucd.lib</ImportLibrary>
-      <AdditionalDependencies>vccorlibd.lib;WindowsApp.lib;msvcrtd.lib;%(AdditionalDependencies)</AdditionalDependencies>
     </Link>
   </ItemDefinitionGroup>
   <ItemGroup>
@@ -280,27 +287,19 @@
     <ClCompile Include="ubidiwrt.cpp" />
     <ClCompile Include="uloc_keytype.cpp" />
     <ClCompile Include="ushape.cpp" />
-    <ClCompile Include="brkeng.cpp">
-    </ClCompile>
-    <ClCompile Include="brkiter.cpp">
-    </ClCompile>
+    <ClCompile Include="brkeng.cpp" />
+    <ClCompile Include="brkiter.cpp" />
     <ClCompile Include="dictbe.cpp" />
     <ClCompile Include="pluralmap.cpp" />
-    <ClCompile Include="rbbi.cpp">
-    </ClCompile>
-    <ClCompile Include="rbbidata.cpp">
-    </ClCompile>
+    <ClCompile Include="rbbi.cpp" />
+    <ClCompile Include="rbbidata.cpp" />
     <ClCompile Include="rbbinode.cpp" />
-    <ClCompile Include="rbbirb.cpp">
-    </ClCompile>
+    <ClCompile Include="rbbirb.cpp" />
     <ClCompile Include="rbbiscan.cpp" />
     <ClCompile Include="rbbisetb.cpp" />
-    <ClCompile Include="rbbistbl.cpp">
-    </ClCompile>
-    <ClCompile Include="rbbitblb.cpp">
-    </ClCompile>
-    <ClCompile Include="rbbi_cache.cpp">
-    </ClCompile>
+    <ClCompile Include="rbbistbl.cpp" />
+    <ClCompile Include="rbbitblb.cpp" />
+    <ClCompile Include="rbbi_cache.cpp" />
     <ClCompile Include="dictionarydata.cpp" />
     <ClCompile Include="ubrk.cpp" />
     <ClCompile Include="ucol_swp.cpp">
@@ -322,14 +321,12 @@
     <ClCompile Include="uvectr64.cpp" />
     <ClCompile Include="errorcode.cpp" />
     <ClCompile Include="icudataver.cpp" />
-    <ClCompile Include="locmap.cpp">
-    </ClCompile>
+    <ClCompile Include="locmap.cpp" />
     <ClCompile Include="putil.cpp">
       <CompileAsWinRT>true</CompileAsWinRT>
     </ClCompile>
     <ClCompile Include="umath.cpp" />
-    <ClCompile Include="umutex.cpp">
-    </ClCompile>
+    <ClCompile Include="umutex.cpp" />
     <ClCompile Include="utrace.cpp" />
     <ClCompile Include="utypes.cpp" />
     <ClCompile Include="wintz.cpp">
@@ -337,15 +334,13 @@
     </ClCompile>
     <ClCompile Include="ucnv.cpp" />
     <ClCompile Include="ucnv2022.cpp" />
-    <ClCompile Include="ucnv_bld.cpp">
-    </ClCompile>
+    <ClCompile Include="ucnv_bld.cpp" />
     <ClCompile Include="ucnv_cb.cpp" />
     <ClCompile Include="ucnv_cnv.cpp" />
     <ClCompile Include="ucnv_ct.cpp" />
     <ClCompile Include="ucnv_err.cpp" />
     <ClCompile Include="ucnv_ext.cpp" />
-    <ClCompile Include="ucnv_io.cpp">
-    </ClCompile>
+    <ClCompile Include="ucnv_io.cpp" />
     <ClCompile Include="ucnv_lmb.cpp" />
     <ClCompile Include="ucnv_set.cpp" />
     <ClCompile Include="ucnv_u16.cpp" />
@@ -359,19 +354,15 @@
     <ClCompile Include="ucnvlat1.cpp" />
     <ClCompile Include="ucnvmbcs.cpp" />
     <ClCompile Include="ucnvscsu.cpp" />
-    <ClCompile Include="ucnvsel.cpp">
-    </ClCompile>
+    <ClCompile Include="ucnvsel.cpp" />
     <ClCompile Include="cmemory.cpp" />
-    <ClCompile Include="ucln_cmn.cpp">
-    </ClCompile>
+    <ClCompile Include="ucln_cmn.cpp" />
     <ClCompile Include="ucmndata.cpp" />
     <ClCompile Include="udata.cpp" />
     <ClCompile Include="udatamem.cpp" />
     <ClCompile Include="udataswp.cpp" />
-    <ClCompile Include="uinit.cpp">
-    </ClCompile>
-    <ClCompile Include="umapfile.cpp">
-    </ClCompile>
+    <ClCompile Include="uinit.cpp" />
+    <ClCompile Include="umapfile.cpp" />
     <ClCompile Include="uobject.cpp" />
     <ClCompile Include="dtintrv.cpp" />
     <ClCompile Include="parsepos.cpp" />
@@ -381,19 +372,15 @@
     <ClCompile Include="punycode.cpp" />
     <ClCompile Include="uidna.cpp" />
     <ClCompile Include="uts46.cpp" />
-    <ClCompile Include="locavailable.cpp">
-    </ClCompile>
+    <ClCompile Include="locavailable.cpp" />
     <ClCompile Include="locbased.cpp" />
     <ClCompile Include="locdispnames.cpp" />
     <ClCompile Include="locdspnm.cpp" />
-    <ClCompile Include="locid.cpp">
-    </ClCompile>
+    <ClCompile Include="locid.cpp" />
     <ClCompile Include="loclikely.cpp" />
     <ClCompile Include="locresdata.cpp" />
-    <ClCompile Include="locutil.cpp">
-    </ClCompile>
-    <ClCompile Include="resbund.cpp">
-    </ClCompile>
+    <ClCompile Include="locutil.cpp" />
+    <ClCompile Include="resbund.cpp" />
     <ClCompile Include="resbund_cnv.cpp" />
     <ClCompile Include="ucat.cpp" />
     <ClCompile Include="uloc.cpp" />
@@ -403,27 +390,22 @@
     <ClCompile Include="uresdata.cpp" />
     <ClCompile Include="resource.cpp" />
     <ClCompile Include="ucurr.cpp" />
-    <ClCompile Include="caniter.cpp">
-    </ClCompile>
+    <ClCompile Include="caniter.cpp" />
     <ClCompile Include="filterednormalizer2.cpp" />
     <ClCompile Include="loadednormalizer2impl.cpp" />
     <ClCompile Include="normalizer2.cpp" />
     <ClCompile Include="normalizer2impl.cpp" />
-    <ClCompile Include="normlzr.cpp">
-    </ClCompile>
+    <ClCompile Include="normlzr.cpp" />
     <ClCompile Include="unorm.cpp" />
     <ClCompile Include="unormcmp.cpp" />
     <ClCompile Include="bmpset.cpp" />
     <ClCompile Include="patternprops.cpp" />
-    <ClCompile Include="propname.cpp">
-    </ClCompile>
+    <ClCompile Include="propname.cpp" />
     <ClCompile Include="ruleiter.cpp" />
-    <ClCompile Include="ucase.cpp">
-    </ClCompile>
+    <ClCompile Include="ucase.cpp" />
     <ClCompile Include="uchar.cpp" />
     <ClCompile Include="unames.cpp" />
-    <ClCompile Include="unifiedcache.cpp">
-    </ClCompile>
+    <ClCompile Include="unifiedcache.cpp" />
     <ClCompile Include="unifilt.cpp" />
     <ClCompile Include="unifunct.cpp" />
     <ClCompile Include="uniset.cpp" />
@@ -438,20 +420,13 @@
     <ClCompile Include="uset_props.cpp" />
     <ClCompile Include="usetiter.cpp" />
     <ClCompile Include="icuplug.cpp" />
-    <ClCompile Include="serv.cpp">
-    </ClCompile>
-    <ClCompile Include="servlk.cpp">
-    </ClCompile>
-    <ClCompile Include="servlkf.cpp">
-    </ClCompile>
-    <ClCompile Include="servls.cpp">
-    </ClCompile>
-    <ClCompile Include="servnotf.cpp">
-    </ClCompile>
-    <ClCompile Include="servrbf.cpp">
-    </ClCompile>
-    <ClCompile Include="servslkf.cpp">
-    </ClCompile>
+    <ClCompile Include="serv.cpp" />
+    <ClCompile Include="servlk.cpp" />
+    <ClCompile Include="servlkf.cpp" />
+    <ClCompile Include="servls.cpp" />
+    <ClCompile Include="servnotf.cpp" />
+    <ClCompile Include="servrbf.cpp" />
+    <ClCompile Include="servslkf.cpp" />
     <ClCompile Include="usprep.cpp" />
     <ClCompile Include="appendable.cpp" />
     <ClCompile Include="bytesinkutil.cpp" />
@@ -497,8 +472,7 @@
   </ItemGroup>
   <ItemGroup>
     <CustomBuild Include="unicode\ubidi.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="localsvc.h" />
@@ -603,65 +577,54 @@
     </CustomBuild>
     <ClInclude Include="putilimp.h" />
     <CustomBuild Include="unicode\std_string.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="uassert.h" />
     <CustomBuild Include="unicode\uconfig.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\umachine.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="umutex.h" />
     <ClInclude Include="uposixdefs.h" />
     <CustomBuild Include="unicode\urename.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utrace.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="utracimp.h" />
     <CustomBuild Include="unicode\utypes.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uvernum.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uversion.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="wintz.h" />
     <CustomBuild Include="unicode\ucnv.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucnv_bld.h" />
     <CustomBuild Include="unicode\ucnv_cb.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucnv_cnv.h" />
     <CustomBuild Include="unicode\ucnv_err.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucnv_ext.h" />
@@ -669,19 +632,16 @@
     <ClInclude Include="ucnv_io.h" />
     <ClInclude Include="ucnvmbcs.h" />
     <CustomBuild Include="unicode\ucnvsel.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="cmemory.h" />
     <CustomBuild Include="unicode\localpointer.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uclean.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucln.h" />
@@ -689,99 +649,82 @@
     <ClInclude Include="ucln_imp.h" />
     <ClInclude Include="ucmndata.h" />
     <CustomBuild Include="unicode\udata.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="udatamem.h" />
     <ClInclude Include="udataswp.h" />
     <ClInclude Include="umapfile.h" />
     <CustomBuild Include="unicode\uobject.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\dtintrv.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\parseerr.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\parsepos.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\umisc.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ustrfmt.h" />
     <ClInclude Include="util.h" />
     <CustomBuild Include="unicode\idna.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="punycode.h" />
     <CustomBuild Include="unicode\uidna.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="locbased.h" />
     <CustomBuild Include="unicode\locid.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="locutil.h" />
     <CustomBuild Include="unicode\resbund.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="sharedobject.h" />
     <ClCompile Include="sharedobject.cpp" />
     <CustomBuild Include="unicode\locdspnm.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\simpleformatter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ucat.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\udisplaycontext.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uldnames.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uloc.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ulocimp.h" />
     <CustomBuild Include="unicode\ures.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="unifiedcache.h" />
@@ -790,36 +733,30 @@
     <ClInclude Include="ureslocs.h" />
     <ClInclude Include="resource.h" />
     <CustomBuild Include="unicode\ucurr.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucurrimp.h" />
     <CustomBuild Include="unicode\caniter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="norm2allmodes.h" />
     <CustomBuild Include="unicode\normalizer2.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="normalizer2impl.h" />
     <CustomBuild Include="unicode\normlzr.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unorm.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unorm2.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="unormimp.h" />
@@ -829,58 +766,48 @@
     <ClInclude Include="propname.h" />
     <ClInclude Include="ruleiter.h" />
     <CustomBuild Include="unicode\symtable.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ucase.h" />
     <CustomBuild Include="unicode\uchar.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unifilt.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unifunct.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unimatch.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uniset.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="unisetspan.h" />
     <ClInclude Include="uprops.h" />
     <ClInclude Include="usc_impl.h" />
     <CustomBuild Include="unicode\uscript.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uset.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="uset_imp.h" />
     <CustomBuild Include="unicode\usetiter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\icuplug.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="icuplugimp.h" />
@@ -889,34 +816,28 @@
     <ClInclude Include="servnotf.h" />
     <ClInclude Include="sprpimpl.h" />
     <CustomBuild Include="unicode\usprep.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\appendable.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="bytesinkutil.h" />
     <CustomBuild Include="unicode\bytestream.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\bytestrie.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\bytestriebuilder.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\chariter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="charstr.h" />
@@ -924,116 +845,94 @@
     <ClInclude Include="cstr.h" />
     <ClInclude Include="cwchar.h" />
     <CustomBuild Include="unicode\messagepattern.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\rep.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\schriter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\stringpiece.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\stringtriebuilder.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ucasemap.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ucharstrie.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ucharstriebuilder.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\uchriter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="uinvchar.h" />
     <CustomBuild Include="unicode\uiter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\unistr.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\urep.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <ClInclude Include="ustr_cnv.h" />
     <ClInclude Include="ustr_imp.h" />
     <CustomBuild Include="unicode\ustring.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ustringtrie.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utext.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utf.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utf16.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utf32.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utf8.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\utf_old.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\listformatter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
     <CustomBuild Include="unicode\ulistformatter.h">
-      <Command>copy "%(FullPath)" ..\..\include\unicode
-</Command>
+      <Command>copy "%(FullPath)" ..\..\include\unicode</Command>
       <Outputs>..\..\include\unicode\%(Filename)%(Extension);%(Outputs)</Outputs>
     </CustomBuild>
   </ItemGroup>
diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index 9084a52fa26..ce7dec15535 100644
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -125,12 +125,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#if U_PLATFORM_HAS_WINUWP_API == 0
 #define U_ICU_VERSION_SHORT "60"
-#else
-// U_DISABLE_RENAMING does not impact dat file name
-#define U_ICU_VERSION_SHORT
-#endif /* U_PLATFORM_HAS_WINUWP_API == 0 */
 
 #ifndef U_HIDE_INTERNAL_API
 /** Data version in ICU4C.
diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index ebc216020ab..13dd687ffd8 100644
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -15,7 +15,8 @@
 U_ICUDATA_NAME=icudt60
 ##############################################################################
 !IF "$(UWP)" == "UWP"
-U_ICUDATA_NAME=icudt
+# Optionally change the name of the data file for the UWP version.
+U_ICUDATA_NAME=icudt60
 !ENDIF
 U_ICUDATA_ENDIAN_SUFFIX=l
 UNICODE_VERSION=10.0
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index 409d30fc4dc..7090c833d0c 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -71,14 +71,15 @@
   </PropertyGroup>
   <ItemDefinitionGroup>
     <Midl>
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <MkTypLibCompatible>true</MkTypLibCompatible>
       <SuppressStartupBanner>true</SuppressStartupBanner>
     </Midl>
     <ClCompile>
       <AdditionalIncludeDirectories>..\..\include;..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
+      <!-- U_DISABLE_RENAMING -->
       <!-- U_HIDE_DRAFT_API & U_HIDE_DEPRECATED_API -->
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;U_ATTRIBUTE_DEPRECATED=;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;U_ATTRIBUTE_DEPRECATED=;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <StringPooling>true</StringPooling>
       <ExceptionHandling>
       </ExceptionHandling>
@@ -93,7 +94,7 @@
       <AdditionalOptions>/utf-8 %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
     <ResourceCompile>
-      <PreprocessorDefinitions>U_DISABLE_RENAMING=1;U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
+      <PreprocessorDefinitions>U_PLATFORM_HAS_WINUWP_API=1;%(PreprocessorDefinitions)</PreprocessorDefinitions>
       <Culture>0x0409</Culture>
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
     </ResourceCompile>
@@ -136,6 +137,9 @@
     <ResourceCompile>
       <PreprocessorDefinitions>_DEBUG;%(PreprocessorDefinitions)</PreprocessorDefinitions>
     </ResourceCompile>
+    <Link>
+      <GenerateDebugInformation>true</GenerateDebugInformation>
+    </Link>
   </ItemDefinitionGroup>
   <ItemDefinitionGroup Condition="'$(Platform)'=='Win32'">
     <Midl>
@@ -178,7 +182,7 @@
       <ProgramDataBaseFileName>.\x86\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin32uwp\icuin.dll</OutputFile>
+      <OutputFile>..\..\bin32uwp\icuin60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib32uwp\icuin.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib32uwp\icuin.lib</ImportLibrary>
       <AdditionalDependencies>..\..\lib32uwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -195,7 +199,7 @@
       <ProgramDataBaseFileName>.\x86\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin32uwp\icuind.dll</OutputFile>
+      <OutputFile>..\..\bin32uwp\icuin60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib32uwp\icuind.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib32uwp\icuind.lib</ImportLibrary>
       <AdditionalDependencies>..\..\lib32uwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -212,7 +216,7 @@
       <ProgramDataBaseFileName>.\x64\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin64uwp\icuin.dll</OutputFile>
+      <OutputFile>..\..\bin64uwp\icuin60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib64uwp\icuin.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib64uwp\icuin.lib</ImportLibrary>
       <AdditionalDependencies>..\..\lib64uwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -229,7 +233,7 @@
       <ProgramDataBaseFileName>.\x64\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\bin64uwp\icuind.dll</OutputFile>
+      <OutputFile>..\..\bin64uwp\icuin60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\lib64uwp\icuind.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\lib64uwp\icuind.lib</ImportLibrary>
       <AdditionalDependencies>..\..\lib64uwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -246,7 +250,7 @@
       <ProgramDataBaseFileName>.\ARM\ReleaseUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\binARMuwp\icuin.dll</OutputFile>
+      <OutputFile>..\..\binARMuwp\icuin60.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\libARMuwp\icuin.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\libARMuwp\icuin.lib</ImportLibrary>
       <AdditionalDependencies>..\..\libARMuwp\icuuc.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -263,7 +267,7 @@
       <ProgramDataBaseFileName>.\ARM\DebugUWP/</ProgramDataBaseFileName>
     </ClCompile>
     <Link>
-      <OutputFile>..\..\binARMuwp\icuind.dll</OutputFile>
+      <OutputFile>..\..\binARMuwp\icuin60d.dll</OutputFile>
       <ProgramDatabaseFile>.\..\..\libARMuwp\icuind.pdb</ProgramDatabaseFile>
       <ImportLibrary>..\..\libARMuwp\icuind.lib</ImportLibrary>
       <AdditionalDependencies>..\..\libARMuwp\icuucd.lib;%(AdditionalDependencies)</AdditionalDependencies>
@@ -396,9 +400,7 @@
     <ClCompile Include="quantityformatter.cpp" />
     <ClCompile Include="rbnf.cpp" />
     <ClCompile Include="rbtz.cpp" />
-    <ClCompile Include="reldatefmt.cpp">
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
+    <ClCompile Include="reldatefmt.cpp" />
     <ClCompile Include="reldtfmt.cpp" />
     <ClCompile Include="scientificnumberformatter.cpp" />
     <ClCompile Include="sharedbreakiterator.cpp" />
@@ -430,21 +432,13 @@
     <ClCompile Include="utmscale.cpp" />
     <ClCompile Include="vtzone.cpp" />
     <ClCompile Include="vzone.cpp" />
-    <ClCompile Include="windtfmt.cpp">
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
-    <ClCompile Include="winnmfmt.cpp">
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
-    <ClCompile Include="wintzimpl.cpp">
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
+    <ClCompile Include="windtfmt.cpp" />
+    <ClCompile Include="winnmfmt.cpp" />
+    <ClCompile Include="wintzimpl.cpp" />
     <ClCompile Include="zonemeta.cpp" />
     <ClCompile Include="zrule.cpp" />
     <ClCompile Include="ztrans.cpp" />
-    <ClCompile Include="ucln_in.cpp">
-      <DisableLanguageExtensions>false</DisableLanguageExtensions>
-    </ClCompile>
+    <ClCompile Include="ucln_in.cpp" />
     <ClCompile Include="regexcmp.cpp" />
     <ClCompile Include="regeximp.cpp" />
     <ClCompile Include="regexst.cpp" />