ICU-9232 Update version in ICU4C to 50.0.1 and update time bombs

X-SVN-Rev: 31725

diff --git a/icu4c/source/common/common.vcxproj b/icu4c/source/common/common.vcxproj
index 42f947c6997d6b5ebb243a0e53b8bbc6456c2928..eb995b39f4e29c510b445c5cae41fe41965aece0 100644 (file)
--- a/icu4c/source/common/common.vcxproj
+++ b/icu4c/source/common/common.vcxproj
@@ -104,7 +104,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuuc49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuuc50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icuuc.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -145,7 +145,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuuc49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuuc50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\icuucd.pdb</ProgramDatabaseFile>\r
@@ -183,7 +183,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuuc49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuuc50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuuc.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -222,7 +222,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuuc49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuuc50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuucd.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/common/unicode/uvernum.h b/icu4c/source/common/unicode/uvernum.h
index 401acf41cd65189836ca7b040be0bdc02afbb119..cbb5825987388dc3c2b75660e1648c25ff44deb3 100644 (file)
--- a/icu4c/source/common/unicode/uvernum.h
+++ b/icu4c/source/common/unicode/uvernum.h
@@ -48,19 +48,19 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION_MAJOR_NUM 49
+#define U_ICU_VERSION_MAJOR_NUM 50
 
 /** The current ICU minor version as an integer. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_MINOR_NUM 1
+#define U_ICU_VERSION_MINOR_NUM 0
 
 /** The current ICU patchlevel version as an integer.  
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION_PATCHLEVEL_NUM 0
+#define U_ICU_VERSION_PATCHLEVEL_NUM 1
 
 /** The current ICU build level version as an integer.  
  *  This value is for use by ICU clients. It defaults to 0.
@@ -74,7 +74,7 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SUFFIX _49
+#define U_ICU_VERSION_SUFFIX _50
 
 /**
  * \def U_DEF2_ICU_ENTRY_POINT_RENAME
@@ -109,19 +109,19 @@
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.4
  */
-#define U_ICU_VERSION "49.1"
+#define U_ICU_VERSION "50.0.1"
 
 /** The current ICU library major/minor version as a string without dots, for library name suffixes. 
  *  This value will change in the subsequent releases of ICU
  *  @stable ICU 2.6
  */
-#define U_ICU_VERSION_SHORT "49"
+#define U_ICU_VERSION_SHORT "50"
 
 #ifndef U_HIDE_INTERNAL_API
 /** Data version in ICU4C.
  * @internal ICU 4.4 Internal Use Only
  **/
