From 9f62b0dadab9f708a2acdf5b9b7d11d90e33535d Mon Sep 17 00:00:00 2001 From: Jeff Genovy <29107334+jefgen@users.noreply.github.com> Date: Fri, 16 Feb 2018 03:16:03 +0000 Subject: [PATCH] ICU-13171 Update the VS project files to use VS 2017, plus various fixes to get Samples compiling. Also add explicit defines for WINVER and _WIN32_WINNT for Windows 7 targeting in non-UWP projects. X-SVN-Rev: 40935 --- icu4c/source/common/common.vcxproj | 20 ++--- icu4c/source/common/common_uwp.vcxproj | 6 +- icu4c/source/data/makedata.vcxproj | 4 +- icu4c/source/data/makedata_uwp.vcxproj | 2 +- icu4c/source/extra/uconv/uconv.vcxproj | 24 +++--- icu4c/source/i18n/i18n.vcxproj | 20 ++--- icu4c/source/i18n/i18n.vcxproj.filters | 68 +++++++++++++-- icu4c/source/i18n/i18n_uwp.vcxproj | 6 +- icu4c/source/io/io.vcxproj | 20 ++--- icu4c/source/samples/all/all.sln | 18 ++-- icu4c/source/samples/break/break.cpp | 3 +- icu4c/source/samples/break/break.vcxproj | 20 ++--- icu4c/source/samples/cal/cal.vcxproj | 24 +++--- icu4c/source/samples/case/case.cpp | 2 + icu4c/source/samples/case/case.vcxproj | 20 ++--- icu4c/source/samples/citer/citer.vcxproj | 20 ++--- icu4c/source/samples/coll/coll.vcxproj | 22 ++--- icu4c/source/samples/csdet/csdet.vcxproj | 20 ++--- icu4c/source/samples/date/date.vcxproj | 24 +++--- icu4c/source/samples/datefmt/datefmt.vcxproj | 20 ++--- icu4c/source/samples/datefmt/main.cpp | 2 + icu4c/source/samples/datefmt/util.cpp | 2 + icu4c/source/samples/datefmt/util.h | 2 + .../samples/dtitvfmtsample/dtitvfmtsample.cpp | 1 + .../dtitvfmtsample/dtitvfmtsample.vcxproj | 86 +++++++++++++++++-- .../samples/dtptngsample/dtptngsample.cpp | 1 + .../samples/dtptngsample/dtptngsample.vcxproj | 83 ++++++++++++++++-- icu4c/source/samples/layout/layout.vcxproj | 16 ++-- icu4c/source/samples/legacy/legacy.vcxproj | 24 +++--- icu4c/source/samples/msgfmt/msgfmt.vcxproj | 20 ++--- icu4c/source/samples/msgfmt/util.cpp | 2 + icu4c/source/samples/msgfmt/util.h | 2 + icu4c/source/samples/numfmt/numfmt.vcxproj | 20 ++--- icu4c/source/samples/numfmt/util.cpp | 2 + icu4c/source/samples/numfmt/util.h | 2 + .../samples/plurfmtsample/plurfmtsample.cpp | 4 +- .../plurfmtsample/plurfmtsample.vcxproj | 75 ++++++++++++++-- icu4c/source/samples/props/props.vcxproj | 20 ++--- icu4c/source/samples/strsrch/strsrch.vcxproj | 20 ++--- .../source/samples/translit/translit.vcxproj | 20 ++--- icu4c/source/samples/translit/unaccent.h | 2 + icu4c/source/samples/translit/util.cpp | 2 + icu4c/source/samples/translit/util.h | 2 + icu4c/source/samples/uciter8/uciter8.vcxproj | 20 ++--- icu4c/source/samples/ucnv/ucnv.vcxproj | 20 ++--- icu4c/source/samples/udata/reader.vcxproj | 46 +++++----- icu4c/source/samples/udata/writer.vcxproj | 20 ++--- .../source/samples/ufortune/ufortune.vcxproj | 24 +++--- icu4c/source/samples/ugrep/ugrep.cpp | 1 + icu4c/source/samples/ugrep/ugrep.vcxproj | 20 ++--- icu4c/source/samples/uresb/resources.vcxproj | 8 +- icu4c/source/samples/uresb/uresb.vcxproj | 20 ++--- icu4c/source/samples/ustring/ustring.cpp | 2 + icu4c/source/samples/ustring/ustring.vcxproj | 20 ++--- icu4c/source/stubdata/stubdata.vcxproj | 24 +++--- icu4c/source/test/cintltst/cintltst.vcxproj | 20 ++--- icu4c/source/test/intltest/intltest.vcxproj | 20 ++--- icu4c/source/test/iotest/iotest.vcxproj | 20 ++--- icu4c/source/tools/ctestfw/ctestfw.vcxproj | 20 ++--- icu4c/source/tools/genbrk/genbrk.vcxproj | 24 +++--- icu4c/source/tools/genccode/genccode.vcxproj | 24 +++--- icu4c/source/tools/gencfu/gencfu.vcxproj | 24 +++--- icu4c/source/tools/gencmn/gencmn.vcxproj | 24 +++--- icu4c/source/tools/gencnval/gencnval.vcxproj | 24 +++--- icu4c/source/tools/gendict/gendict.vcxproj | 24 +++--- icu4c/source/tools/gennorm2/gennorm2.vcxproj | 24 +++--- icu4c/source/tools/genrb/derb.vcxproj | 24 +++--- icu4c/source/tools/genrb/genrb.vcxproj | 24 +++--- icu4c/source/tools/gensprep/gensprep.vcxproj | 24 +++--- icu4c/source/tools/gentest/gentest.vcxproj | 24 +++--- icu4c/source/tools/icuinfo/icuinfo.vcxproj | 20 ++--- icu4c/source/tools/icuinfo/testplug.vcxproj | 24 +++--- icu4c/source/tools/icupkg/icupkg.vcxproj | 24 +++--- icu4c/source/tools/makeconv/makeconv.vcxproj | 24 +++--- icu4c/source/tools/pkgdata/pkgdata.vcxproj | 24 +++--- icu4c/source/tools/toolutil/toolutil.vcxproj | 20 ++--- 76 files changed, 931 insertions(+), 547 deletions(-) diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj index 7a688146402..0aae1ea8d41 100644 --- a/icu4c/source/common/common.vcxproj +++ b/icu4c/source/common/common.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -91,7 +91,7 @@ .\..\..\lib\icuuc.tlb - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -131,7 +131,7 @@ Disabled - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;RBBI_DEBUG;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;RBBI_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -172,7 +172,7 @@ .\..\..\lib64\icuuc.tlb - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -210,7 +210,7 @@ Disabled - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;RBBI_DEBUG;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_COMMON_IMPLEMENTATION;RBBI_DEBUG;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -1924,4 +1924,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj index 72fbf41da10..596ebf7fb10 100644 --- a/icu4c/source/common/common_uwp.vcxproj +++ b/icu4c/source/common/common_uwp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -33,7 +33,7 @@ 14.0 true Windows Store - 10.0.10586.0 + 10.0.16299.0 10.0.10240.0 10.0 @@ -42,7 +42,7 @@ DynamicLibrary false MultiByte - v140 + v141 diff --git a/icu4c/source/data/makedata.vcxproj b/icu4c/source/data/makedata.vcxproj index 4430e8edc75..e788c4ada0e 100644 --- a/icu4c/source/data/makedata.vcxproj +++ b/icu4c/source/data/makedata.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -21,7 +21,7 @@ {D9DF7F2F-93B7-4810-B5CD-96F4F33C079B} MakeFileProj - v140 + v141 8.1 Makefile false diff --git a/icu4c/source/data/makedata_uwp.vcxproj b/icu4c/source/data/makedata_uwp.vcxproj index 7baae5f4773..eccc7d15134 100644 --- a/icu4c/source/data/makedata_uwp.vcxproj +++ b/icu4c/source/data/makedata_uwp.vcxproj @@ -33,7 +33,7 @@ 14.0 true Windows Store - 10.0.10586.0 + 10.0.16299.0 10.0.10240.0 10.0 Makefile diff --git a/icu4c/source/extra/uconv/uconv.vcxproj b/icu4c/source/extra/uconv/uconv.vcxproj index d208f8e950d..39b035f7eea 100644 --- a/icu4c/source/extra/uconv/uconv.vcxproj +++ b/icu4c/source/extra/uconv/uconv.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -135,7 +136,7 @@ Disabled ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -149,6 +150,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -179,7 +181,7 @@ ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -192,6 +194,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -220,7 +223,7 @@ Disabled ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;UCONVMSG_LINK;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -234,6 +237,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -297,4 +301,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj index 47592a44960..ed75a6382e9 100644 --- a/icu4c/source/i18n/i18n.vcxproj +++ b/icu4c/source/i18n/i18n.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -92,7 +92,7 @@ ..\..\include;..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ Disabled ..\..\include;..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -179,7 +179,7 @@ ..\..\include;..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -220,7 +220,7 @@ Disabled ..\..\include;..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -1759,4 +1759,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/i18n/i18n.vcxproj.filters b/icu4c/source/i18n/i18n.vcxproj.filters index bf7c9ec7e4b..f9759133b90 100644 --- a/icu4c/source/i18n/i18n.vcxproj.filters +++ b/icu4c/source/i18n/i18n.vcxproj.filters @@ -558,6 +558,60 @@ formatting + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + formatting + + + misc + @@ -1215,12 +1269,6 @@ formatting - - formatting - - - formatting - formatting @@ -1359,5 +1407,11 @@ formatting + + misc + + + formatting + - + \ No newline at end of file diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj index e720af75ee9..c0f301a928b 100644 --- a/icu4c/source/i18n/i18n_uwp.vcxproj +++ b/icu4c/source/i18n/i18n_uwp.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -33,7 +33,7 @@ 14.0 true Windows Store - 10.0.10586.0 + 10.0.16299.0 10.0.10240.0 10.0 @@ -42,7 +42,7 @@ DynamicLibrary false MultiByte - v140 + v141 diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj index 375b716c9ac..f89ae58c969 100644 --- a/icu4c/source/io/io.vcxproj +++ b/icu4c/source/io/io.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -92,7 +92,7 @@ ..\..\include;..\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ Disabled ..\..\include;..\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -179,7 +179,7 @@ ..\..\include;..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -220,7 +220,7 @@ Disabled ..\..\include;..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_IO_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -325,4 +325,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/all/all.sln b/icu4c/source/samples/all/all.sln index 7020e4cd6cd..a2772461605 100644 --- a/icu4c/source/samples/all/all.sln +++ b/icu4c/source/samples/all/all.sln @@ -1,5 +1,7 @@ -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.27130.2026 +MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "break", "..\break\break.vcxproj", "{DEEADF02-9C14-4854-A395-E505D2904D65}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "cal", "..\cal\cal.vcxproj", "{F7659D77-09CF-4FE9-ACEE-927287AA9509}" @@ -259,21 +261,27 @@ Global {8945255B-473B-4C47-9425-E92384338CAA}.Debug|x64.ActiveCfg = Debug|Win32 {8945255B-473B-4C47-9425-E92384338CAA}.Release|Win32.ActiveCfg = Release|Win32 {8945255B-473B-4C47-9425-E92384338CAA}.Release|Win32.Build.0 = Release|Win32 - {8945255B-473B-4C47-9425-E92384338CAA}.Release|x64.ActiveCfg = Release|Win32 + {8945255B-473B-4C47-9425-E92384338CAA}.Release|x64.ActiveCfg = Release|x64 + {8945255B-473B-4C47-9425-E92384338CAA}.Release|x64.Build.0 = Release|x64 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|Win32.ActiveCfg = Debug|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|Win32.Build.0 = Debug|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Debug|x64.ActiveCfg = Debug|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|Win32.ActiveCfg = Release|Win32 {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|Win32.Build.0 = Release|Win32 - {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|x64.ActiveCfg = Release|Win32 + {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|x64.ActiveCfg = Release|x64 + {B500B731-ED1A-4761-94ED-B22DFE25FF2B}.Release|x64.Build.0 = Release|x64 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|Win32.ActiveCfg = Debug|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|Win32.Build.0 = Debug|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Debug|x64.ActiveCfg = Debug|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|Win32.ActiveCfg = Release|Win32 {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|Win32.Build.0 = Release|Win32 - {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|x64.ActiveCfg = Release|Win32 + {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|x64.ActiveCfg = Release|x64 + {115886F0-7DFB-4B8B-BE79-83162EE8713B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {DB7CDCAF-F002-40F8-9E0E-F25F68EEC77B} + EndGlobalSection EndGlobal diff --git a/icu4c/source/samples/break/break.cpp b/icu4c/source/samples/break/break.cpp index 4965aaceb9f..8b4ad613859 100644 --- a/icu4c/source/samples/break/break.cpp +++ b/icu4c/source/samples/break/break.cpp @@ -17,8 +17,9 @@ #include #include -U_CFUNC int c_main(void); +using namespace icu; +U_CFUNC int c_main(void); void printUnicodeString(const UnicodeString &s) { char charBuf[1000]; diff --git a/icu4c/source/samples/break/break.vcxproj b/icu4c/source/samples/break/break.vcxproj index 0ac3e59630c..60319064c03 100644 --- a/icu4c/source/samples/break/break.vcxproj +++ b/icu4c/source/samples/break/break.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -135,7 +135,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -178,7 +178,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -221,7 +221,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -261,4 +261,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/cal/cal.vcxproj b/icu4c/source/samples/cal/cal.vcxproj index 95a0a53717f..11a4e7f76e3 100644 --- a/icu4c/source/samples/cal/cal.vcxproj +++ b/icu4c/source/samples/cal/cal.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -103,6 +103,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -128,7 +129,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -142,6 +143,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -167,7 +169,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -182,6 +184,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -208,7 +211,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -223,6 +226,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -266,4 +270,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/case/case.cpp b/icu4c/source/samples/case/case.cpp index f11181875d5..c0f72166402 100644 --- a/icu4c/source/samples/case/case.cpp +++ b/icu4c/source/samples/case/case.cpp @@ -18,6 +18,8 @@ #include #include +using namespace icu; + U_CFUNC int c_main(UFILE *out); void printUnicodeString(UFILE *out, const UnicodeString &s) { diff --git a/icu4c/source/samples/case/case.vcxproj b/icu4c/source/samples/case/case.vcxproj index 35967667920..7a1ae95ad7d 100644 --- a/icu4c/source/samples/case/case.vcxproj +++ b/icu4c/source/samples/case/case.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..;..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -129,7 +129,7 @@ Disabled ..;..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -247,4 +247,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/citer/citer.vcxproj b/icu4c/source/samples/citer/citer.vcxproj index bf6355e9cfd..6e9a8396bbc 100644 --- a/icu4c/source/samples/citer/citer.vcxproj +++ b/icu4c/source/samples/citer/citer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 @@ -83,7 +83,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -113,7 +113,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -139,7 +139,7 @@ ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true @@ -167,7 +167,7 @@ ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true @@ -195,4 +195,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/coll/coll.vcxproj b/icu4c/source/samples/coll/coll.vcxproj index 85d03418ed2..5c586e42e09 100644 --- a/icu4c/source/samples/coll/coll.vcxproj +++ b/icu4c/source/samples/coll/coll.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreaded true @@ -128,7 +128,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreaded true @@ -148,7 +148,7 @@ 0x0409 - icuind.lib;icuucd.lib;%(AdditionalDependencies) + icuin.lib;icuuc.lib;%(AdditionalDependencies) .\x64\Release/coll.exe true ..\..\..\lib64;%(AdditionalLibraryDirectories) @@ -167,7 +167,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -208,7 +208,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -248,4 +248,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/csdet/csdet.vcxproj b/icu4c/source/samples/csdet/csdet.vcxproj index 6d2a0add695..9384c96246c 100644 --- a/icu4c/source/samples/csdet/csdet.vcxproj +++ b/icu4c/source/samples/csdet/csdet.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,22 +27,22 @@ Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 Application MultiByte - v140 + v141 @@ -83,7 +83,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -113,7 +113,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true EnableFastChecks MultiThreadedDebug @@ -139,7 +139,7 @@ ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true @@ -167,7 +167,7 @@ ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MultiThreaded true @@ -195,4 +195,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/date/date.vcxproj b/icu4c/source/samples/date/date.vcxproj index f8241c14510..42e8b4c0a86 100644 --- a/icu4c/source/samples/date/date.vcxproj +++ b/icu4c/source/samples/date/date.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -103,6 +103,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -128,7 +129,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -142,6 +143,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -167,7 +169,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -181,6 +183,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -207,7 +210,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -221,6 +224,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/datefmt/datefmt.vcxproj b/icu4c/source/samples/datefmt/datefmt.vcxproj index 078ca49a5da..de28daa1761 100644 --- a/icu4c/source/samples/datefmt/datefmt.vcxproj +++ b/icu4c/source/samples/datefmt/datefmt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -247,4 +247,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/datefmt/main.cpp b/icu4c/source/samples/datefmt/main.cpp index a6553287759..dd1796a9896 100644 --- a/icu4c/source/samples/datefmt/main.cpp +++ b/icu4c/source/samples/datefmt/main.cpp @@ -15,6 +15,8 @@ #include #include "util.h" +using namespace icu; + /** * If the ID supplied to TimeZone is not a valid system ID, * TimeZone::createTimeZone() will return a GMT zone object. In order diff --git a/icu4c/source/samples/datefmt/util.cpp b/icu4c/source/samples/datefmt/util.cpp index 6068d0e56f3..240b405faec 100644 --- a/icu4c/source/samples/datefmt/util.cpp +++ b/icu4c/source/samples/datefmt/util.cpp @@ -12,6 +12,8 @@ #include #include +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg) { if (U_FAILURE(status)) { diff --git a/icu4c/source/samples/datefmt/util.h b/icu4c/source/samples/datefmt/util.h index 3a15a9e43d5..2fd538b9ed7 100644 --- a/icu4c/source/samples/datefmt/util.h +++ b/icu4c/source/samples/datefmt/util.h @@ -10,6 +10,8 @@ #include "unicode/unistr.h" +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg); diff --git a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp index da6f746c3c9..c4f7b18c89e 100644 --- a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp +++ b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.cpp @@ -12,6 +12,7 @@ //! [dtitvfmtPreDefined1] using namespace std; +using namespace icu; static void dtitvfmtPreDefined() { diff --git a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj index 701d8068de7..e7f92d15ea0 100644 --- a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj +++ b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj @@ -1,14 +1,22 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {8945255B-473B-4C47-9425-E92384338CAA} @@ -20,14 +28,27 @@ Application true Unicode - v140 + v141 + + + Application + true + Unicode + v141 Application false true Unicode - v140 + v141 + + + Application + false + true + Unicode + v141 @@ -35,13 +56,20 @@ + + + + + + .\x86\debug\ + .\x86\debug\ @@ -53,7 +81,11 @@ Level3 Disabled - ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) + ..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;%(PreprocessorDefinitions) + .\x86\Debug/ + .\x86\Debug/ + .\x86\Debug/ true @@ -62,22 +94,66 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) + + + Level3 + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;%(PreprocessorDefinitions) + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ + + + true + .\x64\Debug/dtitvfmtsample.exe + icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) + ..\..\..\lib64;%(AdditionalLibraryDirectories) + + Level3 MaxSpeed true true + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;%(PreprocessorDefinitions) + ..\..\..\include;%(AdditionalIncludeDirectories) + .\x86\Release/ + .\x86\Release/ + .\x86\Release/ + + + true + true + true + ..\..\..\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + MaxSpeed + true + true + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;%(PreprocessorDefinitions) + ..\..\..\include;%(AdditionalIncludeDirectories) + .\x64\Release/ + .\x64\Release/ + .\x64\Release/ true true true + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) + ..\..\..\lib64;%(AdditionalLibraryDirectories) ../../common;%(AdditionalIncludeDirectories) + ../../common;%(AdditionalIncludeDirectories) @@ -94,4 +170,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/dtptngsample/dtptngsample.cpp b/icu4c/source/samples/dtptngsample/dtptngsample.cpp index b119f4bad28..58d394d57df 100644 --- a/icu4c/source/samples/dtptngsample/dtptngsample.cpp +++ b/icu4c/source/samples/dtptngsample/dtptngsample.cpp @@ -13,6 +13,7 @@ //! [getBestPatternExample1] using namespace std; +using namespace icu; static void getBestPatternExample() { diff --git a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj index c49ee6ab63a..91735a31cdc 100644 --- a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj +++ b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj @@ -1,14 +1,22 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {115886F0-7DFB-4B8B-BE79-83162EE8713B} @@ -21,14 +29,27 @@ Application true Unicode - v140 + v141 + + + Application + true + Unicode + v141 Application false true Unicode - v140 + v141 + + + Application + false + true + Unicode + v141 @@ -36,9 +57,15 @@ + + + + + + .\x86\debug\ @@ -47,6 +74,9 @@ .\x86\debug\ $(ProjectName) + + $(ProjectName) + .\x86\release @@ -56,11 +86,15 @@ $(ProjectName) + + $(ProjectName) + Level3 Disabled ..\..\common;..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) true @@ -69,6 +103,23 @@ ..\..\..\lib;%(AdditionalLibraryDirectories) + + + Level3 + Disabled + ..\..\common;..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + .\x64\Debug/ + .\x64\Debug/ + .\x64\Debug/ + + + true + .\x64\debug/dtptngsample.exe + icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) + ..\..\..\lib64;%(AdditionalLibraryDirectories) + + Level3 @@ -76,12 +127,34 @@ true true ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + + + true + true + true + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) + ..\..\..\lib;%(AdditionalLibraryDirectories) + + + + + Level3 + MaxSpeed + true + true + ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) + .\x64\Release/ + .\x64\Release/ + .\x64\Release/ true true true - \x86\debug\samples.exe + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) + ..\..\..\lib64;%(AdditionalLibraryDirectories) @@ -101,4 +174,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/layout/layout.vcxproj b/icu4c/source/samples/layout/layout.vcxproj index c27af9d9700..fc750f37c09 100644 --- a/icu4c/source/samples/layout/layout.vcxproj +++ b/icu4c/source/samples/layout/layout.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;..\..\..\include\layout;..\..\common;%(AdditionalIncludeDirectories) - NDEBUG;_CONSOLE;WIN32;UNICODE;_CRT_SECURE_NO_DEPRECATE;LE_USE_CMEMORY;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;NDEBUG;_CONSOLE;WIN32;UNICODE;_CRT_SECURE_NO_DEPRECATE;LE_USE_CMEMORY;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -165,7 +165,7 @@ Disabled ..\..\..\include;..\..\..\include\layout;..\..\common;%(AdditionalIncludeDirectories) - _DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;_DEBUG;WIN32;UNICODE;LE_USE_CMEMORY;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -269,4 +269,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/legacy/legacy.vcxproj b/icu4c/source/samples/legacy/legacy.vcxproj index 56b7fdeedd2..24369830e65 100644 --- a/icu4c/source/samples/legacy/legacy.vcxproj +++ b/icu4c/source/samples/legacy/legacy.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreaded true @@ -128,7 +128,7 @@ OnlyExplicitInline ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) true MultiThreaded true @@ -151,7 +151,7 @@ icuuc.lib;icuin.lib;../../../../icu-1-8-1/lib/icuuc.lib;../../../../icu-1-8-1/lib/icuin.lib;%(AdditionalDependencies) .\x64\Release/legacy.exe true - ../../../lib;%(AdditionalLibraryDirectories) + ../../../lib64;%(AdditionalLibraryDirectories) .\x64\Release/legacy.pdb Console false @@ -167,7 +167,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -207,7 +207,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -230,7 +230,7 @@ icuucd.lib;icuind.lib;../../../../icu-1-8-1/lib/icuucd.lib;../../../../icu-1-8-1/lib/icuind.lib;%(AdditionalDependencies) .\x64\Debug/legacy.exe true - ../../../lib;%(AdditionalLibraryDirectories) + ../../../lib64;%(AdditionalLibraryDirectories) true .\x64\Debug/legacy.pdb Console @@ -253,4 +253,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/msgfmt/msgfmt.vcxproj b/icu4c/source/samples/msgfmt/msgfmt.vcxproj index eebe956d3cb..83ff77afb5d 100644 --- a/icu4c/source/samples/msgfmt/msgfmt.vcxproj +++ b/icu4c/source/samples/msgfmt/msgfmt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -128,7 +128,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -167,7 +167,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -207,7 +207,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -247,4 +247,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/msgfmt/util.cpp b/icu4c/source/samples/msgfmt/util.cpp index fb353a01364..7966e7abe4b 100644 --- a/icu4c/source/samples/msgfmt/util.cpp +++ b/icu4c/source/samples/msgfmt/util.cpp @@ -12,6 +12,8 @@ #include #include +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg) { if (U_FAILURE(status)) { diff --git a/icu4c/source/samples/msgfmt/util.h b/icu4c/source/samples/msgfmt/util.h index b66e019c047..590e545eae7 100644 --- a/icu4c/source/samples/msgfmt/util.h +++ b/icu4c/source/samples/msgfmt/util.h @@ -10,6 +10,8 @@ #include "unicode/unistr.h" +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg); diff --git a/icu4c/source/samples/numfmt/numfmt.vcxproj b/icu4c/source/samples/numfmt/numfmt.vcxproj index 2e295377474..62e1b7c86c2 100644 --- a/icu4c/source/samples/numfmt/numfmt.vcxproj +++ b/icu4c/source/samples/numfmt/numfmt.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ../../../include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ../../../include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -251,4 +251,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/numfmt/util.cpp b/icu4c/source/samples/numfmt/util.cpp index f5db0e12123..ad6f008b7ee 100644 --- a/icu4c/source/samples/numfmt/util.cpp +++ b/icu4c/source/samples/numfmt/util.cpp @@ -13,6 +13,8 @@ #include #include +using namespace icu; + enum { U_SPACE=0x20, U_DQUOTE=0x22, diff --git a/icu4c/source/samples/numfmt/util.h b/icu4c/source/samples/numfmt/util.h index b1c2679a00d..8c048fc81fb 100644 --- a/icu4c/source/samples/numfmt/util.h +++ b/icu4c/source/samples/numfmt/util.h @@ -11,6 +11,8 @@ #include "unicode/unistr.h" #include "unicode/fmtable.h" +using namespace icu; + #ifndef UPRV_LENGTHOF #define UPRV_LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) #endif diff --git a/icu4c/source/samples/plurfmtsample/plurfmtsample.cpp b/icu4c/source/samples/plurfmtsample/plurfmtsample.cpp index 87d77e33be7..c4c2879cee3 100644 --- a/icu4c/source/samples/plurfmtsample/plurfmtsample.cpp +++ b/icu4c/source/samples/plurfmtsample/plurfmtsample.cpp @@ -13,9 +13,11 @@ #include "unicode/plurfmt.h" #include "unicode/msgfmt.h" #include "unicode/ustdio.h" -//! [PluralFormatExample1] +//! [PluralFormatExample1] using namespace std; +using namespace icu; + static void PluralFormatExample() { u_printf("=============================================================================\n"); diff --git a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj index 1276c9afe84..158617b5e07 100644 --- a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj +++ b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj @@ -1,14 +1,22 @@  - + Debug Win32 + + Debug + x64 + Release Win32 + + Release + x64 + {B500B731-ED1A-4761-94ED-B22DFE25FF2B} @@ -20,14 +28,27 @@ Application true Unicode - v140 + v141 + + + Application + true + Unicode + v141 Application false true MultiByte - v140 + v141 + + + Application + false + true + MultiByte + v141 @@ -35,13 +56,20 @@ + + + + + + .\x86\debug + .\x86\debug @@ -55,7 +83,8 @@ Level3 Disabled - ..\..\..\include;..\..\common;%(AdditionalIncludeDirectories) + ..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;%(PreprocessorDefinitions) true @@ -64,18 +93,54 @@ icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) + + + Level3 + Disabled + ..\..\..\include;%(AdditionalIncludeDirectories) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;%(PreprocessorDefinitions) + + + true + .\x64\debug/plurfmtsample.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + icuucd.lib;icuind.lib;icuiod.lib;%(AdditionalDependencies) + + Level3 MaxSpeed true true + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;%(PreprocessorDefinitions) + ..\..\..\include;%(AdditionalIncludeDirectories) true true true .\x86\debug/plurfmtsample.exe + ..\..\..\lib;%(AdditionalLibraryDirectories) + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) + + + + + Level3 + MaxSpeed + true + true + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;%(PreprocessorDefinitions) + ..\..\..\include;%(AdditionalIncludeDirectories) + + + true + true + true + .\x64\Release/plurfmtsample.exe + ..\..\..\lib64;%(AdditionalLibraryDirectories) + icuuc.lib;icuin.lib;icuio.lib;%(AdditionalDependencies) @@ -95,4 +160,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/props/props.vcxproj b/icu4c/source/samples/props/props.vcxproj index 488fe6e9ede..1b4a799be02 100644 --- a/icu4c/source/samples/props/props.vcxproj +++ b/icu4c/source/samples/props/props.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDebugDLL true @@ -128,7 +128,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDebugDLL true @@ -167,7 +167,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -207,7 +207,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/strsrch/strsrch.vcxproj b/icu4c/source/samples/strsrch/strsrch.vcxproj index 67efde7ce18..df67f5befac 100644 --- a/icu4c/source/samples/strsrch/strsrch.vcxproj +++ b/icu4c/source/samples/strsrch/strsrch.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -130,7 +130,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -171,7 +171,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -210,7 +210,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -248,4 +248,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/translit/translit.vcxproj b/icu4c/source/samples/translit/translit.vcxproj index 2e63d9b39bc..4e55a440a8b 100644 --- a/icu4c/source/samples/translit/translit.vcxproj +++ b/icu4c/source/samples/translit/translit.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -251,4 +251,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/translit/unaccent.h b/icu4c/source/samples/translit/unaccent.h index 71521b52c7a..568cc67100e 100644 --- a/icu4c/source/samples/translit/unaccent.h +++ b/icu4c/source/samples/translit/unaccent.h @@ -11,6 +11,8 @@ #include "unicode/translit.h" #include "unicode/normlzr.h" +using namespace icu; + class UnaccentTransliterator : public Transliterator { public: diff --git a/icu4c/source/samples/translit/util.cpp b/icu4c/source/samples/translit/util.cpp index fc00c4f80c2..6f387292fce 100644 --- a/icu4c/source/samples/translit/util.cpp +++ b/icu4c/source/samples/translit/util.cpp @@ -12,6 +12,8 @@ #include #include +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg) { if (U_FAILURE(status)) { diff --git a/icu4c/source/samples/translit/util.h b/icu4c/source/samples/translit/util.h index dcd63843eb9..5ff6c02aa84 100644 --- a/icu4c/source/samples/translit/util.h +++ b/icu4c/source/samples/translit/util.h @@ -10,6 +10,8 @@ #include "unicode/unistr.h" +using namespace icu; + // Verify that a UErrorCode is successful; exit(1) if not void check(UErrorCode& status, const char* msg); diff --git a/icu4c/source/samples/uciter8/uciter8.vcxproj b/icu4c/source/samples/uciter8/uciter8.vcxproj index 194a1d325ef..bdb24cbeb94 100644 --- a/icu4c/source/samples/uciter8/uciter8.vcxproj +++ b/icu4c/source/samples/uciter8/uciter8.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -250,4 +250,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/ucnv/ucnv.vcxproj b/icu4c/source/samples/ucnv/ucnv.vcxproj index 796c700269e..7d97e7885f9 100644 --- a/icu4c/source/samples/ucnv/ucnv.vcxproj +++ b/icu4c/source/samples/ucnv/ucnv.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -250,4 +250,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/udata/reader.vcxproj b/icu4c/source/samples/udata/reader.vcxproj index 0faeeb61a6a..180431d2fb6 100644 --- a/icu4c/source/samples/udata/reader.vcxproj +++ b/icu4c/source/samples/udata/reader.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -124,21 +124,21 @@ X64 - .\reader_Win32_Debug/reader.tlb + .\reader_x64_Debug/reader.tlb Disabled ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true - .\reader_Win32_Debug/reader.pch - .\reader_Win32_Debug/ - .\reader_Win32_Debug/ - .\reader_Win32_Debug/ + .\reader_x64_Debug/reader.pch + .\reader_x64_Debug/ + .\reader_x64_Debug/ + .\reader_x64_Debug/ Level3 true ProgramDatabase @@ -154,12 +154,11 @@ true ../../../lib64;%(AdditionalLibraryDirectories) true - .\reader_Win32_Debug/reader.pdb + .\reader_x64_Debug/reader.pdb Console false - MachineX64 @@ -169,7 +168,7 @@ OnlyExplicitInline ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -203,22 +202,22 @@ X64 - .\reader_Win32_Release/reader.tlb + .\reader_x64_Release/reader.tlb OnlyExplicitInline ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true true - .\reader_Win32_Release/reader.pch - .\reader_Win32_Release/ - .\reader_Win32_Release/ - .\reader_Win32_Release/ + .\reader_x64_Release/reader.pch + .\reader_x64_Release/ + .\reader_x64_Release/ + .\reader_x64_Release/ Level3 true Default @@ -232,12 +231,11 @@ .\reader_x64_Release/reader.exe true ../../../lib64;%(AdditionalLibraryDirectories) - .\reader_Win32_Release/reader.pdb + .\reader_x64_Release/reader.pdb Console false - MachineX64 @@ -249,4 +247,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/udata/writer.vcxproj b/icu4c/source/samples/udata/writer.vcxproj index 80e74abba42..5235e212244 100644 --- a/icu4c/source/samples/udata/writer.vcxproj +++ b/icu4c/source/samples/udata/writer.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -129,7 +129,7 @@ Disabled ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ OnlyExplicitInline ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -208,7 +208,7 @@ OnlyExplicitInline ..\..\..\include;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/ufortune/ufortune.vcxproj b/icu4c/source/samples/ufortune/ufortune.vcxproj index ff1760a0584..4dafd0e71ef 100644 --- a/icu4c/source/samples/ufortune/ufortune.vcxproj +++ b/icu4c/source/samples/ufortune/ufortune.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -127,7 +127,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -148,7 +148,7 @@ icuucd.lib;resources\fortune_resources.lib;icuiod.lib;%(AdditionalDependencies) .\x64\Debug/ufortune.exe true - ../../../lib;%(AdditionalLibraryDirectories) + ../../../lib64;%(AdditionalLibraryDirectories) true .\x64\Debug/ufortune.pdb Console @@ -165,7 +165,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -202,7 +202,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ icuuc.lib;resources\fortune_resources.lib;icuio.lib;%(AdditionalDependencies) .\x64\Release/ufortune.exe true - ../../../lib;%(AdditionalLibraryDirectories) + ../../../lib64;%(AdditionalLibraryDirectories) .\x64\Release/ufortune.pdb Console false @@ -265,4 +265,4 @@ copy Fortune_Resources.DLL "$(TargetDir)" - + \ No newline at end of file diff --git a/icu4c/source/samples/ugrep/ugrep.cpp b/icu4c/source/samples/ugrep/ugrep.cpp index b70405924eb..4f19f214b4d 100644 --- a/icu4c/source/samples/ugrep/ugrep.cpp +++ b/icu4c/source/samples/ugrep/ugrep.cpp @@ -35,6 +35,7 @@ #include "unicode/ucnv.h" #include "unicode/uclean.h" +using namespace icu; // // The following variables contain paramters that may be set from the command line. diff --git a/icu4c/source/samples/ugrep/ugrep.vcxproj b/icu4c/source/samples/ugrep/ugrep.vcxproj index 1d42f57ac9b..3957160532a 100644 --- a/icu4c/source/samples/ugrep/ugrep.vcxproj +++ b/icu4c/source/samples/ugrep/ugrep.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -90,7 +90,7 @@ MaxSpeed AnySuitable ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -134,7 +134,7 @@ MaxSpeed AnySuitable ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -176,7 +176,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -219,7 +219,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -273,4 +273,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/uresb/resources.vcxproj b/icu4c/source/samples/uresb/resources.vcxproj index e121ceae6cb..0316ae5ca7e 100644 --- a/icu4c/source/samples/uresb/resources.vcxproj +++ b/icu4c/source/samples/uresb/resources.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -25,15 +25,19 @@ Makefile + v141 Makefile + v141 Makefile + v141 Makefile + v141 @@ -113,4 +117,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/uresb/uresb.vcxproj b/icu4c/source/samples/uresb/uresb.vcxproj index f5a2f22793e..141b06b679f 100644 --- a/icu4c/source/samples/uresb/uresb.vcxproj +++ b/icu4c/source/samples/uresb/uresb.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ../../../include;../../tools/toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -128,7 +128,7 @@ OnlyExplicitInline ../../../include;../../tools/toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -167,7 +167,7 @@ Disabled ../../../include;../../tools/toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -207,7 +207,7 @@ Disabled ../../../include;../../tools/toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -252,4 +252,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/samples/ustring/ustring.cpp b/icu4c/source/samples/ustring/ustring.cpp index af25e2090d2..4f0101d5edb 100644 --- a/icu4c/source/samples/ustring/ustring.cpp +++ b/icu4c/source/samples/ustring/ustring.cpp @@ -31,6 +31,8 @@ #include "unicode/ucnv.h" #include "unicode/unistr.h" +using namespace icu; + #ifndef UPRV_LENGTHOF #define UPRV_LENGTHOF(array) (int32_t)(sizeof(array)/sizeof((array)[0])) #endif diff --git a/icu4c/source/samples/ustring/ustring.vcxproj b/icu4c/source/samples/ustring/ustring.vcxproj index 9196a82789e..499cfca011e 100644 --- a/icu4c/source/samples/ustring/ustring.vcxproj +++ b/icu4c/source/samples/ustring/ustring.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -128,7 +128,7 @@ OnlyExplicitInline ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -167,7 +167,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -207,7 +207,7 @@ Disabled ..\..\..\include;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -246,4 +246,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj index f296c11fd6e..f0db0996c2a 100644 --- a/icu4c/source/stubdata/stubdata.vcxproj +++ b/icu4c/source/stubdata/stubdata.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -94,7 +94,7 @@ ..\common;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) true @@ -109,6 +109,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) @@ -143,7 +144,7 @@ Disabled ..\common;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -156,6 +157,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) _DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) @@ -188,7 +190,7 @@ ..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) true @@ -203,6 +205,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) @@ -235,7 +238,7 @@ Disabled ..\common;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -248,6 +251,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) _DEBUG;STUBDATA_BUILD;%(PreprocessorDefinitions) @@ -282,4 +286,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj index 8b926f3c1f3..f7701849cc1 100644 --- a/icu4c/source/test/cintltst/cintltst.vcxproj +++ b/icu4c/source/test/cintltst/cintltst.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ Disabled ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -128,7 +128,7 @@ ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -167,7 +167,7 @@ Disabled ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -205,7 +205,7 @@ ..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded true @@ -385,4 +385,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj index 9bd6549e918..1021947a18e 100644 --- a/icu4c/source/test/intltest/intltest.vcxproj +++ b/icu4c/source/test/intltest/intltest.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,25 +28,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -90,7 +90,7 @@ Disabled ..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -131,7 +131,7 @@ Disabled ..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebug true @@ -168,7 +168,7 @@ ..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded false @@ -204,7 +204,7 @@ ..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreaded false @@ -588,4 +588,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/test/iotest/iotest.vcxproj b/icu4c/source/test/iotest/iotest.vcxproj index 5b7a4044f15..d760ad3565c 100644 --- a/icu4c/source/test/iotest/iotest.vcxproj +++ b/icu4c/source/test/iotest/iotest.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -91,7 +91,7 @@ Disabled ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -130,7 +130,7 @@ ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -169,7 +169,7 @@ Disabled ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -206,7 +206,7 @@ ..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories) - U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;U_ATTRIBUTE_DEPRECATED=;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -268,4 +268,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj index 444860fa975..578377efdb5 100644 --- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj +++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ true ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -135,7 +135,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -178,7 +178,7 @@ true ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -218,7 +218,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -287,4 +287,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/genbrk/genbrk.vcxproj b/icu4c/source/tools/genbrk/genbrk.vcxproj index e7953e9fd7f..c59928fddd1 100644 --- a/icu4c/source/tools/genbrk/genbrk.vcxproj +++ b/icu4c/source/tools/genbrk/genbrk.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -133,7 +134,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -215,7 +218,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -230,6 +233,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/genccode/genccode.vcxproj b/icu4c/source/tools/genccode/genccode.vcxproj index c835f32de82..ea950fdae3d 100644 --- a/icu4c/source/tools/genccode/genccode.vcxproj +++ b/icu4c/source/tools/genccode/genccode.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -105,6 +105,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -132,7 +133,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -146,6 +147,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -174,7 +176,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -186,6 +188,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -212,7 +215,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -226,6 +229,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -256,4 +260,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gencfu/gencfu.vcxproj b/icu4c/source/tools/gencfu/gencfu.vcxproj index 50ee280c28b..282d285602d 100644 --- a/icu4c/source/tools/gencfu/gencfu.vcxproj +++ b/icu4c/source/tools/gencfu/gencfu.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,24 +28,24 @@ Application false MultiByte - v140 + v141 Application MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -90,7 +90,7 @@ Disabled ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) false EnableFastChecks MultiThreadedDebugDLL @@ -105,6 +105,7 @@ Level3 EditAndContinue Default + /utf-8 %(AdditionalOptions) .\x86\Debug\gencfu.exe @@ -120,7 +121,7 @@ ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true false MultiThreadedDLL @@ -135,6 +136,7 @@ Level3 ProgramDatabase Default + /utf-8 %(AdditionalOptions) .\x86\Release\gencfu.exe @@ -156,7 +158,7 @@ ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -169,6 +171,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -194,7 +197,7 @@ Disabled ..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -209,6 +212,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -243,4 +247,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gencmn/gencmn.vcxproj b/icu4c/source/tools/gencmn/gencmn.vcxproj index 54dfbf865be..688516448f4 100644 --- a/icu4c/source/tools/gencmn/gencmn.vcxproj +++ b/icu4c/source/tools/gencmn/gencmn.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -133,7 +134,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -215,7 +218,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -230,6 +233,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gencnval/gencnval.vcxproj b/icu4c/source/tools/gencnval/gencnval.vcxproj index d29c61fec53..98d48b24f7f 100644 --- a/icu4c/source/tools/gencnval/gencnval.vcxproj +++ b/icu4c/source/tools/gencnval/gencnval.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -133,7 +134,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -215,7 +218,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -230,6 +233,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gendict/gendict.vcxproj b/icu4c/source/tools/gendict/gendict.vcxproj index 7984a31ddf7..2fcaccf5feb 100644 --- a/icu4c/source/tools/gendict/gendict.vcxproj +++ b/icu4c/source/tools/gendict/gendict.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -133,7 +134,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -148,6 +149,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -215,7 +218,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -230,6 +233,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gennorm2/gennorm2.vcxproj b/icu4c/source/tools/gennorm2/gennorm2.vcxproj index 9feb10e45a0..7c414632998 100644 --- a/icu4c/source/tools/gennorm2/gennorm2.vcxproj +++ b/icu4c/source/tools/gennorm2/gennorm2.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,24 +28,24 @@ Application Unicode - v140 + v141 Application Unicode true - v140 + v141 Application Unicode - v140 + v141 Application Unicode true - v140 + v141 @@ -86,7 +86,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MaxSpeed true true @@ -102,6 +102,7 @@ ProgramDatabase true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -129,7 +130,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true true EnableFastChecks @@ -147,6 +148,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -171,7 +173,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) MaxSpeed true true @@ -187,6 +189,7 @@ ProgramDatabase true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -214,7 +217,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true true EnableFastChecks @@ -232,6 +235,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -272,4 +276,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/genrb/derb.vcxproj b/icu4c/source/tools/genrb/derb.vcxproj index bf8fb1b4d8f..fcec2520f9e 100644 --- a/icu4c/source/tools/genrb/derb.vcxproj +++ b/icu4c/source/tools/genrb/derb.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -97,7 +97,7 @@ ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -110,6 +110,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -141,7 +142,7 @@ Disabled ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -155,6 +156,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -186,7 +188,7 @@ ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -199,6 +201,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -228,7 +231,7 @@ Disabled ..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -242,6 +245,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -283,4 +287,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/genrb/genrb.vcxproj b/icu4c/source/tools/genrb/genrb.vcxproj index 0b2d62c8e99..bd4e344ac8c 100644 --- a/icu4c/source/tools/genrb/genrb.vcxproj +++ b/icu4c/source/tools/genrb/genrb.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,6 @@ ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -105,6 +104,8 @@ Level3 true Default + /utf-8 %(AdditionalOptions) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) @@ -132,7 +133,6 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -147,6 +147,8 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) _DEBUG;%(PreprocessorDefinitions) @@ -175,7 +177,6 @@ ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -187,6 +188,8 @@ Level3 true Default + /utf-8 %(AdditionalOptions) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) NDEBUG;%(PreprocessorDefinitions) @@ -213,7 +216,6 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -228,6 +230,8 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) + WINVER=0x0601;_WIN32_WINNT=0x0601;%(PreprocessorDefinitions) _DEBUG;%(PreprocessorDefinitions) @@ -293,4 +297,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gensprep/gensprep.vcxproj b/icu4c/source/tools/gensprep/gensprep.vcxproj index 4e563449186..f4f6c4dc1d6 100644 --- a/icu4c/source/tools/gensprep/gensprep.vcxproj +++ b/icu4c/source/tools/gensprep/gensprep.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -133,7 +134,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -147,6 +148,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -175,7 +177,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -188,6 +190,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -214,7 +217,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -228,6 +231,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -262,4 +266,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/gentest/gentest.vcxproj b/icu4c/source/tools/gentest/gentest.vcxproj index 078fc79592c..2ee9d0aeae1 100644 --- a/icu4c/source/tools/gentest/gentest.vcxproj +++ b/icu4c/source/tools/gentest/gentest.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,25 +28,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -89,7 +89,7 @@ ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -102,6 +102,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -124,7 +125,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -139,6 +140,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -162,7 +164,7 @@ ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -175,6 +177,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -196,7 +199,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -211,6 +214,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -249,4 +253,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/icuinfo/icuinfo.vcxproj b/icu4c/source/tools/icuinfo/icuinfo.vcxproj index 964ee94009c..15af56d629d 100644 --- a/icu4c/source/tools/icuinfo/icuinfo.vcxproj +++ b/icu4c/source/tools/icuinfo/icuinfo.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -29,25 +29,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -92,7 +92,7 @@ ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -128,7 +128,7 @@ Disabled ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -169,7 +169,7 @@ ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -206,7 +206,7 @@ Disabled ..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -261,4 +261,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/icuinfo/testplug.vcxproj b/icu4c/source/tools/icuinfo/testplug.vcxproj index 39cfcd223fb..25a44a177ed 100644 --- a/icu4c/source/tools/icuinfo/testplug.vcxproj +++ b/icu4c/source/tools/icuinfo/testplug.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ true ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -106,6 +106,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -134,7 +135,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -149,6 +150,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ true ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -189,6 +191,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -215,7 +218,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -230,6 +233,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -260,4 +264,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/icupkg/icupkg.vcxproj b/icu4c/source/tools/icupkg/icupkg.vcxproj index 6e0e998a4a5..a6f61757743 100644 --- a/icu4c/source/tools/icupkg/icupkg.vcxproj +++ b/icu4c/source/tools/icupkg/icupkg.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -28,25 +28,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -91,7 +91,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -104,6 +104,7 @@ Level4 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -127,7 +128,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -142,6 +143,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -168,7 +170,7 @@ ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -181,6 +183,7 @@ Level4 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -205,7 +208,7 @@ Disabled ..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -220,6 +223,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -249,4 +253,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/makeconv/makeconv.vcxproj b/icu4c/source/tools/makeconv/makeconv.vcxproj index 4a9596529f5..39aaed3048a 100644 --- a/icu4c/source/tools/makeconv/makeconv.vcxproj +++ b/icu4c/source/tools/makeconv/makeconv.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -94,7 +94,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -109,6 +109,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -136,7 +137,7 @@ ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -148,6 +149,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -176,7 +178,7 @@ Disabled ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -191,6 +193,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -217,7 +220,7 @@ ..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE=1;%(PreprocessorDefinitions) true MultiThreadedDLL false @@ -229,6 +232,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -265,4 +269,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/pkgdata/pkgdata.vcxproj b/icu4c/source/tools/pkgdata/pkgdata.vcxproj index 9f723c0e664..a84b46bd167 100644 --- a/icu4c/source/tools/pkgdata/pkgdata.vcxproj +++ b/icu4c/source/tools/pkgdata/pkgdata.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 Application false MultiByte - v140 + v141 @@ -94,7 +94,7 @@ Disabled ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -109,6 +109,7 @@ true EditAndContinue Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -136,7 +137,7 @@ ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -149,6 +150,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -177,7 +179,7 @@ Disabled ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -192,6 +194,7 @@ true ProgramDatabase Default + /utf-8 %(AdditionalOptions) _DEBUG;%(PreprocessorDefinitions) @@ -218,7 +221,7 @@ ../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -231,6 +234,7 @@ Level3 true Default + /utf-8 %(AdditionalOptions) NDEBUG;%(PreprocessorDefinitions) @@ -276,4 +280,4 @@ - + \ No newline at end of file diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj index 7197635071e..4a275d89733 100644 --- a/icu4c/source/tools/toolutil/toolutil.vcxproj +++ b/icu4c/source/tools/toolutil/toolutil.vcxproj @@ -1,5 +1,5 @@  - + Debug @@ -27,25 +27,25 @@ DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 DynamicLibrary false MultiByte - v140 + v141 @@ -93,7 +93,7 @@ true ..\..\..\include;..\..\common;..\..\i18n;%(AdditionalIncludeDirectories) - WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -137,7 +137,7 @@ Disabled ..\..\..\include;..\..\common;..\..\i18n;%(AdditionalIncludeDirectories) - WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -181,7 +181,7 @@ true ..\..\..\include;..\..\common;..\..\i18n;%(AdditionalIncludeDirectories) - WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;NDEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) true MultiThreadedDLL true @@ -223,7 +223,7 @@ Disabled ..\..\..\include;..\..\common;..\..\i18n;%(AdditionalIncludeDirectories) - WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) + WINVER=0x0601;_WIN32_WINNT=0x0601;WIN64;WIN32;_DEBUG;_CRT_SECURE_NO_DEPRECATE;U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions) EnableFastChecks MultiThreadedDebugDLL true @@ -337,4 +337,4 @@ - + \ No newline at end of file -- 2.40.0