From 0690c87ebcb2ecf880f534ab94f0aec26ddcb8e1 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 09:45:35 +0100 Subject: [PATCH 01/17] Update build.sh --- build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index 6e8f207c8..6e14489c8 100755 --- a/build.sh +++ b/build.sh @@ -54,9 +54,9 @@ fi # Make sure that packages.config exist. if [ ! -f "$TOOLS_DIR/packages.config" ]; then echo "Downloading packages.config..." - curl -Lsfo "$TOOLS_DIR/packages.config" http://cakebuild.net/download/bootstrapper/packages + curl -Lsfo "$TOOLS_DIR/packages.config" https://cakebuild.net/download/bootstrapper/packages if [ $? -ne 0 ]; then - echo "An error occured while downloading packages.config." + echo "An error occurred while downloading packages.config." exit 1 fi fi @@ -66,7 +66,7 @@ if [ ! -f "$NUGET_EXE" ]; then echo "Downloading NuGet..." curl -Lsfo "$NUGET_EXE" https://dist.nuget.org/win-x86-commandline/latest/nuget.exe if [ $? -ne 0 ]; then - echo "An error occured while downloading nuget.exe." + echo "An error occurred while downloading nuget.exe." exit 1 fi fi @@ -98,4 +98,4 @@ if $SHOW_VERSION; then exec mono "$CAKE_EXE" -version else exec mono "$CAKE_EXE" $SCRIPT -verbosity=$VERBOSITY -configuration=$CONFIGURATION -target=$TARGET $DRYRUN "${SCRIPT_ARGUMENTS[@]}" -fi \ No newline at end of file +fi From 0ee93e5343d3202dfefbce6a74b47aaf7470161d Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 12:33:50 +0100 Subject: [PATCH 02/17] Create azure-pipelines.yml --- azure-pipelines.yml | 67 +++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 azure-pipelines.yml diff --git a/azure-pipelines.yml b/azure-pipelines.yml new file mode 100644 index 000000000..776922ca5 --- /dev/null +++ b/azure-pipelines.yml @@ -0,0 +1,67 @@ +# ASP.NET Core +# Build and test ASP.NET Core projects targeting .NET Core. +# Add steps that run tests, create a NuGet package, deploy, and more: +# https://docs.microsoft.com/azure/devops/pipelines/languages/dotnet-core + +trigger: +- master + +variables: + solution: '**/*.sln' + testProj: '**/*.Tests.csproj' + csProj: '**/*.csproj' + buildConfiguration: 'Release' + publishLocation: '$(Build.SourcesDirectory)src/Ombi/bin/Release/netcoreapp2.2/' + +pool: + vmImage: 'ubuntu-latest' + + +steps: + +- task: CmdLine@2 + displayName: Run Build Script + inputs: + script: './build.sh --settings_skipverification=true' + +- task: CopyFiles@2 + displayName: Upload Windows Build + inputs: + SourceFolder: '$(publishLocation)windows.zip' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true + +- task: CopyFiles@2 + displayName: Upload OSX Build + inputs: + SourceFolder: '$(publishLocation)osx.tar.gz' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true + +- task: CopyFiles@2 + displayName: Upload Linux Build + inputs: + SourceFolder: '$(publishLocation)linux.tar.gz' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true + +- task: CopyFiles@2 + displayName: Upload Linux-ARM Build + inputs: + SourceFolder: '$(publishLocation)linux-arm.tar.gz' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true + +- task: CopyFiles@2 + displayName: Upload Windows 32Bit Build + inputs: + SourceFolder: '$(publishLocation)windows-32bit.zip' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true + +- task: CopyFiles@2 + displayName: Upload Linux-ARM64 Build + inputs: + SourceFolder: '$(publishLocation)linux-arm64.tar.gz' + TargetFolder: '$(Build.ArtifactStagingDirectory)' + OverWrite: true From 5bb4bd0a0803830d7bcbccd5c8c9eca19856fdee Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 12:36:25 +0100 Subject: [PATCH 03/17] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 776922ca5..7adc1e553 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -65,3 +65,11 @@ steps: SourceFolder: '$(publishLocation)linux-arm64.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true + +- task: PublishTestResults@2 + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '**/Test-*.trx' + mergeTestResults: true + failTaskOnFailedTests: true + testRunTitle: 'Unit Tests' \ No newline at end of file From 9cf6f2ae7e9f2a53ba68547becf70f33ebaba442 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 12:38:15 +0100 Subject: [PATCH 04/17] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 7adc1e553..5b8acf1bb 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -5,6 +5,8 @@ trigger: - master +- feature/v4 +- develop variables: solution: '**/*.sln' From a1e86ad728ede08f4c6e7b0cad485264b4f8c0bc Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 21:59:36 +0100 Subject: [PATCH 05/17] Fixed build errors --- .../artist-release-panel.component.scss | 8 ++++---- .../artist-release-panel.component.ts | 3 +-- src/Ombi/ClientApp/src/styles/_imports.scss | 2 +- 3 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.scss b/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.scss index b96c43b09..c3e08c51f 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.scss +++ b/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.scss @@ -1,10 +1,10 @@ - -@import 'Styles/buttons.scss'; + @import '../../../../../../styles/buttons.scss'; // border: solid 3px #fff; .monitored { border: solid 3px $orange !important; } + .available { - border: solid 3px $green !important; - } + border: solid 3px $green !important; + } \ No newline at end of file diff --git a/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.ts b/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.ts index ee4483595..6b26810f1 100644 --- a/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.ts +++ b/src/Ombi/ClientApp/src/app/media-details/components/artist/panels/artist-release-panel/artist-release-panel.component.ts @@ -1,7 +1,6 @@ -import { Component, Input, ViewEncapsulation, OnInit, OnChanges, SimpleChanges } from "@angular/core"; +import { Component, Input, ViewEncapsulation, OnChanges, SimpleChanges } from "@angular/core"; import { IReleaseGroups } from "../../../../../interfaces/IMusicSearchResultV2"; import { SearchV2Service } from "../../../../../services/searchV2.service"; -import { ActivatedRoute } from "@angular/router"; @Component({ templateUrl: "./artist-release-panel.component.html", diff --git a/src/Ombi/ClientApp/src/styles/_imports.scss b/src/Ombi/ClientApp/src/styles/_imports.scss index 9809eccb5..04416038e 100644 --- a/src/Ombi/ClientApp/src/styles/_imports.scss +++ b/src/Ombi/ClientApp/src/styles/_imports.scss @@ -1,4 +1,4 @@ -@import "./styles.scss"; +@import "./Styles.scss"; @import "./shared.scss"; @import "./buttons.scss"; @import "./primeng-overrides.scss" \ No newline at end of file From 494b553a8e1ef46db8c1f47f637952bfd1813593 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 22:21:26 +0100 Subject: [PATCH 06/17] Added CI build --- azure-pipelines.yml | 1 + ci-build.yaml | 36 ++++++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+) create mode 100644 ci-build.yaml diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5b8acf1bb..b576c24df 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -69,6 +69,7 @@ steps: OverWrite: true - task: PublishTestResults@2 + displayName: Upload Test Results inputs: testResultsFormat: 'VSTest' testResultsFiles: '**/Test-*.trx' diff --git a/ci-build.yaml b/ci-build.yaml new file mode 100644 index 000000000..6c93afb3d --- /dev/null +++ b/ci-build.yaml @@ -0,0 +1,36 @@ +# ASP.NET Core +# Build and test ASP.NET Core projects targeting .NET Core. +# 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: + - feature/* + exclude: + - feature/v4 + +variables: + solution: '**/*.sln' + testProj: '**/*.Tests.csproj' + csProj: '**/*.csproj' + buildConfiguration: 'Release' + +pool: + vmImage: 'ubuntu-latest' + +steps: + +- task: CmdLine@2 + displayName: Run Build Script + inputs: + script: './build.sh --settings_skipverification=true --target=build' + +- task: PublishTestResults@2 + displayName: Upload Test Results + inputs: + testResultsFormat: 'VSTest' + testResultsFiles: '**/Test-*.trx' + mergeTestResults: true + failTaskOnFailedTests: true + testRunTitle: 'Unit Tests' \ No newline at end of file From 367c61b0aebd2f279c670dd436625fcf724ea12a Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 22:29:42 +0100 Subject: [PATCH 07/17] fixed cake warnings --- azure-pipelines.yml | 2 +- build.cake | 22 ++++++---------------- ci-build.yaml | 2 +- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index b576c24df..4dd024547 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -24,7 +24,7 @@ steps: - task: CmdLine@2 displayName: Run Build Script inputs: - script: './build.sh --settings_skipverification=true' + script: './build.sh' - task: CopyFiles@2 displayName: Upload Windows Build diff --git a/build.cake b/build.cake index 13cf9c5e7..033710a0e 100644 --- a/build.cake +++ b/build.cake @@ -1,10 +1,9 @@ -#tool "nuget:?package=GitVersion.CommandLine&version=4.0.0" -#addin nuget:?package=SharpZipLib&version=1.1.0 -#addin nuget:?package=Cake.Compression&version=0.2.2 -#addin "Cake.Incubator&version=3.1.0" -#addin nuget:?package=Cake.Yarn&version=0.4.5 -#addin "Cake.Powershell" +#tool "nuget:?package=GitVersion.CommandLine&version=5.0.1" +#addin nuget:?package=SharpZipLib&version=1.2.0 +#addin nuget:?package=Cake.Compression&version=0.2.3 +#addin "Cake.Incubator&version=5.1.0" +#addin nuget:?package=Cake.Yarn&version=0.4.6 ////////////////////////////////////////////////////////////////////// // ARGUMENTS @@ -270,16 +269,7 @@ Task("Upload-Test-Results") .IsDependentOn("Run-Unit-Tests") .ContinueOnError() .Does(() => { - var script = @" - $wc = New-Object 'System.Net.WebClient' - foreach ($name in Resolve-Path .\src\**\TestResults\Test*.trx) - { - Write-Host ""Uploading File: "" + $name - $wc.UploadFile(""https://ci.appveyor.com/api/testresults/mstest/$($env:APPVEYOR_JOB_ID)"", $name) - } - "; - // Upload the results - StartPowershellScript(script); + }); Task("Run-Server-Build") diff --git a/ci-build.yaml b/ci-build.yaml index 6c93afb3d..c610db1c0 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -24,7 +24,7 @@ steps: - task: CmdLine@2 displayName: Run Build Script inputs: - script: './build.sh --settings_skipverification=true --target=build' + script: './build.sh --target=build' - task: PublishTestResults@2 displayName: Upload Test Results From b150f5e8c0a79aaa5f26bb73f79d32c25401b974 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 22:30:43 +0100 Subject: [PATCH 08/17] Fixed publish path --- azure-pipelines.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 4dd024547..4acedf068 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ variables: testProj: '**/*.Tests.csproj' csProj: '**/*.csproj' buildConfiguration: 'Release' - publishLocation: '$(Build.SourcesDirectory)src/Ombi/bin/Release/netcoreapp2.2/' + publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp2.2/' pool: vmImage: 'ubuntu-latest' From 347aa51a8509a7add9bcc2f57426d57eae789549 Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 22:36:25 +0100 Subject: [PATCH 09/17] try again --- ci-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-build.yaml b/ci-build.yaml index c610db1c0..6d5df5f10 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -24,7 +24,7 @@ steps: - task: CmdLine@2 displayName: Run Build Script inputs: - script: './build.sh --target=build' + script: './build.sh -Target Build' - task: PublishTestResults@2 displayName: Upload Test Results From 70824e94e4bd63e4b3f4968350548a6f55e423ea Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 22:40:16 +0100 Subject: [PATCH 10/17] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index 6d5df5f10..9c9aefb7f 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -21,10 +21,16 @@ pool: steps: -- task: CmdLine@2 - displayName: Run Build Script +- task: DotNetCoreCLI@2 + displayName: Run Unit Tests inputs: - script: './build.sh -Target Build' + command: 'test' + projects: '$(testProj)' +- task: Yarn@3 + displayName: Build UI + inputs: + projectDirectory: '/src/Ombi/ClientApp/' + arguments: 'run build' - task: PublishTestResults@2 displayName: Upload Test Results From 04d326554c1e4fa57b9d08944649b81138863cb6 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 22:47:03 +0100 Subject: [PATCH 11/17] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci-build.yaml b/ci-build.yaml index 9c9aefb7f..cc10d4328 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -29,7 +29,7 @@ steps: - task: Yarn@3 displayName: Build UI inputs: - projectDirectory: '/src/Ombi/ClientApp/' + projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/' arguments: 'run build' - task: PublishTestResults@2 From 84ad399da5d3eda28144ed4007c2d070f0efb31e Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 22:54:38 +0100 Subject: [PATCH 12/17] Remove yarn build from CSProj, should speed up builds --- src/Ombi/Ombi.csproj | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 2ed1edfd2..11fafb11b 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -103,19 +103,4 @@ - - - - - - - - - - - %(DistFiles.Identity) - PreserveNewest - - - - + \ No newline at end of file From 74b503c151dc05edf979e555fffc8abcbba27dd7 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 23:00:58 +0100 Subject: [PATCH 13/17] 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 14/17] 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: From e362fa613b235e84e23ff8f2ae0c3d27fc90decb Mon Sep 17 00:00:00 2001 From: tidusjar Date: Wed, 28 Aug 2019 23:04:55 +0100 Subject: [PATCH 15/17] put that back --- src/Ombi/Ombi.csproj | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 11fafb11b..1669f75aa 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -103,4 +103,6 @@ - \ No newline at end of file + + + From 5a580fe8c2ec7a612828c9d09ffc9066521badb1 Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 23:18:47 +0100 Subject: [PATCH 16/17] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index a821185c1..7aba1cafb 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -36,12 +36,3 @@ steps: inputs: projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/' arguments: 'run build' - -- task: PublishTestResults@2 - displayName: Upload Test Results - inputs: - testResultsFormat: 'VSTest' - testResultsFiles: '**/Test-*.trx' - mergeTestResults: true - failTaskOnFailedTests: true - testRunTitle: 'Unit Tests' \ No newline at end of file From 81c27476c3310c2edf4bef040ff8f7fe9c7ee49a Mon Sep 17 00:00:00 2001 From: Jamie Date: Wed, 28 Aug 2019 23:24:09 +0100 Subject: [PATCH 17/17] Update azure-pipelines.yml for Azure Pipelines --- azure-pipelines.yml | 20 +++++++++++++------- 1 file changed, 13 insertions(+), 7 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e2c6979cb..f2352a798 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -13,7 +13,7 @@ variables: testProj: '**/*.Tests.csproj' csProj: '**/*.csproj' buildConfiguration: 'Release' - publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp2.2/' + publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp2.2' pool: vmImage: 'ubuntu-latest' @@ -24,11 +24,17 @@ steps: displayName: Run Build Script inputs: script: './build.sh' - +- task: CmdLine@2 + inputs: + script: | + cd src/Ombi/bin/Release/netcoreapp2.2 + + ls + workingDirectory: '$(Build.SourcesDirectory)' - task: CopyFiles@2 displayName: Upload Windows Build inputs: - SourceFolder: '**/windows.zip' + SourceFolder: '$(publishLocation)/windows.zip' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true @@ -42,28 +48,28 @@ steps: - task: CopyFiles@2 displayName: Upload Linux Build inputs: - SourceFolder: '**/linux.tar.gz' + SourceFolder: '$(publishLocation)/linux.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Linux-ARM Build inputs: - SourceFolder: '**/linux-arm.tar.gz' + SourceFolder: '$(publishLocation)/linux-arm.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Windows 32Bit Build inputs: - SourceFolder: '**/windows-32bit.zip' + SourceFolder: '$(publishLocation)/windows-32bit.zip' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true - task: CopyFiles@2 displayName: Upload Linux-ARM64 Build inputs: - SourceFolder: '**/linux-arm64.tar.gz' + SourceFolder: '$(publishLocation)/linux-arm64.tar.gz' TargetFolder: '$(Build.ArtifactStagingDirectory)' OverWrite: true