-#define U_ICU_DATA_VERSION "49.1"
+#define U_ICU_DATA_VERSION "50.0.1"
 #endif  /* U_HIDE_INTERNAL_API */
 
 /*===========================================================================

diff --git a/icu4c/source/data/makedata.mak b/icu4c/source/data/makedata.mak
index e6bb80b635bb42e74f18cb324735a72d11a0dcdc..3884d2a9ff7b4bef92e396b382c5141704addf05 100644 (file)
--- a/icu4c/source/data/makedata.mak
+++ b/icu4c/source/data/makedata.mak
@@ -1,5 +1,5 @@
 #**********************************************************************
-#* Copyright (C) 1999-2011, International Business Machines Corporation
+#* Copyright (C) 1999-2012, International Business Machines Corporation
 #* and others.  All Rights Reserved.
 #**********************************************************************
 # nmake file for creating data files on win32
@@ -10,7 +10,7 @@
 
 ##############################################################################
 # Keep the following in sync with the version - see common/unicode/uvernum.h
-U_ICUDATA_NAME=icudt49
+U_ICUDATA_NAME=icudt50
 ##############################################################################
 U_ICUDATA_ENDIAN_SUFFIX=l
 UNICODE_VERSION=6.1

diff --git a/icu4c/source/data/misc/icuver.txt b/icu4c/source/data/misc/icuver.txt
index 80e6606f979859fceb06c715da257c2d34c1c2f3..64943dbd2c53dce7720e039d8c08b3e301c18c0c 100644 (file)
--- a/icu4c/source/data/misc/icuver.txt
+++ b/icu4c/source/data/misc/icuver.txt
@@ -6,6 +6,6 @@
 // ***************************************************************************
 
 icuver:table(nofallback){ 
-    DataVersion { "49.1.0.0" }
-    ICUVersion  { "49.1.0.0" }
+    DataVersion { "50.0.1.0" }
+    ICUVersion  { "50.0.1.0" }
 }

diff --git a/icu4c/source/i18n/i18n.vcxproj b/icu4c/source/i18n/i18n.vcxproj
index a9b2cac980b0a56681b44fc37cc4b49b95f63d66..d60330eadfaa219e4686f94f712edb4c9ea8ada9 100644 (file)
--- a/icu4c/source/i18n/i18n.vcxproj
+++ b/icu4c/source/i18n/i18n.vcxproj
@@ -107,7 +107,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuin49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuin50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icuin.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -151,7 +151,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuin49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuin50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\icuind.pdb</ProgramDatabaseFile>\r
@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuin49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuin50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuin.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -234,7 +234,7 @@
       <AdditionalIncludeDirectories>../common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuin49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuin50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuind.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/io/io.vcxproj b/icu4c/source/io/io.vcxproj
index 11d876784667153d360211c54a6ca38dfdee7483..a6f93d49f2adee50c03e0b28b7dffa223a170793 100644 (file)
--- a/icu4c/source/io/io.vcxproj
+++ b/icu4c/source/io/io.vcxproj
@@ -107,7 +107,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuio49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuio50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icuio.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -151,7 +151,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icuio49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icuio50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\icuiod.pdb</ProgramDatabaseFile>\r
@@ -192,7 +192,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuio49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuio50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuio.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -234,7 +234,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icuio49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icuio50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\icuiod.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/layout/layout.vcxproj b/icu4c/source/layout/layout.vcxproj
index 10d2a610a040f49315aa9bd0c2ef0d8a99afd646..643ce0864b3047b11699ff4790f38b4707ddd7a5 100644 (file)
--- a/icu4c/source/layout/layout.vcxproj
+++ b/icu4c/source/layout/layout.vcxproj
@@ -110,7 +110,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icule49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icule50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\iculed.pdb</ProgramDatabaseFile>\r
@@ -151,7 +151,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\icule49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icule50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\icule.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -195,7 +195,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icule49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icule50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculed.pdb</ProgramDatabaseFile>\r
@@ -234,7 +234,7 @@
       <AdditionalIncludeDirectories>..\common;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icule49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icule50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\icule.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r

diff --git a/icu4c/source/layoutex/layoutex.vcxproj b/icu4c/source/layoutex/layoutex.vcxproj
index b114e6a0be2d3013b6682840ba5a00598437e479..5745ad67ed5fcbf5cebe422ab84d0e115d87e6d3 100644 (file)
--- a/icu4c/source/layoutex/layoutex.vcxproj
+++ b/icu4c/source/layoutex/layoutex.vcxproj
@@ -107,7 +107,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\iculx49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\iculx50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib\iculx.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -150,7 +150,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin\iculx49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin\iculx50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib\iculxd.pdb</ProgramDatabaseFile>\r
@@ -190,7 +190,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\iculx49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\iculx50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculx.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -231,7 +231,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\bin64\iculx49d.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\iculx50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\lib64\iculxd.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/stubdata/stubdata.vcxproj b/icu4c/source/stubdata/stubdata.vcxproj
index 4916d0bc33a0bd782b63d923f672ea0ae395fb24..b0e6abbbc5794a5b24d66011ad8a010d40f5423b 100644 (file)
--- a/icu4c/source/stubdata/stubdata.vcxproj
+++ b/icu4c/source/stubdata/stubdata.vcxproj
@@ -113,7 +113,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin\icudt49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icudt50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>\r
       <ProgramDatabaseFile>.\x86\Release\icudt.pdb</ProgramDatabaseFile>\r
@@ -160,7 +160,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin\icudt49.dll</OutputFile>\r
+      <OutputFile>..\..\bin\icudt50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\x86\Debug/icudt.pdb</ProgramDatabaseFile>\r
       <NoEntryPoint>true</NoEntryPoint>\r
@@ -207,7 +207,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icudt49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icudt50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <IgnoreAllDefaultLibraries>true</IgnoreAllDefaultLibraries>\r
       <ProgramDatabaseFile>.\x64\Release\icudt.pdb</ProgramDatabaseFile>\r
@@ -252,7 +252,7 @@
       <Command>echo "File with stubdata build time, used as a dependency to trigger fresh data build, since stubdata dll will overwrite the real one." &gt; "$(ProjectDir)stubdatabuilt.txt"</Command>\r
     </PreLinkEvent>\r
     <Link>\r
-      <OutputFile>..\..\bin64\icudt49.dll</OutputFile>\r
+      <OutputFile>..\..\bin64\icudt50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\x64\Debug/icudt.pdb</ProgramDatabaseFile>\r
       <NoEntryPoint>true</NoEntryPoint>\r

diff --git a/icu4c/source/test/cintltst/cldrtest.c b/icu4c/source/test/cintltst/cldrtest.c
index 64b5a171d36d1350fb7f565955530174a50318d9..a4d179aa18ddf7f24159c7353bc05b2e7ffa9bb8 100644 (file)
--- a/icu4c/source/test/cintltst/cldrtest.c
+++ b/icu4c/source/test/cintltst/cldrtest.c
@@ -934,7 +934,7 @@ static void VerifyTranslation(void) {
             if (U_FAILURE(errorCode)) {
                 log_err("error uloc_getDisplayCountry returned %s\n", u_errorName(errorCode));
             }
-            else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(50, 0, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */
+            else if (uprv_strstr(currLoc, "ti_") != currLoc || isICUVersionAtLeast(50, 1, 0)) { /* TODO: restore DisplayCountry test for ti_* when cldrbug 3058 is fixed) */
               strIdx = findStringSetMismatch(currLoc, langBuffer, langSize, exemplarCharacters, exemplarLen, FALSE, &badChar);
                 if (strIdx >= 0) {
                     log_err("getDisplayCountry(%s) at index %d returned characters not in the exemplar characters: %04X.\n",

diff --git a/icu4c/source/test/cintltst/cmsccoll.c b/icu4c/source/test/cintltst/cmsccoll.c
index 9a5f839af8cb7a544a41bf3ed2deb8a64123da5e..a356c243dbf138accd4461df3d9dbc1102e81f7a 100644 (file)
--- a/icu4c/source/test/cintltst/cmsccoll.c
+++ b/icu4c/source/test/cintltst/cmsccoll.c
@@ -5170,7 +5170,7 @@ TestTailor6179(void)
         }
         log_err("\n");
     }
-if(isICUVersionAtLeast(50, 0, 0)) {  /* TODO: debug & fix, see ticket #8982 */
+if(isICUVersionAtLeast(50, 1, 0)) {  /* TODO: debug & fix, see ticket #8982 */
     tLen = u_strlen(tData2[1]);
     rLen = ucol_getSortKey(coll, tData2[1], tLen, resColl, 100);
     if (rLen != LEN(firstSecondaryIgnCE) || uprv_memcmp(resColl, firstSecondaryIgnCE, rLen) != 0) {

diff --git a/icu4c/source/test/cintltst/creststn.c b/icu4c/source/test/cintltst/creststn.c
index a574bcd0ed9fea344601feba5f4df498cf416194..af935a392293a5bc9d6506d9d5c2bc8f46835ce5 100644 (file)
--- a/icu4c/source/test/cintltst/creststn.c
+++ b/icu4c/source/test/cintltst/creststn.c
@@ -281,7 +281,7 @@ static void TestErrorCodes(void) {
 
   /* we look up the resource which is aliased and at our level */
   /* TODO: restore the following test when cldrbug 3058: is fixed */
-  if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(50, 0, 0)) {
+  if(U_SUCCESS(status) && r != NULL && isICUVersionAtLeast(50, 1, 0)) {
     status = U_USING_DEFAULT_WARNING;
     r2 = ures_getByKey(r, "Countries", r2, &status);
     checkStatus(__LINE__, U_USING_DEFAULT_WARNING, status);

diff --git a/icu4c/source/test/intltest/rbbitst.cpp b/icu4c/source/test/intltest/rbbitst.cpp
index f68a0c927bd2dd39a9b7f63452b9270ee76de390..609241f52f288f40c2ee5d7d487b640a6b4387b8 100644 (file)
--- a/icu4c/source/test/intltest/rbbitst.cpp
+++ b/icu4c/source/test/intltest/rbbitst.cpp
@@ -1744,7 +1744,7 @@ void RBBITest::TestUnicodeFiles() {
 void RBBITest::runUnicodeTestData(const char *fileName, RuleBasedBreakIterator *bi) {
 #if !UCONFIG_NO_REGULAR_EXPRESSIONS
     // TODO(andy): Match line break behavior to Unicode 6.0 and remove this time bomb. Ticket #7270
-    UBool isTicket7270Fixed = isICUVersionAtLeast(50, 0);
+    UBool isTicket7270Fixed = isICUVersionAtLeast(50, 1);
     UBool isLineBreak = 0 == strcmp(fileName, "LineBreakTest.txt");
     UErrorCode  status = U_ZERO_ERROR;
 

diff --git a/icu4c/source/test/intltest/ssearch.cpp b/icu4c/source/test/intltest/ssearch.cpp
index 7b9f0e1ff7edff3b6715ff70a91f5dacb06d62ce..367a25c016158121ae366b418f157a6edcafafa4 100644 (file)
--- a/icu4c/source/test/intltest/ssearch.cpp
+++ b/icu4c/source/test/intltest/ssearch.cpp
@@ -980,7 +980,7 @@ void SSearchTest::offsetTest()
     col->setAttribute(UCOL_NORMALIZATION_MODE, UCOL_ON, status);
 
     for(int32_t i = 0; i < testCount; i += 1) {
-        if (!isICUVersionAtLeast(50, 0) && i>=4 && i<=6) {
+        if (!isICUVersionAtLeast(50, 1) && i>=4 && i<=6) {
             continue; // timebomb until ticket #8080 is resolved
         }
         UnicodeString ts = CharsToUnicodeString(test[i]);

diff --git a/icu4c/source/tools/ctestfw/ctestfw.vcxproj b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
index a914446e6a5f3de6c121c2130ace8ec4f0ae196d..7bbb29726a16096cb768d1ed3a5c0bf04cb56223 100644 (file)
--- a/icu4c/source/tools/ctestfw/ctestfw.vcxproj
+++ b/icu4c/source/tools/ctestfw/ctestfw.vcxproj
@@ -107,7 +107,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin\icutest.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin\icutest50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\..\lib\icutest.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -150,7 +150,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin\icutestd.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin\icutest50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\..\lib\icutestd.pdb</ProgramDatabaseFile>\r
@@ -190,7 +190,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin64\icutest.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin64\icutest50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <ProgramDatabaseFile>.\..\..\..\lib64\icutest.pdb</ProgramDatabaseFile>\r
       <EnableCOMDATFolding>true</EnableCOMDATFolding>\r
@@ -231,7 +231,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin64\icutestd.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin64\icutest50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
       <ProgramDatabaseFile>.\..\..\..\lib64\icutestd.pdb</ProgramDatabaseFile>\r

diff --git a/icu4c/source/tools/toolutil/toolutil.vcxproj b/icu4c/source/tools/toolutil/toolutil.vcxproj
index abb57fdf9d4f77238ec8229fab8317f712131c21..32ff217ec1a690a5663895e58cd64e47fe0addb0 100644 (file)
--- a/icu4c/source/tools/toolutil/toolutil.vcxproj
+++ b/icu4c/source/tools/toolutil/toolutil.vcxproj
@@ -107,7 +107,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin\icutu49.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin\icutu50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ProgramDatabaseFile>.\..\..\..\lib\icutu.pdb</ProgramDatabaseFile>\r
@@ -151,7 +151,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin\icutu49d.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin\icutu50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r
@@ -193,7 +193,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin64\icutu49.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin64\icutu50.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <ProgramDatabaseFile>.\..\..\..\lib64\icutu.pdb</ProgramDatabaseFile>\r
@@ -235,7 +235,7 @@
       <Culture>0x0409</Culture>\r
     </ResourceCompile>\r
     <Link>\r
-      <OutputFile>..\..\..\bin64\icutu49d.dll</OutputFile>\r
+      <OutputFile>..\..\..\bin64\icutu50d.dll</OutputFile>\r
       <SuppressStartupBanner>true</SuppressStartupBanner>\r
       <AdditionalLibraryDirectories>..\..\..\lib64;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>\r
       <GenerateDebugInformation>true</GenerateDebugInformation>\r