diff options
author | Andon Andonov <anandono@microsoft.com> | 2018-02-24 05:48:56 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-02-24 05:48:56 +0300 |
commit | 7a19dafede772c6c9a3fd8408116b9e289e23f36 (patch) | |
tree | bc0c96c2c9e96dc49d554b6277118ddc9b749688 /src/ILVerification | |
parent | 883475b5b49761e2312573eec2a4990fc6c302af (diff) |
Convert ILVerify, ILVerification and ILVerification.Tests to old build (#5351)
* Convert ILVerify, ILVerification and ILVerification.Tests to old build
system
* Respond to PR Feedback
* Change target frameworks add runtime config
* Change accessor and debugging files
* Mirror ILCompiler debugging in ILVerify
* Case change
* Add runtime options property to ILVerify runtime json
Diffstat (limited to 'src/ILVerification')
-rw-r--r-- | src/ILVerification/StrongNameKeys/ILVerify.snk | bin | 0 -> 596 bytes | |||
-rw-r--r-- | src/ILVerification/src/AssemblyInfo.cs | 4 | ||||
-rw-r--r-- | src/ILVerification/src/ILVerification.csproj | 20 | ||||
-rw-r--r-- | src/ILVerification/src/Verifier.cs | 2 | ||||
-rw-r--r-- | src/ILVerification/tests/ILVerification.Tests.csproj | 11 |
5 files changed, 21 insertions, 16 deletions
diff --git a/src/ILVerification/StrongNameKeys/ILVerify.snk b/src/ILVerification/StrongNameKeys/ILVerify.snk Binary files differnew file mode 100644 index 000000000..e5534f1a9 --- /dev/null +++ b/src/ILVerification/StrongNameKeys/ILVerify.snk diff --git a/src/ILVerification/src/AssemblyInfo.cs b/src/ILVerification/src/AssemblyInfo.cs index 722ae4299..2942fd990 100644 --- a/src/ILVerification/src/AssemblyInfo.cs +++ b/src/ILVerification/src/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("ILVerification.Tests")] -[assembly: InternalsVisibleTo("ILVerify")] +[assembly: InternalsVisibleTo("ILVerification.Tests, PublicKey=0024000004800000940000000602000000240000525341310004000001000100314e026e409db99b50d61628136c49095e67f782a3032832cfe1e61ba2af8264d2cf7d9228bdf611c1027f61b0ca4c87ee1c248cd58241a695520ba78e76d1c672c2b597cfa0ab4526dcae2b5b6f36936c126e59ada3500d656f3424826d0dab452ea407039d2846cf0e4820905eee537fe904a86097b5b2f3aaae000fc08fc3")] +[assembly: InternalsVisibleTo("ILVerify, PublicKey=0024000004800000940000000602000000240000525341310004000001000100314e026e409db99b50d61628136c49095e67f782a3032832cfe1e61ba2af8264d2cf7d9228bdf611c1027f61b0ca4c87ee1c248cd58241a695520ba78e76d1c672c2b597cfa0ab4526dcae2b5b6f36936c126e59ada3500d656f3424826d0dab452ea407039d2846cf0e4820905eee537fe904a86097b5b2f3aaae000fc08fc3")] diff --git a/src/ILVerification/src/ILVerification.csproj b/src/ILVerification/src/ILVerification.csproj index 103565244..efa6e5349 100644 --- a/src/ILVerification/src/ILVerification.csproj +++ b/src/ILVerification/src/ILVerification.csproj @@ -1,12 +1,14 @@ -<Project Sdk="Microsoft.NET.Sdk"> - +<Project> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> <OutputType>Library</OutputType> - <TargetFrameworks>netcoreapp2.0;net46</TargetFrameworks> <PlatformTarget>AnyCPU</PlatformTarget> <CLSCompliant>false</CLSCompliant> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <EnableDefaultCompileItems>false</EnableDefaultCompileItems> + <TargetFramework>netstandard1.3</TargetFramework> + <AssemblyKey></AssemblyKey> + <AssemblyOriginatorKeyFile>..\StrongNameKeys\ILVerify.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> @@ -23,7 +25,6 @@ <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> @@ -285,20 +286,17 @@ </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> + <None Include="..\..\ILVerification\StrongNameKeys\ILVerify.snk" Link="ILVerify.snk" /> + </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> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> diff --git a/src/ILVerification/src/Verifier.cs b/src/ILVerification/src/Verifier.cs index aa17d13b9..b9780d2c0 100644 --- a/src/ILVerification/src/Verifier.cs +++ b/src/ILVerification/src/Verifier.cs @@ -18,7 +18,7 @@ namespace ILVerify public class Verifier { private Lazy<ResourceManager> _stringResourceManager = - new Lazy<ResourceManager>(() => new ResourceManager("ILVerification.Resources.Strings", Assembly.GetExecutingAssembly())); + new Lazy<ResourceManager>(() => new ResourceManager("ILVerify.Resources.Strings", typeof(Verifier).GetTypeInfo().Assembly)); private ILVerifyTypeSystemContext _typeSystemContext; diff --git a/src/ILVerification/tests/ILVerification.Tests.csproj b/src/ILVerification/tests/ILVerification.Tests.csproj index ceca7fc93..297f5180d 100644 --- a/src/ILVerification/tests/ILVerification.Tests.csproj +++ b/src/ILVerification/tests/ILVerification.Tests.csproj @@ -1,9 +1,12 @@ -<Project Sdk="Microsoft.NET.Sdk"> +<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" /> <PropertyGroup> - <TargetFramework>netcoreapp2.0</TargetFramework> + <OutputType>Library</OutputType> <IsPackable>false</IsPackable> + <AssemblyKey></AssemblyKey> + <AssemblyOriginatorKeyFile>..\StrongNameKeys\ILVerify.snk</AssemblyOriginatorKeyFile> </PropertyGroup> <ItemGroup> @@ -24,4 +27,8 @@ <Folder Include="ILTests\" /> </ItemGroup> + <ItemGroup> + <None Include="..\..\ILVerification\StrongNameKeys\ILVerify.snk" Link="ILVerify.snk" /> + </ItemGroup> + <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" /> </Project> |