[arch-commits] Commit in dotnet-core-3.1/repos/community-staging-x86_64 (10 files)

Maxime Gauduin alucryd at archlinux.org
Mon Mar 15 17:07:23 UTC 2021


    Date: Monday, March 15, 2021 @ 17:07:23
  Author: alucryd
Revision: 891517

archrelease: copy trunk to community-staging-x86_64

Added:
  dotnet-core-3.1/repos/community-staging-x86_64/9999-core-setup-fix-computed-rid.patch
    (from rev 891516, dotnet-core-3.1/trunk/9999-core-setup-fix-computed-rid.patch)
  dotnet-core-3.1/repos/community-staging-x86_64/9999-coreclr-libicu-68.patch
    (from rev 891516, dotnet-core-3.1/trunk/9999-coreclr-libicu-68.patch)
  dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-add-arch-rids.patch
    (from rev 891516, dotnet-core-3.1/trunk/9999-corefx-add-arch-rids.patch)
  dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-fix-build-clang10.patch
    (from rev 891516, dotnet-core-3.1/trunk/9999-corefx-fix-build-clang10.patch)
  dotnet-core-3.1/repos/community-staging-x86_64/PKGBUILD
    (from rev 891516, dotnet-core-3.1/trunk/PKGBUILD)
Deleted:
  dotnet-core-3.1/repos/community-staging-x86_64/9999-core-setup-fix-computed-rid.patch
  dotnet-core-3.1/repos/community-staging-x86_64/9999-coreclr-libicu-68.patch
  dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-add-arch-rids.patch
  dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-fix-build-clang10.patch
  dotnet-core-3.1/repos/community-staging-x86_64/PKGBUILD

----------------------------------------+
 9999-core-setup-fix-computed-rid.patch |  150 +--
 9999-coreclr-libicu-68.patch           | 1512 +++++++++++++++----------------
 9999-corefx-add-arch-rids.patch        |  182 +--
 9999-corefx-fix-build-clang10.patch    |   26 
 PKGBUILD                               |  336 +++---
 5 files changed, 1103 insertions(+), 1103 deletions(-)

Deleted: 9999-core-setup-fix-computed-rid.patch
===================================================================
--- 9999-core-setup-fix-computed-rid.patch	2021-03-15 16:04:07 UTC (rev 891516)
+++ 9999-core-setup-fix-computed-rid.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -1,75 +0,0 @@
-diff -rupN core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh
---- core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh	2021-03-12 17:57:36.793772783 +0100
-+++ core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh	2021-03-12 18:00:39.490798906 +0100
-@@ -1,61 +1,5 @@
- #!/usr/bin/env bash
- 
--init_rid_plat()
--{
--    # Detect Distro
--    if [ $__CrossBuild == 1 ]; then
--        if [ -z $ROOTFS_DIR ]; then
--            echo "ROOTFS_DIR is not defined."
--            exit -1
--        else
--            if [ -e $ROOTFS_DIR/etc/os-release ]; then
--                source $ROOTFS_DIR/etc/os-release
--                __rid_plat="$ID.$VERSION_ID"
--                if [[ "$ID" == "alpine" ]]; then
--                    __rid_plat="linux-musl"
--                fi
--            fi
--            echo "__rid_plat is $__rid_plat"
--        fi
--    else
--        __rid_plat=""
--        if [ -e /etc/os-release ]; then
--            source /etc/os-release
--            if [[ "$ID" == "rhel" ]]; then
--                # remove the last version number
--                VERSION_ID=${VERSION_ID%.*}
--            fi
--            __rid_plat="$ID.$VERSION_ID"
--            if [[ "$ID" == "alpine" ]]; then
--                __rid_plat="linux-musl"
--            fi
--        elif [ -e /etc/redhat-release ]; then
--            local redhatRelease=$(</etc/redhat-release)
--            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
--               __rid_plat="rhel.6"
--            fi
--        fi
--    fi
--
--    if [ "$(uname -s)" == "Darwin" ]; then
--        __rid_plat=osx.10.12
--    fi
--    if [ "$(uname -s)" == "FreeBSD" ]; then
--        major_ver=`uname -U | cut -b1-2`
--        __rid_plat=freebsd.$major_ver
--    fi
--
--    if [ $__linkPortable == 1 ]; then
--        if [ "$(uname -s)" == "Darwin" ]; then
--            __rid_plat="osx"
--        elif [ "$(uname -s)" == "FreeBSD" ]; then
--            __rid_plat="freebsd"
--        else
--            __rid_plat="linux"
--        fi
--    fi
--}
--
- usage()
- {
-     echo "Usage: $0 --configuration <configuration> --arch <Architecture> --hostver <Dotnet exe version> --apphostver <app host exe version> --fxrver <HostFxr library version> --policyver <HostPolicy library version> --commithash <Git commit hash> [--xcompiler <Cross C++ Compiler>]"
-@@ -186,8 +130,7 @@ fi
- 
- # __base_rid is the base RID that corehost is shipped for, effectively, the name of the folder in "runtimes/{__base_rid}/native/" inside the nupkgs.
- # __rid_plat is the OS portion of the RID.
--__rid_plat=
--init_rid_plat
-+__rid_plat="arch"
- 
- if [ -z $__rid_plat ]; then
-     echo "Unknown base rid (eg.: osx.10.12, ubuntu.14.04) being targeted"

Copied: dotnet-core-3.1/repos/community-staging-x86_64/9999-core-setup-fix-computed-rid.patch (from rev 891516, dotnet-core-3.1/trunk/9999-core-setup-fix-computed-rid.patch)
===================================================================
--- 9999-core-setup-fix-computed-rid.patch	                        (rev 0)
+++ 9999-core-setup-fix-computed-rid.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -0,0 +1,75 @@
+diff -rupN core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh
+--- core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388.orig/src/corehost/build.sh	2021-03-12 17:57:36.793772783 +0100
++++ core-setup.0267ad09c6f2e2a37b23b7d230ffbf9e787dd388/src/corehost/build.sh	2021-03-12 18:00:39.490798906 +0100
+@@ -1,61 +1,5 @@
+ #!/usr/bin/env bash
+ 
+-init_rid_plat()
+-{
+-    # Detect Distro
+-    if [ $__CrossBuild == 1 ]; then
+-        if [ -z $ROOTFS_DIR ]; then
+-            echo "ROOTFS_DIR is not defined."
+-            exit -1
+-        else
+-            if [ -e $ROOTFS_DIR/etc/os-release ]; then
+-                source $ROOTFS_DIR/etc/os-release
+-                __rid_plat="$ID.$VERSION_ID"
+-                if [[ "$ID" == "alpine" ]]; then
+-                    __rid_plat="linux-musl"
+-                fi
+-            fi
+-            echo "__rid_plat is $__rid_plat"
+-        fi
+-    else
+-        __rid_plat=""
+-        if [ -e /etc/os-release ]; then
+-            source /etc/os-release
+-            if [[ "$ID" == "rhel" ]]; then
+-                # remove the last version number
+-                VERSION_ID=${VERSION_ID%.*}
+-            fi
+-            __rid_plat="$ID.$VERSION_ID"
+-            if [[ "$ID" == "alpine" ]]; then
+-                __rid_plat="linux-musl"
+-            fi
+-        elif [ -e /etc/redhat-release ]; then
+-            local redhatRelease=$(</etc/redhat-release)
+-            if [[ $redhatRelease == "CentOS release 6."* || $redhatRelease == "Red Hat Enterprise Linux Server release 6."* ]]; then
+-               __rid_plat="rhel.6"
+-            fi
+-        fi
+-    fi
+-
+-    if [ "$(uname -s)" == "Darwin" ]; then
+-        __rid_plat=osx.10.12
+-    fi
+-    if [ "$(uname -s)" == "FreeBSD" ]; then
+-        major_ver=`uname -U | cut -b1-2`
+-        __rid_plat=freebsd.$major_ver
+-    fi
+-
+-    if [ $__linkPortable == 1 ]; then
+-        if [ "$(uname -s)" == "Darwin" ]; then
+-            __rid_plat="osx"
+-        elif [ "$(uname -s)" == "FreeBSD" ]; then
+-            __rid_plat="freebsd"
+-        else
+-            __rid_plat="linux"
+-        fi
+-    fi
+-}
+-
+ usage()
+ {
+     echo "Usage: $0 --configuration <configuration> --arch <Architecture> --hostver <Dotnet exe version> --apphostver <app host exe version> --fxrver <HostFxr library version> --policyver <HostPolicy library version> --commithash <Git commit hash> [--xcompiler <Cross C++ Compiler>]"
+@@ -186,8 +130,7 @@ fi
+ 
+ # __base_rid is the base RID that corehost is shipped for, effectively, the name of the folder in "runtimes/{__base_rid}/native/" inside the nupkgs.
+ # __rid_plat is the OS portion of the RID.
+-__rid_plat=
+-init_rid_plat
++__rid_plat="arch"
+ 
+ if [ -z $__rid_plat ]; then
+     echo "Unknown base rid (eg.: osx.10.12, ubuntu.14.04) being targeted"

Deleted: 9999-coreclr-libicu-68.patch
===================================================================
--- 9999-coreclr-libicu-68.patch	2021-03-15 16:04:07 UTC (rev 891516)
+++ 9999-coreclr-libicu-68.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -1,756 +0,0 @@
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_calendarData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_calendarData.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_calendarData.c	2021-03-12 14:51:31.467369566 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_calendarData.c	2021-03-12 14:55:07.887506576 +0100
-@@ -115,8 +115,8 @@ int32_t GlobalizationNative_GetCalendars
- {
-     UErrorCode err = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
--    UEnumeration* pEnum = ucal_getKeywordValuesForLocale("calendar", locale, TRUE, &err);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
-+    UEnumeration* pEnum = ucal_getKeywordValuesForLocale("calendar", locale, true, &err);
-     int stringEnumeratorCount = uenum_count(pEnum, &err);
-     int calendarsReturned = 0;
-     for (int i = 0; i < stringEnumeratorCount && calendarsReturned < calendarsCapacity; i++)
-@@ -186,7 +186,7 @@ ResultCode GlobalizationNative_GetCalend
- {
-     UErrorCode err = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
- 
-     if (U_FAILURE(err))
-         return UnknownError;
-@@ -198,7 +198,7 @@ ResultCode GlobalizationNative_GetCalend
-         case CalendarData_MonthDay:
-             return GetMonthDayPattern(locale, result, resultCapacity);
-         default:
--            assert(FALSE);
-+            assert(false);
-             return UnknownError;
-     }
- }
-@@ -219,19 +219,19 @@ static int InvokeCallbackForDatePattern(
-     UDateFormat* pFormat = udat_open(UDAT_NONE, style, locale, NULL, 0, NULL, 0, &err);
- 
-     if (U_FAILURE(err))
--        return FALSE;
-+        return false;
- 
-     UErrorCode ignore = U_ZERO_ERROR;
--    int32_t patternLen = udat_toPattern(pFormat, FALSE, NULL, 0, &ignore) + 1;
-+    int32_t patternLen = udat_toPattern(pFormat, false, NULL, 0, &ignore) + 1;
- 
-     UChar* pattern = calloc(patternLen, sizeof(UChar));
-     if (pattern == NULL)
-     {
-         udat_close(pFormat);
--        return FALSE;
-+        return false;
-     }
- 
--    udat_toPattern(pFormat, FALSE, pattern, patternLen, &err);
-+    udat_toPattern(pFormat, false, pattern, patternLen, &err);
-     udat_close(pFormat);
- 
-     if (U_SUCCESS(err))
-@@ -259,7 +259,7 @@ static int InvokeCallbackForDateTimePatt
-     UDateTimePatternGenerator* pGenerator = udatpg_open(locale, &err);
- 
-     if (U_FAILURE(err))
--        return FALSE;
-+        return false;
- 
-     UErrorCode ignore = U_ZERO_ERROR;
-     int32_t patternLen = udatpg_getBestPattern(pGenerator, patternSkeleton, -1, NULL, 0, &ignore) + 1;
-@@ -268,7 +268,7 @@ static int InvokeCallbackForDateTimePatt
-     if (bestPattern == NULL)
-     {
-         udatpg_close(pGenerator);
--        return FALSE;
-+        return false;
-     }
- 
-     udatpg_getBestPattern(pGenerator, patternSkeleton, -1, bestPattern, patternLen, &err);
-@@ -301,7 +301,7 @@ static int32_t EnumSymbols(const char* l
-     UDateFormat* pFormat = udat_open(UDAT_DEFAULT, UDAT_DEFAULT, locale, NULL, 0, NULL, 0, &err);
- 
-     if (U_FAILURE(err))
--        return FALSE;
-+        return false;
- 
-     char localeWithCalendarName[ULOC_FULLNAME_CAPACITY];
-     strncpy(localeWithCalendarName, locale, ULOC_FULLNAME_CAPACITY);
-@@ -314,7 +314,7 @@ static int32_t EnumSymbols(const char* l
-     if (U_FAILURE(err))
-     {
-         udat_close(pFormat);
--        return FALSE;
-+        return false;
-     }
- 
-     udat_setCalendar(pFormat, pCalendar);
-@@ -416,7 +416,7 @@ static int32_t EnumAbbrevEraNames(const
-     strncpy(localeNamePtr, locale, ULOC_FULLNAME_CAPACITY);
-     localeNamePtr[ULOC_FULLNAME_CAPACITY - 1] = 0;
- 
--    while (TRUE)
-+    while (true)
-     {
-         UErrorCode status = U_ZERO_ERROR;
-         const char* name = GetCalendarName(calendarId);
-@@ -431,7 +431,7 @@ static int32_t EnumAbbrevEraNames(const
-         {
-             EnumUResourceBundle(erasResBundle, callback, context);
-             CloseResBundle(rootResBundle, calResBundle, targetCalResBundle, erasColResBundle, erasResBundle);
--            return TRUE;
-+            return true;
-         }
- 
-         // Couldn't find the data we need for this locale, we should fallback.
-@@ -484,10 +484,10 @@ int32_t GlobalizationNative_EnumCalendar
- {
-     UErrorCode err = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
- 
-     if (U_FAILURE(err))
--        return FALSE;
-+        return false;
- 
-     switch (dataType)
-     {
-@@ -528,8 +528,8 @@ int32_t GlobalizationNative_EnumCalendar
-         case CalendarData_AbbrevEraNames:
-             return EnumAbbrevEraNames(locale, calendarId, callback, context);
-         default:
--            assert(FALSE);
--            return FALSE;
-+            assert(false);
-+            return false;
-     }
- }
- 
-@@ -573,7 +573,7 @@ int32_t GlobalizationNative_GetJapaneseE
-     UCalendar* pCal = ucal_open(NULL, 0, JAPANESE_LOCALE_AND_CALENDAR, UCAL_TRADITIONAL, &err);
- 
-     if (U_FAILURE(err))
--        return FALSE;
-+        return false;
- 
-     ucal_set(pCal, UCAL_ERA, era);
-     ucal_set(pCal, UCAL_YEAR, 1);
-@@ -583,7 +583,7 @@ int32_t GlobalizationNative_GetJapaneseE
-     if (U_FAILURE(err))
-     {
-         ucal_close(pCal);
--        return FALSE;
-+        return false;
-     }
- 
-     // set the date to Jan 1
-@@ -620,5 +620,5 @@ int32_t GlobalizationNative_GetJapaneseE
-     }
- 
-     ucal_close(pCal);
--    return FALSE;
-+    return false;
- }
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_casing.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_casing.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_casing.c	2021-03-12 14:51:31.467369566 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_casing.c	2021-03-12 14:54:35.214466426 +0100
-@@ -29,7 +29,7 @@ void GlobalizationNative_ChangeCase(
-     // compiler wasn't doing that optimization, and it results in an ~15-20% perf
-     // improvement on longer strings.)
- 
--    UBool isError = FALSE;
-+    UBool isError = false;
-     int32_t srcIdx = 0, dstIdx = 0;
-     UChar32 srcCodepoint, dstCodepoint;
- 
-@@ -40,7 +40,7 @@ void GlobalizationNative_ChangeCase(
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = u_toupper(srcCodepoint);
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
-     else
-@@ -50,7 +50,7 @@ void GlobalizationNative_ChangeCase(
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = u_tolower(srcCodepoint);
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
- }
-@@ -68,7 +68,7 @@ void GlobalizationNative_ChangeCaseInvar
- {
-     // See algorithmic comment in ChangeCase.
- 
--    UBool isError = FALSE;
-+    UBool isError = false;
-     int32_t srcIdx = 0, dstIdx = 0;
-     UChar32 srcCodepoint, dstCodepoint;
- 
-@@ -82,7 +82,7 @@ void GlobalizationNative_ChangeCaseInvar
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = ((srcCodepoint == (UChar32)0x0131) ? (UChar32)0x0131 : u_toupper(srcCodepoint));
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
-     else
-@@ -95,7 +95,7 @@ void GlobalizationNative_ChangeCaseInvar
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = ((srcCodepoint == (UChar32)0x0130) ? (UChar32)0x0130 : u_tolower(srcCodepoint));
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
- }
-@@ -112,7 +112,7 @@ void GlobalizationNative_ChangeCaseTurki
- {
-     // See algorithmic comment in ChangeCase.
- 
--    UBool isError = FALSE;
-+    UBool isError = false;
-     int32_t srcIdx = 0, dstIdx = 0;
-     UChar32 srcCodepoint, dstCodepoint;
- 
-@@ -125,7 +125,7 @@ void GlobalizationNative_ChangeCaseTurki
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = ((srcCodepoint == (UChar32)0x0069) ? (UChar32)0x0130 : u_toupper(srcCodepoint));
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
-     else
-@@ -137,7 +137,7 @@ void GlobalizationNative_ChangeCaseTurki
-             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
-             dstCodepoint = ((srcCodepoint == (UChar32)0x0049) ? (UChar32)0x0131 : u_tolower(srcCodepoint));
-             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
--            assert(isError == FALSE && srcIdx == dstIdx);
-+            assert(isError == false && srcIdx == dstIdx);
-         }
-     }
- }
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_collation.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_collation.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_collation.c	2021-03-12 14:51:31.467369566 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_collation.c	2021-03-12 14:55:29.346169931 +0100
-@@ -306,10 +306,10 @@ UCollator* CloneCollatorWithOptions(cons
-     return pClonedCollator;
- }
- 
--// Returns TRUE if all the collation elements in str are completely ignorable
-+// Returns true if all the collation elements in str are completely ignorable
- static int CanIgnoreAllCollationElements(const UCollator* pColl, const UChar* lpStr, int32_t length)
- {
--    int result = TRUE;
-+    int result = true;
-     UErrorCode err = U_ZERO_ERROR;
-     UCollationElements* pCollElem = ucol_openElements(pColl, lpStr, length, &err);
- 
-@@ -320,7 +320,7 @@ static int CanIgnoreAllCollationElements
-         {
-             if (curCollElem != 0)
-             {
--                result = FALSE;
-+                result = false;
-                 break;
-             }
-         }
-@@ -328,7 +328,7 @@ static int CanIgnoreAllCollationElements
-         ucol_closeElements(pCollElem);
-     }
- 
--    return U_SUCCESS(err) ? result : FALSE;
-+    return U_SUCCESS(err) ? result : false;
- 
- }
- 
-@@ -422,7 +422,7 @@ int32_t GlobalizationNative_GetSortVersi
-     }
-     else
-     {
--        assert(FALSE && "Unexpected ucol_getVersion to fail.");
-+        assert(false && "Unexpected ucol_getVersion to fail.");
- 
-         // we didn't use UCOL_TAILORINGS_VERSION because it is deprecated in ICU v5
-         result = UCOL_RUNTIME_VERSION << 16 | UCOL_BUILDER_VERSION;
-@@ -527,7 +527,7 @@ static int AreEqualOrdinalIgnoreCase(UCh
- 
-     if (one == two)
-     {
--        return TRUE;
-+        return true;
-     }
- 
-     if (one == 0x0131 || two == 0x0131)
-@@ -535,7 +535,7 @@ static int AreEqualOrdinalIgnoreCase(UCh
-         // On Windows with InvariantCulture, the LATIN SMALL LETTER DOTLESS I (U+0131)
-         // capitalizes to itself, whereas with ICU it capitalizes to LATIN CAPITAL LETTER I (U+0049).
-         // We special case it to match the Windows invariant behavior.
--        return FALSE;
-+        return false;
-     }
- 
-     return u_toupper(one) == u_toupper(two);
-@@ -560,14 +560,14 @@ int32_t GlobalizationNative_IndexOfOrdin
-         const UChar *src = lpSource, *trg = lpTarget;
-         UChar32 srcCodepoint, trgCodepoint;
- 
--        int32_t match = TRUE;
-+        int32_t match = true;
-         while (trgIdx < cwTargetLength)
-         {
-             U16_NEXT(src, srcIdx, cwSourceLength, srcCodepoint);
-             U16_NEXT(trg, trgIdx, cwTargetLength, trgCodepoint);
-             if (!AreEqualOrdinalIgnoreCase(srcCodepoint, trgCodepoint))
-             {
--                match = FALSE; 
-+                match = false; 
-                 break;
-             }
-         }
-@@ -598,7 +598,7 @@ int32_t GlobalizationNative_StartsWith(
-                         int32_t cwSourceLength,
-                         int32_t options)
- {
--    int32_t result = FALSE;
-+    int32_t result = false;
-     UErrorCode err = U_ZERO_ERROR;
-     const UCollator* pColl = GetCollatorFromSortHandle(pSortHandle, options, &err);
- 
-@@ -614,7 +614,7 @@ int32_t GlobalizationNative_StartsWith(
-             {
-                 if (idx == 0)
-                 {
--                    result = TRUE;
-+                    result = true;
-                 }
-                 else
-                 {
-@@ -640,7 +640,7 @@ int32_t GlobalizationNative_EndsWith(
-                         int32_t cwSourceLength,
-                         int32_t options)
- {
--    int32_t result = FALSE;
-+    int32_t result = false;
-     UErrorCode err = U_ZERO_ERROR;
-     const UCollator* pColl = GetCollatorFromSortHandle(pSortHandle, options, &err);
- 
-@@ -657,7 +657,7 @@ int32_t GlobalizationNative_EndsWith(
-             {
-                 if ((idx + usearch_getMatchedLength(pSearch)) == cwSourceLength)
-                 {
--                    result = TRUE;
-+                    result = true;
-                 }
-                 else
-                 {
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_icushim.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_icushim.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_icushim.c	2021-03-12 14:51:31.467369566 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_icushim.c	2021-03-12 14:55:47.701211172 +0100
-@@ -38,13 +38,13 @@ static int FindICULibs(const char* versi
- 
-     if (libicuuc == NULL)
-     {
--        return FALSE;
-+        return false;
-     }
- 
-     // in OSX all ICU APIs exist in the same library libicucore.A.dylib
-     libicui18n = libicuuc;
- 
--    return TRUE;
-+    return true;
- }
- 
- #else // __APPLE__
-@@ -103,13 +103,13 @@ static int FindSymbolVersion(int majorVe
-                 sprintf(symbolName, "u_strlen%s", symbolVersion);
-                 if (dlsym(libicuuc, symbolName) == NULL)
-                 {
--                    return FALSE;
-+                    return false;
-                 }
-             }
-         }
-     }
- 
--    return TRUE;
-+    return true;
- }
- 
- // Try to open the necessary ICU libraries
-@@ -159,12 +159,12 @@ static int FindLibUsingOverride(const ch
-         {
-             if (OpenICULibraries(first, second, third, versionPrefix, symbolName, symbolVersion))
-             {
--                return TRUE;
-+                return true;
-             }
-         }
-     }
- 
--    return FALSE;
-+    return false;
- }
- 
- // Search for library files with names including the major version.
-@@ -176,7 +176,7 @@ static int FindLibWithMajorVersion(const
-     // Select the version of ICU present at build time.
-     if (OpenICULibraries(MinICUVersion, -1, -1, versionPrefix, symbolName, symbolVersion))
-     {
--        return TRUE;
-+        return true;
-     }
- 
-     // Select the highest supported version of ICU present on the local machine
-@@ -184,11 +184,11 @@ static int FindLibWithMajorVersion(const
-     {
-         if (OpenICULibraries(i, -1, -1, versionPrefix, symbolName, symbolVersion))
-         {
--            return TRUE;
-+            return true;
-         }
-     }
- 
--    return FALSE;
-+    return false;
- }
- 
- // Select the highest supported version of ICU present on the local machine
-@@ -201,12 +201,12 @@ static int FindLibWithMajorMinorVersion(
-         {
-             if (OpenICULibraries(i, j, -1, versionPrefix, symbolName, symbolVersion))
-             {
--                return TRUE;
-+                return true;
-             }
-         }
-     }
- 
--    return FALSE;
-+    return false;
- }
- 
- // Select the highest supported version of ICU present on the local machine
-@@ -221,13 +221,13 @@ static int FindLibWithMajorMinorSubVersi
-             {
-                 if (OpenICULibraries(i, j, k, versionPrefix, symbolName, symbolVersion))
-                 {
--                    return TRUE;
-+                    return true;
-                 }
-             }
-         }
-     }
- 
--    return FALSE;
-+    return false;
- }
- 
- 
-@@ -256,7 +256,7 @@ int32_t GlobalizationNative_LoadICU()
-         if (!FindICULibs(VERSION_PREFIX_SUSE, symbolName, symbolVersion))
- #endif
-         {
--            return FALSE;
-+            return false;
-         }
-     }
- 
-@@ -275,7 +275,7 @@ int32_t GlobalizationNative_LoadICU()
-     libicui18n = NULL;
- #endif // __APPLE__
- 
--    return TRUE;
-+    return true;
- }
- 
- // GlobalizationNative_GetICUVersion
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_locale.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_locale.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_locale.c	2021-03-12 14:51:31.470703210 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_locale.c	2021-03-12 14:55:55.868637806 +0100
-@@ -15,7 +15,7 @@ int32_t UErrorCodeToBool(UErrorCode stat
- {
-     if (U_SUCCESS(status))
-     {
--        return TRUE;
-+        return true;
-     }
- 
-     // assert errors that should never occur
-@@ -24,7 +24,7 @@ int32_t UErrorCodeToBool(UErrorCode stat
- 
-     // add possible SetLastError support here
- 
--    return FALSE;
-+    return false;
- }
- 
- int32_t GetLocale(const UChar* localeName,
-@@ -193,7 +193,7 @@ int32_t GlobalizationNative_GetLocaleNam
-     UErrorCode status = U_ZERO_ERROR;
- 
-     char localeNameBuffer[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, localeNameBuffer, ULOC_FULLNAME_CAPACITY, TRUE, &status);
-+    GetLocale(localeName, localeNameBuffer, ULOC_FULLNAME_CAPACITY, true, &status);
-     u_charsToUChars_safe(localeNameBuffer, value, valueLength, &status);
- 
-     if (U_SUCCESS(status))
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeNumberData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeNumberData.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeNumberData.c	2021-03-12 14:51:31.470703210 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeNumberData.c	2021-03-12 14:56:16.237199744 +0100
-@@ -56,10 +56,10 @@ static char* NormalizeNumericPattern(con
-     }
- 
-     int index = 0;
--    int minusAdded = FALSE;
--    int digitAdded = FALSE;
--    int currencyAdded = FALSE;
--    int spaceAdded = FALSE;
-+    int minusAdded = false;
-+    int digitAdded = false;
-+    int currencyAdded = false;
-+    int spaceAdded = false;
- 
-     for (int i = iStart; i <= iEnd; i++)
-     {
-@@ -69,7 +69,7 @@ static char* NormalizeNumericPattern(con
-             case UCHAR_MINUS:
-             case UCHAR_OPENPAREN:
-             case UCHAR_CLOSEPAREN:
--                minusAdded = TRUE;
-+                minusAdded = true;
-                 break;
-         }
-     }
-@@ -103,7 +103,7 @@ static char* NormalizeNumericPattern(con
-             case UCHAR_DIGIT:
-                 if (!digitAdded)
-                 {
--                    digitAdded = TRUE;
-+                    digitAdded = true;
-                     destPattern[index++] = 'n';
-                 }
-                 break;
-@@ -111,7 +111,7 @@ static char* NormalizeNumericPattern(con
-             case UCHAR_CURRENCY:
-                 if (!currencyAdded)
-                 {
--                    currencyAdded = TRUE;
-+                    currencyAdded = true;
-                     destPattern[index++] = 'C';
-                 }
-                 break;
-@@ -120,19 +120,19 @@ static char* NormalizeNumericPattern(con
-             case UCHAR_NBSPACE:
-                 if (!spaceAdded)
-                 {
--                    spaceAdded = TRUE;
-+                    spaceAdded = true;
-                     destPattern[index++] = ' ';
-                 }
-                 else
-                 {
--                    assert(FALSE);
-+                    assert(false);
-                 }
-                 break;
- 
-             case UCHAR_MINUS:
-             case UCHAR_OPENPAREN:
-             case UCHAR_CLOSEPAREN:
--                minusAdded = TRUE;
-+                minusAdded = true;
-                 destPattern[index++] = (char)ch;
-                 break;
- 
-@@ -162,7 +162,7 @@ static int GetNumericPattern(const UNumb
-     const int MAX_DOTNET_NUMERIC_PATTERN_LENGTH = 6; // example: "(C n)" plus terminator
- 
-     UErrorCode ignore = U_ZERO_ERROR;
--    int32_t icuPatternLength = unum_toPattern(pNumberFormat, FALSE, NULL, 0, &ignore) + 1;
-+    int32_t icuPatternLength = unum_toPattern(pNumberFormat, false, NULL, 0, &ignore) + 1;
- 
-     UChar* icuPattern = calloc(icuPatternLength, sizeof(UChar));
-     if (icuPattern == NULL)
-@@ -172,7 +172,7 @@ static int GetNumericPattern(const UNumb
- 
-     UErrorCode err = U_ZERO_ERROR;
- 
--    unum_toPattern(pNumberFormat, FALSE, icuPattern, icuPatternLength, &err);
-+    unum_toPattern(pNumberFormat, false, icuPattern, icuPatternLength, &err);
- 
-     assert(U_SUCCESS(err));
- 
-@@ -200,7 +200,7 @@ static int GetNumericPattern(const UNumb
-         }
-     }
- 
--    assert(FALSE); // should have found a valid pattern
-+    assert(false); // should have found a valid pattern
-     free(normalizedPattern);
-     return INVALID_FORMAT;
- }
-@@ -239,7 +239,7 @@ static int GetCurrencyNegativePattern(co
- 
-     if (U_SUCCESS(status))
-     {
--        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
-+        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
-         if (value >= 0)
-         {
-             unum_close(pFormat);
-@@ -270,7 +270,7 @@ static int GetCurrencyPositivePattern(co
- 
-     if (U_SUCCESS(status))
-     {
--        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), FALSE);
-+        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), false);
-         if (value >= 0)
-         {
-             unum_close(pFormat);
-@@ -301,7 +301,7 @@ static int GetNumberNegativePattern(cons
- 
-     if (U_SUCCESS(status))
-     {
--        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
-+        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
-         if (value >= 0)
-         {
-             unum_close(pFormat);
-@@ -333,7 +333,7 @@ static int GetPercentNegativePattern(con
- 
-     if (U_SUCCESS(status))
-     {
--        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
-+        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
-         if (value >= 0)
-         {
-             unum_close(pFormat);
-@@ -364,7 +364,7 @@ static int GetPercentPositivePattern(con
- 
-     if (U_SUCCESS(status))
-     {
--        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), FALSE);
-+        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), false);
-         if (value >= 0)
-         {
-             unum_close(pFormat);
-@@ -408,11 +408,11 @@ int32_t GlobalizationNative_GetLocaleInf
- {
-     UErrorCode status = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
- 
-     if (U_FAILURE(status))
-     {
--        return FALSE;
-+        return false;
-     }
- 
-     switch (localeNumberData)
-@@ -515,7 +515,7 @@ int32_t GlobalizationNative_GetLocaleInf
-             break;
-         default:
-             status = U_UNSUPPORTED_ERROR;
--            assert(FALSE);
-+            assert(false);
-             break;
-     }
- 
-@@ -534,7 +534,7 @@ int32_t GlobalizationNative_GetLocaleInf
- {
-     UErrorCode status = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
- 
-     if (U_FAILURE(status))
-     {
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeStringData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeStringData.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeStringData.c	2021-03-12 14:51:31.470703210 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeStringData.c	2021-03-12 14:56:31.718640278 +0100
-@@ -210,7 +210,7 @@ int32_t GlobalizationNative_GetLocaleInf
- {
-     UErrorCode status = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
- 
-     if (U_FAILURE(status))
-     {
-@@ -268,10 +268,10 @@ int32_t GlobalizationNative_GetLocaleInf
-             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_INTL_CURRENCY_SYMBOL, value, valueLength);
-             break;
-         case LocaleString_CurrencyEnglishName:
--            status = GetLocaleCurrencyName(locale, FALSE, value, valueLength);
-+            status = GetLocaleCurrencyName(locale, false, value, valueLength);
-             break;
-         case LocaleString_CurrencyNativeName:
--            status = GetLocaleCurrencyName(locale, TRUE, value, valueLength);
-+            status = GetLocaleCurrencyName(locale, true, value, valueLength);
-             break;
-         case LocaleString_MonetaryDecimalSeparator:
-             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_MONETARY_SEPARATOR_SYMBOL, value, valueLength);
-@@ -281,10 +281,10 @@ int32_t GlobalizationNative_GetLocaleInf
-                 GetLocaleInfoDecimalFormatSymbol(locale, UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL, value, valueLength);
-             break;
-         case LocaleString_AMDesignator:
--            status = GetLocaleInfoAmPm(locale, TRUE, value, valueLength);
-+            status = GetLocaleInfoAmPm(locale, true, value, valueLength);
-             break;
-         case LocaleString_PMDesignator:
--            status = GetLocaleInfoAmPm(locale, FALSE, value, valueLength);
-+            status = GetLocaleInfoAmPm(locale, false, value, valueLength);
-             break;
-         case LocaleString_PositiveSign:
-             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_PLUS_SIGN_SYMBOL, value, valueLength);
-@@ -352,10 +352,10 @@ int32_t GlobalizationNative_GetLocaleTim
- {
-     UErrorCode err = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
-     UDateFormatStyle style = (shortFormat != 0) ? UDAT_SHORT : UDAT_MEDIUM;
-     UDateFormat* pFormat = udat_open(style, UDAT_NONE, locale, NULL, 0, NULL, 0, &err);
--    udat_toPattern(pFormat, FALSE, value, valueLength, &err);
-+    udat_toPattern(pFormat, false, value, valueLength, &err);
-     udat_close(pFormat);
-     return UErrorCodeToBool(err);
- }
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_normalization.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_normalization.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_normalization.c	2021-03-12 14:51:31.470703210 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_normalization.c	2021-03-12 14:54:11.855626285 +0100
-@@ -48,7 +48,7 @@ int32_t GlobalizationNative_IsNormalized
- 
-     if (U_SUCCESS(err))
-     {
--        return isNormalized == TRUE ? 1 : 0;
-+        return isNormalized ? 1 : 0;
-     }
-     else
-     {
-diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c
---- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c	2021-03-12 14:51:31.470703210 +0100
-+++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c	2021-03-12 14:54:44.828694339 +0100
-@@ -19,7 +19,7 @@ ResultCode GlobalizationNative_GetTimeZo
- {
-     UErrorCode err = U_ZERO_ERROR;
-     char locale[ULOC_FULLNAME_CAPACITY];
--    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
-+    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
- 
-     int32_t timeZoneIdLength = -1; // timeZoneId is NULL-terminated
-     UCalendar* calendar = ucal_open(timeZoneId, timeZoneIdLength, locale, UCAL_DEFAULT, &err);

Copied: dotnet-core-3.1/repos/community-staging-x86_64/9999-coreclr-libicu-68.patch (from rev 891516, dotnet-core-3.1/trunk/9999-coreclr-libicu-68.patch)
===================================================================
--- 9999-coreclr-libicu-68.patch	                        (rev 0)
+++ 9999-coreclr-libicu-68.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -0,0 +1,756 @@
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_calendarData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_calendarData.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_calendarData.c	2021-03-12 14:51:31.467369566 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_calendarData.c	2021-03-12 14:55:07.887506576 +0100
+@@ -115,8 +115,8 @@ int32_t GlobalizationNative_GetCalendars
+ {
+     UErrorCode err = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
+-    UEnumeration* pEnum = ucal_getKeywordValuesForLocale("calendar", locale, TRUE, &err);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
++    UEnumeration* pEnum = ucal_getKeywordValuesForLocale("calendar", locale, true, &err);
+     int stringEnumeratorCount = uenum_count(pEnum, &err);
+     int calendarsReturned = 0;
+     for (int i = 0; i < stringEnumeratorCount && calendarsReturned < calendarsCapacity; i++)
+@@ -186,7 +186,7 @@ ResultCode GlobalizationNative_GetCalend
+ {
+     UErrorCode err = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
+ 
+     if (U_FAILURE(err))
+         return UnknownError;
+@@ -198,7 +198,7 @@ ResultCode GlobalizationNative_GetCalend
+         case CalendarData_MonthDay:
+             return GetMonthDayPattern(locale, result, resultCapacity);
+         default:
+-            assert(FALSE);
++            assert(false);
+             return UnknownError;
+     }
+ }
+@@ -219,19 +219,19 @@ static int InvokeCallbackForDatePattern(
+     UDateFormat* pFormat = udat_open(UDAT_NONE, style, locale, NULL, 0, NULL, 0, &err);
+ 
+     if (U_FAILURE(err))
+-        return FALSE;
++        return false;
+ 
+     UErrorCode ignore = U_ZERO_ERROR;
+-    int32_t patternLen = udat_toPattern(pFormat, FALSE, NULL, 0, &ignore) + 1;
++    int32_t patternLen = udat_toPattern(pFormat, false, NULL, 0, &ignore) + 1;
+ 
+     UChar* pattern = calloc(patternLen, sizeof(UChar));
+     if (pattern == NULL)
+     {
+         udat_close(pFormat);
+-        return FALSE;
++        return false;
+     }
+ 
+-    udat_toPattern(pFormat, FALSE, pattern, patternLen, &err);
++    udat_toPattern(pFormat, false, pattern, patternLen, &err);
+     udat_close(pFormat);
+ 
+     if (U_SUCCESS(err))
+@@ -259,7 +259,7 @@ static int InvokeCallbackForDateTimePatt
+     UDateTimePatternGenerator* pGenerator = udatpg_open(locale, &err);
+ 
+     if (U_FAILURE(err))
+-        return FALSE;
++        return false;
+ 
+     UErrorCode ignore = U_ZERO_ERROR;
+     int32_t patternLen = udatpg_getBestPattern(pGenerator, patternSkeleton, -1, NULL, 0, &ignore) + 1;
+@@ -268,7 +268,7 @@ static int InvokeCallbackForDateTimePatt
+     if (bestPattern == NULL)
+     {
+         udatpg_close(pGenerator);
+-        return FALSE;
++        return false;
+     }
+ 
+     udatpg_getBestPattern(pGenerator, patternSkeleton, -1, bestPattern, patternLen, &err);
+@@ -301,7 +301,7 @@ static int32_t EnumSymbols(const char* l
+     UDateFormat* pFormat = udat_open(UDAT_DEFAULT, UDAT_DEFAULT, locale, NULL, 0, NULL, 0, &err);
+ 
+     if (U_FAILURE(err))
+-        return FALSE;
++        return false;
+ 
+     char localeWithCalendarName[ULOC_FULLNAME_CAPACITY];
+     strncpy(localeWithCalendarName, locale, ULOC_FULLNAME_CAPACITY);
+@@ -314,7 +314,7 @@ static int32_t EnumSymbols(const char* l
+     if (U_FAILURE(err))
+     {
+         udat_close(pFormat);
+-        return FALSE;
++        return false;
+     }
+ 
+     udat_setCalendar(pFormat, pCalendar);
+@@ -416,7 +416,7 @@ static int32_t EnumAbbrevEraNames(const
+     strncpy(localeNamePtr, locale, ULOC_FULLNAME_CAPACITY);
+     localeNamePtr[ULOC_FULLNAME_CAPACITY - 1] = 0;
+ 
+-    while (TRUE)
++    while (true)
+     {
+         UErrorCode status = U_ZERO_ERROR;
+         const char* name = GetCalendarName(calendarId);
+@@ -431,7 +431,7 @@ static int32_t EnumAbbrevEraNames(const
+         {
+             EnumUResourceBundle(erasResBundle, callback, context);
+             CloseResBundle(rootResBundle, calResBundle, targetCalResBundle, erasColResBundle, erasResBundle);
+-            return TRUE;
++            return true;
+         }
+ 
+         // Couldn't find the data we need for this locale, we should fallback.
+@@ -484,10 +484,10 @@ int32_t GlobalizationNative_EnumCalendar
+ {
+     UErrorCode err = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
+ 
+     if (U_FAILURE(err))
+-        return FALSE;
++        return false;
+ 
+     switch (dataType)
+     {
+@@ -528,8 +528,8 @@ int32_t GlobalizationNative_EnumCalendar
+         case CalendarData_AbbrevEraNames:
+             return EnumAbbrevEraNames(locale, calendarId, callback, context);
+         default:
+-            assert(FALSE);
+-            return FALSE;
++            assert(false);
++            return false;
+     }
+ }
+ 
+@@ -573,7 +573,7 @@ int32_t GlobalizationNative_GetJapaneseE
+     UCalendar* pCal = ucal_open(NULL, 0, JAPANESE_LOCALE_AND_CALENDAR, UCAL_TRADITIONAL, &err);
+ 
+     if (U_FAILURE(err))
+-        return FALSE;
++        return false;
+ 
+     ucal_set(pCal, UCAL_ERA, era);
+     ucal_set(pCal, UCAL_YEAR, 1);
+@@ -583,7 +583,7 @@ int32_t GlobalizationNative_GetJapaneseE
+     if (U_FAILURE(err))
+     {
+         ucal_close(pCal);
+-        return FALSE;
++        return false;
+     }
+ 
+     // set the date to Jan 1
+@@ -620,5 +620,5 @@ int32_t GlobalizationNative_GetJapaneseE
+     }
+ 
+     ucal_close(pCal);
+-    return FALSE;
++    return false;
+ }
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_casing.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_casing.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_casing.c	2021-03-12 14:51:31.467369566 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_casing.c	2021-03-12 14:54:35.214466426 +0100
+@@ -29,7 +29,7 @@ void GlobalizationNative_ChangeCase(
+     // compiler wasn't doing that optimization, and it results in an ~15-20% perf
+     // improvement on longer strings.)
+ 
+-    UBool isError = FALSE;
++    UBool isError = false;
+     int32_t srcIdx = 0, dstIdx = 0;
+     UChar32 srcCodepoint, dstCodepoint;
+ 
+@@ -40,7 +40,7 @@ void GlobalizationNative_ChangeCase(
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = u_toupper(srcCodepoint);
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+     else
+@@ -50,7 +50,7 @@ void GlobalizationNative_ChangeCase(
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = u_tolower(srcCodepoint);
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+ }
+@@ -68,7 +68,7 @@ void GlobalizationNative_ChangeCaseInvar
+ {
+     // See algorithmic comment in ChangeCase.
+ 
+-    UBool isError = FALSE;
++    UBool isError = false;
+     int32_t srcIdx = 0, dstIdx = 0;
+     UChar32 srcCodepoint, dstCodepoint;
+ 
+@@ -82,7 +82,7 @@ void GlobalizationNative_ChangeCaseInvar
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = ((srcCodepoint == (UChar32)0x0131) ? (UChar32)0x0131 : u_toupper(srcCodepoint));
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+     else
+@@ -95,7 +95,7 @@ void GlobalizationNative_ChangeCaseInvar
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = ((srcCodepoint == (UChar32)0x0130) ? (UChar32)0x0130 : u_tolower(srcCodepoint));
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+ }
+@@ -112,7 +112,7 @@ void GlobalizationNative_ChangeCaseTurki
+ {
+     // See algorithmic comment in ChangeCase.
+ 
+-    UBool isError = FALSE;
++    UBool isError = false;
+     int32_t srcIdx = 0, dstIdx = 0;
+     UChar32 srcCodepoint, dstCodepoint;
+ 
+@@ -125,7 +125,7 @@ void GlobalizationNative_ChangeCaseTurki
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = ((srcCodepoint == (UChar32)0x0069) ? (UChar32)0x0130 : u_toupper(srcCodepoint));
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+     else
+@@ -137,7 +137,7 @@ void GlobalizationNative_ChangeCaseTurki
+             U16_NEXT(lpSrc, srcIdx, cwSrcLength, srcCodepoint);
+             dstCodepoint = ((srcCodepoint == (UChar32)0x0049) ? (UChar32)0x0131 : u_tolower(srcCodepoint));
+             U16_APPEND(lpDst, dstIdx, cwDstLength, dstCodepoint, isError);
+-            assert(isError == FALSE && srcIdx == dstIdx);
++            assert(isError == false && srcIdx == dstIdx);
+         }
+     }
+ }
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_collation.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_collation.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_collation.c	2021-03-12 14:51:31.467369566 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_collation.c	2021-03-12 14:55:29.346169931 +0100
+@@ -306,10 +306,10 @@ UCollator* CloneCollatorWithOptions(cons
+     return pClonedCollator;
+ }
+ 
+-// Returns TRUE if all the collation elements in str are completely ignorable
++// Returns true if all the collation elements in str are completely ignorable
+ static int CanIgnoreAllCollationElements(const UCollator* pColl, const UChar* lpStr, int32_t length)
+ {
+-    int result = TRUE;
++    int result = true;
+     UErrorCode err = U_ZERO_ERROR;
+     UCollationElements* pCollElem = ucol_openElements(pColl, lpStr, length, &err);
+ 
+@@ -320,7 +320,7 @@ static int CanIgnoreAllCollationElements
+         {
+             if (curCollElem != 0)
+             {
+-                result = FALSE;
++                result = false;
+                 break;
+             }
+         }
+@@ -328,7 +328,7 @@ static int CanIgnoreAllCollationElements
+         ucol_closeElements(pCollElem);
+     }
+ 
+-    return U_SUCCESS(err) ? result : FALSE;
++    return U_SUCCESS(err) ? result : false;
+ 
+ }
+ 
+@@ -422,7 +422,7 @@ int32_t GlobalizationNative_GetSortVersi
+     }
+     else
+     {
+-        assert(FALSE && "Unexpected ucol_getVersion to fail.");
++        assert(false && "Unexpected ucol_getVersion to fail.");
+ 
+         // we didn't use UCOL_TAILORINGS_VERSION because it is deprecated in ICU v5
+         result = UCOL_RUNTIME_VERSION << 16 | UCOL_BUILDER_VERSION;
+@@ -527,7 +527,7 @@ static int AreEqualOrdinalIgnoreCase(UCh
+ 
+     if (one == two)
+     {
+-        return TRUE;
++        return true;
+     }
+ 
+     if (one == 0x0131 || two == 0x0131)
+@@ -535,7 +535,7 @@ static int AreEqualOrdinalIgnoreCase(UCh
+         // On Windows with InvariantCulture, the LATIN SMALL LETTER DOTLESS I (U+0131)
+         // capitalizes to itself, whereas with ICU it capitalizes to LATIN CAPITAL LETTER I (U+0049).
+         // We special case it to match the Windows invariant behavior.
+-        return FALSE;
++        return false;
+     }
+ 
+     return u_toupper(one) == u_toupper(two);
+@@ -560,14 +560,14 @@ int32_t GlobalizationNative_IndexOfOrdin
+         const UChar *src = lpSource, *trg = lpTarget;
+         UChar32 srcCodepoint, trgCodepoint;
+ 
+-        int32_t match = TRUE;
++        int32_t match = true;
+         while (trgIdx < cwTargetLength)
+         {
+             U16_NEXT(src, srcIdx, cwSourceLength, srcCodepoint);
+             U16_NEXT(trg, trgIdx, cwTargetLength, trgCodepoint);
+             if (!AreEqualOrdinalIgnoreCase(srcCodepoint, trgCodepoint))
+             {
+-                match = FALSE; 
++                match = false; 
+                 break;
+             }
+         }
+@@ -598,7 +598,7 @@ int32_t GlobalizationNative_StartsWith(
+                         int32_t cwSourceLength,
+                         int32_t options)
+ {
+-    int32_t result = FALSE;
++    int32_t result = false;
+     UErrorCode err = U_ZERO_ERROR;
+     const UCollator* pColl = GetCollatorFromSortHandle(pSortHandle, options, &err);
+ 
+@@ -614,7 +614,7 @@ int32_t GlobalizationNative_StartsWith(
+             {
+                 if (idx == 0)
+                 {
+-                    result = TRUE;
++                    result = true;
+                 }
+                 else
+                 {
+@@ -640,7 +640,7 @@ int32_t GlobalizationNative_EndsWith(
+                         int32_t cwSourceLength,
+                         int32_t options)
+ {
+-    int32_t result = FALSE;
++    int32_t result = false;
+     UErrorCode err = U_ZERO_ERROR;
+     const UCollator* pColl = GetCollatorFromSortHandle(pSortHandle, options, &err);
+ 
+@@ -657,7 +657,7 @@ int32_t GlobalizationNative_EndsWith(
+             {
+                 if ((idx + usearch_getMatchedLength(pSearch)) == cwSourceLength)
+                 {
+-                    result = TRUE;
++                    result = true;
+                 }
+                 else
+                 {
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_icushim.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_icushim.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_icushim.c	2021-03-12 14:51:31.467369566 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_icushim.c	2021-03-12 14:55:47.701211172 +0100
+@@ -38,13 +38,13 @@ static int FindICULibs(const char* versi
+ 
+     if (libicuuc == NULL)
+     {
+-        return FALSE;
++        return false;
+     }
+ 
+     // in OSX all ICU APIs exist in the same library libicucore.A.dylib
+     libicui18n = libicuuc;
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ #else // __APPLE__
+@@ -103,13 +103,13 @@ static int FindSymbolVersion(int majorVe
+                 sprintf(symbolName, "u_strlen%s", symbolVersion);
+                 if (dlsym(libicuuc, symbolName) == NULL)
+                 {
+-                    return FALSE;
++                    return false;
+                 }
+             }
+         }
+     }
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ // Try to open the necessary ICU libraries
+@@ -159,12 +159,12 @@ static int FindLibUsingOverride(const ch
+         {
+             if (OpenICULibraries(first, second, third, versionPrefix, symbolName, symbolVersion))
+             {
+-                return TRUE;
++                return true;
+             }
+         }
+     }
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ // Search for library files with names including the major version.
+@@ -176,7 +176,7 @@ static int FindLibWithMajorVersion(const
+     // Select the version of ICU present at build time.
+     if (OpenICULibraries(MinICUVersion, -1, -1, versionPrefix, symbolName, symbolVersion))
+     {
+-        return TRUE;
++        return true;
+     }
+ 
+     // Select the highest supported version of ICU present on the local machine
+@@ -184,11 +184,11 @@ static int FindLibWithMajorVersion(const
+     {
+         if (OpenICULibraries(i, -1, -1, versionPrefix, symbolName, symbolVersion))
+         {
+-            return TRUE;
++            return true;
+         }
+     }
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ // Select the highest supported version of ICU present on the local machine
+@@ -201,12 +201,12 @@ static int FindLibWithMajorMinorVersion(
+         {
+             if (OpenICULibraries(i, j, -1, versionPrefix, symbolName, symbolVersion))
+             {
+-                return TRUE;
++                return true;
+             }
+         }
+     }
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ // Select the highest supported version of ICU present on the local machine
+@@ -221,13 +221,13 @@ static int FindLibWithMajorMinorSubVersi
+             {
+                 if (OpenICULibraries(i, j, k, versionPrefix, symbolName, symbolVersion))
+                 {
+-                    return TRUE;
++                    return true;
+                 }
+             }
+         }
+     }
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ 
+@@ -256,7 +256,7 @@ int32_t GlobalizationNative_LoadICU()
+         if (!FindICULibs(VERSION_PREFIX_SUSE, symbolName, symbolVersion))
+ #endif
+         {
+-            return FALSE;
++            return false;
+         }
+     }
+ 
+@@ -275,7 +275,7 @@ int32_t GlobalizationNative_LoadICU()
+     libicui18n = NULL;
+ #endif // __APPLE__
+ 
+-    return TRUE;
++    return true;
+ }
+ 
+ // GlobalizationNative_GetICUVersion
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_locale.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_locale.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_locale.c	2021-03-12 14:51:31.470703210 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_locale.c	2021-03-12 14:55:55.868637806 +0100
+@@ -15,7 +15,7 @@ int32_t UErrorCodeToBool(UErrorCode stat
+ {
+     if (U_SUCCESS(status))
+     {
+-        return TRUE;
++        return true;
+     }
+ 
+     // assert errors that should never occur
+@@ -24,7 +24,7 @@ int32_t UErrorCodeToBool(UErrorCode stat
+ 
+     // add possible SetLastError support here
+ 
+-    return FALSE;
++    return false;
+ }
+ 
+ int32_t GetLocale(const UChar* localeName,
+@@ -193,7 +193,7 @@ int32_t GlobalizationNative_GetLocaleNam
+     UErrorCode status = U_ZERO_ERROR;
+ 
+     char localeNameBuffer[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, localeNameBuffer, ULOC_FULLNAME_CAPACITY, TRUE, &status);
++    GetLocale(localeName, localeNameBuffer, ULOC_FULLNAME_CAPACITY, true, &status);
+     u_charsToUChars_safe(localeNameBuffer, value, valueLength, &status);
+ 
+     if (U_SUCCESS(status))
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeNumberData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeNumberData.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeNumberData.c	2021-03-12 14:51:31.470703210 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeNumberData.c	2021-03-12 14:56:16.237199744 +0100
+@@ -56,10 +56,10 @@ static char* NormalizeNumericPattern(con
+     }
+ 
+     int index = 0;
+-    int minusAdded = FALSE;
+-    int digitAdded = FALSE;
+-    int currencyAdded = FALSE;
+-    int spaceAdded = FALSE;
++    int minusAdded = false;
++    int digitAdded = false;
++    int currencyAdded = false;
++    int spaceAdded = false;
+ 
+     for (int i = iStart; i <= iEnd; i++)
+     {
+@@ -69,7 +69,7 @@ static char* NormalizeNumericPattern(con
+             case UCHAR_MINUS:
+             case UCHAR_OPENPAREN:
+             case UCHAR_CLOSEPAREN:
+-                minusAdded = TRUE;
++                minusAdded = true;
+                 break;
+         }
+     }
+@@ -103,7 +103,7 @@ static char* NormalizeNumericPattern(con
+             case UCHAR_DIGIT:
+                 if (!digitAdded)
+                 {
+-                    digitAdded = TRUE;
++                    digitAdded = true;
+                     destPattern[index++] = 'n';
+                 }
+                 break;
+@@ -111,7 +111,7 @@ static char* NormalizeNumericPattern(con
+             case UCHAR_CURRENCY:
+                 if (!currencyAdded)
+                 {
+-                    currencyAdded = TRUE;
++                    currencyAdded = true;
+                     destPattern[index++] = 'C';
+                 }
+                 break;
+@@ -120,19 +120,19 @@ static char* NormalizeNumericPattern(con
+             case UCHAR_NBSPACE:
+                 if (!spaceAdded)
+                 {
+-                    spaceAdded = TRUE;
++                    spaceAdded = true;
+                     destPattern[index++] = ' ';
+                 }
+                 else
+                 {
+-                    assert(FALSE);
++                    assert(false);
+                 }
+                 break;
+ 
+             case UCHAR_MINUS:
+             case UCHAR_OPENPAREN:
+             case UCHAR_CLOSEPAREN:
+-                minusAdded = TRUE;
++                minusAdded = true;
+                 destPattern[index++] = (char)ch;
+                 break;
+ 
+@@ -162,7 +162,7 @@ static int GetNumericPattern(const UNumb
+     const int MAX_DOTNET_NUMERIC_PATTERN_LENGTH = 6; // example: "(C n)" plus terminator
+ 
+     UErrorCode ignore = U_ZERO_ERROR;
+-    int32_t icuPatternLength = unum_toPattern(pNumberFormat, FALSE, NULL, 0, &ignore) + 1;
++    int32_t icuPatternLength = unum_toPattern(pNumberFormat, false, NULL, 0, &ignore) + 1;
+ 
+     UChar* icuPattern = calloc(icuPatternLength, sizeof(UChar));
+     if (icuPattern == NULL)
+@@ -172,7 +172,7 @@ static int GetNumericPattern(const UNumb
+ 
+     UErrorCode err = U_ZERO_ERROR;
+ 
+-    unum_toPattern(pNumberFormat, FALSE, icuPattern, icuPatternLength, &err);
++    unum_toPattern(pNumberFormat, false, icuPattern, icuPatternLength, &err);
+ 
+     assert(U_SUCCESS(err));
+ 
+@@ -200,7 +200,7 @@ static int GetNumericPattern(const UNumb
+         }
+     }
+ 
+-    assert(FALSE); // should have found a valid pattern
++    assert(false); // should have found a valid pattern
+     free(normalizedPattern);
+     return INVALID_FORMAT;
+ }
+@@ -239,7 +239,7 @@ static int GetCurrencyNegativePattern(co
+ 
+     if (U_SUCCESS(status))
+     {
+-        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
++        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
+         if (value >= 0)
+         {
+             unum_close(pFormat);
+@@ -270,7 +270,7 @@ static int GetCurrencyPositivePattern(co
+ 
+     if (U_SUCCESS(status))
+     {
+-        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), FALSE);
++        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), false);
+         if (value >= 0)
+         {
+             unum_close(pFormat);
+@@ -301,7 +301,7 @@ static int GetNumberNegativePattern(cons
+ 
+     if (U_SUCCESS(status))
+     {
+-        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
++        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
+         if (value >= 0)
+         {
+             unum_close(pFormat);
+@@ -333,7 +333,7 @@ static int GetPercentNegativePattern(con
+ 
+     if (U_SUCCESS(status))
+     {
+-        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), TRUE);
++        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), true);
+         if (value >= 0)
+         {
+             unum_close(pFormat);
+@@ -364,7 +364,7 @@ static int GetPercentPositivePattern(con
+ 
+     if (U_SUCCESS(status))
+     {
+-        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), FALSE);
++        int value = GetNumericPattern(pFormat, Patterns, ARRAY_LENGTH(Patterns), false);
+         if (value >= 0)
+         {
+             unum_close(pFormat);
+@@ -408,11 +408,11 @@ int32_t GlobalizationNative_GetLocaleInf
+ {
+     UErrorCode status = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
+ 
+     if (U_FAILURE(status))
+     {
+-        return FALSE;
++        return false;
+     }
+ 
+     switch (localeNumberData)
+@@ -515,7 +515,7 @@ int32_t GlobalizationNative_GetLocaleInf
+             break;
+         default:
+             status = U_UNSUPPORTED_ERROR;
+-            assert(FALSE);
++            assert(false);
+             break;
+     }
+ 
+@@ -534,7 +534,7 @@ int32_t GlobalizationNative_GetLocaleInf
+ {
+     UErrorCode status = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
+ 
+     if (U_FAILURE(status))
+     {
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeStringData.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeStringData.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_localeStringData.c	2021-03-12 14:51:31.470703210 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_localeStringData.c	2021-03-12 14:56:31.718640278 +0100
+@@ -210,7 +210,7 @@ int32_t GlobalizationNative_GetLocaleInf
+ {
+     UErrorCode status = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &status);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &status);
+ 
+     if (U_FAILURE(status))
+     {
+@@ -268,10 +268,10 @@ int32_t GlobalizationNative_GetLocaleInf
+             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_INTL_CURRENCY_SYMBOL, value, valueLength);
+             break;
+         case LocaleString_CurrencyEnglishName:
+-            status = GetLocaleCurrencyName(locale, FALSE, value, valueLength);
++            status = GetLocaleCurrencyName(locale, false, value, valueLength);
+             break;
+         case LocaleString_CurrencyNativeName:
+-            status = GetLocaleCurrencyName(locale, TRUE, value, valueLength);
++            status = GetLocaleCurrencyName(locale, true, value, valueLength);
+             break;
+         case LocaleString_MonetaryDecimalSeparator:
+             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_MONETARY_SEPARATOR_SYMBOL, value, valueLength);
+@@ -281,10 +281,10 @@ int32_t GlobalizationNative_GetLocaleInf
+                 GetLocaleInfoDecimalFormatSymbol(locale, UNUM_MONETARY_GROUPING_SEPARATOR_SYMBOL, value, valueLength);
+             break;
+         case LocaleString_AMDesignator:
+-            status = GetLocaleInfoAmPm(locale, TRUE, value, valueLength);
++            status = GetLocaleInfoAmPm(locale, true, value, valueLength);
+             break;
+         case LocaleString_PMDesignator:
+-            status = GetLocaleInfoAmPm(locale, FALSE, value, valueLength);
++            status = GetLocaleInfoAmPm(locale, false, value, valueLength);
+             break;
+         case LocaleString_PositiveSign:
+             status = GetLocaleInfoDecimalFormatSymbol(locale, UNUM_PLUS_SIGN_SYMBOL, value, valueLength);
+@@ -352,10 +352,10 @@ int32_t GlobalizationNative_GetLocaleTim
+ {
+     UErrorCode err = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
+     UDateFormatStyle style = (shortFormat != 0) ? UDAT_SHORT : UDAT_MEDIUM;
+     UDateFormat* pFormat = udat_open(style, UDAT_NONE, locale, NULL, 0, NULL, 0, &err);
+-    udat_toPattern(pFormat, FALSE, value, valueLength, &err);
++    udat_toPattern(pFormat, false, value, valueLength, &err);
+     udat_close(pFormat);
+     return UErrorCodeToBool(err);
+ }
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_normalization.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_normalization.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_normalization.c	2021-03-12 14:51:31.470703210 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_normalization.c	2021-03-12 14:54:11.855626285 +0100
+@@ -48,7 +48,7 @@ int32_t GlobalizationNative_IsNormalized
+ 
+     if (U_SUCCESS(err))
+     {
+-        return isNormalized == TRUE ? 1 : 0;
++        return isNormalized ? 1 : 0;
+     }
+     else
+     {
+diff -rupN coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c
+--- coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c.orig/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c	2021-03-12 14:51:31.470703210 +0100
++++ coreclr.fa682a7bd0a7a1eb5f80904c10b88301eb33150c/src/corefx/System.Globalization.Native/pal_timeZoneInfo.c	2021-03-12 14:54:44.828694339 +0100
+@@ -19,7 +19,7 @@ ResultCode GlobalizationNative_GetTimeZo
+ {
+     UErrorCode err = U_ZERO_ERROR;
+     char locale[ULOC_FULLNAME_CAPACITY];
+-    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, FALSE, &err);
++    GetLocale(localeName, locale, ULOC_FULLNAME_CAPACITY, false, &err);
+ 
+     int32_t timeZoneIdLength = -1; // timeZoneId is NULL-terminated
+     UCalendar* calendar = ucal_open(timeZoneId, timeZoneIdLength, locale, UCAL_DEFAULT, &err);

Deleted: 9999-corefx-add-arch-rids.patch
===================================================================
--- 9999-corefx-add-arch-rids.patch	2021-03-15 16:04:07 UTC (rev 891516)
+++ 9999-corefx-add-arch-rids.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -1,91 +0,0 @@
-From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
-From: Omair Majid <omajid at redhat.com>
-Date: Fri, 8 Nov 2019 21:01:11 -0500
-Subject: [PATCH] Add runtime id for Arch Linux
-
-Like gentoo, Arch Linux is a rolling release and doesn't have explicit
-version numbers.
-
-    $ cat /etc/os-release
-    NAME="Arch Linux"
-    PRETTY_NAME="Arch Linux"
-    ID=arch
-    BUILD_ID=rolling
-    ANSI_COLOR="0;36"
-    HOME_URL="https://www.archlinux.org/"
-    DOCUMENTATION_URL="https://wiki.archlinux.org/"
-    SUPPORT_URL="https://bbs.archlinux.org/"
-    BUG_REPORT_URL="https://bugs.archlinux.org/"
-    LOGO=archlinux
----
- .../runtime.compatibility.json                  | 17 +++++++++++++++++
- .../Microsoft.NETCore.Platforms/runtime.json    | 11 +++++++++++
- .../runtimeGroups.props                         |  5 +++++
- 3 files changed, 33 insertions(+)
-
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-index 2a196ecc9fc7..d273634527ef 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
-@@ -270,6 +270,23 @@
-     "any",
-     "base"
-   ],
-+  "arch": [
-+    "arch",
-+    "linux",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-+  "arch-x64": [
-+    "arch-x64",
-+    "arch",
-+    "linux-x64",
-+    "linux",
-+    "unix-x64",
-+    "unix",
-+    "any",
-+    "base"
-+  ],
-   "base": [
-     "base"
-   ],
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
-index e70f2da7e668..5b2f70f44b9e 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtime.json
-+++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
-@@ -121,6 +121,17 @@
-         "any"
-       ]
-     },
-+    "arch": {
-+      "#import": [
-+        "linux"
-+      ]
-+    },
-+    "arch-x64": {
-+      "#import": [
-+        "arch",
-+        "linux-x64"
-+      ]
-+    },
-     "base": {
-       "#import": []
-     },
-diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-index 6c95b67819be..aa31cac61f34 100644
---- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-+++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
-@@ -25,6 +25,11 @@
-       <Versions>21</Versions>
-     </RuntimeGroup>
-
-+    <RuntimeGroup Include="arch">
-+      <Parent>linux</Parent>
-+      <Architectures>x64</Architectures>
-+    </RuntimeGroup>
-+
-     <RuntimeGroup Include="centos">
-       <Parent>rhel</Parent>
-       <Architectures>x64</Architectures>

Copied: dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-add-arch-rids.patch (from rev 891516, dotnet-core-3.1/trunk/9999-corefx-add-arch-rids.patch)
===================================================================
--- 9999-corefx-add-arch-rids.patch	                        (rev 0)
+++ 9999-corefx-add-arch-rids.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -0,0 +1,91 @@
+From c70ef244c862e8e13ff6552ee829e968186e0f45 Mon Sep 17 00:00:00 2001
+From: Omair Majid <omajid at redhat.com>
+Date: Fri, 8 Nov 2019 21:01:11 -0500
+Subject: [PATCH] Add runtime id for Arch Linux
+
+Like gentoo, Arch Linux is a rolling release and doesn't have explicit
+version numbers.
+
+    $ cat /etc/os-release
+    NAME="Arch Linux"
+    PRETTY_NAME="Arch Linux"
+    ID=arch
+    BUILD_ID=rolling
+    ANSI_COLOR="0;36"
+    HOME_URL="https://www.archlinux.org/"
+    DOCUMENTATION_URL="https://wiki.archlinux.org/"
+    SUPPORT_URL="https://bbs.archlinux.org/"
+    BUG_REPORT_URL="https://bugs.archlinux.org/"
+    LOGO=archlinux
+---
+ .../runtime.compatibility.json                  | 17 +++++++++++++++++
+ .../Microsoft.NETCore.Platforms/runtime.json    | 11 +++++++++++
+ .../runtimeGroups.props                         |  5 +++++
+ 3 files changed, 33 insertions(+)
+
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+index 2a196ecc9fc7..d273634527ef 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.compatibility.json
+@@ -270,6 +270,23 @@
+     "any",
+     "base"
+   ],
++  "arch": [
++    "arch",
++    "linux",
++    "unix",
++    "any",
++    "base"
++  ],
++  "arch-x64": [
++    "arch-x64",
++    "arch",
++    "linux-x64",
++    "linux",
++    "unix-x64",
++    "unix",
++    "any",
++    "base"
++  ],
+   "base": [
+     "base"
+   ],
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtime.json b/pkg/Microsoft.NETCore.Platforms/runtime.json
+index e70f2da7e668..5b2f70f44b9e 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtime.json
++++ b/pkg/Microsoft.NETCore.Platforms/runtime.json
+@@ -121,6 +121,17 @@
+         "any"
+       ]
+     },
++    "arch": {
++      "#import": [
++        "linux"
++      ]
++    },
++    "arch-x64": {
++      "#import": [
++        "arch",
++        "linux-x64"
++      ]
++    },
+     "base": {
+       "#import": []
+     },
+diff --git a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+index 6c95b67819be..aa31cac61f34 100644
+--- a/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
++++ b/pkg/Microsoft.NETCore.Platforms/runtimeGroups.props
+@@ -25,6 +25,11 @@
+       <Versions>21</Versions>
+     </RuntimeGroup>
+
++    <RuntimeGroup Include="arch">
++      <Parent>linux</Parent>
++      <Architectures>x64</Architectures>
++    </RuntimeGroup>
++
+     <RuntimeGroup Include="centos">
+       <Parent>rhel</Parent>
+       <Architectures>x64</Architectures>

Deleted: 9999-corefx-fix-build-clang10.patch
===================================================================
--- 9999-corefx-fix-build-clang10.patch	2021-03-15 16:04:07 UTC (rev 891516)
+++ 9999-corefx-fix-build-clang10.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -1,13 +0,0 @@
-diff -rupN corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt
---- corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt	2020-06-23 18:07:14.111464986 +0200
-+++ corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt	2020-06-23 18:08:56.147153789 +0200
-@@ -18,6 +18,8 @@ add_compile_options(-Wno-empty-translati
- add_compile_options(-Wno-cast-align)
- add_compile_options(-Wno-typedef-redefinition)
- add_compile_options(-Wno-c11-extensions)
-+add_compile_options(-Wno-sign-conversion)
-+add_compile_options(-Wno-unused-result)
- add_compile_options(-fPIC)
- add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
- add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
-

Copied: dotnet-core-3.1/repos/community-staging-x86_64/9999-corefx-fix-build-clang10.patch (from rev 891516, dotnet-core-3.1/trunk/9999-corefx-fix-build-clang10.patch)
===================================================================
--- 9999-corefx-fix-build-clang10.patch	                        (rev 0)
+++ 9999-corefx-fix-build-clang10.patch	2021-03-15 17:07:23 UTC (rev 891517)
@@ -0,0 +1,13 @@
+diff -rupN corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt
+--- corefx.620cea9ccf0359993e803c900059932966399584.orig/src/Native/Unix/CMakeLists.txt	2020-06-23 18:07:14.111464986 +0200
++++ corefx.620cea9ccf0359993e803c900059932966399584/src/Native/Unix/CMakeLists.txt	2020-06-23 18:08:56.147153789 +0200
+@@ -18,6 +18,8 @@ add_compile_options(-Wno-empty-translati
+ add_compile_options(-Wno-cast-align)
+ add_compile_options(-Wno-typedef-redefinition)
+ add_compile_options(-Wno-c11-extensions)
++add_compile_options(-Wno-sign-conversion)
++add_compile_options(-Wno-unused-result)
+ add_compile_options(-fPIC)
+ add_compile_options(-I${CMAKE_CURRENT_SOURCE_DIR}/Common)
+ add_compile_options(-I${CMAKE_CURRENT_BINARY_DIR}/Common)
+

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-03-15 16:04:07 UTC (rev 891516)
+++ PKGBUILD	2021-03-15 17:07:23 UTC (rev 891517)
@@ -1,168 +0,0 @@
-# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
-# Contributor: Kristian Mosegaard <kristian at mosen.me>
-# Contributor: Max Liebkies <mail at maxliebkies.de>
-# Contributor: Krzysztof Bogacki <krzysztof.bogacki at leancode.pl>
-
-pkgbase=dotnet-core
-pkgname=(
- dotnet-runtime-3.1
- aspnet-runtime-3.1
- dotnet-sdk-3.1
- dotnet-targeting-pack-3.1
- aspnet-targeting-pack-3.1
-)
-pkgver=3.1.12.sdk112
-pkgrel=1
-arch=(x86_64)
-url=https://www.microsoft.com/net/core
-license=(MIT)
-makedepends=(
-  bash
-  clang
-  cmake
-  curl
-  dotnet-host
-  git
-  icu
-  inetutils
-  krb5
-  libgit2
-  libunwind
-  libxml2
-  lldb
-  llvm
-  lttng-ust
-  nodejs
-  openssl
-  systemd
-  zlib
-)
-options=(staticlibs)
-_tag=899abf95fa2ed1a42252d542c610564ba7ed2cc2
-source=(
-  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
-  9999-coreclr-libicu-68.patch
-  9999-corefx-add-arch-rids.patch
-  9999-corefx-fix-build-clang10.patch
-  9999-core-setup-fix-computed-rid.patch
-)
-b2sums=('SKIP'
-        '85dbfde59de36b7632448a221a176a98804e3c5de65057de4aac0c93b5b37fe8f382eedcd8df143fceb8c5a38c2cb12173b354e2fb3ea1010aba4783a8959cf5'
-        '2e56d6458c50c95e5d2489235b13727c8d708162318cad1cc05b225d47d736dbd9bc897eb3eb7014f716423dcfef67178efbdee41be30e64bac120912efeabd4'
-        '6d0945602c351bab8b7c8555ce0bf0d72ee465e5807c444b10d24e00376d40ba84b5f1fd5adc4f06966a711e1d405a9c6dc3d988a19fd3baabefcb45277afb2a'
-        'bd9e0cec11937997df2764bccfdb9468af8ffabd85597447a3de52c801cd6c2717fb297f4bad00784568c67b4f1648038cc0ffdccc7f52c63935562bc2f2ef9a')
-
-pkgver() {
-  cd dotnet-source-build
-
-  if [[ $(git describe --tags) != *-SDK ]]; then
-    exit 1
-  fi
-
-  local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.linux-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//')
-  local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//')
-
-  echo "${_runtimever}.sdk${_sdkver##*.}"
-}
-
-prepare() {
-  cd dotnet-source-build
-
-  [ -d patches/coreclr ] || mkdir patches/coreclr
-  cp ../9999-coreclr-libicu-68.patch patches/coreclr/
-  [ -d patches/corefx ] || mkdir patches/corefx
-  cp ../9999-corefx-add-arch-rids.patch patches/corefx/
-  cp ../9999-corefx-fix-build-clang10.patch patches/corefx/
-  [ -d patches/core-setup ] || mkdir patches/core-setup
-  cp ../9999-core-setup-fix-computed-rid.patch patches/core-setup/
-}
-
-build() {
-  cd dotnet-source-build
-
-  export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
-
-  ./build.sh \
-    /p:ArchiveDownloadedPackages=true \
-    /p:ContinueOnPrebuiltBaselineError=true \
-    /p:SkipPortableRuntimeBuild=true \
-    /p:SkipPrebuiltEnforcement=true \
-    /p:UseSystemLibraries=true \
-    /p:UseSystemLibunwind=true
-}
-
-package_dotnet-runtime-3.1() {
-  pkgdesc='The .NET Core runtime'
-  depends=(
-    dotnet-host
-    gcc-libs
-    glibc
-    icu
-    libcurl.so
-    libgssapi_krb5.so
-    libunwind
-    openssl
-    zlib
-  )
-
-  optdepends=('lttng-ust: CoreCLR tracing')
-
-  cd dotnet-source-build/artifacts/x64/Release
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
-  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
-}
-
-package_aspnet-runtime-3.1() {
-  pkgdesc='The ASP.NET Core runtime'
-  depends=(dotnet-runtime-3.1)
-
-  cd dotnet-source-build/artifacts/x64/Release
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
-  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime
-}
-
-package_dotnet-sdk-3.1() {
-  pkgdesc='The .NET Core SDK'
-  depends=(
-    dotnet-runtime-3.1
-    dotnet-targeting-pack-3.1
-    glibc
-    gcc-libs
-    netstandard-targeting-pack-3.1
-  )
-  optdepends=('aspnet-targeting-pack-3.1: Build ASP.NET Core applications')
-
-  cd dotnet-source-build/artifacts/x64/Release
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
-  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk
-}
-
-package_dotnet-targeting-pack-3.1() {
-  pkgdesc='The .NET Core targeting pack'
-  depends=(netstandard-targeting-pack)
-
-  cd dotnet-source-build/artifacts/x64/Release
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
-  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.{Host.arch-x64,Ref}
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-targeting-pack
-}
-
-package_aspnet-targeting-pack-3.1() {
-  pkgdesc='The ASP.NET Core targeting pack'
-  depends=(dotnet-targeting-pack-3.1)
-
-  cd dotnet-source-build/artifacts/x64/Release
-
-  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
-  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref
-  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-targeting-pack
-}
-
-# vim: ts=2 sw=2 et:

Copied: dotnet-core-3.1/repos/community-staging-x86_64/PKGBUILD (from rev 891516, dotnet-core-3.1/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-03-15 17:07:23 UTC (rev 891517)
@@ -0,0 +1,168 @@
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
+# Contributor: Kristian Mosegaard <kristian at mosen.me>
+# Contributor: Max Liebkies <mail at maxliebkies.de>
+# Contributor: Krzysztof Bogacki <krzysztof.bogacki at leancode.pl>
+
+pkgbase=dotnet-core
+pkgname=(
+ dotnet-runtime-3.1
+ aspnet-runtime-3.1
+ dotnet-sdk-3.1
+ dotnet-targeting-pack-3.1
+ aspnet-targeting-pack-3.1
+)
+pkgver=3.1.12.sdk112
+pkgrel=1
+arch=(x86_64)
+url=https://www.microsoft.com/net/core
+license=(MIT)
+makedepends=(
+  bash
+  clang
+  cmake
+  curl
+  dotnet-host
+  git
+  icu
+  inetutils
+  krb5
+  libgit2
+  libunwind
+  libxml2
+  lldb
+  llvm
+  lttng-ust
+  nodejs
+  openssl
+  systemd
+  zlib
+)
+options=(staticlibs)
+_tag=899abf95fa2ed1a42252d542c610564ba7ed2cc2
+source=(
+  dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
+  9999-coreclr-libicu-68.patch
+  9999-corefx-add-arch-rids.patch
+  9999-corefx-fix-build-clang10.patch
+  9999-core-setup-fix-computed-rid.patch
+)
+b2sums=('SKIP'
+        '85dbfde59de36b7632448a221a176a98804e3c5de65057de4aac0c93b5b37fe8f382eedcd8df143fceb8c5a38c2cb12173b354e2fb3ea1010aba4783a8959cf5'
+        '2e56d6458c50c95e5d2489235b13727c8d708162318cad1cc05b225d47d736dbd9bc897eb3eb7014f716423dcfef67178efbdee41be30e64bac120912efeabd4'
+        '6d0945602c351bab8b7c8555ce0bf0d72ee465e5807c444b10d24e00376d40ba84b5f1fd5adc4f06966a711e1d405a9c6dc3d988a19fd3baabefcb45277afb2a'
+        'bd9e0cec11937997df2764bccfdb9468af8ffabd85597447a3de52c801cd6c2717fb297f4bad00784568c67b4f1648038cc0ffdccc7f52c63935562bc2f2ef9a')
+
+pkgver() {
+  cd dotnet-source-build
+
+  if [[ $(git describe --tags) != *-SDK ]]; then
+    exit 1
+  fi
+
+  local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.linux-x64']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//')
+  local _sdkver=$(xmllint --xpath "//Dependency[@Name='Microsoft.NET.Sdk']/@Version" eng/Version.Details.xml | cut -d '=' -f 2 | sed 's/^"//; s/"$//; s/-rtm.*//; s/-servicing.*//')
+
+  echo "${_runtimever}.sdk${_sdkver##*.}"
+}
+
+prepare() {
+  cd dotnet-source-build
+
+  [ -d patches/coreclr ] || mkdir patches/coreclr
+  cp ../9999-coreclr-libicu-68.patch patches/coreclr/
+  [ -d patches/corefx ] || mkdir patches/corefx
+  cp ../9999-corefx-add-arch-rids.patch patches/corefx/
+  cp ../9999-corefx-fix-build-clang10.patch patches/corefx/
+  [ -d patches/core-setup ] || mkdir patches/core-setup
+  cp ../9999-core-setup-fix-computed-rid.patch patches/core-setup/
+}
+
+build() {
+  cd dotnet-source-build
+
+  export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
+
+  ./build.sh \
+    /p:ArchiveDownloadedPackages=true \
+    /p:ContinueOnPrebuiltBaselineError=true \
+    /p:SkipPortableRuntimeBuild=true \
+    /p:SkipPrebuiltEnforcement=true \
+    /p:UseSystemLibraries=true \
+    /p:UseSystemLibunwind=true
+}
+
+package_dotnet-runtime-3.1() {
+  pkgdesc='The .NET Core runtime'
+  depends=(
+    dotnet-host
+    gcc-libs
+    glibc
+    icu
+    libcurl.so
+    libgssapi_krb5.so
+    libunwind
+    openssl
+    zlib
+  )
+
+  optdepends=('lttng-ust: CoreCLR tracing')
+
+  cd dotnet-source-build/artifacts/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.NETCore.App
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-runtime
+}
+
+package_aspnet-runtime-3.1() {
+  pkgdesc='The ASP.NET Core runtime'
+  depends=(dotnet-runtime-3.1)
+
+  cd dotnet-source-build/artifacts/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner shared/Microsoft.AspNetCore.App
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-runtime
+}
+
+package_dotnet-sdk-3.1() {
+  pkgdesc='The .NET Core SDK'
+  depends=(
+    dotnet-runtime-3.1
+    dotnet-targeting-pack-3.1
+    glibc
+    gcc-libs
+    netstandard-targeting-pack-3.1
+  )
+  optdepends=('aspnet-targeting-pack-3.1: Build ASP.NET Core applications')
+
+  cd dotnet-source-build/artifacts/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner sdk templates
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-sdk
+}
+
+package_dotnet-targeting-pack-3.1() {
+  pkgdesc='The .NET Core targeting pack'
+  depends=(netstandard-targeting-pack)
+
+  cd dotnet-source-build/artifacts/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.NETCore.App.{Host.arch-x64,Ref}
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/dotnet-targeting-pack
+}
+
+package_aspnet-targeting-pack-3.1() {
+  pkgdesc='The ASP.NET Core targeting pack'
+  depends=(dotnet-targeting-pack-3.1)
+
+  cd dotnet-source-build/artifacts/x64/Release
+
+  install -dm 755 "${pkgdir}"/usr/share/{dotnet,licenses}
+  bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner packs/Microsoft.AspNetCore.App.Ref
+  ln -s dotnet-host "${pkgdir}"/usr/share/licenses/aspnet-targeting-pack
+}
+
+# vim: ts=2 sw=2 et:



More information about the arch-commits mailing list