From 1fecb9efb2bec4fccfa39bb0b04ad2206cbb7c86 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:17:52 +0100 Subject: [PATCH 1/6] Fix the VSTest runner --- .ci/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 143873266d..6cedf32fd4 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -132,7 +132,7 @@ jobs: inputs: packageFeedSelector: 'nugetOrg' # Options: nugetOrg, customFeed, netShare versionSelector: 'latestPreRelease' # Required when packageFeedSelector == NugetOrg || PackageFeedSelector == CustomFeed# Options: latestPreRelease, latestStable, specificVersion - + - task: VSTest@2 inputs: testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun @@ -147,6 +147,7 @@ jobs: codeCoverageEnabled: True # Optional configuration: 'Debug' # Optional publishRunAttachments: true # Optional + otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v3.1 /logger:console;verbosity="normal" ' - job: main_build_win displayName: Publish Windows From 1ea613a9bd4fd5d1fa4cb556fe238ecd4720e1e0 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:26:42 +0100 Subject: [PATCH 2/6] Update Jellyfin.Api.Test to 3.1 --- tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj index 1671b8d797..e0deeeabb8 100644 --- a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj +++ b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj @@ -1,7 +1,7 @@ - netcoreapp3.0 + netcoreapp3.1 false From 6792fa111ec8bed026a2c30afe2dc39ca2b02245 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:27:48 +0100 Subject: [PATCH 3/6] Fix the test selection glob. --- .ci/azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 6cedf32fd4..4905a6fdb9 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -137,7 +137,7 @@ jobs: inputs: testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun testAssemblyVer2: | # Required when testSelector == TestAssemblies - **\bin\$(BuildConfiguration)\**\*test*.dll + **\bin\$(BuildConfiguration)\**\*test.dll !**\obj\** !**\xunit.runner.visualstudio.testadapter.dll !**\xunit.runner.visualstudio.dotnetcore.testadapter.dll @@ -147,6 +147,7 @@ jobs: codeCoverageEnabled: True # Optional configuration: 'Debug' # Optional publishRunAttachments: true # Optional + testRunTitle: $(Agent.JobName) otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v3.1 /logger:console;verbosity="normal" ' - job: main_build_win From d328fc51cf72a2231b8b16d68c416214e12ed093 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:28:20 +0100 Subject: [PATCH 4/6] Apply suggestions from code review Co-Authored-By: Bond-009 Co-Authored-By: dkanada --- .ci/azure-pipelines.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 4905a6fdb9..b69195fcce 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -132,7 +132,6 @@ jobs: inputs: packageFeedSelector: 'nugetOrg' # Options: nugetOrg, customFeed, netShare versionSelector: 'latestPreRelease' # Required when packageFeedSelector == NugetOrg || PackageFeedSelector == CustomFeed# Options: latestPreRelease, latestStable, specificVersion - - task: VSTest@2 inputs: testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun @@ -148,7 +147,7 @@ jobs: configuration: 'Debug' # Optional publishRunAttachments: true # Optional testRunTitle: $(Agent.JobName) - otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v3.1 /logger:console;verbosity="normal" ' + otherConsoleOptions: '/platform:x64 /Framework:.NETCoreApp,Version=v3.1 /logger:console;verbosity="normal"' - job: main_build_win displayName: Publish Windows From 654336990f8109c12ce1383d94dcdc84e7a3c5b6 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:31:44 +0100 Subject: [PATCH 5/6] Added plural glob for test assemblies --- .ci/azure-pipelines.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index b69195fcce..3adc6f85c3 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -136,6 +136,7 @@ jobs: inputs: testSelector: 'testAssemblies' # Options: testAssemblies, testPlan, testRun testAssemblyVer2: | # Required when testSelector == TestAssemblies + **\bin\$(BuildConfiguration)\**\*tests.dll **\bin\$(BuildConfiguration)\**\*test.dll !**\obj\** !**\xunit.runner.visualstudio.testadapter.dll From 312987aea57d5a7f1366a07220ed1aae27e235a6 Mon Sep 17 00:00:00 2001 From: Erwin de Haan Date: Thu, 9 Jan 2020 17:39:17 +0100 Subject: [PATCH 6/6] Build all test projects using a wildcard --- .ci/azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 3adc6f85c3..7bcaed70cd 100644 --- a/.ci/azure-pipelines.yml +++ b/.ci/azure-pipelines.yml @@ -2,7 +2,7 @@ name: $(Date:yyyyMMdd)$(Rev:.r) variables: - name: TestProjects - value: 'tests/Jellyfin.Common.Tests/Jellyfin.Common.Tests.csproj' + value: 'tests/**/*Tests.csproj' - name: RestoreBuildProjects value: 'Jellyfin.Server/Jellyfin.Server.csproj'