Fixup Azure Pipelines

Author: AArnott

azure-pipelines/build.yml

@@ -13,7 +13,6 @@ jobs:
     displayName: Set build number
 
   - template: dotnet.yml
-  - template: expand-template.yml
 
 - job: Linux
   pool:
@@ -23,7 +22,6 @@ jobs:
     clean: true
   - template: install-dependencies.yml
   - template: dotnet.yml
-  - template: expand-template.yml
 
 - job: macOS
   pool:
@@ -33,7 +31,6 @@ jobs:
     clean: true
   - template: install-dependencies.yml
   - template: dotnet.yml
-  - template: expand-template.yml
 
 - job: WrapUp
   dependsOn:

azure-pipelines/dotnet.yml

@@ -21,13 +21,6 @@ steps:
     arguments: --no-build -c $(BuildConfiguration) -f netcoreapp2.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
     testRunTitle: netcoreapp2.1-$(Agent.JobName)
 
-- task: DotNetCoreCLI@2
-  displayName: dotnet test -f netcoreapp3.1
-  inputs:
-    command: test
-    arguments: --no-build -c $(BuildConfiguration) -f netcoreapp3.1 --filter "TestCategory!=FailsInCloudTest" -v n /p:CollectCoverage=true
-    testRunTitle: netcoreapp3.1-$(Agent.JobName)
-
 - task: PowerShell@2
   inputs:
     filePath: azure-pipelines/variables/_pipelines.ps1