From 4147a2a9ccac4ecb715e67955a3aca3a8d3c2dd0 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 12:19:02 +0000 Subject: [PATCH 1/8] Update Ombi.csproj --- src/Ombi/Ombi.csproj | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/src/Ombi/Ombi.csproj b/src/Ombi/Ombi.csproj index 7c0e5b583..30b63a904 100644 --- a/src/Ombi/Ombi.csproj +++ b/src/Ombi/Ombi.csproj @@ -102,17 +102,4 @@ - - - - - - - - %(DistFiles.Identity) - PreserveNewest - - - - From 43a14780af68481847b54546fcd548694c9688fb Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 12:22:53 +0000 Subject: [PATCH 2/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index 33488f752..aed2d7a04 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -161,9 +161,9 @@ steps: - task: GitHubRelease@1 inputs: gitHubConnection: 'github.com_tidusjar' - repositoryName: 'tidusjar/Ombi.Releases' + repositoryName: 'dotnet-foundation/Home' action: 'create' - target: '$(Build.SourceVersion)' + target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' tagSource: 'gitTag' tagPattern: 'v4.*' releaseNotesSource: 'inline' From 6645017f867bd69e838a2e7343763507e531f89b Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 12:36:28 +0000 Subject: [PATCH 3/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index aed2d7a04..6efc623db 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -20,6 +20,7 @@ variables: csProj: '**/*.csproj' buildConfiguration: 'Release' publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0' + gitTag: 'v4.0.${Build.BuildId}' pool: vmImage: 'ubuntu-latest' @@ -164,14 +165,13 @@ steps: repositoryName: 'dotnet-foundation/Home' action: 'create' target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' - tagSource: 'gitTag' - tagPattern: 'v4.*' + tagSource: 'userSpecifiedTag' + tag: '${gitTag}' releaseNotesSource: 'inline' releaseNotesInline: 'test' isPreRelease: true changeLogCompareToRelease: 'lastFullRelease' changeLogType: 'commitBased' - #- task: PublishBuildArtifacts@1 # displayName: Publish Win 86 # inputs: From 85795515075fcab7ed345c45c6e08f1139dd66be Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 12:48:11 +0000 Subject: [PATCH 4/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index 6efc623db..fd7996358 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -20,7 +20,7 @@ variables: csProj: '**/*.csproj' buildConfiguration: 'Release' publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0' - gitTag: 'v4.0.${Build.BuildId}' + gitTag: 'v4.0.$(Build.BuildId)' pool: vmImage: 'ubuntu-latest' @@ -162,16 +162,17 @@ steps: - task: GitHubRelease@1 inputs: gitHubConnection: 'github.com_tidusjar' - repositoryName: 'dotnet-foundation/Home' + repositoryName: 'tidusjar/Ombi.Releases' action: 'create' target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' tagSource: 'userSpecifiedTag' - tag: '${gitTag}' + tag: '$(gitTag)' releaseNotesSource: 'inline' releaseNotesInline: 'test' isPreRelease: true changeLogCompareToRelease: 'lastFullRelease' changeLogType: 'commitBased' + #- task: PublishBuildArtifacts@1 # displayName: Publish Win 86 # inputs: From 97138b758edb04b48920b4e674335dc882004daa Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 13:05:39 +0000 Subject: [PATCH 5/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 35 ++++++++++++++++++----------------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index fd7996358..8c606157f 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -20,7 +20,7 @@ variables: csProj: '**/*.csproj' buildConfiguration: 'Release' publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0' - gitTag: 'v4.0.$(Build.BuildId)' + gitTag: 'v4.0.${Build.BuildId}' pool: vmImage: 'ubuntu-latest' @@ -38,13 +38,6 @@ steps: projectDirectory: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/' arguments: 'run build' -- task: CopyFiles@2 - displayName: 'Publish Angular App Win10-x64' - inputs: - SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist' - Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot' - #- task: DotNetCoreCLI@2 # displayName: Run Unit Tests # inputs: @@ -60,6 +53,13 @@ steps: publishWebProjects: true arguments: '-c $(buildConfiguration) -r "win10-x64" -o $(Build.ArtifactStagingDirectory)/win-64' +- task: CopyFiles@2 + displayName: 'Publish Angular App Win10-x64' + inputs: + SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist' + Contents: '**' + TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot' + #- task: DotNetCoreCLI@2 # displayName: Publish Win10-x86 # inputs: @@ -97,14 +97,14 @@ steps: ### Zip them up -#- task: ArchiveFiles@2 -# displayName: Zip Win-x64 -# inputs: -# rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64' -# includeRootFolder: true -# archiveType: 'zip' -# archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip' -# replaceExistingArchive: true +- task: ArchiveFiles@2 + displayName: Zip Win-x64 + inputs: + rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64' + includeRootFolder: true + archiveType: 'zip' + archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip' + replaceExistingArchive: true #- task: ArchiveFiles@2 # displayName: Zip Win-x86 @@ -166,9 +166,10 @@ steps: action: 'create' target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' tagSource: 'userSpecifiedTag' - tag: '$(gitTag)' + tag: '${gitTag}' releaseNotesSource: 'inline' releaseNotesInline: 'test' + assets: '$(Build.ArtifactStagingDirectory)/*.zip' isPreRelease: true changeLogCompareToRelease: 'lastFullRelease' changeLogType: 'commitBased' From 53bbc88dbf6ae1593afd809df5d19f357eec7972 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 13:25:44 +0000 Subject: [PATCH 6/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci-build.yaml b/ci-build.yaml index 8c606157f..1e1345bb4 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -20,7 +20,7 @@ variables: csProj: '**/*.csproj' buildConfiguration: 'Release' publishLocation: '$(Build.SourcesDirectory)/src/Ombi/bin/Release/netcoreapp3.0' - gitTag: 'v4.0.${Build.BuildId}' + gitTag: 'v4.0.$(Build.BuildId)' pool: vmImage: 'ubuntu-latest' @@ -166,7 +166,7 @@ steps: action: 'create' target: 'c7fcbb77b58aef1076d635a9ef99e4374abc8672' tagSource: 'userSpecifiedTag' - tag: '${gitTag}' + tag: '$(gitTag)' releaseNotesSource: 'inline' releaseNotesInline: 'test' assets: '$(Build.ArtifactStagingDirectory)/*.zip' From 5d8496246a7af09d3b73f76f4ed6a52a4a2ee9f6 Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 13:36:13 +0000 Subject: [PATCH 7/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-build.yaml b/ci-build.yaml index 1e1345bb4..9e5c620ee 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -52,6 +52,7 @@ steps: command: 'publish' publishWebProjects: true arguments: '-c $(buildConfiguration) -r "win10-x64" -o $(Build.ArtifactStagingDirectory)/win-64' + zipAfterPublish: false - task: CopyFiles@2 displayName: 'Publish Angular App Win10-x64' @@ -101,7 +102,7 @@ steps: displayName: Zip Win-x64 inputs: rootFolderOrFile: '$(Build.ArtifactStagingDirectory)/win-64' - includeRootFolder: true + includeRootFolder: false archiveType: 'zip' archiveFile: '$(Build.ArtifactStagingDirectory)/win-x64-$(Build.BuildId).zip' replaceExistingArchive: true From 9d5961de007a99811fc63159317c26ab64e3a2dd Mon Sep 17 00:00:00 2001 From: Jamie Date: Mon, 6 Jan 2020 20:12:00 +0000 Subject: [PATCH 8/8] Update ci-build.yaml for Azure Pipelines --- ci-build.yaml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ci-build.yaml b/ci-build.yaml index 9e5c620ee..b3f293104 100644 --- a/ci-build.yaml +++ b/ci-build.yaml @@ -53,13 +53,14 @@ steps: publishWebProjects: true arguments: '-c $(buildConfiguration) -r "win10-x64" -o $(Build.ArtifactStagingDirectory)/win-64' zipAfterPublish: false + modifyOutputPath: false - task: CopyFiles@2 displayName: 'Publish Angular App Win10-x64' inputs: SourceFolder: '$(Build.SourcesDirectory)/src/Ombi/ClientApp/dist' Contents: '**' - TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/wwwroot' + TargetFolder: '$(Build.ArtifactStagingDirectory)/win-64/ClientApp/dist' #- task: DotNetCoreCLI@2 # displayName: Publish Win10-x86