From 74b503c151dc05edf979e555fffc8abcbba27dd7 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 23:00:58 +0100 Subject: [PATCH 1/2] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4acedf068..e2c6979cb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -20,7 +20,6 @@ pool: steps: - - task: CmdLine@2 displayName: Run Build Script inputs: @@ -29,42 +28,42 @@ steps: - task: CopyFiles@2 displayName: Upload Windows Build inputs: - SourceFolder: '$(publishLocation)windows.zip' + SourceFolder: '**/windows.zip' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload OSX Build inputs: - SourceFolder: '$(publishLocation)osx.tar.gz' + SourceFolder: '**/osx.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Linux Build inputs: - SourceFolder: '$(publishLocation)linux.tar.gz' + SourceFolder: '**/linux.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Linux-ARM Build inputs: - SourceFolder: '$(publishLocation)linux-arm.tar.gz' + SourceFolder: '**/linux-arm.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Windows 32Bit Build inputs: - SourceFolder: '$(publishLocation)windows-32bit.zip' + SourceFolder: '**/windows-32bit.zip' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Linux-ARM64 Build inputs: - SourceFolder: '$(publishLocation)linux-arm64.tar.gz' + SourceFolder: '**/linux-arm64.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true @@ -72,7 +71,7 @@ steps: displayName: Upload Test Results inputs: testResultsFormat: 'VSTest' - testResultsFiles: '**/Test-*.trx' + testResultsFiles: '**/Test.trx' mergeTestResults: true failTaskOnFailedTests: true testRunTitle: 'Unit Tests' \ No newline at end of file From 5402be5f8456b33926d79cbbe6eb55df5232fd6e Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 23:04:18 +0100 Subject: [PATCH 2/2] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ci-build.yaml b/ci-build.yaml index cc10d4328..a821185c1 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -3,6 +3,7 @@ # Add steps that run tests, create a NuGet package, deploy, and more: # https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core + trigger: branches: include: @@ -20,7 +21,11 @@ pool: vmImage: 'ubuntu-latest' steps: - +- task: UseDotNet@2 + displayName: Use dotnet sdk + inputs: + packageType: 'sdk' + version: '2.2.401' - task: DotNetCoreCLI@2 displayName: Run Unit Tests inputs: