Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

Commit ff440aa

Browse files
jkotasjkotas
authored
Move ArraySegment and a few other files to shared CoreLib partition (#15158)
1 parent 3e734b6 commit ff440aa

27 files changed

+399
-475
lines changed

‎src/mscorlib/System.Private.CoreLib.csproj‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -306,7 +306,6 @@
306306
<Compile Include="$(BclSourcesRoot)\System\CurrentSystemTimeZone.Cache.cs" />
307307
<Compile Include="$(BclSourcesRoot)\System\Object.cs" />
308308
<Compile Include="$(BclSourcesRoot)\System\Array.cs" />
309-
<Compile Include="$(BclSourcesRoot)\System\ArraySegment.cs" />
310309
<Compile Include="$(BclSourcesRoot)\System\ThrowHelper.cs" />
311310
<Compile Include="$(BclSourcesRoot)\System\String.cs" />
312311
<Compile Include="$(BclSourcesRoot)\System\String.Comparison.cs" />
@@ -331,13 +330,11 @@
331330
<Compile Include="$(BclSourcesRoot)\System\Decimal.cs" />
332331
<Compile Include="$(BclSourcesRoot)\System\Decimal.DecCalc.cs" />
333332
<Compile Include="$(BclSourcesRoot)\System\DefaultBinder.CanConvert.cs" />
334-
<Compile Include="$(BclSourcesRoot)\System\Empty.cs" />
335333
<Compile Include="$(BclSourcesRoot)\System\Enum.cs" />
336334
<Compile Include="$(BclSourcesRoot)\System\Environment.cs" />
337335
<Compile Include="$(BclSourcesRoot)\System\GC.cs" />
338336
<Compile Include="$(BclSourcesRoot)\System\Guid.CoreCLR.cs" />
339337
<Compile Include="$(BclSourcesRoot)\System\InsufficientMemoryException.cs" />
340-
<Compile Include="$(BclSourcesRoot)\System\IntPtr.cs" />
341338
<Compile Include="$(BclSourcesRoot)\System\Internal.cs" />
342339
<Compile Include="$(BclSourcesRoot)\System\Math.CoreCLR.cs" />
343340
<Compile Include="$(BclSourcesRoot)\System\MathF.CoreCLR.cs" />
@@ -358,7 +355,6 @@
358355
<Compile Include="$(BclSourcesRoot)\System\TypeNameParser.cs" />
359356
<Compile Include="$(BclSourcesRoot)\System\TypedReference.cs" />
360357
<Compile Include="$(BclSourcesRoot)\System\TypeLoadException.cs" />
361-
<Compile Include="$(BclSourcesRoot)\System\UIntPtr.cs" />
362358
<Compile Include="$(BclSourcesRoot)\System\ValueType.cs" />
363359
<Compile Include="$(BclSourcesRoot)\System\WeakReference.cs" />
364360
<Compile Include="$(BclSourcesRoot)\System\WeakReferenceOfT.cs" />
@@ -451,14 +447,10 @@
451447
<Compile Include="$(BclSourcesRoot)\System\Reflection\Metadata\AssemblyExtensions.cs" />
452448
</ItemGroup>
453449
<ItemGroup>
454-
<Compile Include="$(BclSourcesRoot)\System\Globalization\BidiCategory.cs" />
455-
<Compile Include="$(BclSourcesRoot)\System\Globalization\CharUnicodeInfo.cs" />
456450
<Compile Include="$(BclSourcesRoot)\System\Globalization\CharUnicodeInfoData.cs" />
457451
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.cs" />
458452
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.cs" />
459453
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.cs" />
460-
<Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.cs" />
461-
<Compile Include="$(BclSourcesRoot)\System\Globalization\RegionInfo.cs" />
462454
<Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.cs" />
463455
</ItemGroup>
464456
<ItemGroup Condition="'$(FeatureCoreFxGlobalization)' != 'true'">
@@ -609,7 +601,6 @@
609601
<Compile Include="$(BclSourcesRoot)\Interop\Windows\Normaliz\Interop.Idna.cs" />
610602
<Compile Include="$(BclSourcesRoot)\Interop\Windows\Normaliz\Interop.Normalization.cs" />
611603
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Debug.Windows.cs" />
612-
<Compile Include="$(BclSourcesRoot)\System\Globalization\CalendarData.Windows.cs" />
613604
<Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.Windows.cs" />
614605
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.Windows.cs" />
615606
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Windows.cs" />

‎src/mscorlib/shared/Microsoft/Win32/SafeHandles/CriticalHandleZeroOrMinusOneIsInvalid.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ protected CriticalHandleZeroOrMinusOneIsInvalid()
1515
{
1616
}
1717

18-
public override bool IsInvalid => handle.IsNull() || handle == new IntPtr(-1);
18+
public override bool IsInvalid => handle == IntPtr.Zero || handle == new IntPtr(-1);
1919
}
2020
}

