From f0bddf0604efdfec95baa3b82a95e0a05a57cd2b Mon Sep 17 00:00:00 2001
From: Stef Heyenrath <stef.heyenrath@gmail.com>
Date: Sat, 28 Nov 2020 13:00:04 +0100
Subject: [PATCH] SonarCloud

---
 .gitignore                                        |  1 +
 azure-pipelines-ci.yml                            | 13 ++++++++++---
 test/WireMock.Net.Tests/WireMock.Net.Tests.csproj |  3 +--
 3 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index b018970d..0e6a51af 100644
--- a/.gitignore
+++ b/.gitignore
@@ -252,3 +252,4 @@ paket-files/
 *.sln.iml
 
 ./report/coverlet/
+/test/WireMock.Net.Tests/coverage.opencover.xml
diff --git a/azure-pipelines-ci.yml b/azure-pipelines-ci.yml
index 9e3cb2f7..3bec8ce0 100644
--- a/azure-pipelines-ci.yml
+++ b/azure-pipelines-ci.yml
@@ -32,15 +32,22 @@ steps:
 # - https://github.com/Microsoft/vsts-tasks/issues/8291
 #
 - script: |
-    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"wiremock" /o:"stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="**\coverage.opencover.xml"
+    %USERPROFILE%\.dotnet\tools\dotnet-sonarscanner begin /k:"wiremock" /o:"stefh-github" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.login="$(SONAR_TOKEN)" /v:"$(buildId)" /d:sonar.cs.opencover.reportsPaths="./test/WireMock.Net.Tests/coverage.opencover.xml"
   displayName: Begin SonarScanner
   condition: and(succeeded(), eq(variables['RUN_SONAR'], 'yes'))
 
-# Build source, tests and run tests for net452 and netcoreapp3.1 (with coverage)
+- task: DotNetCoreCLI@2
+  displayName: Build Debug
+  inputs:
+    command: 'build'
+    arguments: /p:Configuration=Debug
+    projects: $(buildProjects)
+
+# Build tests and run tests for net452 and netcoreapp3.1 (with coverage)
 - script: |
     dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework net452
     dotnet test ./test/WireMock.Net.Tests/WireMock.Net.Tests.csproj --configuration Debug --framework netcoreapp3.1 --logger trx /p:CollectCoverage=true /p:CoverletOutputFormat=opencover
-  displayName: 'Build source, tests and run tests for net452 and netcoreapp3.1 (with coverage)'
+  displayName: 'Build tests and run tests for net452 and netcoreapp3.1 (with coverage)'
 
 # End SonarScanner
 - script: |
diff --git a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
index d00f8c02..2e0bbe70 100644
--- a/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
+++ b/test/WireMock.Net.Tests/WireMock.Net.Tests.csproj
@@ -2,8 +2,7 @@
 
   <PropertyGroup>
     <Authors>Stef Heyenrath</Authors>
-    <!--<TargetFrameworks>net452;netcoreapp2.1</TargetFrameworks>-->
-    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <TargetFramework>net452;netcoreapp3.1</TargetFramework>
     <DebugType>full</DebugType>
     <AssemblyName>WireMock.Net.Tests</AssemblyName>
     <PackageId>WireMock.Net.Tests</PackageId>