Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/corert.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJan Kotas <jkotas@microsoft.com>2016-09-30 07:17:34 +0300
committerJan Kotas <jkotas@microsoft.com>2016-09-30 07:17:34 +0300
commit708a59f72fd6482f1a11b7a0899945deda691dbe (patch)
treea065b97a81746c1a4413f5bf6a49edc5b502522c /src/Test.CoreLib
parent6832404e0321bf8a33755dbf38f220fea3778ccf (diff)
Fix conflicts between Test.CoreLib and CastableObject work
Diffstat (limited to 'src/Test.CoreLib')
-rw-r--r--src/Test.CoreLib/src/Test.CoreLib.csproj6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/Test.CoreLib/src/Test.CoreLib.csproj b/src/Test.CoreLib/src/Test.CoreLib.csproj
index b73948bba..041706c58 100644
--- a/src/Test.CoreLib/src/Test.CoreLib.csproj
+++ b/src/Test.CoreLib/src/Test.CoreLib.csproj
@@ -74,6 +74,9 @@
<Compile Include="..\..\Runtime.Base\src\System\Runtime\InternalCalls.cs">
<Link>Runtime.Base\src\System\Runtime\InternalCalls.cs</Link>
</Compile>
+ <Compile Include="..\..\Runtime.Base\src\System\Runtime\CastableObjectSupport.cs">
+ <Link>Runtime.Base\src\System\Runtime\CastableObjectSupport.cs</Link>
+ </Compile>
<Compile Include="..\..\Runtime.Base\src\System\Runtime\RuntimeExports.cs">
<Link>Runtime.Base\src\System\Runtime\RuntimeExports.cs</Link>
</Compile>
@@ -172,6 +175,9 @@
<Compile Include="..\..\Runtime.Base\src\System\Runtime\CompilerServices\IntrinsicAttribute.cs">
<Link>System\Runtime\CompilerServices\IntrinsicAttribute.cs</Link>
</Compile>
+ <Compile Include="..\..\Runtime.Base\src\System\Runtime\CompilerServices\ICastable.cs">
+ <Link>System\Runtime\CompilerServices\ICastable.cs</Link>
+ </Compile>
<Compile Include="..\..\Runtime.Base\src\System\Runtime\CompilerServices\IsVolatile.cs">
<Link>System\Runtime\CompilerServices\IsVolatile.cs</Link>
</Compile>