diff options
author | Jan Kotas <jkotas@microsoft.com> | 2017-10-02 21:28:12 -0700 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2017-10-05 22:10:36 -0700 |
commit | 6ef58bae7c5ffc966cae00d37906769e66b98485 (patch) | |
tree | 9763b4962449216cfc9bb80482ac9373dc547721 /src | |
parent | 4e033eabe262457733b7f4f8045083eb1baca582 (diff) | |
download | coreclr-6ef58bae7c5ffc966cae00d37906769e66b98485.tar.gz coreclr-6ef58bae7c5ffc966cae00d37906769e66b98485.tar.bz2 coreclr-6ef58bae7c5ffc966cae00d37906769e66b98485.zip |
Update Microsoft.NETCore.Native package (dotnet/corert#4646)
Partial port of https://github.com/dotnet/coreclr/pull/10264
Fixes #4640
Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
Diffstat (limited to 'src')
-rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 1 | ||||
-rw-r--r-- | src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.ICU.cs (renamed from src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.ICU.cs) | 0 | ||||
-rw-r--r-- | src/mscorlib/shared/System.Private.CoreLib.Shared.projitems | 1 |
3 files changed, 1 insertions, 1 deletions
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index 03838dba84..4919269b32 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -616,7 +616,6 @@ </ItemGroup> <ItemGroup Condition="'$(TargetsUnix)' == 'true'"> <Compile Include="$(BclSourcesRoot)\Interop\Unix\Interop.Libraries.cs" /> - <Compile Include="$(BclSourcesRoot)\Interop\Unix\System.Globalization.Native\Interop.ICU.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\CompareInfo.Unix.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\CultureInfo.Unix.cs" /> <Compile Include="$(BclSourcesRoot)\System\Globalization\EncodingTable.Unix.cs" /> diff --git a/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.ICU.cs b/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.ICU.cs index c690884145..c690884145 100644 --- a/src/mscorlib/src/Interop/Unix/System.Globalization.Native/Interop.ICU.cs +++ b/src/mscorlib/shared/Interop/Unix/System.Globalization.Native/Interop.ICU.cs diff --git a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems index 1dbbe7b34e..8f315167d2 100644 --- a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems @@ -645,6 +645,7 @@ <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Calendar.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Casing.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Collation.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> + <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.ICU.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Idna.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Locale.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> <Compile Include="$(MSBuildThisFileDirectory)Interop\Unix\System.Globalization.Native\Interop.Normalization.cs" Condition="'$(EnableDummyGlobalizationImplementation)' != 'true'" /> |