Imported Upstream version 6.4.0.137

Former-commit-id: 943baa9f16a098c33e129777827f3a9d20da00d6
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-07-26 19:53:28 +00:00
parent e9207cf623
commit ef583813eb
2712 changed files with 74169 additions and 40587 deletions

View File

@@ -1,13 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
<PropertyGroup>
<ProjectGuid>{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}</ProjectGuid>
<RootNamespace>Mono.Cecil.Mdb</RootNamespace>
<AssemblyName>Mono.Cecil.Mdb</AssemblyName>
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
<DefineConstants>$(DefineConstants);CECIL</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
</ItemGroup>
@@ -16,9 +13,4 @@
<Compile Include="Mono.Cecil.Mdb\*.cs" />
<Compile Include="Mono.CompilerServices.SymbolWriter\*.cs" />
</ItemGroup>
<Import Project="..\..\Mono.Cecil.props" />
<Import Project="$(MSBuildCSharpTargets)" Condition=" ! $(NetStandard) " />
<PropertyGroup>
<DefineConstants>$(DefineConstants);CECIL</DefineConstants>
</PropertyGroup>
</Project>

View File

@@ -50,12 +50,10 @@ namespace Mono.Cecil.Mdb {
this.documents = new Dictionary<string, Document> ();
}
#if !READ_ONLY
public ISymbolWriterProvider GetWriterProvider ()
{
return new MdbWriterProvider ();
}
#endif
public bool ProcessDebugHeader (ImageDebugHeader header)
{

View File

@@ -18,7 +18,6 @@ using Mono.CompilerServices.SymbolWriter;
namespace Mono.Cecil.Mdb {
#if !READ_ONLY
public sealed class MdbWriterProvider : ISymbolWriterProvider {
public ISymbolWriter GetSymbolWriter (ModuleDefinition module, string fileName)
@@ -211,5 +210,4 @@ namespace Mono.Cecil.Mdb {
}
}
}
#endif
}

View File

@@ -1,22 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Project Sdk="Microsoft.NET.Sdk" ToolsVersion="Current">
<Import Project="..\..\..\Mono.Cecil.Tests.props" />
<PropertyGroup>
<ProjectGuid>{AC71DF9C-99FA-4A63-990A-66C8010355A6}</ProjectGuid>
<RootNamespace>Mono.Cecil.Mdb.Tests</RootNamespace>
<AssemblyName>Mono.Cecil.Mdb.Tests</AssemblyName>
<TargetFrameworks>netcoreapp2.1;net40</TargetFrameworks>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Test\Mono.Cecil.Tests.csproj">
<Project>{A47B1F49-A81A-43E8-BE6B-DD28AF2C4055}</Project>
<Name>Mono.Cecil.Tests</Name>
</ProjectReference>
<ProjectReference Include="..\Mono.Cecil.Mdb.csproj">
<Project>{8559DD7F-A16F-46D0-A05A-9139FAEBA8FD}</Project>
<Name>Mono.Cecil.Mdb</Name>
</ProjectReference>
</ItemGroup>
@@ -26,5 +20,4 @@
<ItemGroup>
<None Include="Resources\**\*" />
</ItemGroup>
<Import Project="$(MSBuildCSharpTargets)" Condition="!$(NetStandard)" />
</Project>
</Project>

View File

@@ -1,4 +1,3 @@
#if !READ_ONLY
using Mono.Cecil.Mdb;
using NUnit.Framework;
@@ -11,7 +10,7 @@ namespace Mono.Cecil.Tests {
[Test]
public void MdbWithJustLineInfo ()
{
TestModule ("hello.exe", module => {
TestModule ("simplemdb.exe", module => {
var type = module.GetType ("Program");
var main = type.GetMethod ("Main");
@@ -83,4 +82,3 @@ namespace Mono.Cecil.Tests {
}
}
}
#endif