Skip to content

Commit 45c13fc

Browse files
Anipikjkotas
authored andcommitted
Removed duplicated Implementation of CultureAwareComparer (dotnet/corefx#27099)
Commit migrated from dotnet/corefx@0fbb5f1
1 parent d1a1ffb commit 45c13fc

File tree

9 files changed

+3
-399
lines changed

9 files changed

+3
-399
lines changed

src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,12 @@
88
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
99
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
1010
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
11-
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
11+
<ItemGroup>
1212
<Compile Include="System.Globalization.Extensions.Forwards.cs" />
1313
</ItemGroup>
14-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
15-
<Compile Include="System.Globalization.Extensions.netfx.cs" />
16-
</ItemGroup>
17-
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
14+
<ItemGroup>
1815
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
1916
<ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
20-
<ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" />
21-
</ItemGroup>
22-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
23-
<Reference Include="mscorlib" />
2417
</ItemGroup>
2518
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
2619
</Project>

src/libraries/System.Globalization.Extensions/ref/System.Globalization.Extensions.netfx.cs

Lines changed: 0 additions & 25 deletions
This file was deleted.

src/libraries/System.Globalization.Extensions/src/ApiCompatBaseline.netfx.txt

Lines changed: 0 additions & 4 deletions
This file was deleted.

src/libraries/System.Globalization.Extensions/src/Resources/Strings.resx

Lines changed: 0 additions & 123 deletions
This file was deleted.

src/libraries/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj

Lines changed: 1 addition & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,16 @@
99
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
1010
<ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid>
1111
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
12-
<OmitResources Condition="'$(TargetGroup)' != 'netfx'">true</OmitResources>
1312
</PropertyGroup>
1413
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
1514
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
1615
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
1716
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
1817
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
1918
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
20-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
21-
<Compile Include="System\Globalization\Extensions.cs" />
22-
<Compile Include="System\StringNormalizationExtensions.netfx.cs" />
23-
</ItemGroup>
24-
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
25-
<Reference Include="System.Diagnostics.Debug" />
26-
<Reference Include="System.Diagnostics.Tools" />
27-
<Reference Include="System.Resources.ResourceManager" />
19+
<ItemGroup>
2820
<Reference Include="System.Runtime" />
2921
<Reference Include="System.Runtime.Extensions" />
30-
<Reference Include="System.Runtime.InteropServices" />
31-
</ItemGroup>
32-
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
33-
<Reference Include="mscorlib" />
34-
<Reference Include="System" />
3522
</ItemGroup>
3623
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
3724
</Project>

src/libraries/System.Globalization.Extensions/src/System/Globalization/Extensions.cs

Lines changed: 0 additions & 97 deletions
This file was deleted.

src/libraries/System.Globalization.Extensions/src/System/StringNormalizationExtensions.netfx.cs

Lines changed: 0 additions & 29 deletions
This file was deleted.

src/libraries/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@
3333
<Compile Include="System\Environment.cs" />
3434
<Compile Include="System\Environment.SpecialFolder.cs" />
3535
<Compile Include="System\Environment.SpecialFolderOption.cs" />
36-
<Compile Include="System\Globalization\Extensions.cs" />
3736
<Compile Include="System\LoaderOptimization.cs" />
3837
<Compile Include="System\LoaderOptimizationAttribute.cs" />
3938
<Compile Include="System\OperatingSystem.cs" />

0 commit comments

Comments
 (0)