‎src/mscorlib/shared/System.Private.CoreLib.Shared.projitems‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
<Compile Include="$(MSBuildThisFileDirectory)System\ArgumentNullException.cs" />
3232
<Compile Include="$(MSBuildThisFileDirectory)System\ArgumentOutOfRangeException.cs" />
3333
<Compile Include="$(MSBuildThisFileDirectory)System\ArithmeticException.cs" />
34+
<Compile Include="$(MSBuildThisFileDirectory)System\ArraySegment.cs" />
3435
<Compile Include="$(MSBuildThisFileDirectory)System\ArrayTypeMismatchException.cs" />
3536
<Compile Include="$(MSBuildThisFileDirectory)System\AssemblyLoadEventArgs.cs" />
3637
<Compile Include="$(MSBuildThisFileDirectory)System\AssemblyLoadEventHandler.cs" />
@@ -114,6 +115,7 @@
114115
<Compile Include="$(MSBuildThisFileDirectory)System\DllNotFoundException.cs" />
115116
<Compile Include="$(MSBuildThisFileDirectory)System\Double.cs" />
116117
<Compile Include="$(MSBuildThisFileDirectory)System\DuplicateWaitObjectException.cs" />
118+
<Compile Include="$(MSBuildThisFileDirectory)System\Empty.cs" />
117119
<Compile Include="$(MSBuildThisFileDirectory)System\EntryPointNotFoundException.cs" />
118120
<Compile Include="$(MSBuildThisFileDirectory)System\EventArgs.cs" />
119121
<Compile Include="$(MSBuildThisFileDirectory)System\EventHandler.cs" />
@@ -122,11 +124,13 @@
122124
<Compile Include="$(MSBuildThisFileDirectory)System\FlagsAttribute.cs" />
123125
<Compile Include="$(MSBuildThisFileDirectory)System\FormatException.cs" />
124126
<Compile Include="$(MSBuildThisFileDirectory)System\FormattableString.cs" />
127+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\BidiCategory.cs" />
125128
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\Calendar.cs" />
126129
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarAlgorithmType.cs" />
127130
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.cs" />
128131
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarWeekRule.cs" />
129132
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendricalCalculationsHelper.cs" />
133+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CharUnicodeInfo.cs" />
130134
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ChineseLunisolarCalendar.cs" />
131135
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.cs" />
132136
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CompareInfo.Invariant.cs" />
@@ -146,6 +150,7 @@
146150
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HebrewCalendar.cs" />
147151
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HebrewNumber.cs" />
148152
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.cs" />
153+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\IdnMapping.cs" />
149154
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\InternalGlobalizationHelper.cs" />
150155
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.cs" />
151156
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseLunisolarCalendar.cs" />
@@ -155,6 +160,7 @@
155160
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\NumberFormatInfo.cs" />
156161
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\NumberStyles.cs" />
157162
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\PersianCalendar.cs" />
163+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\RegionInfo.cs" />
158164
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\SortKey.cs" />
159165
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\SortVersion.cs" />
160166
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\StringInfo.cs" />
@@ -216,6 +222,7 @@
216222
<Compile Include="$(MSBuildThisFileDirectory)System\Int16.cs" />
217223
<Compile Include="$(MSBuildThisFileDirectory)System\Int32.cs" />
218224
<Compile Include="$(MSBuildThisFileDirectory)System\Int64.cs" />
225+
<Compile Include="$(MSBuildThisFileDirectory)System\IntPtr.cs" />
219226
<Compile Include="$(MSBuildThisFileDirectory)System\Lazy.cs" />
220227
<Compile Include="$(MSBuildThisFileDirectory)System\Math.cs" />
221228
<Compile Include="$(MSBuildThisFileDirectory)System\MathF.cs" />
@@ -545,6 +552,7 @@
545552
<Compile Include="$(MSBuildThisFileDirectory)System\UInt16.cs" />
546553
<Compile Include="$(MSBuildThisFileDirectory)System\UInt32.cs" />
547554
<Compile Include="$(MSBuildThisFileDirectory)System\UInt64.cs" />
555+
<Compile Include="$(MSBuildThisFileDirectory)System\UIntPtr.cs" />
548556
<Compile Include="$(MSBuildThisFileDirectory)System\UnauthorizedAccessException.cs" />
549557
<Compile Include="$(MSBuildThisFileDirectory)System\UnhandledExceptionEventArgs.cs" />
550558
<Compile Include="$(MSBuildThisFileDirectory)System\UnhandledExceptionEventHandler.cs" />
@@ -635,6 +643,7 @@
635643
<Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\OleAut32\Interop.SysFreeString.cs" />
636644
<Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\OleAut32\Interop.SysStringLen.cs" />
637645
<Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFileHandle.Windows.cs" />
646+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Windows.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" />
638647
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Win32.cs" Condition="'$(EnableWinRT)' != 'true' and '$(EnableDummyGlobalizationImplementation)' != 'true'" />
639648
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.WinRT.cs" Condition="'$(EnableWinRT)' == 'true'" />
640649
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.Win32.cs" Condition="'$(EnableWinRT)' != 'true' and '$(EnableDummyGlobalizationImplementation)' != 'true'" />

