From 3829a5a7f9e509c7b25832dd31dc775e5cd08f2c Mon Sep 17 00:00:00 2001 From: Stef Heyenrath Date: Sat, 28 Nov 2020 11:13:56 +0000 Subject: [PATCH] Use Java 11 in Azure Pipelines (needed for SonarCloud) (#544) * Install Java 11 * jdkSourceOption: 'PreInstalled' * nuget * 1.12.3 --- azure-pipelines-ci.yml | 10 +++++++++- test/WireMock.Net.Tests/WireMock.Net.Tests.csproj | 10 +++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml index 5e7c5b1a..9e3cb2f7 100644 --- a/azure-pipelines-ci.yml +++ b/azure-pipelines-ci.yml @@ -17,6 +17,14 @@ steps: dotnet tool install --global dotnet-sonarscanner displayName: Install Tools (SonarScanner) +- task: JavaToolInstaller@0 + inputs: + versionSpec: "11" + jdkArchitectureOption: x64 + jdkSourceOption: 'PreInstalled' + displayName: Install Java 11 + + # Begin SonarScanner # See also # - https://docs.microsoft.com/en-us/dotnet/core/tools/global-tools, else you get this error: `Since you just installed the .NET Core SDK, you will need to reopen the Command Prompt window before running the tool you installed.` @@ -46,7 +54,7 @@ steps: # Upload coverage to codecov.io - script: | - %USERPROFILE%\.nuget\packages\codecov\1.10.0\tools\codecov.exe -f "./test/WireMock.Net.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN) + %USERPROFILE%\.nuget\packages\codecov\1.12.3\tools\codecov.exe -f "./test/WireMock.Net.Tests/coverage.opencover.xml" -t $(CODECOV_TOKEN) displayName: Upload coverage to codecov.io # https://github.com/microsoft/azure-pipelines-tasks/issues/12212 diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj index 61251b07..d00f8c02 100644 --- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj +++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj @@ -36,8 +36,8 @@ - - + + all runtime; build; native; contentfiles; analyzers @@ -45,12 +45,12 @@ - - + + - +