[arch-commits] Commit in dotnet-core/repos/community-x86_64 (7 files)
Maxime Gauduin
alucryd at archlinux.org
Thu Apr 15 13:57:04 UTC 2021
Date: Thursday, April 15, 2021 @ 13:57:04
Author: alucryd
Revision: 919070
archrelease: copy trunk to community-x86_64
Added:
dotnet-core/repos/community-x86_64/9999-runtime-link-order.patch
(from rev 919069, dotnet-core/trunk/9999-runtime-link-order.patch)
dotnet-core/repos/community-x86_64/9999-sdk-telemetry-optout.patch
(from rev 919069, dotnet-core/trunk/9999-sdk-telemetry-optout.patch)
dotnet-core/repos/community-x86_64/PKGBUILD
(from rev 919069, dotnet-core/trunk/PKGBUILD)
dotnet-core/repos/community-x86_64/dotnet.sh
(from rev 919069, dotnet-core/trunk/dotnet.sh)
Deleted:
dotnet-core/repos/community-x86_64/9999-runtime-libicu-68.patch
dotnet-core/repos/community-x86_64/9999-runtime-link-order.patch
dotnet-core/repos/community-x86_64/PKGBUILD
---------------------------------+
9999-runtime-libicu-68.patch | 1033 --------------------------------------
9999-runtime-link-order.patch | 40 -
9999-sdk-telemetry-optout.patch | 12
PKGBUILD | 418 ++++++++-------
dotnet.sh | 12
5 files changed, 262 insertions(+), 1253 deletions(-)
Deleted: 9999-runtime-libicu-68.patch
===================================================================
--- 9999-runtime-libicu-68.patch 2021-04-15 13:56:56 UTC (rev 919069)
+++ 9999-runtime-libicu-68.patch 2021-04-15 13:57:04 UTC (rev 919070)
@@ -1,1033 +0,0 @@
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.c
-index e7960716ea0..709b27328df 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_calendarData.c
-@@ -2,6 +2,7 @@
- // The .NET Foundation licenses this file to you under the MIT license.
-
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdlib.h>
- #include <string.h>
- #include "pal_locale_internal.h"
-@@ -126,8 +127,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++)
-@@ -197,7 +198,7 @@ ResultCode GlobalizationNative_GetCalendarInfo(
- {
- 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;
-@@ -209,7 +210,7 @@ ResultCode GlobalizationNative_GetCalendarInfo(
- case CalendarData_MonthDay:
- return GetMonthDayPattern(locale, result, resultCapacity);
- default:
-- assert(FALSE);
-+ assert(false);
- return UnknownError;
- }
- }
-@@ -230,19 +231,19 @@ static int InvokeCallbackForDatePattern(const char* locale,
- 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 = (UChar*)calloc((size_t)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))
-@@ -270,7 +271,7 @@ static int InvokeCallbackForDateTimePattern(const char* locale,
- 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;
-@@ -279,7 +280,7 @@ static int InvokeCallbackForDateTimePattern(const char* locale,
- if (bestPattern == NULL)
- {
- udatpg_close(pGenerator);
-- return FALSE;
-+ return false;
- }
-
- udatpg_getBestPattern(pGenerator, patternSkeleton, -1, bestPattern, patternLen, &err);
-@@ -312,7 +313,7 @@ static int32_t EnumSymbols(const char* locale,
- 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];
- STRING_COPY(localeWithCalendarName, sizeof(localeWithCalendarName), locale);
-@@ -324,7 +325,7 @@ static int32_t EnumSymbols(const char* locale,
- if (U_FAILURE(err))
- {
- udat_close(pFormat);
-- return FALSE;
-+ return false;
- }
-
- udat_setCalendar(pFormat, pCalendar);
-@@ -424,7 +425,7 @@ static int32_t EnumAbbrevEraNames(const char* locale,
- char* parentNamePtr = parentNameBuf;
- STRING_COPY(localeNamePtr, sizeof(localeNameBuf), locale);
-
-- while (TRUE)
-+ while (true)
- {
- UErrorCode status = U_ZERO_ERROR;
- const char* name = GetCalendarName(calendarId);
-@@ -439,7 +440,7 @@ static int32_t EnumAbbrevEraNames(const char* locale,
- {
- 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.
-@@ -492,10 +493,10 @@ int32_t GlobalizationNative_EnumCalendarInfo(EnumCalendarInfoCallback callback,
- {
- 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)
- {
-@@ -536,8 +537,8 @@ int32_t GlobalizationNative_EnumCalendarInfo(EnumCalendarInfoCallback callback,
- case CalendarData_AbbrevEraNames:
- return EnumAbbrevEraNames(locale, calendarId, callback, context);
- default:
-- assert(FALSE);
-- return FALSE;
-+ assert(false);
-+ return false;
- }
- }
-
-@@ -581,7 +582,7 @@ int32_t GlobalizationNative_GetJapaneseEraStartDate(int32_t era,
- 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);
-@@ -591,7 +592,7 @@ int32_t GlobalizationNative_GetJapaneseEraStartDate(int32_t era,
- if (U_FAILURE(err))
- {
- ucal_close(pCal);
-- return FALSE;
-+ return false;
- }
-
- // set the date to Jan 1
-@@ -628,5 +629,5 @@ int32_t GlobalizationNative_GetJapaneseEraStartDate(int32_t era,
- }
-
- ucal_close(pCal);
-- return FALSE;
-+ return false;
- }
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_casing.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_casing.c
-index ceca03b53f5..aad75f64da7 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_casing.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_casing.c
-@@ -3,6 +3,7 @@
- //
-
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdint.h>
-
- #include "pal_icushim_internal.h"
-@@ -34,7 +35,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;
- (void)isError; // only used for assert
- int32_t srcIdx = 0, dstIdx = 0;
- UChar32 srcCodepoint, dstCodepoint;
-@@ -46,7 +47,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
-@@ -56,7 +57,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);
- }
- }
- }
-@@ -74,7 +75,7 @@ void GlobalizationNative_ChangeCaseInvariant(
- {
- // See algorithmic comment in ChangeCase.
-
-- UBool isError = FALSE;
-+ UBool isError = false;
- (void)isError; // only used for assert
- int32_t srcIdx = 0, dstIdx = 0;
- UChar32 srcCodepoint, dstCodepoint;
-@@ -89,7 +90,7 @@ void GlobalizationNative_ChangeCaseInvariant(
- 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
-@@ -102,7 +103,7 @@ void GlobalizationNative_ChangeCaseInvariant(
- 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);
- }
- }
- }
-@@ -119,7 +120,7 @@ void GlobalizationNative_ChangeCaseTurkish(
- {
- // See algorithmic comment in ChangeCase.
-
-- UBool isError = FALSE;
-+ UBool isError = false;
- (void)isError; // only used for assert
- int32_t srcIdx = 0, dstIdx = 0;
- UChar32 srcCodepoint, dstCodepoint;
-@@ -133,7 +134,7 @@ void GlobalizationNative_ChangeCaseTurkish(
- 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
-@@ -145,7 +146,7 @@ void GlobalizationNative_ChangeCaseTurkish(
- 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 --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c
-index 72077cfffc3..56daec02a2b 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_collation.c
-@@ -311,10 +311,10 @@ static UCollator* CloneCollatorWithOptions(const UCollator* pCollator, int32_t o
- 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);
-
-@@ -325,7 +325,7 @@ static int CanIgnoreAllCollationElements(const UCollator* pColl, const UChar* lp
- {
- if (curCollElem != UCOL_IGNORABLE)
- {
-- result = FALSE;
-+ result = false;
- break;
- }
- }
-@@ -333,7 +333,7 @@ static int CanIgnoreAllCollationElements(const UCollator* pColl, const UChar* lp
- ucol_closeElements(pCollElem);
- }
-
-- return U_SUCCESS(err) ? result : FALSE;
-+ return U_SUCCESS(err) ? result : false;
- }
-
- static void CreateSortHandle(SortHandle** ppSortHandle)
-@@ -425,7 +425,7 @@ int32_t GlobalizationNative_GetSortVersion(SortHandle* pSortHandle)
- }
- else
- {
-- assert(FALSE && "Unexpected ucol_getVersion to fail.");
-+ assert(false && "Unexpected ucol_getVersion to fail.");
- }
- return result;
- }
-@@ -591,7 +591,7 @@ static int AreEqualOrdinalIgnoreCase(UChar32 one, UChar32 two)
-
- if (one == two)
- {
-- return TRUE;
-+ return true;
- }
-
- if (one == 0x0131 || two == 0x0131)
-@@ -599,7 +599,7 @@ static int AreEqualOrdinalIgnoreCase(UChar32 one, UChar32 two)
- // 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);
-@@ -639,13 +639,13 @@ static int32_t inline SimpleAffix_Iterators(UCollationElements* pPatternIterator
- assert(strength >= UCOL_SECONDARY);
-
- UErrorCode errorCode = U_ZERO_ERROR;
-- int32_t movePattern = TRUE, moveSource = TRUE;
-+ int32_t movePattern = true, moveSource = true;
- int32_t patternElement = UCOL_IGNORABLE, sourceElement = UCOL_IGNORABLE;
- int32_t capturedOffset = 0;
-
- int32_t collationElementMask = GetCollationElementMask(strength);
-
-- while (TRUE)
-+ while (true)
- {
- if (movePattern)
- {
-@@ -659,7 +659,7 @@ static int32_t inline SimpleAffix_Iterators(UCollationElements* pPatternIterator
- }
- sourceElement = forwardSearch ? ucol_next(pSourceIterator, &errorCode) : ucol_previous(pSourceIterator, &errorCode);
- }
-- movePattern = TRUE; moveSource = TRUE;
-+ movePattern = true; moveSource = true;
-
- if (patternElement == UCOL_NULLORDER)
- {
-@@ -673,7 +673,7 @@ static int32_t inline SimpleAffix_Iterators(UCollationElements* pPatternIterator
- }
- else if (forwardSearch && ((sourceElement & UCOL_PRIMARYORDERMASK) == 0) && (sourceElement & UCOL_SECONDARYORDERMASK) != 0)
- {
-- return FALSE; // the next character in source text is a combining character, an example: "o\u0308".StartsWith("o")
-+ return false; // the next character in source text is a combining character, an example: "o\u0308".StartsWith("o")
- }
- else
- {
-@@ -682,15 +682,15 @@ static int32_t inline SimpleAffix_Iterators(UCollationElements* pPatternIterator
- }
- else if (patternElement == UCOL_IGNORABLE)
- {
-- moveSource = FALSE;
-+ moveSource = false;
- }
- else if (sourceElement == UCOL_IGNORABLE)
- {
-- movePattern = FALSE;
-+ movePattern = false;
- }
- else if ((patternElement & collationElementMask) != (sourceElement & collationElementMask))
- {
-- return FALSE;
-+ return false;
- }
- }
-
-@@ -699,12 +699,12 @@ ReturnTrue:
- {
- *pCapturedOffset = capturedOffset;
- }
-- return TRUE;
-+ return true;
- }
-
- static int32_t SimpleAffix(const UCollator* pCollator, UErrorCode* pErrorCode, const UChar* pPattern, int32_t patternLength, const UChar* pText, int32_t textLength, int32_t forwardSearch, int32_t* pMatchedLength)
- {
-- int32_t result = FALSE;
-+ int32_t result = false;
-
- UCollationElements* pPatternIterator = ucol_openElements(pCollator, pPattern, patternLength, pErrorCode);
- if (U_SUCCESS(*pErrorCode))
-@@ -735,7 +735,7 @@ static int32_t SimpleAffix(const UCollator* pCollator, UErrorCode* pErrorCode, c
-
- static int32_t ComplexStartsWith(const UCollator* pCollator, UErrorCode* pErrorCode, const UChar* pPattern, int32_t patternLength, const UChar* pText, int32_t textLength, int32_t* pMatchedLength)
- {
-- int32_t result = FALSE;
-+ int32_t result = false;
-
- UStringSearch* pSearch = usearch_openFromCollator(pPattern, patternLength, pText, textLength, pCollator, NULL, pErrorCode);
- if (U_SUCCESS(*pErrorCode))
-@@ -745,7 +745,7 @@ static int32_t ComplexStartsWith(const UCollator* pCollator, UErrorCode* pErrorC
- {
- if (idx == 0)
- {
-- result = TRUE;
-+ result = true;
- }
- else
- {
-@@ -782,7 +782,7 @@ int32_t GlobalizationNative_StartsWith(
-
- if (!U_SUCCESS(err))
- {
-- return FALSE;
-+ return false;
- }
- else if (options > CompareOptionsIgnoreCase)
- {
-@@ -790,13 +790,13 @@ int32_t GlobalizationNative_StartsWith(
- }
- else
- {
-- return SimpleAffix(pCollator, &err, lpTarget, cwTargetLength, lpSource, cwSourceLength, TRUE, pMatchedLength);
-+ return SimpleAffix(pCollator, &err, lpTarget, cwTargetLength, lpSource, cwSourceLength, true, pMatchedLength);
- }
- }
-
- static int32_t ComplexEndsWith(const UCollator* pCollator, UErrorCode* pErrorCode, const UChar* pPattern, int32_t patternLength, const UChar* pText, int32_t textLength, int32_t* pMatchedLength)
- {
-- int32_t result = FALSE;
-+ int32_t result = false;
-
- UStringSearch* pSearch = usearch_openFromCollator(pPattern, patternLength, pText, textLength, pCollator, NULL, pErrorCode);
- if (U_SUCCESS(*pErrorCode))
-@@ -809,7 +809,7 @@ static int32_t ComplexEndsWith(const UCollator* pCollator, UErrorCode* pErrorCod
-
- if (matchEnd == textLength)
- {
-- result = TRUE;
-+ result = true;
- }
- else
- {
-@@ -848,7 +848,7 @@ int32_t GlobalizationNative_EndsWith(
-
- if (!U_SUCCESS(err))
- {
-- return FALSE;
-+ return false;
- }
- else if (options > CompareOptionsIgnoreCase)
- {
-@@ -856,7 +856,7 @@ int32_t GlobalizationNative_EndsWith(
- }
- else
- {
-- return SimpleAffix(pCollator, &err, lpTarget, cwTargetLength, lpSource, cwSourceLength, FALSE, pMatchedLength);
-+ return SimpleAffix(pCollator, &err, lpTarget, cwTargetLength, lpSource, cwSourceLength, false, pMatchedLength);
- }
- }
-
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
-index 43e1d4fb370..99a7899b848 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c
-@@ -2,6 +2,7 @@
- // The .NET Foundation licenses this file to you under the MIT license.
- //
-
-+#include <stdbool.h>
- #include <stdlib.h>
- #include "pal_icushim_internal.h"
-
-@@ -58,7 +59,7 @@ static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbo
- if (dlsym(libicuuc, symbolName) == NULL)
- {
- if (minorVer == -1)
-- return FALSE;
-+ return false;
-
- // Now try the _majorVer_minorVer added
- sprintf(symbolVersion, "_%d_%d%s", majorVer, minorVer, suffix);
-@@ -66,20 +67,20 @@ static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbo
- if (dlsym(libicuuc, symbolName) == NULL)
- {
- if (subVer == -1)
-- return FALSE;
-+ return false;
-
- // Finally, try the _majorVer_minorVer_subVer added
- sprintf(symbolVersion, "_%d_%d_%d%s", majorVer, minorVer, subVer, suffix);
- sprintf(symbolName, "u_strlen%s", symbolVersion);
- if (dlsym(libicuuc, symbolName) == NULL)
- {
-- return FALSE;
-+ return false;
- }
- }
- }
- }
-
-- return TRUE;
-+ return true;
- }
-
- #endif // TARGET_UNIX
-@@ -98,12 +99,12 @@ static int FindICULibs()
- libicuuc = LoadLibraryExW(L"icu.dll", NULL, LOAD_LIBRARY_SEARCH_SYSTEM32);
- if (libicuuc == NULL)
- {
-- return FALSE;
-+ return false;
- }
-
- // Windows has a single dll for icu.
- libicui18n = libicuuc;
-- return TRUE;
-+ return true;
- }
-
- static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbolName, char* symbolVersion, char* suffix)
-@@ -119,7 +120,7 @@ static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbo
- if (GetProcAddress(lib, symbolName) == NULL)
- {
- if (minorVer == -1)
-- return FALSE;
-+ return false;
-
- // Now try the _majorVer_minorVer added
- sprintf_s(symbolVersion, MaxICUVersionStringWithSuffixLength, "_%d_%d%s", majorVer, minorVer, suffix);
-@@ -127,19 +128,19 @@ static int FindSymbolVersion(int majorVer, int minorVer, int subVer, char* symbo
- if (GetProcAddress(lib, symbolName) == NULL)
- {
- if (subVer == -1)
-- return FALSE;
-+ return false;
- // Finally, try the _majorVer_minorVer_subVer added
- sprintf_s(symbolVersion, MaxICUVersionStringWithSuffixLength, "_%d_%d_%d%s", majorVer, minorVer, subVer, suffix);
- sprintf_s(symbolName, SYMBOL_NAME_SIZE, "u_strlen%s", symbolVersion);
- if (GetProcAddress(lib, symbolName) == NULL)
- {
-- return FALSE;
-+ return false;
- }
- }
- }
- }
-
-- return TRUE;
-+ return true;
- }
-
- #elif defined(TARGET_OSX)
-@@ -155,13 +156,13 @@ static int FindICULibs()
-
- 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;
- }
-
- #elif defined(TARGET_ANDROID)
-@@ -176,14 +177,14 @@ static int FindICULibs(char* symbolName, char* symbolVersion)
-
- if (libicui18n == NULL)
- {
-- return FALSE;
-+ return false;
- }
-
- libicuuc = dlopen("libicuuc.so", RTLD_LAZY);
-
- if (libicuuc == NULL)
- {
-- return FALSE;
-+ return false;
- }
-
- char symbolSuffix[SYMBOL_CUSTOM_SUFFIX_SIZE]="";
-@@ -191,12 +192,12 @@ static int FindICULibs(char* symbolName, char* symbolVersion)
- {
- if (FindSymbolVersion(i, -1, -1, symbolName, symbolVersion, symbolSuffix))
- {
-- return TRUE;
-+ return true;
- }
- }
-
- fprintf(stderr, "Cannot determine ICU version.");
-- return FALSE;
-+ return false;
- }
-
- #else // !TARGET_WINDOWS && !TARGET_OSX && !TARGET_ANDROID
-@@ -290,12 +291,12 @@ static int FindLibUsingOverride(const char* versionPrefix, char* symbolName, cha
- {
- 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.
-@@ -309,11 +310,11 @@ static int FindLibWithMajorVersion(const char* versionPrefix, char* symbolName,
- {
- 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
-@@ -326,12 +327,12 @@ static int FindLibWithMajorMinorVersion(const char* versionPrefix, char* symbolN
- {
- 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
-@@ -346,13 +347,13 @@ static int FindLibWithMajorMinorSubVersion(const char* versionPrefix, char* symb
- {
- if (OpenICULibraries(i, j, k, versionPrefix, symbolName, symbolVersion))
- {
-- return TRUE;
-+ return true;
- }
- }
- }
- }
-
-- return FALSE;
-+ return false;
- }
-
-
-@@ -392,27 +393,27 @@ int32_t GlobalizationNative_LoadICU()
-
- if (!FindICULibs())
- {
-- return FALSE;
-+ return false;
- }
-
- #elif defined(TARGET_ANDROID)
- if (!FindICULibs(symbolName, symbolVersion))
- {
-- return FALSE;
-+ return false;
- }
- #else
- if (!FindICULibs(VERSION_PREFIX_NONE, symbolName, symbolVersion))
- {
- if (!FindICULibs(VERSION_PREFIX_SUSE, symbolName, symbolVersion))
- {
-- return FALSE;
-+ return false;
- }
- }
- #endif // TARGET_WINDOWS || TARGET_OSX
-
- FOR_ALL_ICU_FUNCTIONS
- ValidateICUDataCanLoad();
-- return TRUE;
-+ return true;
- }
-
- void GlobalizationNative_InitICUFunctions(void* icuuc, void* icuin, const char* version, const char* suffix)
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_locale.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_locale.c
-index a96d5d955b2..2f933b32a01 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_locale.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_locale.c
-@@ -3,6 +3,7 @@
- //
-
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdint.h>
- #include <string.h>
- #include <stdlib.h>
-@@ -15,7 +16,7 @@ int32_t UErrorCodeToBool(UErrorCode status)
- {
- if (U_SUCCESS(status))
- {
-- return TRUE;
-+ return true;
- }
-
- // assert errors that should never occur
-@@ -24,7 +25,7 @@ int32_t UErrorCodeToBool(UErrorCode status)
-
- // add possible SetLastError support here
-
-- return FALSE;
-+ return false;
- }
-
- int32_t GetLocale(const UChar* localeName,
-@@ -193,7 +194,7 @@ int32_t GlobalizationNative_GetLocaleName(const UChar* localeName, UChar* value,
- 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))
-@@ -234,17 +235,17 @@ int32_t GlobalizationNative_GetDefaultLocaleName(UChar* value, int32_t valueLeng
- return UErrorCodeToBool(status);
- }
-
--// GlobalizationNative_IsPredefinedLocale returns TRUE if ICU has a real data for the locale.
--// Otherwise it returns FALSE;
-+// GlobalizationNative_IsPredefinedLocale returns true if ICU has a real data for the locale.
-+// Otherwise it returns false;
-
- int32_t GlobalizationNative_IsPredefinedLocale(const UChar* localeName)
- {
- 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;
-
- // ures_open returns err = U_ZERO_ERROR when ICU has data for localeName.
- // If it is fake locale, it will return err = U_USING_FALLBACK_WARNING || err = U_USING_DEFAULT_WARNING.
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.c
-index 3e313858920..686fbf5631f 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_localeNumberData.c
-@@ -3,6 +3,7 @@
- //
-
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdlib.h>
- #include <string.h>
-
-@@ -56,10 +57,10 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- }
-
- 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 +70,7 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- case UCHAR_MINUS:
- case UCHAR_OPENPAREN:
- case UCHAR_CLOSEPAREN:
-- minusAdded = TRUE;
-+ minusAdded = true;
- break;
- }
- }
-@@ -104,7 +105,7 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- case UCHAR_ZERO:
- if (!digitAdded)
- {
-- digitAdded = TRUE;
-+ digitAdded = true;
- destPattern[index++] = 'n';
- }
- break;
-@@ -112,7 +113,7 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- case UCHAR_CURRENCY:
- if (!currencyAdded)
- {
-- currencyAdded = TRUE;
-+ currencyAdded = true;
- destPattern[index++] = 'C';
- }
- break;
-@@ -121,7 +122,7 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- case UCHAR_NBSPACE:
- if (!spaceAdded)
- {
-- spaceAdded = TRUE;
-+ spaceAdded = true;
- destPattern[index++] = ' ';
- }
- break;
-@@ -129,7 +130,7 @@ static char* NormalizeNumericPattern(const UChar* srcPattern, int isNegative)
- case UCHAR_MINUS:
- case UCHAR_OPENPAREN:
- case UCHAR_CLOSEPAREN:
-- minusAdded = TRUE;
-+ minusAdded = true;
- destPattern[index++] = (char)ch;
- break;
-
-@@ -159,7 +160,7 @@ static int GetNumericPattern(const UNumberFormat* pNumberFormat,
- 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 = (UChar*)calloc((size_t)icuPatternLength, sizeof(UChar));
- if (icuPattern == NULL)
-@@ -169,7 +170,7 @@ static int GetNumericPattern(const UNumberFormat* pNumberFormat,
-
- UErrorCode err = U_ZERO_ERROR;
-
-- unum_toPattern(pNumberFormat, FALSE, icuPattern, icuPatternLength, &err);
-+ unum_toPattern(pNumberFormat, false, icuPattern, icuPatternLength, &err);
-
- assert(U_SUCCESS(err));
-
-@@ -197,7 +198,7 @@ static int GetNumericPattern(const UNumberFormat* pNumberFormat,
- }
- }
-
-- assert(FALSE); // should have found a valid pattern
-+ assert(false); // should have found a valid pattern
-
- free(normalizedPattern);
- return INVALID_FORMAT;
-@@ -238,7 +239,7 @@ static int GetCurrencyNegativePattern(const char* locale)
-
- 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);
-@@ -269,7 +270,7 @@ static int GetCurrencyPositivePattern(const char* locale)
-
- 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);
-@@ -300,7 +301,7 @@ static int GetNumberNegativePattern(const char* locale)
-
- 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);
-@@ -332,7 +333,7 @@ static int GetPercentNegativePattern(const char* locale)
-
- 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);
-@@ -363,7 +364,7 @@ static int GetPercentPositivePattern(const char* locale)
-
- 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);
-@@ -407,11 +408,11 @@ int32_t GlobalizationNative_GetLocaleInfoInt(
- {
- 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)
-@@ -514,7 +515,7 @@ int32_t GlobalizationNative_GetLocaleInfoInt(
- break;
- default:
- status = U_UNSUPPORTED_ERROR;
-- assert(FALSE);
-+ assert(false);
- break;
- }
-
-@@ -533,7 +534,7 @@ int32_t GlobalizationNative_GetLocaleInfoGroupingSizes(
- {
- 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 --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.c
-index 669d59f88e9..6e10e3543de 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_localeStringData.c
-@@ -3,6 +3,7 @@
- //
-
- #include <assert.h>
-+#include <stdbool.h>
- #include <stdlib.h>
- #include <string.h>
-
-@@ -210,7 +211,7 @@ int32_t GlobalizationNative_GetLocaleInfoString(const UChar* localeName,
- {
- 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))
- {
-@@ -266,10 +267,10 @@ int32_t GlobalizationNative_GetLocaleInfoString(const UChar* localeName,
- 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);
-@@ -279,10 +280,10 @@ int32_t GlobalizationNative_GetLocaleInfoString(const UChar* localeName,
- 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);
-@@ -350,10 +351,10 @@ int32_t GlobalizationNative_GetLocaleTimeFormat(const UChar* localeName,
- {
- 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 --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.c
-index bd453f9ff1c..9faca845b7d 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_normalization.c
-@@ -2,6 +2,7 @@
- // The .NET Foundation licenses this file to you under the MIT license.
- //
-
-+#include <stdbool.h>
- #include <stdint.h>
-
- #include "pal_icushim_internal.h"
-@@ -47,7 +48,7 @@ int32_t GlobalizationNative_IsNormalized(
-
- if (U_SUCCESS(err))
- {
-- return isNormalized == TRUE ? 1 : 0;
-+ return isNormalized ? 1 : 0;
- }
- else
- {
-diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.c
-index 802aa8515e2..ce865cdf0c1 100644
---- a/src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.c
-+++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_timeZoneInfo.c
-@@ -2,6 +2,7 @@
- // The .NET Foundation licenses this file to you under the MIT license.
- //
-
-+#include <stdbool.h>
- #include <stdint.h>
-
- #include "pal_errors_internal.h"
-@@ -19,7 +20,7 @@ ResultCode GlobalizationNative_GetTimeZoneDisplayName(const UChar* localeName,
- {
- 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-runtime-link-order.patch
===================================================================
--- 9999-runtime-link-order.patch 2021-04-15 13:56:56 UTC (rev 919069)
+++ 9999-runtime-link-order.patch 2021-04-15 13:57:04 UTC (rev 919070)
@@ -1,20 +0,0 @@
---- runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1.orig/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:05:11.692543567 +0000
-+++ runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:06:51.581738910 +0000
-@@ -207,12 +207,12 @@ target_link_libraries(
- libhostcommon
- ${CORECLR_LIBRARIES}
-
-- ${ZLIB_LIBRARIES}
-- ${LIBGSS}
-- ${NATIVE_LIBS_EXTRA}
--
- ${START_WHOLE_ARCHIVE}
- ${RUNTIMEINFO_LIB}
- ${NATIVE_LIBS}
- ${END_WHOLE_ARCHIVE}
-+
-+ ${ZLIB_LIBRARIES}
-+ ${LIBGSS}
-+ ${NATIVE_LIBS_EXTRA}
- )
-
Copied: dotnet-core/repos/community-x86_64/9999-runtime-link-order.patch (from rev 919069, dotnet-core/trunk/9999-runtime-link-order.patch)
===================================================================
--- 9999-runtime-link-order.patch (rev 0)
+++ 9999-runtime-link-order.patch 2021-04-15 13:57:04 UTC (rev 919070)
@@ -0,0 +1,20 @@
+--- runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1.orig/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:05:11.692543567 +0000
++++ runtime.f27d33729518f5aa478aa818b7b4f54a4d50bef1/src/installer/corehost/cli/apphost/static/CMakeLists.txt 2021-03-16 15:06:51.581738910 +0000
+@@ -207,12 +207,12 @@ target_link_libraries(
+ libhostcommon
+ ${CORECLR_LIBRARIES}
+
+- ${ZLIB_LIBRARIES}
+- ${LIBGSS}
+- ${NATIVE_LIBS_EXTRA}
+-
+ ${START_WHOLE_ARCHIVE}
+ ${RUNTIMEINFO_LIB}
+ ${NATIVE_LIBS}
+ ${END_WHOLE_ARCHIVE}
++
++ ${ZLIB_LIBRARIES}
++ ${LIBGSS}
++ ${NATIVE_LIBS_EXTRA}
+ )
+
Copied: dotnet-core/repos/community-x86_64/9999-sdk-telemetry-optout.patch (from rev 919069, dotnet-core/trunk/9999-sdk-telemetry-optout.patch)
===================================================================
--- 9999-sdk-telemetry-optout.patch (rev 0)
+++ 9999-sdk-telemetry-optout.patch 2021-04-15 13:57:04 UTC (rev 919070)
@@ -0,0 +1,12 @@
+diff -rupN sdk.51369266643769f9f0c1184e89715cd1045126d0.orig/src/Cli/dotnet/Program.cs sdk.51369266643769f9f0c1184e89715cd1045126d0/src/Cli/dotnet/Program.cs
+--- sdk.51369266643769f9f0c1184e89715cd1045126d0.orig/src/Cli/dotnet/Program.cs 2021-04-15 07:25:31.290095535 +0000
++++ sdk.51369266643769f9f0c1184e89715cd1045126d0/src/Cli/dotnet/Program.cs 2021-04-15 07:27:01.742066297 +0000
+@@ -187,7 +187,7 @@ namespace Microsoft.DotNet.Cli
+ bool generateAspNetCertificate =
+ environmentProvider.GetEnvironmentVariableAsBool("DOTNET_GENERATE_ASPNET_CERTIFICATE", defaultValue: true);
+ bool telemetryOptout =
+- environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: false);
++ environmentProvider.GetEnvironmentVariableAsBool("DOTNET_CLI_TELEMETRY_OPTOUT", defaultValue: true);
+ bool addGlobalToolsToPath =
+ environmentProvider.GetEnvironmentVariableAsBool("DOTNET_ADD_GLOBAL_TOOLS_TO_PATH", defaultValue: true);
+ bool nologo =
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-04-15 13:56:56 UTC (rev 919069)
+++ PKGBUILD 2021-04-15 13:57:04 UTC (rev 919070)
@@ -1,200 +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-host
- dotnet-runtime
- aspnet-runtime
- dotnet-sdk
- netstandard-targeting-pack
- dotnet-targeting-pack
- aspnet-targeting-pack
-)
-pkgver=5.0.4.sdk104
-pkgrel=1
-arch=(x86_64)
-url=https://www.microsoft.com/net/core
-license=(MIT)
-makedepends=(
- bash
- clang
- cmake
- git
- icu
- inetutils
- krb5
- libgit2
- libunwind
- libxml2
- lldb
- llvm
- lttng-ust
- nodejs
- openssl
- systemd
- zlib
-)
-options=(staticlibs)
-_tag=269e323b5f2e2df4678c7763282c14fb1a530cfa
-source=(
- dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
- 9999-runtime-libicu-68.patch
- 9999-runtime-link-order.patch
-)
-b2sums=('SKIP'
- '5e60cccee68ff6b5fa64a37364da099592890eda734472ed55e356718388ea0880a5558e1b3c1904208187207daf314c4abfdcf3a11985415e9a494aa04d1ddf'
- '437e0b0956576795087f9e5299f6b847aaaef8158847a269d34331d42da6729721d121eed82b95e4833f9d01322da677d85db924bf43140360c5592d51324565')
-
-pkgver() {
- cd dotnet-source-build
-
- if [[ $(git describe --tags) != *-SDK ]]; then
- exit 1
- fi
-
- local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.win-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/runtime ] || mkdir patches/runtime
- cp ../9999-runtime-libicu-68.patch patches/runtime/
- cp ../9999-runtime-link-order.patch patches/runtime/
-
- # disable warnings
- sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
-}
-
-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-host() {
- pkgdesc='A generic driver for the .NET Core Command Line Interface'
- depends=(
- gcc-libs
- glibc
- )
-
- cd dotnet-source-build/artifacts/x64/Release
-
- install -dm 755 "${pkgdir}"/usr/{bin,lib,share/{dotnet,licenses/dotnet-host}}
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host
- bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/licenses/dotnet-host/ --no-same-owner LICENSE.txt ThirdPartyNotices.txt
- ln -s /usr/share/dotnet/dotnet "${pkgdir}"/usr/bin/dotnet
- ln -s /usr/share/dotnet/host/fxr/${pkgver%.sdk*}/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
-}
-
-package_dotnet-runtime() {
- pkgdesc='The .NET Core runtime'
- depends=(
- dotnet-host
- gcc-libs
- glibc
- icu
- libgssapi_krb5.so
- libunwind
- zlib
- openssl
- )
-
- optdepends=('lttng-ust: CoreCLR tracing')
- provides=(dotnet-runtime-5.0)
- conflicts=(dotnet-runtime-5.0)
-
- 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() {
- pkgdesc='The ASP.NET Core runtime'
- depends=(dotnet-runtime)
- provides=(aspnet-runtime-5.0)
- conflicts=(aspnet-runtime-5.0)
-
- 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() {
- pkgdesc='The .NET Core SDK'
- depends=(
- dotnet-runtime
- dotnet-targeting-pack
- glibc
- gcc-libs
- netstandard-targeting-pack
- )
- optdepends=('aspnet-targeting-pack: Build ASP.NET Core applications')
- provides=(dotnet-sdk-5.0)
- conflicts=(dotnet-sdk-5.0)
-
- 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_netstandard-targeting-pack() {
- pkgdesc='The .NET Standard targeting pack'
- provides=(netstandard-targeting-pack-2.1)
- conflicts=(netstandard-targeting-pack-2.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/NETStandard.Library.Ref
- ln -s dotnet-host "${pkgdir}"/usr/share/licenses/netstandard-targeting-pack
-}
-
-package_dotnet-targeting-pack() {
- pkgdesc='The .NET Core targeting pack'
- depends=(netstandard-targeting-pack)
- provides=(dotnet-targeting-pack-5.0)
- conflicts=(dotnet-targeting-pack-5.0)
-
- 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() {
- pkgdesc='The ASP.NET Core targeting pack'
- depends=(dotnet-targeting-pack)
- provides=(aspnet-targeting-pack-5.0)
- conflicts=(aspnet-targeting-pack-5.0)
-
- 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/repos/community-x86_64/PKGBUILD (from rev 919069, dotnet-core/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-04-15 13:57:04 UTC (rev 919070)
@@ -0,0 +1,218 @@
+# 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-host
+ dotnet-runtime
+ aspnet-runtime
+ dotnet-sdk
+ netstandard-targeting-pack
+ dotnet-targeting-pack
+ aspnet-targeting-pack
+)
+pkgver=5.0.5.sdk202
+pkgrel=1
+arch=(x86_64)
+url=https://www.microsoft.com/net/core
+license=(MIT)
+makedepends=(
+ bash
+ clang
+ cmake
+ git
+ icu
+ inetutils
+ krb5
+ libgit2
+ libunwind
+ libxml2
+ lldb
+ llvm
+ lttng-ust
+ nodejs
+ openssl
+ systemd
+ zlib
+)
+options=(staticlibs)
+_tag=561d6ea60d5c3f914c0d2c4f88f1e955bc9c997a
+source=(
+ dotnet-source-build::git+https://github.com/dotnet/source-build.git#tag=${_tag}
+ https://dotnetcli.azureedge.net/dotnet/Runtime/3.1.1/dotnet-runtime-3.1.1-linux-x64.tar.gz
+ https://dotnetcli.azureedge.net/dotnet/Sdk/5.0.202/dotnet-sdk-5.0.202-linux-x64.tar.gz
+ dotnet.sh
+ 9999-runtime-link-order.patch
+ 9999-sdk-telemetry-optout.patch
+)
+noextract=(
+ dotnet-runtime-3.1.1-linux-x64.tar.gz
+ dotnet-sdk-5.0.202-linux-x64.tar.gz
+)
+b2sums=('SKIP'
+ 'c51b167da0624df2fb5b346652ffa5a7fcfb00f95104664329721d4cf4b563dfdc8f7f3ea36332af1f50e8eedff14d7f960b55793ef2ed6b467a672bd92b3acd'
+ 'cbdc6ff24baff47dead2f6e2cc46b11527630a4481dbea2241c205bfd065032a97e9367678d1f0520ea2858f87f2f1f0f5d4872e8c442b375b1c09efae6cc596'
+ '4a64e3ee550e296bdde894f9202c6f372934cc29154f47d302599b4c368825a96a7b786faa6109a24a1101ff130fd9e4d0ccba094ec91e7f2ca645725bf71b34'
+ '437e0b0956576795087f9e5299f6b847aaaef8158847a269d34331d42da6729721d121eed82b95e4833f9d01322da677d85db924bf43140360c5592d51324565'
+ '2d69b0eb110f49badbf411ec22be0b10913321275d4146a9e3ea2e5a160a7388e6b0f70200d8ed8640c742f7791694a13be89d85f8424078396ab29e28fca113')
+
+pkgver() {
+ mkdir dotnet
+
+ bsdtar -xf dotnet-runtime-3.1.1-linux-x64.tar.gz -C dotnet
+ bsdtar -xf dotnet-sdk-5.0.202-linux-x64.tar.gz -C dotnet
+
+ cd dotnet-source-build
+
+ if [[ $(git describe --tags) != *-SDK ]]; then
+ exit 1
+ fi
+
+ local _runtimever=$(xmllint --xpath "//Dependency[@Name='Microsoft.NETCore.App.Runtime.win-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/runtime ] || mkdir patches/runtime
+ cp ../9999-runtime-link-order.patch patches/runtime/
+ [ -d patches/sdk ] || mkdir patches/sdk
+ cp ../9999-sdk-telemetry-optout.patch patches/sdk/
+
+ # disable warnings
+ sed -i 's|skiptests|skiptests ignorewarnings|' repos/runtime.common.props
+}
+
+build() {
+ cd dotnet-source-build
+
+ export SOURCE_BUILD_SKIP_SUBMODULE_CHECK=1
+
+ ./build.sh \
+ --with-sdk ../dotnet \
+ /p:ArchiveDownloadedPackages=true \
+ /p:ContinueOnPrebuiltBaselineError=true \
+ /p:SkipPortableRuntimeBuild=true \
+ /p:SkipPrebuiltEnforcement=true \
+ /p:UseSystemLibraries=true \
+ /p:UseSystemLibunwind=true
+}
+
+package_dotnet-host() {
+ pkgdesc='A generic driver for the .NET Core Command Line Interface'
+ depends=(
+ gcc-libs
+ glibc
+ )
+
+ cd dotnet-source-build/artifacts/x64/Release
+
+ install -dm 755 "${pkgdir}"/{etc/profile.d,usr/{bin,lib,share/{dotnet,licenses/dotnet-host}}}
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/dotnet/ --no-same-owner dotnet host
+ bsdtar -xf dotnet-sdk-${pkgver%.*.sdk*}.${pkgver#*sdk}-arch-x64.tar.gz -C "${pkgdir}"/usr/share/licenses/dotnet-host/ --no-same-owner LICENSE.txt ThirdPartyNotices.txt
+ ln -s /usr/share/dotnet/dotnet "${pkgdir}"/usr/bin/dotnet
+ ln -s /usr/share/dotnet/host/fxr/${pkgver%.sdk*}/libhostfxr.so "${pkgdir}"/usr/lib/libhostfxr.so
+ install -Dm 644 "${srcdir}"/dotnet.sh -t "${pkgdir}"/etc/profile.d/
+}
+
+package_dotnet-runtime() {
+ pkgdesc='The .NET Core runtime'
+ depends=(
+ dotnet-host
+ gcc-libs
+ glibc
+ icu
+ libgssapi_krb5.so
+ libunwind
+ zlib
+ openssl
+ )
+
+ optdepends=('lttng-ust: CoreCLR tracing')
+ provides=(dotnet-runtime-5.0)
+ conflicts=(dotnet-runtime-5.0)
+
+ 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() {
+ pkgdesc='The ASP.NET Core runtime'
+ depends=(dotnet-runtime)
+ provides=(aspnet-runtime-5.0)
+ conflicts=(aspnet-runtime-5.0)
+
+ 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() {
+ pkgdesc='The .NET Core SDK'
+ depends=(
+ dotnet-runtime
+ dotnet-targeting-pack
+ glibc
+ gcc-libs
+ netstandard-targeting-pack
+ )
+ optdepends=('aspnet-targeting-pack: Build ASP.NET Core applications')
+ provides=(dotnet-sdk-5.0)
+ conflicts=(dotnet-sdk-5.0)
+
+ 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_netstandard-targeting-pack() {
+ pkgdesc='The .NET Standard targeting pack'
+ provides=(netstandard-targeting-pack-2.1)
+ conflicts=(netstandard-targeting-pack-2.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/NETStandard.Library.Ref
+ ln -s dotnet-host "${pkgdir}"/usr/share/licenses/netstandard-targeting-pack
+}
+
+package_dotnet-targeting-pack() {
+ pkgdesc='The .NET Core targeting pack'
+ depends=(netstandard-targeting-pack)
+ provides=(dotnet-targeting-pack-5.0)
+ conflicts=(dotnet-targeting-pack-5.0)
+
+ 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() {
+ pkgdesc='The ASP.NET Core targeting pack'
+ depends=(dotnet-targeting-pack)
+ provides=(aspnet-targeting-pack-5.0)
+ conflicts=(aspnet-targeting-pack-5.0)
+
+ 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/repos/community-x86_64/dotnet.sh (from rev 919069, dotnet-core/trunk/dotnet.sh)
===================================================================
--- dotnet.sh (rev 0)
+++ dotnet.sh 2021-04-15 13:57:04 UTC (rev 919070)
@@ -0,0 +1,12 @@
+# Set location for AppHost lookup
+[ -z "$DOTNET_ROOT" ] && export DOTNET_ROOT=/usr/share/dotnet
+
+# Add dotnet tools directory to PATH
+DOTNET_TOOLS_PATH="$HOME/.dotnet/tools"
+case "$PATH" in
+ *"$DOTNET_TOOLS_PATH"* ) true ;;
+ * ) PATH="$PATH:$DOTNET_TOOLS_PATH" ;;
+esac
+
+# Extract self-contained executables under HOME to avoid multi-user issues from using the default '/var/tmp'
+[ -z "$DOTNET_BUNDLE_EXTRACT_BASE_DIR" ] && export DOTNET_BUNDLE_EXTRACT_BASE_DIR="${XDG_CACHE_HOME:-"$HOME"/.cache}/dotnet_bundle_extract"
More information about the arch-commits
mailing list