src/mscorlib/src/System/ArraySegment.cs renamed to src/mscorlib/shared/System/ArraySegment.cs

File renamed without changes.

‎src/mscorlib/shared/System/Empty.cs‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
// Licensed to the .NET Foundation under one or more agreements.
2+
// The .NET Foundation licenses this file to you under the MIT license.
3+
// See the LICENSE file in the project root for more information.
4+
5+
namespace System
6+
{
7+
#if CORERT
8+
public // Needs to be public so that Reflection.Core can see it.
9+
#else
10+
internal
11+
#endif
12+
sealed class Empty
13+
{
14+
private Empty()
15+
{
16+
}
17+
18+
public static readonly Empty Value = new Empty();
19+
20+
public override String ToString()
21+
{
22+
return String.Empty;
23+
}
24+
}
25+
}

src/mscorlib/src/System/Globalization/BidiCategory.cs renamed to src/mscorlib/shared/System/Globalization/BidiCategory.cs

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,6 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5-
/*============================================================
6-
**
7-
**
8-
** Purpose:
9-
**
10-
**
11-
============================================================*/
12-
135
namespace System.Globalization
146
{
157
internal enum BidiCategory

src/mscorlib/src/System/Globalization/CalendarData.Windows.cs renamed to src/mscorlib/shared/System/Globalization/CalendarData.Windows.cs

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,6 @@
1010

1111
namespace System.Globalization
1212
{
13-
#if CORECLR
14-
using IntList = List<int>;
15-
using StringList = List<string>;
16-
#else
17-
using IntList = LowLevelList<int>;
18-
using StringList = LowLevelList<string>;
19-
#endif
20-
2113
internal partial class CalendarData
2214
{
2315
private bool LoadCalendarDataFromSystem(String localeName, CalendarId calendarId)
@@ -140,7 +132,7 @@ internal static int GetCalendars(String localeName, bool useUserOverride, Calend
140132

141133
EnumCalendarsData data = new EnumCalendarsData();
142134
data.userOverride = 0;
143-
data.calendars = new IntList();
135+
data.calendars = new List<int>();
144136

145137
// First call GetLocaleInfo if necessary
146138
if (useUserOverride)
@@ -284,7 +276,7 @@ private static unsafe bool CallGetCalendarInfoEx(string localeName, CalendarId c
284276
private class EnumData
285277
{
286278
public string userOverride;
287-
public StringList strings;
279+
public List<string> strings;
288280
}
289281

290282
// EnumCalendarInfoExEx callback itself.
@@ -312,7 +304,7 @@ private static unsafe bool CallEnumCalendarInfo(string localeName, CalendarId ca
312304
{
313305
EnumData context = new EnumData();
314306
context.userOverride = null;
315-
context.strings = new StringList();
307+
context.strings = new List<string>();
316308
// First call GetLocaleInfo if necessary
317309
if (((lcType != 0) && ((lcType & CAL_NOUSEROVERRIDE) == 0)) &&
318310
// Get user locale, see if it matches localeName.
@@ -437,7 +429,7 @@ private static bool GetCalendarMonthInfo(string localeName, CalendarId calendar,
437429
private class EnumCalendarsData
438430
{
439431
public int userOverride; // user override value (if found)
440-
public IntList calendars; // list of calendars found so far
432+
public List<int> calendars; // list of calendars found so far
441433
}
442434

443435
// [NativeCallable(CallingConvention = CallingConvention.StdCall)]

src/mscorlib/src/System/Globalization/CharUnicodeInfo.cs renamed to src/mscorlib/shared/System/Globalization/CharUnicodeInfo.cs

File renamed without changes.

src/mscorlib/src/System/Globalization/IdnMapping.cs renamed to src/mscorlib/shared/System/Globalization/IdnMapping.cs

File renamed without changes.

src/mscorlib/src/System/Globalization/RegionInfo.cs renamed to src/mscorlib/shared/System/Globalization/RegionInfo.cs

File renamed without changes.

0 commit comments

Comments
 (0)