Skip to content
This repository has been archived by the owner on Nov 1, 2020. It is now read-only.

Commit

Permalink
ILVerify: split into exe and library (#5258)
Browse files Browse the repository at this point in the history
  • Loading branch information
jcouv authored and jkotas committed Jan 18, 2018
1 parent dd3cf33 commit eb2f375
Show file tree
Hide file tree
Showing 44 changed files with 347 additions and 311 deletions.
3 changes: 3 additions & 0 deletions src/ILVerification/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# ILVerification

The ILVerification library is part of the ILVerify project. See details under [src/ILVerify/](https://github.com/dotnet/corert/tree/master/src/ILVerify).
4 changes: 4 additions & 0 deletions src/ILVerification/src/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
using System.Runtime.CompilerServices;

[assembly: InternalsVisibleTo("ILVerification.Tests")]
[assembly: InternalsVisibleTo("ILVerify")]
304 changes: 304 additions & 0 deletions src/ILVerification/src/ILVerification.csproj
Original file line number Diff line number Diff line change
@@ -0,0 +1,304 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<OutputType>Library</OutputType>
<TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<CLSCompliant>false</CLSCompliant>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
</PropertyGroup>

<ItemGroup>
<Compile Include="AssemblyInfo.cs" />
<Compile Include="ILImporter.Verify.cs" />
<Compile Include="ILImporter.StackValue.cs" />
<Compile Include="SimpleArrayOfTRuntimeInterfacesAlgorithm.cs" />
<Compile Include="ILVerifyTypeSystemContext.cs" />
<Compile Include="Verifier.cs" />
<Compile Include="VerifierError.cs" />
<Compile Include="TypeSystemHelpers.cs" />
<Compile Include="InstantiatedGenericParameter.cs" />
<Compile Include="AccessVerificationHelpers.cs" />
<Compile Include="VerificationResult.cs" />
<Compile Include="IResolver.cs" />
</ItemGroup>

<ItemGroup>
<Compile Include="..\..\Common\src\TypeSystem\CodeGen\MethodDesc.CodeGen.cs">
<Link>TypeSystem\CodeGen\MethodDesc.CodeGen.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\AlignmentHelper.cs">
<Link>Utilities\AlignmentHelper.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\CastingHelper.cs">
<Link>TypeSystem\Common\CastingHelper.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\FunctionPointerType.cs">
<Link>TypeSystem\Common\FunctionPointerType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\IAssemblyDesc.cs">
<Link>TypeSystem\Common\IAssemblyDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Instantiation.cs">
<Link>TypeSystem\Common\Instantiation.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ModuleDesc.cs">
<Link>TypeSystem\Common\ModuleDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeSystemEntity.cs">
<Link>TypeSystem\Common\TypeSystemEntity.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeSystemException.cs">
<Link>TypeSystem\Common\TypeSystemException.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Utilities\CustomAttributeTypeNameParser.cs">
<Link>Utilities\CustomAttributeTypeNameParser.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Utilities\LockFreeReaderHashtable.cs">
<Link>Utilities\LockFreeReaderHashtable.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ArrayType.cs">
<Link>TypeSystem\Common\ArrayType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ArrayOfTRuntimeInterfacesAlgorithm.cs">
<Link>TypeSystem\Common\ArrayOfTRuntimeInterfacesAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\BaseTypeRuntimeInterfacesAlgorithm.cs">
<Link>TypeSystem\Common\BaseTypeRuntimeInterfacesAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ByRefType.cs">
<Link>TypeSystem\Common\ByRefType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\GenericParameterDesc.cs">
<Link>TypeSystem\Common\GenericParameterDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ExceptionStringID.cs">
<Link>TypeSystem\Common\ExceptionStringID.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\FieldForInstantiatedType.cs">
<Link>TypeSystem\Common\FieldForInstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\FieldDesc.cs">
<Link>TypeSystem\Common\FieldDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\FieldDesc.FieldLayout.cs">
<Link>TypeSystem\Common\FieldDesc.FieldLayout.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\FieldLayoutAlgorithm.cs">
<Link>TypeSystem\Common\FieldLayoutAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\InstantiatedMethod.cs">
<Link>TypeSystem\Common\InstantiatedMethod.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\InstantiatedType.cs">
<Link>TypeSystem\Common\InstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\InstantiatedType.Interfaces.cs">
<Link>TypeSystem\Common\InstantiatedType.Interfaces.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\InstantiatedType.MethodImpls.cs">
<Link>TypeSystem\Common\InstantiatedType.MethodImpls.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\LayoutInt.cs">
<Link>TypeSystem\Common\LayoutInt.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataType.cs">
<Link>TypeSystem\Common\MetadataType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataType.Interfaces.cs">
<Link>TypeSystem\Common\MetadataType.Interfaces.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataType.MethodImpls.cs">
<Link>TypeSystem\Common\MetadataType.MethodImpls.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataFieldLayoutAlgorithm.cs">
<Link>TypeSystem\Common\MetadataFieldLayoutAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataRuntimeInterfacesAlgorithm.cs">
<Link>TypeSystem\Common\MetadataRuntimeInterfacesAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataTypeSystemContext.cs">
<Link>TypeSystem\Common\MetadataTypeSystemContext.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MethodForInstantiatedType.cs">
<Link>TypeSystem\Common\MethodForInstantiatedType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ParameterizedType.cs">
<Link>TypeSystem\Common\ParameterizedType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\PointerType.cs">
<Link>TypeSystem\Common\PointerType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\PropertySignature.cs">
<Link>TypeSystem\Common\PropertySignature.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\SignatureVariable.cs">
<Link>TypeSystem\Common\SignatureVariable.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TargetDetails.cs">
<Link>TypeSystem\Common\TargetDetails.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ThreadSafeFlags.cs">
<Link>TypeSystem\Common\ThreadSafeFlags.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeFlags.cs">
<Link>TypeSystem\Common\TypeFlags.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeHashingAlgorithms.cs">
<Link>TypeSystem\Common\TypeHashingAlgorithms.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeSystemContext.cs">
<Link>TypeSystem\Common\TypeSystemContext.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeSystemHelpers.cs">
<Link>TypeSystem\Common\TypeSystemHelpers.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Utilities\TypeNameFormatter.cs">
<Link>Utilities\TypeNameFormatter.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\WellKnownType.cs">
<Link>TypeSystem\Common\WellKnownType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\VirtualMethodAlgorithm.cs">
<Link>TypeSystem\Common\VirtualMethodAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MethodDesc.cs">
<Link>TypeSystem\Common\MethodDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\MetadataVirtualMethodAlgorithm.cs">
<Link>TypeSystem\Common\StandardVirtualMethodAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeDesc.cs">
<Link>TypeSystem\Common\TypeDesc.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeDesc.Interfaces.cs">
<Link>TypeSystem\Common\TypeDesc.Interfaces.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\DefType.cs">
<Link>TypeSystem\Common\DefType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\DefType.FieldLayout.cs">
<Link>TypeSystem\Common\DefType.FieldLayout.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\RuntimeInterfacesAlgorithm.cs">
<Link>TypeSystem\Common\RuntimeInterfacesAlgorithm.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ThrowHelper.Common.cs">
<Link>TypeSystem\Common\ThrowHelper.Common.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\ThrowHelper.cs">
<Link>TypeSystem\Common\ThrowHelper.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Utilities\ExceptionTypeNameFormatter.cs">
<Link>TypeSystem\Common\Utilities\ExceptionTypeNameFormatter.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\Utilities\ExceptionTypeNameFormatter.Metadata.cs">
<Link>TypeSystem\Common\Utilities\ExceptionTypeNameFormatter.Metadata.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\CustomAttributeTypeProvider.cs">
<Link>Ecma\CustomAttributeTypeProvider.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaAssembly.cs">
<Link>Ecma\EcmaAssembly.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaField.cs">
<Link>Ecma\EcmaField.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaGenericParameter.cs">
<Link>Ecma\EcmaGenericParameter.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaMethod.cs">
<Link>Ecma\EcmaMethod.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaModule.cs">
<Link>Ecma\EcmaModule.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaSignatureParser.cs">
<Link>Ecma\EcmaSignatureParser.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaType.cs">
<Link>Ecma\EcmaType.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaType.MethodImpls.cs">
<Link>Ecma\EcmaType.MethodImpls.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\EcmaType.Interfaces.cs">
<Link>Ecma\EcmaType.Interfaces.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\MetadataExtensions.cs">
<Link>Ecma\MetadataExtensions.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\IMetadataStringDecoderProvider.cs">
<Link>Ecma\IMetadataStringDecoderProvider.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\CachingMetadataStringDecoder.cs">
<Link>Ecma\CachingMetadataStringDecoder.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Ecma\PrimitiveTypeProvider.cs">
<Link>Ecma\PrimitiveTypeProvider.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\EcmaMethodIL.cs">
<Link>IL\EcmaMethodIL.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\MethodIL.cs">
<Link>IL\MethodIL.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\MethodILDebugView.cs">
<Link>IL\MethodILDebugView.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\ILDisassembler.cs">
<Link>IL\ILDisassembler.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\InstantiatedMethodIL.cs">
<Link>IL\InstantiatedMethodIL.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\ILOpcode.cs">
<Link>IL\ILOpcode.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\IL\ILImporter.cs">
<Link>IL\ILImporter.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Interop\InstantiatedType.Interop.cs">
<Link>Interop\InstantiatedType.Interop.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Interop\MetadataType.Interop.cs">
<Link>Interop\MetadataType.Interop.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Interop\MethodDesc.Interop.cs">
<Link>Interop\MethodDesc.Interop.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Interop\MarshalAsDescriptor.cs">
<Link>TypeSystem\Interop\MarshalAsDescriptor.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\System\Collections\Generic\ArrayBuilder.cs">
<Link>Utilities\ArrayBuilder.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\LocalVariableDefinition.cs">
<Link>TypeSystem\Common\LocalVariableDefinition.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\System\FormattingHelpers.cs">
<Link>Common\System\FormattingHelpers.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\TypeSystem\Common\TypeSystemConstraintsHelpers.cs">
<Link>TypeSystem\Common\TypeSystemConstraintsHelpers.cs</Link>
</Compile>
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\Common\src\CommandLine\CommandLineException.cs">
<Link>CommandLine\CommandLineException.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\CommandLine\CommandLineHelpers.cs">
<Link>CommandLine\CommandLineHelpers.cs</Link>
</Compile>
<Compile Include="..\..\Common\src\System\NotImplemented.cs">
<Link>System\NotImplemented.cs</Link>
</Compile>
</ItemGroup>

<ItemGroup>
<PackageReference Include="System.IO.MemoryMappedFiles" Version="4.3.0" />
<PackageReference Include="System.Reflection.Metadata" Version="1.4.1" />
<PackageReference Include="System.CommandLine" Version="0.1.0-e160909-1" />
</ItemGroup>
</Project>
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ namespace ILVerify
public class Verifier
{
private Lazy<ResourceManager> _stringResourceManager =
new Lazy<ResourceManager>(() => new ResourceManager("ILVerify.Resources.Strings", Assembly.GetExecutingAssembly()));
new Lazy<ResourceManager>(() => new ResourceManager("ILVerification.Resources.Strings", Assembly.GetExecutingAssembly()));

private ILVerifyTypeSystemContext _typeSystemContext;

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\src\ILVerify.csproj" />
<ProjectReference Include="..\src\ILVerification.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
19 changes: 14 additions & 5 deletions src/ILVerify/ILVerify.sln
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,9 @@ VisualStudioVersion = 15.0.26510.0
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILVerify", "src\ILVerify.csproj", "{56AA4730-39A4-4B48-95E9-89E8A29F0A06}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILVerify.Tests", "tests\ILVerify.Tests.csproj", "{1228E4B6-E5E5-414A-94EC-69B792984FAB}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILVerification", "..\ILVerification\src\ILVerification.csproj", "{6166B258-3D41-4431-88D9-510FAF5E6927}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ILVerification.Tests", "..\ILVerification\tests\ILVerification.Tests.csproj", "{894F0BC9-31D1-42D0-9C3F-4FC9A41CD07E}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand All @@ -17,12 +19,19 @@ Global
{56AA4730-39A4-4B48-95E9-89E8A29F0A06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{56AA4730-39A4-4B48-95E9-89E8A29F0A06}.Release|Any CPU.ActiveCfg = Release|Any CPU
{56AA4730-39A4-4B48-95E9-89E8A29F0A06}.Release|Any CPU.Build.0 = Release|Any CPU
{1228E4B6-E5E5-414A-94EC-69B792984FAB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{1228E4B6-E5E5-414A-94EC-69B792984FAB}.Debug|Any CPU.Build.0 = Debug|Any CPU
{1228E4B6-E5E5-414A-94EC-69B792984FAB}.Release|Any CPU.ActiveCfg = Release|Any CPU
{1228E4B6-E5E5-414A-94EC-69B792984FAB}.Release|Any CPU.Build.0 = Release|Any CPU
{6166B258-3D41-4431-88D9-510FAF5E6927}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{6166B258-3D41-4431-88D9-510FAF5E6927}.Debug|Any CPU.Build.0 = Debug|Any CPU
{6166B258-3D41-4431-88D9-510FAF5E6927}.Release|Any CPU.ActiveCfg = Release|Any CPU
{6166B258-3D41-4431-88D9-510FAF5E6927}.Release|Any CPU.Build.0 = Release|Any CPU
{894F0BC9-31D1-42D0-9C3F-4FC9A41CD07E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{894F0BC9-31D1-42D0-9C3F-4FC9A41CD07E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{894F0BC9-31D1-42D0-9C3F-4FC9A41CD07E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{894F0BC9-31D1-42D0-9C3F-4FC9A41CD07E}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {3B6C08A7-1F82-4EC0-9CA7-1F07716F36B1}
EndGlobalSection
EndGlobal
Loading

0 comments on commit eb2f375

Please sign in to comment.