From 7478e6ce63e68441ed49771daeb354adc2e679af Mon Sep 17 00:00:00 2001 From: Dan Moseley Date: Mon, 27 Feb 2017 19:39:04 -0800 Subject: [PATCH] Replace INSIDE_CLR with CORECLR (dotnet/coreclr#9841) Commit migrated from https://github.com/dotnet/coreclr/commit/dd40277667a6e72f499be8eded2122b69049e2e7 --- src/coreclr/src/mscorlib/System.Private.CoreLib.csproj | 2 +- src/coreclr/src/mscorlib/corefx/System/Globalization/Calendar.cs | 2 +- src/coreclr/src/mscorlib/corefx/System/Globalization/CultureData.cs | 2 +- src/coreclr/src/mscorlib/corefx/System/Globalization/CultureInfo.cs | 2 +- .../src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs | 6 +++--- .../corefx/System/Globalization/DateTimeFormatInfoScanner.cs | 2 +- .../src/mscorlib/src/System/Diagnostics/Contracts/Contracts.cs | 4 ++-- 7 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj index dc935ef..b1086fc 100644 --- a/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/coreclr/src/mscorlib/System.Private.CoreLib.csproj @@ -34,7 +34,7 @@ false true true - $(DefineConstants);CORECLR;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;INSIDE_CLR;CODE_ANALYSIS_BASELINE + $(DefineConstants);CORECLR;_USE_NLS_PLUS_TABLE;RESOURCE_SATELLITE_CONFIG;CODE_ANALYSIS_BASELINE diff --git a/src/coreclr/src/mscorlib/corefx/System/Globalization/Calendar.cs b/src/coreclr/src/mscorlib/corefx/System/Globalization/Calendar.cs index 0ff5040..274fe6f 100644 --- a/src/coreclr/src/mscorlib/corefx/System/Globalization/Calendar.cs +++ b/src/coreclr/src/mscorlib/corefx/System/Globalization/Calendar.cs @@ -64,7 +64,7 @@ namespace System.Globalization [OptionalField(VersionAdded = 2)] private bool _isReadOnly = false; -#if INSIDE_CLR +#if CORECLR internal const CalendarId CAL_HEBREW = CalendarId.HEBREW; internal const CalendarId CAL_HIJRI = CalendarId.HIJRI; internal const CalendarId CAL_JAPAN = CalendarId.JAPAN; diff --git a/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureData.cs b/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureData.cs index c15a77c..0a8c2c2 100644 --- a/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureData.cs +++ b/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureData.cs @@ -10,7 +10,7 @@ using System.Threading; namespace System.Globalization { -#if INSIDE_CLR +#if CORECLR using StringStringDictionary = Dictionary; using StringCultureDataDictionary = Dictionary; using LcidToCultureNameDictionary = Dictionary; diff --git a/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureInfo.cs b/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureInfo.cs index da084d1..0c937f2 100644 --- a/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureInfo.cs +++ b/src/coreclr/src/mscorlib/corefx/System/Globalization/CultureInfo.cs @@ -35,7 +35,7 @@ using System.Threading; namespace System.Globalization { -#if INSIDE_CLR +#if CORECLR using StringCultureInfoDictionary = Dictionary; using StringLcidDictionary = Dictionary; diff --git a/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs b/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs index b79ce90..bcfd6b1 100644 --- a/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs +++ b/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfo.cs @@ -2724,7 +2724,7 @@ namespace System.Globalization //////////////////////////////////////////////////////////////////////// private static bool TryParseHebrewNumber( -#if INSIDE_CLR +#if CORECLR ref __DTString str, #else ref FormatProvider.__DTString str, @@ -2783,7 +2783,7 @@ namespace System.Globalization } internal bool Tokenize(TokenType TokenMask, out TokenType tokenType, out int tokenValue, -#if INSIDE_CLR +#if CORECLR ref __DTString str) #else ref FormatProvider.__DTString str) @@ -3036,7 +3036,7 @@ namespace System.Globalization } } -#if !INSIDE_CLR +#if !CORECLR // // The type of token that will be returned by DateTimeFormatInfo.Tokenize(). // diff --git a/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfoScanner.cs b/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfoScanner.cs index 9cbc19f..ddf7d7e 100644 --- a/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfoScanner.cs +++ b/src/coreclr/src/mscorlib/corefx/System/Globalization/DateTimeFormatInfoScanner.cs @@ -28,7 +28,7 @@ using System.Text; namespace System.Globalization { -#if INSIDE_CLR +#if CORECLR using StringStringDictionary = Dictionary; using StringList = List; #else diff --git a/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/Contracts.cs b/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/Contracts.cs index b768e4d..fe1afe3 100644 --- a/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/Contracts.cs +++ b/src/coreclr/src/mscorlib/src/System/Diagnostics/Contracts/Contracts.cs @@ -639,7 +639,7 @@ namespace System.Diagnostics.Contracts public static bool ForAll(int fromInclusive, int toExclusive, Predicate predicate) { if (fromInclusive > toExclusive) -#if INSIDE_CLR +#if CORECLR throw new ArgumentException(Environment.GetResourceString("Argument_ToExclusiveLessThanFromExclusive")); #else throw new ArgumentException("fromInclusive must be less than or equal to toExclusive."); @@ -699,7 +699,7 @@ namespace System.Diagnostics.Contracts public static bool Exists(int fromInclusive, int toExclusive, Predicate predicate) { if (fromInclusive > toExclusive) -#if INSIDE_CLR +#if CORECLR throw new ArgumentException(Environment.GetResourceString("Argument_ToExclusiveLessThanFromExclusive")); #else throw new ArgumentException("fromInclusive must be less than or equal to toExclusive."); -- 2.7.4