Give AzureDevops its own .runsettings so that it picks up the tests a… (#4361)

* Give AzureDevops its own .runsettings so that it picks up the tests again

* Always publish unit test results

Author: Mpdreamz

Elasticsearch.sln

@@ -15,6 +15,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{6C4A2627
 ProjectSection(SolutionItems) = preProject
 	tests\Directory.Build.props = tests\Directory.Build.props
 	tests\.runsettings = tests\.runsettings
+	tests\.ci.runsettings = tests\.ci.runsettings
 EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tests", "tests\Tests\Tests.csproj", "{5B393962-7586-49BA-BD99-3B1E35F48E94}"

azure-pipelines.yml

@@ -21,6 +21,7 @@ jobs:
   - script: ./build.sh test-one
     displayName: 'build and unit test'
   - task: PublishTestResults@2
+    condition: succeededOrFailed()
     inputs:
         testRunner: VSTest
         testResultsFiles: 'tests/**/*.trx'
@@ -52,6 +53,7 @@ jobs:
   - script: build.bat canary
     displayName: 'build and unit test'
   - task: PublishTestResults@2
+    condition: succeededOrFailed()
     inputs:
       testRunner: VSTest
       testResultsFiles: 'tests/**/*.trx'

build/scripts/Commandline.fs

@@ -111,7 +111,8 @@ Execution hints can be provided anywhere on the command line
 
     let private buildingOnAzurePipeline = Environment.environVarAsBool "TF_BUILD"
 
-    let runningOnCi = Environment.hasEnvironVar "TF_BUILD" || Environment.hasEnvironVar "APPVEYOR_BUILD_VERSION"
+    let runningOnAzureDevops = Environment.hasEnvironVar "TF_BUILD" 
+    let runningOnCi = runningOnAzureDevops || Environment.hasEnvironVar "APPVEYOR_BUILD_VERSION"
 
     let parse (args: string list) =
 

build/scripts/Testing.fs

@@ -34,8 +34,14 @@ module Tests =
         ignore()
 
     let private dotnetTest proj args =
+        let runSettings =
+            // force the logger section to be cleared so that azure devops can work its magic.
+            // relies heavily on the original console logger
+            let prefix = if Commandline.runningOnAzureDevops then ".ci" else ""
+            sprintf "tests/%s.runsettings" prefix
+        
         Directory.CreateDirectory Paths.BuildOutput |> ignore
-        let command = ["test"; proj; "--nologo"; "-c"; "Release"; "-s"; "tests/.runsettings"; "--no-build"]
+        let command = ["test"; proj; "--nologo"; "-c"; "Release"; "-s"; runSettings; "--no-build"]
 
         let wantsTrx =
             let wants = match args.CommandArguments with | Integration a -> a.TrxExport | Test t -> t.TrxExport | _ -> false

tests/.ci.runsettings

@@ -0,0 +1,15 @@
+<RunSettings>
+	<RunConfiguration>
+		<CollectSourceInformation>true</CollectSourceInformation>
+	</RunConfiguration>
+	<DataCollectionRunSettings>
+		<DataCollectors>
+			<DataCollector friendlyName="XPlat Code Coverage">
+				<Configuration>
+					<Format>cobertura</Format>
+					<UseSourceLink>true</UseSourceLink>
+				</Configuration>
+			</DataCollector>
+		</DataCollectors>
+	</DataCollectionRunSettings>
+</RunSettings>