diff --git a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
index 5d7e3344889..222c0aa0b80 100644
--- a/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.ProjectConfiguration.props
@@ -96,6 +96,9 @@
/utf-8 %(AdditionalOptions)
true
+
+ stdcpp17
+ stdc11
0x0409
diff --git a/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
index 948b7c4f98b..12c29b3291b 100644
--- a/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
+++ b/icu4c/source/allinone/Build.Windows.UWP.ProjectConfiguration.props
@@ -45,6 +45,9 @@
%(PreprocessorDefinitions);
U_PLATFORM_HAS_WINUWP_API=1;
+
+ stdcpp17
+ stdc11
diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 56fe146ed7a..1fdf3bda895 100644
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -34,10 +34,7 @@
$(OutDir)\icuuc.tlb
- stdcpp17
- stdc11
U_ATTRIBUTE_DEPRECATED=;U_COMMON_IMPLEMENTATION;U_PLATFORM_USES_ONLY_WIN32_API=1;%(PreprocessorDefinitions)
- false
Level3
Default
ProgramDatabase
diff --git a/icu4c/source/common/common_uwp.vcxproj b/icu4c/source/common/common_uwp.vcxproj
index 7379eade57f..177455dc57b 100644
--- a/icu4c/source/common/common_uwp.vcxproj
+++ b/icu4c/source/common/common_uwp.vcxproj
@@ -72,8 +72,6 @@
$(OutDir)\icuuc.tlb
- stdcpp17
- stdc11
..\..\include;..\common;%(AdditionalIncludeDirectories)
@@ -82,7 +80,6 @@
true
- false
true
Level3
true
diff --git a/icu4c/source/extra/uconv/uconv.vcxproj b/icu4c/source/extra/uconv/uconv.vcxproj
index adfe06c87d3..a0cc5adf092 100644
--- a/icu4c/source/extra/uconv/uconv.vcxproj
+++ b/icu4c/source/extra/uconv/uconv.vcxproj
@@ -34,11 +34,8 @@
$(OutDir)\uconv.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\common;%(AdditionalIncludeDirectories)
UCONVMSG_LINK;%(PreprocessorDefinitions)
$(OutDir)\uconv.pch
diff --git a/icu4c/source/i18n/calendar.cpp b/icu4c/source/i18n/calendar.cpp
index 2bd2cc9aa9d..33050553488 100644
--- a/icu4c/source/i18n/calendar.cpp
+++ b/icu4c/source/i18n/calendar.cpp
@@ -3695,13 +3695,15 @@ int32_t Calendar::handleGetExtendedYearFromWeekFields(int32_t yearWoy, int32_t w
int32_t Calendar::handleGetMonthLength(int32_t extendedYear, int32_t month) const
{
- return handleComputeMonthStart(extendedYear, month+1, true) -
- handleComputeMonthStart(extendedYear, month, true);
+ const int32_t nextMonthStart = handleComputeMonthStart(extendedYear, month+1, true);
+ const int32_t thisMonthStart = handleComputeMonthStart(extendedYear, month, true);
+ return nextMonthStart - thisMonthStart;
}
-int32_t Calendar::handleGetYearLength(int32_t eyear) const {
- int32_t nextYearStart = handleComputeMonthStart(eyear + 1, 0, false);
- int32_t thisYearStart = handleComputeMonthStart(eyear, 0, false);
+int32_t Calendar::handleGetYearLength(int32_t eyear) const
+{
+ const int32_t nextYearStart = handleComputeMonthStart(eyear + 1, 0, false);
+ const int32_t thisYearStart = handleComputeMonthStart(eyear, 0, false);
return nextYearStart - thisYearStart;
}
diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index a9622aa45e9..55471bef149 100644
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -34,10 +34,7 @@
$(OutDir)\icuin.tlb
- stdcpp17
- stdc11
U_ATTRIBUTE_DEPRECATED=;U_I18N_IMPLEMENTATION;%(PreprocessorDefinitions)
- false
Level3
..\..\include;..\common;%(AdditionalIncludeDirectories)
Default
diff --git a/icu4c/source/i18n/i18n_uwp.vcxproj b/icu4c/source/i18n/i18n_uwp.vcxproj
index f389562d058..dd997d11580 100644
--- a/icu4c/source/i18n/i18n_uwp.vcxproj
+++ b/icu4c/source/i18n/i18n_uwp.vcxproj
@@ -70,8 +70,6 @@
true
- stdcpp17
- stdc11
..\..\include;..\common;%(AdditionalIncludeDirectories)
@@ -80,7 +78,6 @@
true
- false
true
Level3
true
diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj
index bad5d666ebd..b4b31a6d090 100644
--- a/icu4c/source/io/io.vcxproj
+++ b/icu4c/source/io/io.vcxproj
@@ -34,11 +34,8 @@
$(OutDir)\icuio.tlb
- stdcpp17
- stdc11
..\..\include;..\common;%(AdditionalIncludeDirectories)
U_IO_IMPLEMENTATION;%(PreprocessorDefinitions)
- false
Level3
Default
ProgramDatabase
diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj
index 0445eeed748..41fdacec7d7 100644
--- a/icu4c/source/layoutex/layoutex.vcxproj
+++ b/icu4c/source/layoutex/layoutex.vcxproj
@@ -34,8 +34,6 @@
- stdcpp17
- stdc11
..\..\include;..\common;%(AdditionalIncludeDirectories)
U_LAYOUTEX_IMPLEMENTATION;%(PreprocessorDefinitions)
Level3
@@ -48,7 +46,6 @@
MultiThreadedDLL
true
- false
.\x86\Release/layoutex.pch
.\x86\Release/
.\x86\Release/
@@ -71,7 +68,6 @@
MultiThreadedDebugDLL
- false
.\x86\Debug/layoutex.pch
.\x86\Debug/
.\x86\Debug/
@@ -98,7 +94,6 @@
MultiThreadedDLL
true
- false
.\x64\Release/layoutex.pch
.\x64\Release/
.\x64\Release/
@@ -119,7 +114,6 @@
MultiThreadedDebugDLL
- false
.\x64\Debug/layoutex.pch
.\x64\Debug/
.\x64\Debug/
@@ -140,15 +134,9 @@
-
- false
-
-
- false
-
-
- false
-
+
+
+
diff --git a/icu4c/source/samples/break/break.vcxproj b/icu4c/source/samples/break/break.vcxproj
index 59a93b56ed3..d9a51001d2a 100644
--- a/icu4c/source/samples/break/break.vcxproj
+++ b/icu4c/source/samples/break/break.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/samples/cal/cal.vcxproj b/icu4c/source/samples/cal/cal.vcxproj
index aee2c34333c..2051033546d 100644
--- a/icu4c/source/samples/cal/cal.vcxproj
+++ b/icu4c/source/samples/cal/cal.vcxproj
@@ -33,11 +33,8 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
- false
diff --git a/icu4c/source/samples/case/case.vcxproj b/icu4c/source/samples/case/case.vcxproj
index f0c4122e48c..ab24c9344b3 100644
--- a/icu4c/source/samples/case/case.vcxproj
+++ b/icu4c/source/samples/case/case.vcxproj
@@ -33,11 +33,8 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
- false
diff --git a/icu4c/source/samples/citer/citer.vcxproj b/icu4c/source/samples/citer/citer.vcxproj
index 68e4fadeb2f..c9211442449 100644
--- a/icu4c/source/samples/citer/citer.vcxproj
+++ b/icu4c/source/samples/citer/citer.vcxproj
@@ -30,12 +30,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
..\..\..\include;%(AdditionalIncludeDirectories)
diff --git a/icu4c/source/samples/coll/coll.vcxproj b/icu4c/source/samples/coll/coll.vcxproj
index f58b0521715..fd49d1b8915 100644
--- a/icu4c/source/samples/coll/coll.vcxproj
+++ b/icu4c/source/samples/coll/coll.vcxproj
@@ -30,12 +30,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/coll.tlb
diff --git a/icu4c/source/samples/csdet/csdet.vcxproj b/icu4c/source/samples/csdet/csdet.vcxproj
index 74d4ad57dd1..234a7b84e68 100644
--- a/icu4c/source/samples/csdet/csdet.vcxproj
+++ b/icu4c/source/samples/csdet/csdet.vcxproj
@@ -31,12 +31,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
../../../include;%(AdditionalIncludeDirectories)
diff --git a/icu4c/source/samples/date/date.vcxproj b/icu4c/source/samples/date/date.vcxproj
index e5d34f37345..3d20f9576ed 100644
--- a/icu4c/source/samples/date/date.vcxproj
+++ b/icu4c/source/samples/date/date.vcxproj
@@ -30,12 +30,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/date.tlb
diff --git a/icu4c/source/samples/datefmt/datefmt.vcxproj b/icu4c/source/samples/datefmt/datefmt.vcxproj
index b1cf597f7b9..00dcd6d6700 100644
--- a/icu4c/source/samples/datefmt/datefmt.vcxproj
+++ b/icu4c/source/samples/datefmt/datefmt.vcxproj
@@ -30,12 +30,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/datefmt.tlb
diff --git a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj
index e5fbcb88a2d..aea18b217f3 100644
--- a/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj
+++ b/icu4c/source/samples/dtitvfmtsample/dtitvfmtsample.vcxproj
@@ -65,12 +65,6 @@
.\x64\Release\
$(ProjectName)
-
-
- stdcpp17
- stdc11
-
-
Level3
diff --git a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj
index 3d01f6cb465..542b3439f03 100644
--- a/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj
+++ b/icu4c/source/samples/dtptngsample/dtptngsample.vcxproj
@@ -65,12 +65,6 @@
.\x64\Release\
$(ProjectName)
-
-
- stdcpp17
- stdc11
-
-
Level3
diff --git a/icu4c/source/samples/layout/layout.vcxproj b/icu4c/source/samples/layout/layout.vcxproj
index 66c6053cca7..31ac1d942ef 100644
--- a/icu4c/source/samples/layout/layout.vcxproj
+++ b/icu4c/source/samples/layout/layout.vcxproj
@@ -30,12 +30,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/layout.tlb
diff --git a/icu4c/source/samples/legacy/legacy.vcxproj b/icu4c/source/samples/legacy/legacy.vcxproj
index 1f7c71ac438..41f5aac4a4d 100644
--- a/icu4c/source/samples/legacy/legacy.vcxproj
+++ b/icu4c/source/samples/legacy/legacy.vcxproj
@@ -66,12 +66,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/legacy.tlb
@@ -93,6 +87,8 @@
Level3
true
Default
+ stdcpp17
+ stdc11
NDEBUG;%(PreprocessorDefinitions)
diff --git a/icu4c/source/samples/msgfmt/msgfmt.vcxproj b/icu4c/source/samples/msgfmt/msgfmt.vcxproj
index 1123d6fb545..b1a90405b6c 100644
--- a/icu4c/source/samples/msgfmt/msgfmt.vcxproj
+++ b/icu4c/source/samples/msgfmt/msgfmt.vcxproj
@@ -30,12 +30,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/msgfmt.tlb
diff --git a/icu4c/source/samples/numfmt/numfmt.vcxproj b/icu4c/source/samples/numfmt/numfmt.vcxproj
index 3de1f6d1edc..4ea39eb54a7 100644
--- a/icu4c/source/samples/numfmt/numfmt.vcxproj
+++ b/icu4c/source/samples/numfmt/numfmt.vcxproj
@@ -30,12 +30,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/numfmt.tlb
diff --git a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj
index 1b375dbceb9..c0d3246ae82 100644
--- a/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj
+++ b/icu4c/source/samples/plurfmtsample/plurfmtsample.vcxproj
@@ -64,12 +64,6 @@
.\x64\Release\
$(ProjectName)
-
-
- stdcpp17
- stdc11
-
-
Level3
diff --git a/icu4c/source/samples/props/props.vcxproj b/icu4c/source/samples/props/props.vcxproj
index 5b925d3d2e8..17869e17632 100644
--- a/icu4c/source/samples/props/props.vcxproj
+++ b/icu4c/source/samples/props/props.vcxproj
@@ -30,12 +30,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/props.tlb
diff --git a/icu4c/source/samples/strsrch/strsrch.vcxproj b/icu4c/source/samples/strsrch/strsrch.vcxproj
index 0afa64de4df..8ebc131172a 100644
--- a/icu4c/source/samples/strsrch/strsrch.vcxproj
+++ b/icu4c/source/samples/strsrch/strsrch.vcxproj
@@ -30,12 +30,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/strsrch.tlb
diff --git a/icu4c/source/samples/translit/translit.vcxproj b/icu4c/source/samples/translit/translit.vcxproj
index 289958b2a57..eae6965fc8f 100644
--- a/icu4c/source/samples/translit/translit.vcxproj
+++ b/icu4c/source/samples/translit/translit.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/samples/uciter8/uciter8.vcxproj b/icu4c/source/samples/uciter8/uciter8.vcxproj
index c75b51de02f..fdbfa44d380 100644
--- a/icu4c/source/samples/uciter8/uciter8.vcxproj
+++ b/icu4c/source/samples/uciter8/uciter8.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/samples/ucnv/ucnv.vcxproj b/icu4c/source/samples/ucnv/ucnv.vcxproj
index 154274784df..b131e4881bc 100644
--- a/icu4c/source/samples/ucnv/ucnv.vcxproj
+++ b/icu4c/source/samples/ucnv/ucnv.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/samples/udata/reader.vcxproj b/icu4c/source/samples/udata/reader.vcxproj
index 25e10c16b97..ab97c1b4ea8 100644
--- a/icu4c/source/samples/udata/reader.vcxproj
+++ b/icu4c/source/samples/udata/reader.vcxproj
@@ -35,12 +35,6 @@
.\x64\Release\
$(ProjectName)
-
-
- stdcpp17
- stdc11
-
-
.\reader_Win32_Debug/reader.tlb
diff --git a/icu4c/source/samples/udata/writer.vcxproj b/icu4c/source/samples/udata/writer.vcxproj
index d7518c91eff..a0abdb379c8 100644
--- a/icu4c/source/samples/udata/writer.vcxproj
+++ b/icu4c/source/samples/udata/writer.vcxproj
@@ -35,12 +35,6 @@
.\x64\Release\
$(ProjectName)
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/writer.tlb
diff --git a/icu4c/source/samples/ufortune/ufortune.vcxproj b/icu4c/source/samples/ufortune/ufortune.vcxproj
index 891ef759aa0..cdb926b4a1c 100644
--- a/icu4c/source/samples/ufortune/ufortune.vcxproj
+++ b/icu4c/source/samples/ufortune/ufortune.vcxproj
@@ -32,8 +32,6 @@
$(OutDir)\ufortune.tlb
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
%(PreprocessorDefinitions)
Level3
diff --git a/icu4c/source/samples/ugrep/ugrep.vcxproj b/icu4c/source/samples/ugrep/ugrep.vcxproj
index 5d71bf171d9..5c2c559f1c1 100644
--- a/icu4c/source/samples/ugrep/ugrep.vcxproj
+++ b/icu4c/source/samples/ugrep/ugrep.vcxproj
@@ -26,12 +26,6 @@
true
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/ugrep.tlb
diff --git a/icu4c/source/samples/uresb/uresb.vcxproj b/icu4c/source/samples/uresb/uresb.vcxproj
index 18053775e4a..52ab5d05dbb 100644
--- a/icu4c/source/samples/uresb/uresb.vcxproj
+++ b/icu4c/source/samples/uresb/uresb.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
../../../include;../../tools/toolutil;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/samples/ustring/ustring.vcxproj b/icu4c/source/samples/ustring/ustring.vcxproj
index a120cb6163a..644dc95d6c1 100644
--- a/icu4c/source/samples/ustring/ustring.vcxproj
+++ b/icu4c/source/samples/ustring/ustring.vcxproj
@@ -33,8 +33,6 @@
- stdcpp17
- stdc11
..\..\..\include;%(AdditionalIncludeDirectories)
Level3
diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj
index 40cb9dfac12..0b2c61cb06b 100644
--- a/icu4c/source/stubdata/stubdata.vcxproj
+++ b/icu4c/source/stubdata/stubdata.vcxproj
@@ -35,11 +35,8 @@
$(OutDir)\icudt.tlb
- stdcpp17
- stdc11
..\common;%(AdditionalIncludeDirectories)
STUBDATA_BUILD;%(PreprocessorDefinitions)
- false
Level3
Default
$(OutDir)/icudt.pch
diff --git a/icu4c/source/test/cintltst/cintltst.vcxproj b/icu4c/source/test/cintltst/cintltst.vcxproj
index b5d8b88d8f1..9f3b8129e39 100644
--- a/icu4c/source/test/cintltst/cintltst.vcxproj
+++ b/icu4c/source/test/cintltst/cintltst.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\cintltst.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\tools\ctestfw;..\..\common;..\..\i18n;..\..\tools\toolutil;%(AdditionalIncludeDirectories)
U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
$(OutDir)\cintltst.pch
diff --git a/icu4c/source/test/intltest/intltest.vcxproj b/icu4c/source/test/intltest/intltest.vcxproj
index 8f7e491dfa7..3ffdfe7e302 100644
--- a/icu4c/source/test/intltest/intltest.vcxproj
+++ b/icu4c/source/test/intltest/intltest.vcxproj
@@ -33,11 +33,8 @@
$(OutDir)\intltest.tlb
- stdcpp17
- stdc11
..\..\..\include;..\..\common;..\..\i18n;..\..\tools\toolutil;..\..\tools\ctestfw;%(AdditionalIncludeDirectories)
U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
- false
Level3
Default
$(OutDir)/intltest.pch
@@ -73,21 +70,15 @@
-
- false
-
-
- false
-
+
+
-
- false
-
+
@@ -115,29 +106,17 @@
-
- false
-
-
- false
-
-
- false
-
+
+
+
-
- false
-
+
-
- false
-
+
-
- false
-
+
@@ -148,9 +127,7 @@
-
- false
-
+
@@ -189,9 +166,7 @@
-
- false
-
+
@@ -206,75 +181,45 @@
-
- false
-
+
-
- false
-
-
- false
-
-
- false
-
-
- false
-
+
+
+
+
-
- false
-
+
-
- false
-
-
- false
-
-
- false
-
+
+
+
-
- false
-
+
-
- false
-
-
- false
-
-
- false
-
+
+
+
-
- false
-
+
-
- false
-
+
diff --git a/icu4c/source/test/iotest/iotest.vcxproj b/icu4c/source/test/iotest/iotest.vcxproj
index 53572c7913e..fc52b1b42e2 100644
--- a/icu4c/source/test/iotest/iotest.vcxproj
+++ b/icu4c/source/test/iotest/iotest.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\iotest.tlb
- stdcpp17
- stdc11
..\..\..\include;..\..\tools\ctestfw;..\..\common;%(AdditionalIncludeDirectories)
U_ATTRIBUTE_DEPRECATED=;%(PreprocessorDefinitions)
- false
Level3
Default
$(OutDir)\iotest.pch
@@ -74,7 +71,6 @@
- false
diff --git a/icu4c/source/test/letest/cletest.vcxproj b/icu4c/source/test/letest/cletest.vcxproj
index e2a9636c7e9..86a6e032644 100644
--- a/icu4c/source/test/letest/cletest.vcxproj
+++ b/icu4c/source/test/letest/cletest.vcxproj
@@ -77,12 +77,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
Disabled
@@ -95,6 +89,8 @@
Level3
EditAndContinue
+ stdcpp17
+ stdc11
..\..\..\lib\icuucd.lib;..\..\..\lib\icuind.lib;..\..\..\lib\icutestd.lib;..\..\..\lib\icutud.lib;..\..\..\lib\iculed.lib;..\..\..\lib\iculxd.lib;%(AdditionalDependencies)
diff --git a/icu4c/source/test/letest/gendata.vcxproj b/icu4c/source/test/letest/gendata.vcxproj
index 4a765f505b0..fcef1792dc8 100644
--- a/icu4c/source/test/letest/gendata.vcxproj
+++ b/icu4c/source/test/letest/gendata.vcxproj
@@ -65,12 +65,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/gendata.tlb
@@ -92,6 +86,8 @@
true
EditAndContinue
Default
+ stdcpp17
+ stdc11
_DEBUG;%(PreprocessorDefinitions)
diff --git a/icu4c/source/test/letest/letest.vcxproj b/icu4c/source/test/letest/letest.vcxproj
index f474c7feab5..44be57e1cf4 100644
--- a/icu4c/source/test/letest/letest.vcxproj
+++ b/icu4c/source/test/letest/letest.vcxproj
@@ -65,12 +65,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/letest.tlb
@@ -92,6 +86,8 @@
Level3
true
Default
+ stdcpp17
+ stdc11
NDEBUG;%(PreprocessorDefinitions)
diff --git a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
index 3799ebf19c7..c03f3960035 100644
--- a/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
+++ b/icu4c/source/test/perf/DateFmtPerf/DateFmtPerf.vcxproj
@@ -46,12 +46,6 @@
$(Configuration)\
false
-
-
- stdcpp17
- stdc11
-
-
Disabled
diff --git a/icu4c/source/test/perf/charperf/charperf.vcxproj b/icu4c/source/test/perf/charperf/charperf.vcxproj
index 854b41b6f74..a2b438233d3 100644
--- a/icu4c/source/test/perf/charperf/charperf.vcxproj
+++ b/icu4c/source/test/perf/charperf/charperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/charperf.tlb
diff --git a/icu4c/source/test/perf/collperf/collperf.vcxproj b/icu4c/source/test/perf/collperf/collperf.vcxproj
index 3f452c87f25..4eaae91f22f 100644
--- a/icu4c/source/test/perf/collperf/collperf.vcxproj
+++ b/icu4c/source/test/perf/collperf/collperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/collperf.tlb
diff --git a/icu4c/source/test/perf/collperf2/collperf2.vcxproj b/icu4c/source/test/perf/collperf2/collperf2.vcxproj
index 849f3c548f9..48a246cae42 100644
--- a/icu4c/source/test/perf/collperf2/collperf2.vcxproj
+++ b/icu4c/source/test/perf/collperf2/collperf2.vcxproj
@@ -1,4 +1,4 @@
-
+
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/collperf2.tlb
diff --git a/icu4c/source/test/perf/convperf/convperf.vcxproj b/icu4c/source/test/perf/convperf/convperf.vcxproj
index e57400393a5..3a875328a10 100644
--- a/icu4c/source/test/perf/convperf/convperf.vcxproj
+++ b/icu4c/source/test/perf/convperf/convperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Debug\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/convperf.tlb
diff --git a/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj b/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
index 65c9d1ed7ae..2d752026bca 100644
--- a/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
+++ b/icu4c/source/test/perf/normperf/dtfmtrtperf.vcxproj
@@ -66,12 +66,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/normperf.tlb
@@ -95,6 +89,8 @@
true
ProgramDatabase
Default
+ stdcpp17
+ stdc11
_DEBUG;%(PreprocessorDefinitions)
diff --git a/icu4c/source/test/perf/normperf/normperf.vcxproj b/icu4c/source/test/perf/normperf/normperf.vcxproj
index cd0d0b21bd5..ee8f01e62f7 100644
--- a/icu4c/source/test/perf/normperf/normperf.vcxproj
+++ b/icu4c/source/test/perf/normperf/normperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/normperf.tlb
diff --git a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
index 0af6d6fdecb..f5988dfa721 100644
--- a/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
+++ b/icu4c/source/test/perf/strsrchperf/strsrchperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/strsrchperf.tlb
diff --git a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
index 75cc0187a8c..87f23eaeba8 100644
--- a/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
+++ b/icu4c/source/test/perf/ubrkperf/ubrkperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/ubrkperf.tlb
diff --git a/icu4c/source/test/perf/ucnvavailperf/ucnvavailperf.vcxproj b/icu4c/source/test/perf/ucnvavailperf/ucnvavailperf.vcxproj
index 96a6df3acb9..83ee363b840 100644
--- a/icu4c/source/test/perf/ucnvavailperf/ucnvavailperf.vcxproj
+++ b/icu4c/source/test/perf/ucnvavailperf/ucnvavailperf.vcxproj
@@ -46,12 +46,6 @@
.\x86\$(Configuration)\
false
-
-
- stdcpp17
- stdc11
-
-
Disabled
diff --git a/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj b/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
index 14e5afd7ffe..c68b7006622 100644
--- a/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
+++ b/icu4c/source/test/perf/unisetperf/unisetperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/unisetperf.tlb
diff --git a/icu4c/source/test/perf/usetperf/usetperf.vcxproj b/icu4c/source/test/perf/usetperf/usetperf.vcxproj
index 5e805357362..9c566432371 100644
--- a/icu4c/source/test/perf/usetperf/usetperf.vcxproj
+++ b/icu4c/source/test/perf/usetperf/usetperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Debug\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/usetperf.tlb
diff --git a/icu4c/source/test/perf/ustrperf/stringperf.vcxproj b/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
index d32d34cc174..86dd1ae8342 100644
--- a/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
+++ b/icu4c/source/test/perf/ustrperf/stringperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Debug\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Release/stringperf.tlb
diff --git a/icu4c/source/test/perf/utfperf/utfperf.vcxproj b/icu4c/source/test/perf/utfperf/utfperf.vcxproj
index 11261d667d4..49aea66a06f 100644
--- a/icu4c/source/test/perf/utfperf/utfperf.vcxproj
+++ b/icu4c/source/test/perf/utfperf/utfperf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/utfperf.tlb
diff --git a/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj b/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
index a5735b1002b..d829fcbd5bd 100644
--- a/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
+++ b/icu4c/source/test/perf/utrie2perf/utrie2perf.vcxproj
@@ -63,12 +63,6 @@
.\x64\Release\
false
-
-
- stdcpp17
- stdc11
-
-
.\x86\Debug/utrie2perf.tlb
diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
index 5e9770c702a..e92b5dd8adf 100644
--- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj
+++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/icutest.tlb
- stdcpp17
- stdc11
..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- false
Level3
Default
$(OutDir)/icutest.pch
@@ -77,18 +74,10 @@
-
- false
-
-
- false
-
-
- false
-
-
- false
-
+
+
+
+
diff --git a/icu4c/source/tools/genbrk/genbrk.vcxproj b/icu4c/source/tools/genbrk/genbrk.vcxproj
index d384f10ec61..4374b272f2a 100644
--- a/icu4c/source/tools/genbrk/genbrk.vcxproj
+++ b/icu4c/source/tools/genbrk/genbrk.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/genbrk.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/genbrk.pch
$(OutDir)/
diff --git a/icu4c/source/tools/genccode/genccode.vcxproj b/icu4c/source/tools/genccode/genccode.vcxproj
index 413ba78813c..d9c1a794403 100644
--- a/icu4c/source/tools/genccode/genccode.vcxproj
+++ b/icu4c/source/tools/genccode/genccode.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/genccode.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/genccode.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gencfu/gencfu.vcxproj b/icu4c/source/tools/gencfu/gencfu.vcxproj
index 87bb4d9d632..c59d82de8d4 100644
--- a/icu4c/source/tools/gencfu/gencfu.vcxproj
+++ b/icu4c/source/tools/gencfu/gencfu.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\gencfu.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\..\i18n;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)\gencfu.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gencmn/gencmn.vcxproj b/icu4c/source/tools/gencmn/gencmn.vcxproj
index cdf72bc80ea..c6047cc9e84 100644
--- a/icu4c/source/tools/gencmn/gencmn.vcxproj
+++ b/icu4c/source/tools/gencmn/gencmn.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/gencmn.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/gencmn.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gencnval/gencnval.vcxproj b/icu4c/source/tools/gencnval/gencnval.vcxproj
index 2073d99ad56..df37a88f2c1 100644
--- a/icu4c/source/tools/gencnval/gencnval.vcxproj
+++ b/icu4c/source/tools/gencnval/gencnval.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/gencnval.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/gencnval.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gendict/gendict.vcxproj b/icu4c/source/tools/gendict/gendict.vcxproj
index 87a405e74c6..4c779528306 100644
--- a/icu4c/source/tools/gendict/gendict.vcxproj
+++ b/icu4c/source/tools/gendict/gendict.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\gendict.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)\gendict.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gennorm2/gennorm2.vcxproj b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
index dcafdcda430..94534d291ff 100644
--- a/icu4c/source/tools/gennorm2/gennorm2.vcxproj
+++ b/icu4c/source/tools/gennorm2/gennorm2.vcxproj
@@ -47,11 +47,8 @@
$(OutDir)\gennorm2.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)\gennorm2.pch
$(OutDir)/
diff --git a/icu4c/source/tools/genrb/derb.vcxproj b/icu4c/source/tools/genrb/derb.vcxproj
index 833a42d8e73..328766bcfc5 100644
--- a/icu4c/source/tools/genrb/derb.vcxproj
+++ b/icu4c/source/tools/genrb/derb.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/derb.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\i18n;..\..\common;..\toolutil;..\..\io;%(AdditionalIncludeDirectories)
$(OutDir)/derb.pch
$(OutDir)/
diff --git a/icu4c/source/tools/genrb/genrb.vcxproj b/icu4c/source/tools/genrb/genrb.vcxproj
index d4f665be08f..079c4e879b5 100644
--- a/icu4c/source/tools/genrb/genrb.vcxproj
+++ b/icu4c/source/tools/genrb/genrb.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/genrb.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\common;..\toolutil;..\..\i18n;%(AdditionalIncludeDirectories)
$(OutDir)/genrb.pch
$(OutDir)/
@@ -77,25 +74,15 @@
-
- false
-
-
- false
-
+
+
-
- false
-
+
-
- false
-
-
- false
-
+
+
diff --git a/icu4c/source/tools/gensprep/gensprep.vcxproj b/icu4c/source/tools/gensprep/gensprep.vcxproj
index 3100e190f0b..b5ddda4ca92 100644
--- a/icu4c/source/tools/gensprep/gensprep.vcxproj
+++ b/icu4c/source/tools/gensprep/gensprep.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\gensprep.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)\gensprep.pch
$(OutDir)/
diff --git a/icu4c/source/tools/gentest/gentest.vcxproj b/icu4c/source/tools/gentest/gentest.vcxproj
index 66a25add0d1..577b84378bc 100644
--- a/icu4c/source/tools/gentest/gentest.vcxproj
+++ b/icu4c/source/tools/gentest/gentest.vcxproj
@@ -33,11 +33,8 @@
$(OutDir)/gentest.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
$(OutDir)/gentest.pch
$(OutDir)/
diff --git a/icu4c/source/tools/icuexportdata/icuexportdata.vcxproj b/icu4c/source/tools/icuexportdata/icuexportdata.vcxproj
index ce10bea4497..3d397278d32 100644
--- a/icu4c/source/tools/icuexportdata/icuexportdata.vcxproj
+++ b/icu4c/source/tools/icuexportdata/icuexportdata.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/icuexportdata.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/icuexportdata.pch
$(OutDir)/
diff --git a/icu4c/source/tools/icuinfo/icuinfo.vcxproj b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
index e3044e35dcd..2277f5799fa 100644
--- a/icu4c/source/tools/icuinfo/icuinfo.vcxproj
+++ b/icu4c/source/tools/icuinfo/icuinfo.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\icuinfo.tlb
- stdcpp17
- stdc11
Level4
Default
- false
..\..\common;..\..\i18n;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
$(OutDir)\icuinfo.pch
$(OutDir)/
diff --git a/icu4c/source/tools/icuinfo/testplug.vcxproj b/icu4c/source/tools/icuinfo/testplug.vcxproj
index 5c2051b3107..56f2070b67d 100644
--- a/icu4c/source/tools/icuinfo/testplug.vcxproj
+++ b/icu4c/source/tools/icuinfo/testplug.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\testplug.tlb
- stdcpp17
- stdc11
..\..\..\include;..\..\common;..\toolutil;..\ctestfw;%(AdditionalIncludeDirectories)
T_CTEST_IMPLEMENTATION;%(PreprocessorDefinitions)
- false
Level3
Default
ProgramDatabase
diff --git a/icu4c/source/tools/icupkg/icupkg.vcxproj b/icu4c/source/tools/icupkg/icupkg.vcxproj
index 8bbbc2ccbad..9f907ae4fee 100644
--- a/icu4c/source/tools/icupkg/icupkg.vcxproj
+++ b/icu4c/source/tools/icupkg/icupkg.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)\icupkg.tlb
- stdcpp17
- stdc11
Level4
Default
- false
..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)\icupkg.pch
$(OutDir)/
diff --git a/icu4c/source/tools/icuswap/icuswap.vcxproj b/icu4c/source/tools/icuswap/icuswap.vcxproj
index 0f5ebbc0781..cb9e9e2e91d 100644
--- a/icu4c/source/tools/icuswap/icuswap.vcxproj
+++ b/icu4c/source/tools/icuswap/icuswap.vcxproj
@@ -62,12 +62,6 @@
.\x64\Debug\
true
-
-
- stdcpp17
- stdc11
-
-
copy "$(TargetPath)" ..\..\..\bin
@@ -83,7 +77,6 @@
true
MultiThreadedDLL
true
- false
.\x86\Release/icuswap.pch
.\x86\Release/
.\x86\Release/
@@ -91,6 +84,8 @@
Level4
true
Default
+ stdcpp17
+ stdc11
NDEBUG;%(PreprocessorDefinitions)
@@ -119,7 +114,6 @@
EnableFastChecks
MultiThreadedDebugDLL
true
- false
.\x86\Debug/icuswap.pch
.\x86\Debug/
.\x86\Debug/
@@ -158,7 +152,6 @@
true
MultiThreadedDLL
true
- false
.\x64\Release/icuswap.pch
.\x64\Release/
.\x64\Release/
@@ -196,7 +189,6 @@
EnableFastChecks
MultiThreadedDebugDLL
true
- false
.\x64\Debug/icuswap.pch
.\x64\Debug/
.\x64\Debug/
diff --git a/icu4c/source/tools/makeconv/makeconv.vcxproj b/icu4c/source/tools/makeconv/makeconv.vcxproj
index 330510898ed..17e06e65cbd 100644
--- a/icu4c/source/tools/makeconv/makeconv.vcxproj
+++ b/icu4c/source/tools/makeconv/makeconv.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/makeconv.tlb
- stdcpp17
- stdc11
Level3
Default
- false
..\..\..\include;..\..\common;..\toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/makeconv.pch
$(OutDir)/
diff --git a/icu4c/source/tools/pkgdata/pkgdata.vcxproj b/icu4c/source/tools/pkgdata/pkgdata.vcxproj
index 8ae85f9bf05..ee034b125f3 100644
--- a/icu4c/source/tools/pkgdata/pkgdata.vcxproj
+++ b/icu4c/source/tools/pkgdata/pkgdata.vcxproj
@@ -32,11 +32,8 @@
$(OutDir)/pkgdata.tlb
- stdcpp17
- stdc11
Level3
Default
- false
../../../include;../../common;../toolutil;%(AdditionalIncludeDirectories)
$(OutDir)/pkgdata.pch
$(OutDir)/
diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj
index 529a03a6e4d..a2ac21739f2 100644
--- a/icu4c/source/tools/toolutil/toolutil.vcxproj
+++ b/icu4c/source/tools/toolutil/toolutil.vcxproj
@@ -29,11 +29,8 @@
- stdcpp17
- stdc11
..\..\..\include;..\..\common;..\..\i18n;%(AdditionalIncludeDirectories)
U_TOOLUTIL_IMPLEMENTATION;%(PreprocessorDefinitions)
- false
Level3
Default
@@ -199,31 +196,19 @@
-
- false
-
+
-
- false
-
-
- false
-
+
+
-
- false
-
-
- false
-
-
- false
-
+
+
+
@@ -231,18 +216,10 @@
-
- false
-
-
- false
-
-
- false
-
-
- false
-
+
+
+
+
diff --git a/icu4c/source/tools/tzcode/icuzdump.vcxproj b/icu4c/source/tools/tzcode/icuzdump.vcxproj
index 93bca180eb3..42c6fccc24b 100644
--- a/icu4c/source/tools/tzcode/icuzdump.vcxproj
+++ b/icu4c/source/tools/tzcode/icuzdump.vcxproj
@@ -45,12 +45,6 @@
$(Configuration)\
false
-
-
- stdcpp17
- stdc11
-
-
copy "$(TargetPath)" ..\..\..\bin
@@ -64,7 +58,6 @@
false
EnableFastChecks
MultiThreadedDebugDLL
- false
.\x86\Debug/icuzdump.pch
@@ -75,6 +68,8 @@
Level3
EditAndContinue
Default
+ stdcpp17
+ stdc11
icuucd.lib;icuind.lib;icutud.lib;icuiod.lib;%(AdditionalDependencies)