Skip to content
This repository was archived by the owner on Nov 1, 2020. It is now read-only.
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace Internal.TypeSystem
{
static class VirtualFunctionResolution
public static class VirtualFunctionResolution
{
class UnificationGroup
{
Expand Down
59 changes: 59 additions & 0 deletions src/ILToNative.TypeSystem/src/ILToNative.TypeSystem.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,59 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}</ProjectGuid>
<OutputType>Library</OutputType>
<RootNamespace>Internal.TypeSystem</RootNamespace>
<AssemblyName>ILToNative.TypeSystem</AssemblyName>
<DefaultLanguage>en-US</DefaultLanguage>
<FileAlignment>512</FileAlignment>
<CLSCompliant>false</CLSCompliant>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<ExcludeResourcesImport>true</ExcludeResourcesImport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<Compile Include="$(CommonPath)\TypeSystem\Common\AlignmentHelper.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\ArrayType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\ByRefType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\FieldForInstantiatedType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\FieldLayout.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\InstantiatedMethod.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\InstantiatedType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\MetadataType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\MethodForInstantiatedType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\ParameterizedType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\PointerType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\SignatureVariable.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TargetDetails.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\ThreadSafeFlags.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeCast.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeFlags.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeHashingAlgorithms.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeSystemContext.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeSystemHelpers.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\WellKnownType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\FieldDesc.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\MethodDesc.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\VirtualFunctionResolution.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeDesc.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Common\TypeDesc.MethodImpls.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaField.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaGenericParameter.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaMethod.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaModule.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaSignatureParser.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\EcmaType.cs" />
<Compile Include="$(CommonPath)\TypeSystem\Ecma\IMetadataStringDecoderProvider.cs" />
</ItemGroup>
<ItemGroup>
<None Include="project.json" />
</ItemGroup>
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
"System.Threading": "4.0.0",
"System.Text.Encoding.Extensions": "4.0.0",
"System.Reflection.Extensions": "4.0.0",
"System.Reflection.Metadata": "1.0.22"
"System.Reflection.Metadata": "1.0.22",
},
"frameworks": {
"dotnet": {}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,9 @@
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\src\TypeSystem.csproj">
<ProjectReference Include="..\src\ILToNative.TypeSystem.csproj">
<Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
<Name>TypeSystem</Name>
</ProjectReference>
<ProjectReference Include="..\..\TypeSystem.Ecma\src\TypeSystem.Ecma.csproj">
<Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
<Name>TypeSystem</Name>
<Name>ILToNative.TypeSystem</Name>
</ProjectReference>

<!-- Make sure the test data gets built -->
Expand Down
6 changes: 6 additions & 0 deletions src/ILToNative/ILToNative.sln
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILToNative", "src\ILToNativ
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "repro", "repro\repro.csproj", "{FBA029C3-B184-4457-AEEC-38D0C2523067}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ILToNative.TypeSystem", "..\ILToNative.TypeSystem\src\ILToNative.TypeSystem.csproj", "{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -21,6 +23,10 @@ Global
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.ActiveCfg = Release|Any CPU
{FBA029C3-B184-4457-AEEC-38D0C2523067}.Release|Any CPU.Build.0 = Release|Any CPU
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1A9DF196-43A9-44BB-B2C6-D62AA56B0E49}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
124 changes: 15 additions & 109 deletions src/ILToNative/src/ILToNative.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,12 @@
<PropertyGroup>
<StartupObject />
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\ILToNative.TypeSystem\src\ILToNative.TypeSystem.csproj">
<Project>{dd5b6baa-d41a-4a6e-9e7d-83060f394b10}</Project>
<Name>ILToNative.TypeSystem</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="Compiler\AsmWriter.cs" />
<Compile Include="Compiler\Compilation.cs" />
Expand All @@ -59,131 +65,31 @@
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\TypeSystem\src\Common\AlignmentHelper.cs">
<Link>TypeSystem\AlignmentHelper.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\ArrayType.cs">
<Link>TypeSystem\ArrayType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\ByRefType.cs">
<Link>TypeSystem\ByRefType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\FieldForInstantiatedType.cs">
<Link>TypeSystem\FieldForInstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\FieldLayout.cs">
<Link>TypeSystem\FieldLayout.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\InstantiatedMethod.cs">
<Link>TypeSystem\InstantiatedMethod.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\InstantiatedType.cs">
<Link>TypeSystem\InstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\MetadataType.cs">
<Link>TypeSystem\MetadataType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\MethodForInstantiatedType.cs">
<Link>TypeSystem\MethodForInstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\ParameterizedType.cs">
<Link>TypeSystem\ParameterizedType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\PointerType.cs">
<Link>TypeSystem\PointerType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\SignatureVariable.cs">
<Link>TypeSystem\SignatureVariable.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TargetDetails.cs">
<Link>TypeSystem\TargetDetails.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\ThreadSafeFlags.cs">
<Link>TypeSystem\ThreadSafeFlags.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeCast.cs">
<Link>TypeSystem\TypeCast.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeFlags.cs">
<Link>TypeSystem\TypeFlags.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeHashingAlgorithms.cs">
<Link>TypeSystem\TypeHashingAlgorithms.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeSystemContext.cs">
<Link>TypeSystem\TypeSystemContext.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeSystemHelpers.cs">
<Link>TypeSystem\TypeSystemHelpers.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\WellKnownType.cs">
<Link>TypeSystem\WellKnownType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\FieldDesc.cs">
<Link>TypeSystem\FieldDesc.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\MethodDesc.cs">
<Link>TypeSystem\MethodDesc.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeDesc.cs">
<Link>TypeSystem\TypeDesc.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\TypeDesc.MethodImpls.cs">
<Link>TypeSystem\TypeDesc.MethodImpls.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Common\VirtualFunctionResolution.cs">
<Link>TypeSystem\VirtualFunctionResolution.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaField.cs">
<Link>TypeSystem.Ecma\EcmaField.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaGenericParameter.cs">
<Link>TypeSystem.Ecma\EcmaGenericParameter.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaMethod.cs">
<Link>TypeSystem.Ecma\EcmaMethod.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaModule.cs">
<Link>TypeSystem.Ecma\EcmaModule.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaSignatureParser.cs">
<Link>TypeSystem.Ecma\EcmaSignatureParser.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\EcmaType.cs">
<Link>TypeSystem.Ecma\EcmaType.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\Ecma\IMetadataStringDecoderProvider.cs">
<Link>TypeSystem.Ecma\IMetadataStringDecoderProvider.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\TypeSystem\src\IL\EcmaMethodIL.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\EcmaMethodIL.cs">
<Link>IL\EcmaMethodIL.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\ILOpcode.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\ILOpcode.cs">
<Link>IL\ILOpcode.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\ILProvider.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\ILProvider.cs">
<Link>IL\ILProvider.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\InstantiatedMethodIL.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\InstantiatedMethodIL.cs">
<Link>IL\InstantiatedMethodIL.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\MethodIL.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\MethodIL.cs">
<Link>IL\MethodIL.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\ILImporter.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\ILImporter.cs">
<Link>IL\ILImporter.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\Stubs\ArrayMethodILEmitter.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\ArrayMethodILEmitter.cs">
<Link>IL\Stubs\ArrayMethodILEmitter.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\Stubs\DelegateThunks.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\DelegateThunks.cs">
<Link>IL\Stubs\DelegateThunks.cs</Link>
</Compile>
<Compile Include="..\..\TypeSystem\src\IL\Stubs\ILEmitter.cs">
<Compile Include="$(CommonPath)\TypeSystem\IL\Stubs\ILEmitter.cs">
<Link>IL\Stubs\ILEmitter.cs</Link>
</Compile>
</ItemGroup>
Expand Down
53 changes: 0 additions & 53 deletions src/TypeSystem.Ecma/src/TypeSystem.Ecma.csproj

This file was deleted.

65 changes: 0 additions & 65 deletions src/TypeSystem/src/TypeSystem.csproj

This file was deleted.

Loading