Merge pull request #3686 from icsharpcode/custom-signature-decoder-comparer

Hide compiler-generated accessor methods

Author: christophwille

ICSharpCode.Decompiler.Tests/Helpers/Tester.cs

@@ -489,6 +489,17 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 			{
 				sourceFileNames.Add(Path.GetFullPath(Path.Combine(Path.GetDirectoryName(sourceFileName), match.Groups[1].Value)));
 			}
+
+			List<string> dependencyAssemblies = new List<string>();
+			string sourceText = File.ReadAllText(sourceFileName);
+			foreach (Match match in Regex.Matches(sourceText, @"//\s*#dependency\s+([\w\d./\\]+)"))
+			{
+				string depSourcePath = Path.GetFullPath(Path.Combine(
+					Path.GetDirectoryName(sourceFileName), match.Groups[1].Value));
+				var depResults = await CompileCSharp(depSourcePath, flags | CompilerOptions.Library).ConfigureAwait(false);
+				dependencyAssemblies.Add(Path.GetFullPath(depResults.PathToAssembly));
+			}
+
 			bool targetNet40 = (flags & CompilerOptions.TargetNet40) != 0;
 			bool useRoslyn = (flags & CompilerOptions.UseRoslynMask) != 0;
 
@@ -556,6 +567,11 @@ public static async Task<CompilerResults> CompileCSharp(string sourceFileName, C
 
 				references = references.Select(r => "-r:\"" + Path.Combine(refAsmPath, r) + "\"");
 
+				foreach (var dependency in dependencyAssemblies)
+				{
+					references = references.Append($"-r:\"{dependency}\"");
+				}
+
 				string otherOptions = $"-nologo -noconfig " +
 					$"-langversion:{languageVersion} " +
 					$"-unsafe -o{(flags.HasFlag(CompilerOptions.Optimize) ? "+ " : "- ")}";

ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj

@@ -167,6 +167,9 @@
     <Compile Include="TestCases\Pretty\Issue3610.cs" />
     <Compile Include="TestCases\Pretty\Issue3611.cs" />
     <Compile Include="TestCases\Pretty\Issue3598.cs" />
+    <Compile Include="Metadata\SignatureBlobComparerTests.cs" />
+    <None Include="TestCases\Pretty\Issue3684.dep.cs" />
+    <None Include="TestCases\Pretty\Issue3684.cs" />
     <None Include="TestCases\Ugly\NoLocalFunctions.Expected.cs" />
     <None Include="TestCases\ILPretty\Issue3504.cs" />
     <Compile Include="TestCases\ILPretty\MonoFixed.cs" />