Merge remote-tracking branch 'upstream/master'mono-2017-12

6 files changed, 30 insertions, 12 deletions

diff --git a/Mono.Cecil.Tests.props b/Mono.Cecil.Tests.props
index e4a4031..49c1a38 100644
--- a/Mono.Cecil.Tests.props
+++ b/Mono.Cecil.Tests.props
@@ -5,10 +5,13 @@
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
   <Import Project="Mono.Cecil.props" />
-  <PropertyGroup Condition="'$(NetStandard)' == 'true'">
+  <PropertyGroup Condition="$(NetStandard)">
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
-  <ItemGroup Condition="'$(NetStandard)' == 'true'">
+  <PropertyGroup Condition="!$(NetStandard)">
+    <AutoGenerateBindingRedirects>false</AutoGenerateBindingRedirects>
+  </PropertyGroup>
+  <ItemGroup Condition="$(NetStandard)">
     <PackageReference Include="NUnit">
       <Version>3.7.1</Version>
     </PackageReference>
@@ -17,9 +20,9 @@
     </PackageReference>
     <PackageReference Include="NUnit3TestAdapter">
       <Version>3.8.0</Version>
-    </PackageReference>    
+    </PackageReference>
   </ItemGroup>
-  <ItemGroup Condition="'$(NetStandard)' != 'true'">
+  <ItemGroup Condition="!$(NetStandard)">
     <Reference Include="nunit.core">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(MSBuildThisFileDirectory)\Test\libs\nunit-2.6.2\nunit.core.dll</HintPath>
@@ -37,7 +40,7 @@
   <Target Name="ForceGenerationOfBindingRedirects"
           AfterTargets="ResolveAssemblyReferences"
           BeforeTargets="GenerateBindingRedirects"
-          Condition="'$(AutoGenerateBindingRedirects)' == 'true'">
+          Condition="$(AutoGenerateBindingRedirects)">
     <PropertyGroup>
       <!-- Needs to be set in a target because it has to be set after the initial evaluation in the common targets -->
       <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
diff --git a/Mono.Cecil.props b/Mono.Cecil.props
index 366603e..aef3a98 100644
--- a/Mono.Cecil.props
+++ b/Mono.Cecil.props
@@ -14,6 +14,7 @@
     <MSBuildCSharpTargets>$(MSBuildToolsPath)\Microsoft.CSharp.targets</MSBuildCSharpTargets>
     <NetStandard Condition=" $(Configuration.StartsWith('netstandard')) Or '$(NuGetRestoreTargets)' != '' ">true</NetStandard>
     <NetStandard Condition=" '$(NetStandard)' == '' ">false</NetStandard>
+    <IsTestProject Condition=" '$(IsTestProject)' == '' ">false</IsTestProject>
   </PropertyGroup>
   <PropertyGroup Condition=" $(Configuration.Contains('Debug')) ">
     <DebugSymbols>true</DebugSymbols>
@@ -42,13 +43,13 @@
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
     <DefineConstants>$(DefineConstants);NET_4_0;</DefineConstants>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(NetStandard)' == 'true'">
-    <TargetFramework Condition="'$(IsTestProject)' == 'true'">netcoreapp2.0</TargetFramework>
-    <TargetFramework Condition="'$(IsTestProject)' != 'true'">netstandard1.3</TargetFramework>
+  <PropertyGroup Condition="$(NetStandard)">
+    <TargetFramework Condition="$(IsTestProject)">netcoreapp2.0</TargetFramework>
+    <TargetFramework Condition="!$(IsTestProject)">netstandard1.3</TargetFramework>
   </PropertyGroup>
-  <Import Project="NetStandard.props" Condition="'$(NetStandard)' == 'true'" />
+  <Import Project="NetStandard.props" Condition="$(NetStandard)" />
   <!-- Shared References -->
-  <ItemGroup Condition="'$(NetStandard)' != 'true'">
+  <ItemGroup Condition="!$(NetStandard)">
     <Reference Include="System.Core" />
     <Reference Include="System" />
   </ItemGroup>
diff --git a/Test/Mono.Cecil.Tests.csproj b/Test/Mono.Cecil.Tests.csproj
index a8c4d0e..4585623 100644
--- a/Test/Mono.Cecil.Tests.csproj
+++ b/Test/Mono.Cecil.Tests.csproj
@@ -6,7 +6,7 @@
     <RootNamespace>Mono.Cecil.Tests</RootNamespace>
     <AssemblyName>Mono.Cecil.Tests</AssemblyName>
   </PropertyGroup>
-  <ItemGroup Condition="'$(NetStandard)' == 'true'">
+  <ItemGroup Condition="$(NetStandard)">
     <PackageReference Include="System.Reflection.TypeExtensions">
       <Version>4.3.0</Version>
     </PackageReference>
@@ -50,5 +50,5 @@
   <ItemGroup>
     <None Include="Resources\**\*" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="'$(NetStandard)' != 'true'" />
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" Condition="!$(NetStandard)" />
 </Project>
\ No newline at end of file
diff --git a/Test/Mono.Cecil.Tests/AssemblyTests.cs b/Test/Mono.Cecil.Tests/AssemblyTests.cs
index af45a3c..0b7c7c1 100644
--- a/Test/Mono.Cecil.Tests/AssemblyTests.cs
+++ b/Test/Mono.Cecil.Tests/AssemblyTests.cs
@@ -89,5 +89,19 @@ namespace Mono.Cecil.Tests {
 				Assert.AreEqual (module.AssemblyReferences [0], module.TypeSystem.CoreLibrary);
 			}, verify: !Platform.OnMono);
 		}
+
+		[Test]
+		public void MismatchedLibraryAndSymbols_DoNotThrow ()
+		{
+			// SQLite-net.dll (from nuget) shiped with mismatched symbol files, but throwIfNoSymbol did not prevent it from throwing
+			var readerParms = new ReaderParameters {
+				ReadSymbols = true,
+				SymbolReaderProvider = new Cil.DefaultSymbolReaderProvider (throwIfNoSymbol: false)
+			};
+
+			using (var module = GetResourceModule ("SQLite-net.dll", readerParms)) {
+				Assert.Null (module.SymbolReader);
+			}
+		}
 	}
 }
diff --git a/Test/Resources/assemblies/SQLite-net.dll b/Test/Resources/assemblies/SQLite-net.dll
new file mode 100644
index 0000000..544dbb3
--- /dev/null
+++ b/Test/Resources/assemblies/SQLite-net.dll
diff --git a/Test/Resources/assemblies/SQLite-net.dll.mdb b/Test/Resources/assemblies/SQLite-net.dll.mdb
new file mode 100644
index 0000000..8b3583a
--- /dev/null
+++ b/Test/Resources/assemblies/SQLite-net.dll.mdb