From e926b0cd3be46fb281e1e70a7ec8401054014588 Mon Sep 17 00:00:00 2001 From: NN Date: Fri, 23 Nov 2018 00:30:06 +0200 Subject: [PATCH 1/2] Update packages. Use new XUnit constructor. --- Blocks/tests/CodeJam.Blocks-Tests.csproj | 8 ++++---- .../CodeJam.Experimental-Tests.Performance.csproj | 8 ++++---- Experimental/tests/CodeJam.Experimental-Tests.csproj | 8 ++++---- Main/src/CodeJam.Main.csproj | 2 +- .../CodeJam.Main-Tests.Performance.csproj | 8 ++++---- Main/tests/CodeJam.Main-Tests.csproj | 8 ++++---- PerfTests/src-Etw/CodeJam.PerfTests.Etw.csproj | 2 +- PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj | 2 +- PerfTests/src-NUnit/CodeJam.PerfTests.NUnit.csproj | 2 +- PerfTests/src-xUnit/CodeJam.PerfTests.xUnit.csproj | 2 +- .../Running.Core.Xunit/CompetitionFactDiscoverer.cs | 1 + .../Running.Core.Xunit/CompetitionFactTestCase.cs | 9 ++++++--- .../tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj | 6 +++--- .../tests-NUnit/CodeJam.PerfTests-Tests.NUnit.csproj | 8 ++++---- .../tests-xUnit/CodeJam.PerfTests-Tests.xUnit.csproj | 9 ++++++--- PerfTests/tests/CodeJam.PerfTests-Tests.csproj | 8 ++++---- 16 files changed, 49 insertions(+), 42 deletions(-) diff --git a/Blocks/tests/CodeJam.Blocks-Tests.csproj b/Blocks/tests/CodeJam.Blocks-Tests.csproj index 8e0010a9b..06e77b759 100644 --- a/Blocks/tests/CodeJam.Blocks-Tests.csproj +++ b/Blocks/tests/CodeJam.Blocks-Tests.csproj @@ -39,13 +39,13 @@ - - + + - - + + diff --git a/Experimental/tests-performance/CodeJam.Experimental-Tests.Performance.csproj b/Experimental/tests-performance/CodeJam.Experimental-Tests.Performance.csproj index 45b814ae3..306fa62b8 100644 --- a/Experimental/tests-performance/CodeJam.Experimental-Tests.Performance.csproj +++ b/Experimental/tests-performance/CodeJam.Experimental-Tests.Performance.csproj @@ -48,13 +48,13 @@ - - + + - - + + diff --git a/Experimental/tests/CodeJam.Experimental-Tests.csproj b/Experimental/tests/CodeJam.Experimental-Tests.csproj index 779a947b3..c17db7a5f 100644 --- a/Experimental/tests/CodeJam.Experimental-Tests.csproj +++ b/Experimental/tests/CodeJam.Experimental-Tests.csproj @@ -43,13 +43,13 @@ - - + + - - + + diff --git a/Main/src/CodeJam.Main.csproj b/Main/src/CodeJam.Main.csproj index c39457409..64957dd3d 100644 --- a/Main/src/CodeJam.Main.csproj +++ b/Main/src/CodeJam.Main.csproj @@ -73,7 +73,7 @@ - + diff --git a/Main/tests-performance/CodeJam.Main-Tests.Performance.csproj b/Main/tests-performance/CodeJam.Main-Tests.Performance.csproj index ed48b3962..29dd4a1c4 100644 --- a/Main/tests-performance/CodeJam.Main-Tests.Performance.csproj +++ b/Main/tests-performance/CodeJam.Main-Tests.Performance.csproj @@ -43,13 +43,13 @@ - - + + - - + + diff --git a/Main/tests/CodeJam.Main-Tests.csproj b/Main/tests/CodeJam.Main-Tests.csproj index f6ce94a0c..fa6d5d637 100644 --- a/Main/tests/CodeJam.Main-Tests.csproj +++ b/Main/tests/CodeJam.Main-Tests.csproj @@ -48,13 +48,13 @@ - - + + - - + + diff --git a/PerfTests/src-Etw/CodeJam.PerfTests.Etw.csproj b/PerfTests/src-Etw/CodeJam.PerfTests.Etw.csproj index 5b7828993..ef6ad77ea 100644 --- a/PerfTests/src-Etw/CodeJam.PerfTests.Etw.csproj +++ b/PerfTests/src-Etw/CodeJam.PerfTests.Etw.csproj @@ -57,7 +57,7 @@ - + diff --git a/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj b/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj index 583eadb00..b7aeec05e 100644 --- a/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj +++ b/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj @@ -57,7 +57,7 @@ - + diff --git a/PerfTests/src-NUnit/CodeJam.PerfTests.NUnit.csproj b/PerfTests/src-NUnit/CodeJam.PerfTests.NUnit.csproj index 3f60d195b..8b72be141 100644 --- a/PerfTests/src-NUnit/CodeJam.PerfTests.NUnit.csproj +++ b/PerfTests/src-NUnit/CodeJam.PerfTests.NUnit.csproj @@ -57,7 +57,7 @@ - + diff --git a/PerfTests/src-xUnit/CodeJam.PerfTests.xUnit.csproj b/PerfTests/src-xUnit/CodeJam.PerfTests.xUnit.csproj index 98f335f04..f1b55f98f 100644 --- a/PerfTests/src-xUnit/CodeJam.PerfTests.xUnit.csproj +++ b/PerfTests/src-xUnit/CodeJam.PerfTests.xUnit.csproj @@ -57,7 +57,7 @@ - + diff --git a/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactDiscoverer.cs b/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactDiscoverer.cs index 53bb0c419..ea2cac275 100644 --- a/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactDiscoverer.cs +++ b/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactDiscoverer.cs @@ -32,6 +32,7 @@ public IEnumerable Discover( yield return new CompetitionFactTestCase( _diagnosticMessageSink, discoveryOptions.MethodDisplayOrDefault(), + TestMethodDisplayOptions.None, testMethod); } } diff --git a/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactTestCase.cs b/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactTestCase.cs index 07aa3922f..4640d3fc1 100644 --- a/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactTestCase.cs +++ b/PerfTests/src-xUnit/Running.Core.Xunit/CompetitionFactTestCase.cs @@ -38,9 +38,12 @@ public CompetitionFactTestCase() { } /// public CompetitionFactTestCase( - IMessageSink diagnosticMessageSink, TestMethodDisplay defaultMethodDisplay, ITestMethod testMethod, + IMessageSink diagnosticMessageSink, + TestMethodDisplay defaultMethodDisplay, + TestMethodDisplayOptions defaultMethodDisplayOptions, + ITestMethod testMethod, object[] testMethodArguments = null) - : base(diagnosticMessageSink, defaultMethodDisplay, testMethod, testMethodArguments) { } + : base(diagnosticMessageSink, defaultMethodDisplay, defaultMethodDisplayOptions, testMethod, testMethodArguments) { } /// public override async Task RunAsync( @@ -53,7 +56,7 @@ public override async Task RunAsync( var skipMessageBus = new SkipTestMessageBus(messageBus); AssertNoOutput(); - + var result = await new HackTestCaseRunner( this, DisplayName, SkipReason, constructorArguments, TestMethodArguments, diff --git a/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj b/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj index 03e738e01..31c99126c 100644 --- a/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj +++ b/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj @@ -41,11 +41,11 @@ - - + + - + diff --git a/PerfTests/tests-NUnit/CodeJam.PerfTests-Tests.NUnit.csproj b/PerfTests/tests-NUnit/CodeJam.PerfTests-Tests.NUnit.csproj index df30e4b74..05f163d94 100644 --- a/PerfTests/tests-NUnit/CodeJam.PerfTests-Tests.NUnit.csproj +++ b/PerfTests/tests-NUnit/CodeJam.PerfTests-Tests.NUnit.csproj @@ -46,13 +46,13 @@ - - + + - - + + diff --git a/PerfTests/tests-xUnit/CodeJam.PerfTests-Tests.xUnit.csproj b/PerfTests/tests-xUnit/CodeJam.PerfTests-Tests.xUnit.csproj index 340f00945..dd9b06e75 100644 --- a/PerfTests/tests-xUnit/CodeJam.PerfTests-Tests.xUnit.csproj +++ b/PerfTests/tests-xUnit/CodeJam.PerfTests-Tests.xUnit.csproj @@ -41,11 +41,14 @@ - - + + + all + runtime; build; native; contentfiles; analyzers + - + diff --git a/PerfTests/tests/CodeJam.PerfTests-Tests.csproj b/PerfTests/tests/CodeJam.PerfTests-Tests.csproj index 0a2101453..e7bd2d183 100644 --- a/PerfTests/tests/CodeJam.PerfTests-Tests.csproj +++ b/PerfTests/tests/CodeJam.PerfTests-Tests.csproj @@ -46,13 +46,13 @@ - - + + - - + + From e723c0afbdf618c8c680cd4f093e46ed39aee7a4 Mon Sep 17 00:00:00 2001 From: NN Date: Wed, 28 Nov 2018 20:13:09 +0200 Subject: [PATCH 2/2] Update MSTest.TestFramework package. --- PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj | 2 +- PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj b/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj index b7aeec05e..44d9aeb7c 100644 --- a/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj +++ b/PerfTests/src-MSTest/CodeJam.PerfTests.MSTest.csproj @@ -57,7 +57,7 @@ - + diff --git a/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj b/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj index 31c99126c..bed91d07a 100644 --- a/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj +++ b/PerfTests/tests-MSTest/CodeJam.PerfTests-Tests.MSTest.csproj @@ -41,8 +41,8 @@ - - + +