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

Commit 7babb04

Browse files
authored
Move more files to shared CoreLib partition (#11429)
1 parent bb70a71 commit 7babb04

17 files changed

+32
-30
lines changed

src/mscorlib/System.Private.CoreLib.csproj

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -345,7 +345,6 @@
345345
<Compile Include="$(BclSourcesRoot)\System\NonSerializedAttribute.cs" />
346346
<Compile Include="$(BclSourcesRoot)\System\Number.cs" />
347347
<Compile Include="$(BclSourcesRoot)\System\OperatingSystem.cs" />
348-
<Compile Include="$(BclSourcesRoot)\System\OperationCanceledException.cs" />
349348
<Compile Include="$(BclSourcesRoot)\System\ParseNumbers.cs" />
350349
<Compile Include="$(BclSourcesRoot)\System\PlatformID.cs" />
351350
<Compile Include="$(BclSourcesRoot)\System\ResId.cs" />
@@ -475,10 +474,7 @@
475474
<Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendar.cs" />
476475
<Compile Include="$(BclSourcesRoot)\System\Globalization\GregorianCalendarHelper.cs" />
477476
<Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.cs" />
478-
<Compile Include="$(BclSourcesRoot)\System\Globalization\NumberFormatInfo.cs" />
479477
<Compile Include="$(BclSourcesRoot)\System\Globalization\RegionInfo.cs" />
480-
<Compile Include="$(BclSourcesRoot)\System\Globalization\SortKey.cs" />
481-
<Compile Include="$(BclSourcesRoot)\System\Globalization\StringInfo.cs" />
482478
<Compile Include="$(BclSourcesRoot)\System\Globalization\TextElementEnumerator.cs" />
483479
<Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.cs" />
484480
<Compile Include="$(BclSourcesRoot)\System\Globalization\TimeSpanFormat.cs" />
@@ -543,7 +539,6 @@
543539
<Compile Include="$(BclSourcesRoot)\System\IO\Directory.cs" />
544540
<Compile Include="$(BclSourcesRoot)\System\IO\SearchOption.cs" />
545541
<Compile Include="$(BclSourcesRoot)\System\IO\DriveNotFoundException.cs" />
546-
<Compile Include="$(BclSourcesRoot)\System\IO\EncodingCache.cs" />
547542
<Compile Include="$(BclSourcesRoot)\System\IO\File.cs" />
548543
<Compile Include="$(BclSourcesRoot)\System\IO\FileLoadException.CoreCLR.cs" />
549544
<Compile Include="$(BclSourcesRoot)\System\IO\FileNotFoundException.CoreCLR.cs" />
@@ -662,17 +657,11 @@
662657
<ItemGroup Condition="'$(TargetsUnix)' == 'true'">
663658
<Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.Collation.cs" />
664659
<Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.ICU.cs" />
665-
<Compile Include="$(BclSourcesRoot)\System\Diagnostics\Debug.Unix.cs" />
666-
<Compile Include="$(BclSourcesRoot)\System\Globalization\CalendarData.Unix.cs" />
667660
<Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.Unix.cs" />
668-
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.Unix.cs" />
669661
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Unix.cs" />
670662
<Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingTable.Unix.cs" />
671663
<Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingDataItem.Unix.cs" />
672664
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Unix.cs" />
673-
<Compile Include="$(BclSourcesRoot)\System\Globalization\HijriCalendar.Unix.cs" />
674-
<Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.Unix.cs" />
675-
<Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.Unix.cs" />
676665
<Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.Unix.cs" />
677666
<Compile Include="$(BclSourcesRoot)\System\IO\FileSystemEnumerable.cs" />
678667
<Compile Include="$(BclSourcesRoot)\System\IO\TextReader.cs" />
@@ -690,9 +679,7 @@
690679
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureData.Windows.cs" />
691680
<Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Windows.cs" />
692681
<Compile Include="$(BclSourcesRoot)\System\Globalization\GlobalizationMode.Windows.cs" />
693-
<Compile Include="$(BclSourcesRoot)\System\Globalization\HijriCalendar.Win32.cs" />
694682
<Compile Include="$(BclSourcesRoot)\System\Globalization\IdnMapping.Windows.cs" />
695-
<Compile Include="$(BclSourcesRoot)\System\Globalization\JapaneseCalendar.Win32.cs" />
696683
<Compile Include="$(BclSourcesRoot)\System\Globalization\TextInfo.Windows.cs" />
697684
<Compile Include="$(BclSourcesRoot)\System\Text\Normalization.Windows.cs" />
698685
<Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.Win32.cs" />

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

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,12 @@
112112
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JulianCalendar.cs"/>
113113
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\KoreanCalendar.cs"/>
114114
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\KoreanLunisolarCalendar.cs"/>
115+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\NumberFormatInfo.cs"/>
115116
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\NumberStyles.cs"/>
116117
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\PersianCalendar.cs"/>
118+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\SortKey.cs"/>
117119
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\SortVersion.cs"/>
120+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\StringInfo.cs"/>
118121
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TaiwanCalendar.cs"/>
119122
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\TaiwanLunisolarCalendar.cs"/>
120123
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\ThaiBuddhistCalendar.cs"/>
@@ -137,6 +140,7 @@
137140
<Compile Include="$(MSBuildThisFileDirectory)System\InvalidProgramException.cs"/>
138141
<Compile Include="$(MSBuildThisFileDirectory)System\InvalidTimeZoneException.cs"/>
139142
<Compile Include="$(MSBuildThisFileDirectory)System\IO\DirectoryNotFoundException.cs"/>
143+
<Compile Include="$(MSBuildThisFileDirectory)System\IO\EncodingCache.cs"/>
140144
<Compile Include="$(MSBuildThisFileDirectory)System\IO\EndOfStreamException.cs"/>
141145
<Compile Include="$(MSBuildThisFileDirectory)System\IO\Error.cs"/>
142146
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileAccess.cs"/>
@@ -170,6 +174,7 @@
170174
<Compile Include="$(MSBuildThisFileDirectory)System\NullReferenceException.cs"/>
171175
<Compile Include="$(MSBuildThisFileDirectory)System\ObjectDisposedException.cs"/>
172176
<Compile Include="$(MSBuildThisFileDirectory)System\ObsoleteAttribute.cs"/>
177+
<Compile Include="$(MSBuildThisFileDirectory)System\OperationCanceledException.cs"/>
173178
<Compile Include="$(MSBuildThisFileDirectory)System\OverflowException.cs"/>
174179
<Compile Include="$(MSBuildThisFileDirectory)System\ParamArrayAttribute.cs"/>
175180
<Compile Include="$(MSBuildThisFileDirectory)System\ParamsArray.cs"/>
@@ -493,6 +498,10 @@
493498
<Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\OleAut32\Interop.SysFreeString.cs"/>
494499
<Compile Include="$(MSBuildThisFileDirectory)Interop\Windows\OleAut32\Interop.SysStringLen.cs"/>
495500
<Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFileHandle.Windows.cs" />
501+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Win32.cs" Condition="'$(IsProjectNLibrary)' != 'true' and '$(EnableDummyGlobalizationImplementation)' != 'true'"/>
502+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.WinRT.cs" Condition="'$(IsProjectNLibrary)' == 'true'"/>
503+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.Win32.cs" Condition="'$(IsProjectNLibrary)' != 'true' and '$(EnableDummyGlobalizationImplementation)' != 'true'"/>
504+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.WinRT.cs" Condition="'$(IsProjectNLibrary)' == 'true'"/>
496505
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Win32.cs" Condition="'$(IsProjectNLibrary)' != 'true'" />
497506
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Windows.cs" />
498507
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.WinRT.cs" Condition="'$(IsProjectNLibrary)' == 'true'" />
@@ -537,7 +546,13 @@
537546
<Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.Unlink.cs"/>
538547
<Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Native\Interop.Write.cs"/>
539548
<Compile Include="$(MSBuildThisFileDirectory)Microsoft\Win32\SafeHandles\SafeFileHandle.Unix.cs"/>
549+
<Compile Include="$(MSBuildThisFileDirectory)System\Diagnostics\Debug.Unix.cs"/>
550+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CalendarData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
551+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\CultureData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
552+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\HijriCalendar.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
553+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\IdnMapping.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
540554
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\LocaleData.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
555+
<Compile Include="$(MSBuildThisFileDirectory)System\Globalization\JapaneseCalendar.Unix.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'"/>
541556
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.OSX.cs" Condition="'$(TargetsOSX)' == 'true'"/>
542557
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Linux.cs" Condition="'$(TargetsOSX)' != 'true'"/>
543558
<Compile Include="$(MSBuildThisFileDirectory)System\IO\FileStream.Unix.cs"/>
File renamed without changes.

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

File renamed without changes.

src/mscorlib/src/System/Globalization/CultureData.Unix.cs renamed to src/mscorlib/shared/System/Globalization/CultureData.Unix.cs

File renamed without changes.

src/mscorlib/src/System/Globalization/HijriCalendar.Unix.cs renamed to src/mscorlib/shared/System/Globalization/HijriCalendar.Unix.cs

File renamed without changes.

src/mscorlib/src/System/Globalization/HijriCalendar.Win32.cs renamed to src/mscorlib/shared/System/Globalization/HijriCalendar.Win32.cs

File renamed without changes.

src/mscorlib/src/System/Globalization/HijriCalendar.WinRT.cs renamed to src/mscorlib/shared/System/Globalization/HijriCalendar.WinRT.cs

File renamed without changes.

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

File renamed without changes.

src/mscorlib/src/System/Globalization/JapaneseCalendar.Unix.cs renamed to src/mscorlib/shared/System/Globalization/JapaneseCalendar.Unix.cs

File renamed without changes.

0 commit comments

Comments
 (0)