diff options
| author | Jan Kotas <jkotas@microsoft.com> | 2017-03-20 16:17:55 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-20 16:17:55 -0700 |
| commit | 900113351c78d676d0d853df24bdc51a1f1171df (patch) | |
| tree | d1c1409c9472cdfc3854d3920b483a851eb563ff | |
| parent | 027180d8ef4a8a0e50f4cba3ad985af38882f5ef (diff) | |
| parent | 378a18beb2bf841a2d069b700d413dd10fdd7eb6 (diff) | |
| download | coreclr-900113351c78d676d0d853df24bdc51a1f1171df.tar.gz coreclr-900113351c78d676d0d853df24bdc51a1f1171df.tar.bz2 coreclr-900113351c78d676d0d853df24bdc51a1f1171df.zip | |
Merge pull request #10325 from dotnet/mirror-merge-9055987
Mirror changes from dotnet/corert
| -rw-r--r-- | src/mscorlib/System.Private.CoreLib.csproj | 4 | ||||
| -rw-r--r-- | src/mscorlib/shared/System.Private.CoreLib.Shared.projitems | 4 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/Reflection/Module.cs (renamed from src/mscorlib/src/System/Reflection/Module.cs) | 0 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/Type.Enum.cs (renamed from src/mscorlib/src/System/Type.Enum.cs) | 0 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/Type.Helpers.cs (renamed from src/mscorlib/src/System/Type.Helpers.cs) | 0 | ||||
| -rw-r--r-- | src/mscorlib/shared/System/Type.cs (renamed from src/mscorlib/src/System/Type.cs) | 0 |
6 files changed, 4 insertions, 4 deletions
diff --git a/src/mscorlib/System.Private.CoreLib.csproj b/src/mscorlib/System.Private.CoreLib.csproj index a6720342a4..612b1848e5 100644 --- a/src/mscorlib/System.Private.CoreLib.csproj +++ b/src/mscorlib/System.Private.CoreLib.csproj @@ -399,10 +399,7 @@ <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.cs" /> <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.StringSerializer.cs" /> <Compile Include="$(BclSourcesRoot)\System\TimeZoneInfo.TransitionTime.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Type.cs" /> <Compile Include="$(BclSourcesRoot)\System\Type.CoreCLR.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Type.Enum.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Type.Helpers.cs" /> <Compile Include="$(BclSourcesRoot)\System\TypeNameParser.cs" /> <Compile Include="$(BclSourcesRoot)\System\TypedReference.cs" /> <Compile Include="$(BclSourcesRoot)\System\TypeLoadException.cs" /> @@ -475,7 +472,6 @@ <Compile Include="$(BclSourcesRoot)\System\Reflection\MethodBase.CoreCLR.cs" /> <Compile Include="$(BclSourcesRoot)\System\Reflection\MethodImplAttributes.cs" /> <Compile Include="$(BclSourcesRoot)\System\Reflection\Missing.cs" /> - <Compile Include="$(BclSourcesRoot)\System\Reflection\Module.cs" /> <Compile Include="$(BclSourcesRoot)\System\Reflection\ModuleResolveEventHandler.cs" /> <Compile Include="$(BclSourcesRoot)\System\Reflection\MethodBody.cs" /> <Compile Include="$(BclSourcesRoot)\System\Reflection\ParameterAttributes.cs" /> diff --git a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems index 8286d377b8..fd12c72e7f 100644 --- a/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems +++ b/src/mscorlib/shared/System.Private.CoreLib.Shared.projitems @@ -162,6 +162,7 @@ <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\MemberInfo.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\MethodInfo.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\MethodBase.cs" /> + <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\Module.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ObfuscateAssemblyAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ObfuscationAttribute.cs" /> <Compile Include="$(MSBuildThisFileDirectory)System\Reflection\ParameterInfo.cs" /> @@ -213,6 +214,9 @@ <Compile Include="$(MSBuildThisFileDirectory)System\TimeoutException.cs"/> <Compile Include="$(MSBuildThisFileDirectory)System\TimeZoneNotFoundException.cs"/> <Compile Include="$(MSBuildThisFileDirectory)System\TupleExtensions.cs"/> + <Compile Include="$(MSBuildThisFileDirectory)System\Type.cs"/> + <Compile Include="$(MSBuildThisFileDirectory)System\Type.Enum.cs"/> + <Compile Include="$(MSBuildThisFileDirectory)System\Type.Helpers.cs"/> <Compile Include="$(MSBuildThisFileDirectory)System\TypeAccessException.cs"/> <Compile Include="$(MSBuildThisFileDirectory)System\TypeCode.cs"/> <Compile Include="$(MSBuildThisFileDirectory)System\TypeInitializationException.cs"/> diff --git a/src/mscorlib/src/System/Reflection/Module.cs b/src/mscorlib/shared/System/Reflection/Module.cs index 56f83c40d9..56f83c40d9 100644 --- a/src/mscorlib/src/System/Reflection/Module.cs +++ b/src/mscorlib/shared/System/Reflection/Module.cs diff --git a/src/mscorlib/src/System/Type.Enum.cs b/src/mscorlib/shared/System/Type.Enum.cs index 4d82410383..4d82410383 100644 --- a/src/mscorlib/src/System/Type.Enum.cs +++ b/src/mscorlib/shared/System/Type.Enum.cs diff --git a/src/mscorlib/src/System/Type.Helpers.cs b/src/mscorlib/shared/System/Type.Helpers.cs index f2f3bf601e..f2f3bf601e 100644 --- a/src/mscorlib/src/System/Type.Helpers.cs +++ b/src/mscorlib/shared/System/Type.Helpers.cs diff --git a/src/mscorlib/src/System/Type.cs b/src/mscorlib/shared/System/Type.cs index 09a72aaef4..09a72aaef4 100644 --- a/src/mscorlib/src/System/Type.cs +++ b/src/mscorlib/shared/System/Type.cs |