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,23 +1,15 @@
<?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>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</ProjectGuid>
<RootNamespace>Mono.Cecil.Rocks</RootNamespace>
<AssemblyName>Mono.Cecil.Rocks</AssemblyName>
<TargetFrameworks>netstandard2.0;net40</TargetFrameworks>
<DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants>
</PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Mono.Cecil.csproj">
<Name>Mono.Cecil</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
<Compile Include="..\ProjectInfo.cs" />
<Compile Include="Mono.Cecil.Rocks\*.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\Mono.Cecil.csproj">
<Project>{D68133BD-1E63-496E-9EDE-4FBDBF77B486}</Project>
<Name>Mono.Cecil</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\Mono.Cecil.props" />
<Import Project="$(MSBuildCSharpTargets)" Condition=" ! $(NetStandard) " />
<PropertyGroup>
<DefineConstants>$(DefineConstants);INSIDE_ROCKS</DefineConstants>
</PropertyGroup>
</Project>

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>{C6CFD7E1-B855-44DC-B4CE-9CD72984AF52}</ProjectGuid>
<RootNamespace>Mono.Cecil.Rocks.Tests</RootNamespace>
<AssemblyName>Mono.Cecil.Rocks.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.Rocks.csproj">
<Project>{FBC6DD59-D09D-499C-B03C-99C1C78FF2AC}</Project>
<Name>Mono.Cecil.Rocks</Name>
</ProjectReference>
</ItemGroup>
@@ -26,5 +20,4 @@
<ItemGroup>
<None Include="Resources\**\*" />
</ItemGroup>
<Import Project="$(MSBuildCSharpTargets)" Condition="!$(NetStandard)" />
</Project>
</Project>

View File

@@ -1,3 +1,5 @@
#if !NET_CORE
using System.Security.Permissions;
using NUnit.Framework;
@@ -60,3 +62,5 @@ namespace Mono.Cecil.Tests {
}
}
}
#endif

View File

@@ -1,4 +1,3 @@
#if !READ_ONLY
using System;
using Mono.Cecil.Rocks;
@@ -123,4 +122,3 @@ namespace Mono.Cecil.Tests {
}
}
}
#endif