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

Removed duplicated Implementation of CultureAwareComparer #27099

Merged
merged 5 commits into from
Feb 22, 2018
Merged

Removed duplicated Implementation of CultureAwareComparer #27099

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
12f4dac
Removed duplicated Impleementatuin
Anipik Feb 13, 2018
78a429c
Cleanup Done
Anipik Feb 15, 2018
457b33c
Ref folder cleaned
Anipik Feb 15, 2018
462112c
Moved to Coreclr
Anipik Feb 20, 2018
e7b68a0
More Cleaning
Anipik Feb 22, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 2 additions & 9 deletions src/System.Globalization.Extensions/ref/System.Globalization.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,19 +8,12 @@
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
<ItemGroup>
<Compile Include="System.Globalization.Extensions.Forwards.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Compile Include="System.Globalization.Extensions.netfx.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
<ItemGroup>
<ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
<ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
<ProjectReference Include="..\..\System.Globalization\ref\System.Globalization.csproj" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
25 changes: 0 additions & 25 deletions src/System.Globalization.Extensions/ref/System.Globalization.Extensions.netfx.cs
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions src/System.Globalization.Extensions/src/ApiCompatBaseline.netfx.txt
View file
Open in desktop

This file was deleted.

123 changes: 0 additions & 123 deletions src/System.Globalization.Extensions/src/Resources/Strings.resx
View file
Open in desktop

This file was deleted.

15 changes: 1 addition & 14 deletions src/System.Globalization.Extensions/src/System.Globalization.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,29 +9,16 @@
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ProjectGuid>{2B96AA10-84C0-4927-8611-8D2474B990E8}</ProjectGuid>
<IsPartialFacadeAssembly>true</IsPartialFacadeAssembly>
<OmitResources Condition="'$(TargetGroup)' != 'netfx'">true</OmitResources>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Unix-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'netcoreapp-Windows_NT-Release|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Debug|AnyCPU'" />
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'uap-Windows_NT-Release|AnyCPU'" />
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
Copy link
Member

@jkotas jkotas Feb 15, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You can delete all netfx conditions from this file.

<Compile Include="System\Globalization\Extensions.cs" />
<Compile Include="System\StringNormalizationExtensions.netfx.cs" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' != 'netfx'">
<Reference Include="System.Diagnostics.Debug" />
<Reference Include="System.Diagnostics.Tools" />
<Reference Include="System.Resources.ResourceManager" />
<ItemGroup>
<Reference Include="System.Runtime" />
<Reference Include="System.Runtime.Extensions" />
<Reference Include="System.Runtime.InteropServices" />
</ItemGroup>
<ItemGroup Condition="'$(TargetGroup)' == 'netfx'">
<Reference Include="mscorlib" />
<Reference Include="System" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
97 changes: 0 additions & 97 deletions src/System.Globalization.Extensions/src/System/Globalization/Extensions.cs
View file
Open in desktop

This file was deleted.

29 changes: 0 additions & 29 deletions src/System.Globalization.Extensions/src/System/StringNormalizationExtensions.netfx.cs
View file
Open in desktop

This file was deleted.

1 change: 0 additions & 1 deletion src/System.Runtime.Extensions/src/System.Runtime.Extensions.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,6 @@
<Compile Include="System\Environment.cs" />
<Compile Include="System\Environment.SpecialFolder.cs" />
<Compile Include="System\Environment.SpecialFolderOption.cs" />
<Compile Include="System\Globalization\Extensions.cs" />
<Compile Include="System\LoaderOptimization.cs" />
<Compile Include="System\LoaderOptimizationAttribute.cs" />
<Compile Include="System\OperatingSystem.cs" />
Expand Down
Loading