From 006bc18a9689c77d294959ccc685754ddb0fcd57 Mon Sep 17 00:00:00 2001 From: Siegfried Pammer Date: Tue, 12 Apr 2022 15:23:37 +0200 Subject: [PATCH] Run ComInterop test case only on .NET 4.0. --- .../CorrectnessTestRunner.cs | 16 +++++++++++++++- .../ICSharpCode.Decompiler.Tests.csproj | 2 +- .../TestCases/Correctness/ComInterop.cs | 4 ---- 3 files changed, 16 insertions(+), 6 deletions(-) diff --git a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs index c8a77eafd..499cc16d5 100644 --- a/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs +++ b/ICSharpCode.Decompiler.Tests/CorrectnessTestRunner.cs @@ -72,6 +72,20 @@ namespace ICSharpCode.Decompiler.Tests CompilerOptions.Optimize | CompilerOptions.UseRoslynLatest, }; + static readonly CompilerOptions[] net40OnlyOptions = + { + CompilerOptions.None, + CompilerOptions.Optimize, + CompilerOptions.UseRoslyn1_3_2 | CompilerOptions.TargetNet40, + CompilerOptions.Optimize | CompilerOptions.UseRoslyn1_3_2 | CompilerOptions.TargetNet40, + CompilerOptions.UseRoslyn2_10_0 | CompilerOptions.TargetNet40, + CompilerOptions.Optimize | CompilerOptions.UseRoslyn2_10_0 | CompilerOptions.TargetNet40, + CompilerOptions.UseRoslyn3_11_0 | CompilerOptions.TargetNet40, + CompilerOptions.Optimize | CompilerOptions.UseRoslyn3_11_0 | CompilerOptions.TargetNet40, + CompilerOptions.UseRoslynLatest | CompilerOptions.TargetNet40, + CompilerOptions.Optimize | CompilerOptions.UseRoslynLatest | CompilerOptions.TargetNet40 + }; + static readonly CompilerOptions[] defaultOptions = { CompilerOptions.None, @@ -392,7 +406,7 @@ namespace ICSharpCode.Decompiler.Tests } [Test] - public async Task ComInterop([ValueSource(nameof(noMonoOptions))] CompilerOptions options) + public async Task ComInterop([ValueSource(nameof(net40OnlyOptions))] CompilerOptions options) { await RunCS(options: options); } diff --git a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj index 3c116d3e5..8d1dfa60b 100644 --- a/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj +++ b/ICSharpCode.Decompiler.Tests/ICSharpCode.Decompiler.Tests.csproj @@ -106,7 +106,7 @@ - + diff --git a/ICSharpCode.Decompiler.Tests/TestCases/Correctness/ComInterop.cs b/ICSharpCode.Decompiler.Tests/TestCases/Correctness/ComInterop.cs index cea92ef07..0baf4bfcf 100644 --- a/ICSharpCode.Decompiler.Tests/TestCases/Correctness/ComInterop.cs +++ b/ICSharpCode.Decompiler.Tests/TestCases/Correctness/ComInterop.cs @@ -1,9 +1,5 @@ using System; -using System.Collections.Generic; -using System.Linq; using System.Runtime.InteropServices; -using System.Text; -using System.Threading.Tasks; namespace ICSharpCode.Decompiler.Tests.TestCases.Correctness {