diff options
| author | dkanada <dkanada@users.noreply.github.com> | 2020-01-11 15:34:22 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-11 15:34:22 +0900 |
| commit | bca48b5d5cce5ef62760e0c2bee10952d99ac234 (patch) | |
| tree | 7d4a8850e4bb90f2c34b6679b547eb9160e2a8fb | |
| parent | d63debd0085c3203555ea4bd587c72fc171abb81 (diff) | |
| parent | 312987aea57d5a7f1366a07220ed1aae27e235a6 (diff) | |
Merge pull request #2248 from jellyfin/azp-vstest-fix
Fix the VSTest runner
| -rw-r--r-- | .ci/azure-pipelines.yml | 8 | ||||
| -rw-r--r-- | tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj | 2 |
2 files changed, 6 insertions, 4 deletions
diff --git a/.ci/azure-pipelines.yml b/.ci/azure-pipelines.yml index 143873266..7bcaed70c 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' @@ -132,12 +132,12 @@ 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 testAssemblyVer2: | # Required when testSelector == TestAssemblies - **\bin\$(BuildConfiguration)\**\*test*.dll + **\bin\$(BuildConfiguration)\**\*tests.dll + **\bin\$(BuildConfiguration)\**\*test.dll !**\obj\** !**\xunit.runner.visualstudio.testadapter.dll !**\xunit.runner.visualstudio.dotnetcore.testadapter.dll @@ -147,6 +147,8 @@ 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 displayName: Publish Windows diff --git a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj index 1671b8d79..e0deeeabb 100644 --- a/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj +++ b/tests/Jellyfin.Api.Tests/Jellyfin.Api.Tests.csproj @@ -1,7 +1,7 @@ <Project Sdk="Microsoft.NET.Sdk"> <PropertyGroup> - <TargetFramework>netcoreapp3.0</TargetFramework> + <TargetFramework>netcoreapp3.1</TargetFramework> <IsPackable>false</IsPackable> </PropertyGroup> |