Update Azure Pipelines VMs to latest

.ci/DockerFile

@@ -1,5 +1,5 @@
-ARG DOTNET_VERSION=5.0.102
-FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION}-1 AS elasticsearch-net-build
+ARG DOTNET_VERSION=5.0.103
+FROM mcr.microsoft.com/dotnet/sdk:${DOTNET_VERSION} AS elasticsearch-net-build
 
 WORKDIR /sln
 

.ci/make.sh

@@ -19,7 +19,7 @@ output_folder=".ci/output"
 OUTPUT_DIR="$repo/${output_folder}"
 mkdir -p "$OUTPUT_DIR"
 
-DOTNET_VERSION=${DOTNET_VERSION-5.0.102}
+DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
 
 echo -e "\033[34;1mINFO:\033[0m VERSION ${STACK_VERSION}\033[0m"
 echo -e "\033[34;1mINFO:\033[0m OUTPUT_DIR ${OUTPUT_DIR}\033[0m"

.ci/readme.md

@@ -30,7 +30,7 @@ $ STACK_VERSION=7.x-SNAPSHOT ELASTICSEARCH_VERSION=7.x-SNAPSHOT ./.ci/run-tests
 |-------------------------|-------------|-------------|
 | `STACK_VERSION` | `N/A`       | The elasticsearch version to target
 | `TEST_SUITE`            | `basic`     | `free` or `platinum` sets which test suite to run and which container to run against. |
-| `DOTNET_VERSION`        | `5.0.102`   | The .NET sdk version used to grab the proper container |
+| `DOTNET_VERSION`        | `5.0.103`   | The .NET sdk version used to grab the proper container |
 
 
 If you want to manually spin up elasticsearch for these tests and call the runner afterwards you can use

.ci/run-repository.ps1

@@ -14,7 +14,7 @@ param(
     $NODE_NAME,
 
     [string]
-    $DOTNET_VERSION = "5.0.102"
+    $DOTNET_VERSION = "5.0.103"
 )
 
 $ESC = [char]27

.ci/run-repository.sh

@@ -9,7 +9,7 @@ script_path=$(dirname $(realpath -s $0))
 source $script_path/functions/imports.sh
 set -euo pipefail
 
-DOTNET_VERSION=${DOTNET_VERSION-5.0.102}
+DOTNET_VERSION=${DOTNET_VERSION-5.0.103}
 ELASTICSEARCH_URL=${ELASTICSEARCH_URL-"$elasticsearch_url"}
 elasticsearch_container=${elasticsearch_container-}
 

.ci/run-tests.ps1

@@ -8,7 +8,7 @@ param (
     $TEST_SUITE = "free",
 
     [string]
-    $DOTNET_VERSION = "5.0.102"
+    $DOTNET_VERSION = "5.0.103"
 )
 
 $ESC = [char]27

.ci/test-matrix.yml

@@ -8,6 +8,6 @@ TEST_SUITE:
   - platinum
 
 DOTNET_VERSION:
-    - 5.0.102
+    - 5.0.103
 
 exclude: ~

appveyor.yml

@@ -6,7 +6,7 @@ environment:
     DOTNET_CLI_TELEMETRY_OPTOUT: true
     DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
 install:
-    - cmd: choco install dotnet-5.0-sdk --version 5.0.102
+    - cmd: choco install dotnet-5.0-sdk --version 5.0.103
 build_script:
     - cmd: build.bat canary
 

azure-pipelines.yml

@@ -14,23 +14,24 @@ pr:
 jobs:
 - job: StaleDocs
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
     inputs:
-       version: '5.0.102'
+       version: '5.0.103'
   - script: ./build.sh documentation
     displayName: 'Generate Documentation'
   - script: |
       if [ -n "$(git status --porcelain)" ]; then echo Error: changes found after running documentation; git diff; git status; exit 1; fi
     displayName: 'Ensure no uncommitted docs'
+
 - job: LinuxUnitTests
   pool:
-    vmImage: 'ubuntu-16.04'
+    vmImage: 'ubuntu-20.04'
   steps:
   - task: UseDotNet@2
     inputs:
-        version: '5.0.102'
+        version: '5.0.103'
   - script: ./build.sh test-one
     displayName: 'build and unit test'
   - task: PublishTestResults@2
@@ -58,24 +59,21 @@ jobs:
 
 - job: WindowsCanaryTests
   pool:
-    vmImage: 'vs2017-win2016'
-  steps:
-  - task: UseDotNet@2
-    inputs:
-      version: '5.0.102'
-  - script: build.bat canary
-    displayName: 'build and unit test'
-  - task: PublishTestResults@2
-    condition: succeededOrFailed()
-    inputs:
-      testRunner: VSTest
-      testResultsFiles: 'tests/**/*.trx'
-      testRunTitle: Windows Unit Tests
+    vmImage: 'windows-2019'
+  steps:  
+    - script: build.bat canary
+      displayName: 'build and unit test'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+        testRunner: VSTest
+        testResultsFiles: 'tests/**/*.trx'
+        testRunTitle: Windows Unit Tests
 
 - job: WindowsIntegrationTests
   dependsOn: WindowsCanaryTests
   pool:
-      vmImage: 'vs2017-win2016'
+      vmImage: 'windows-2019'
   strategy:
     maxParallel: 5
     matrix:
@@ -108,22 +106,19 @@ jobs:
       latest7:
         esVersion: 'latest-7'
   steps:
-      - task: UseDotNet@2
-        inputs:
-            version: '5.0.102'
-      - script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
-        displayName: '$(esVersion) windows integration tests'
-      - task: PublishTestResults@2
-        condition: succeededOrFailed()
-        inputs:
-            testRunner: VSTest
-            testResultsFiles: 'tests/Tests/**/*.trx'
-            testRunTitle: '$(esVersion) Windows Integration Tests'
+    - script: 'build.bat integrate-one $(esVersion) "readonly,writable,bool,xpack"'
+      displayName: '$(esVersion) windows integration tests'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+          testRunner: VSTest
+          testResultsFiles: 'tests/Tests/**/*.trx'
+          testRunTitle: '$(esVersion) Windows Integration Tests'
 
 - job: LinuxIntegrationTests
   dependsOn: LinuxUnitTests
   pool:
-      vmImage: 'ubuntu-16.04'
+      vmImage: 'ubuntu-20.04'
   strategy:
       maxParallel: 5
       matrix:
@@ -156,14 +151,14 @@ jobs:
         latest7:
           esVersion: 'latest-7'
   steps:
-      - task: UseDotNet@2
-        inputs:
-            version: '5.0.102'
-      - script: './build.sh integrate-one $(esVersion) "readonly,writable"'
-        displayName: '$(esVersion) linux integration tests'
-      - task: PublishTestResults@2
-        condition: succeededOrFailed()
-        inputs:
-            testRunner: VSTest
-            testResultsFiles: 'tests/Tests/**/*.trx'
-            testRunTitle: '$(esVersion) Linux Integration Tests'
+    - task: UseDotNet@2
+      inputs:
+          version: '5.0.103'
+    - script: './build.sh integrate-one $(esVersion) "readonly,writable"'
+      displayName: '$(esVersion) linux integration tests'
+    - task: PublishTestResults@2
+      condition: succeededOrFailed()
+      inputs:
+          testRunner: VSTest
+          testResultsFiles: 'tests/Tests/**/*.trx'
+          testRunTitle: '$(esVersion) Linux Integration Tests'

build/scripts/Commandline.fs

@@ -207,7 +207,7 @@ Execution hints can be provided anywhere on the command line
                 parsed with CommandArguments = Test {
                         TestFilter = None
                         TrxExport = buildingOnAzurePipeline 
-                        CodeCoverage = buildingOnAzurePipeline
+                        CodeCoverage = false
                 }
             }
 

build/scripts/Testing.fs

@@ -57,7 +57,7 @@ module Tests =
         let commandWithAdditionalOptions =
             wantsCoverage |> List.append wantsTrx |> List.append command
 
-        Tooling.DotNet.ExecInWithTimeout "." commandWithAdditionalOptions (TimeSpan.FromMinutes 60.)
+        Tooling.DotNet.ExecInWithTimeout "." commandWithAdditionalOptions (TimeSpan.FromMinutes 30.)
 
     let RunReleaseUnitTests version args =
         //xUnit always does its own build, this env var is picked up by Tests.csproj

build/scripts/Tooling.fs

@@ -38,6 +38,8 @@ module Tooling =
         let startArgs = ExecArguments(bin, args |> List.toArray)
         if (Option.isSome workinDir) then
             startArgs.WorkingDirectory <- Option.defaultValue "" workinDir
+        let options = args |> String.concat " "
+        printfn "Running command: %s %s" bin options
         let result = Proc.Exec(startArgs, timeout)
         try
             if not result.HasValue || result.Value > 0 then