Skip to content

Commit

Permalink
Merge pull request #119 from onovotny/consolidate
Browse files Browse the repository at this point in the history
consolidate build files
  • Loading branch information
Oren Novotny authored Sep 13, 2018
2 parents 8c1f923 + c3814c8 commit 1105b07
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 35 deletions.
24 changes: 19 additions & 5 deletions .vsts-shared.yml → .azure-pipelines.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,11 @@
parameters:
signSteps: []
trigger:
- master
- rel/*

queue: Hosted VS2017

variables:
BuildConfiguration: Release

steps:
- task: DotNetCoreCLI@2
Expand Down Expand Up @@ -27,12 +33,20 @@ steps:
verbosityPack: Minimal
displayName: Build Package

- ${{ parameters.signSteps }}
- task: PowerShell@2
displayName: Authenticode Sign artifacts
inputs:
filePath: Tools\Sign-Package.ps1
env:
SignClientUser: $(SignClientUser)
SignClientSecret: $(SignClientSecret)
ArtifactDirectory: $(Build.ArtifactStagingDirectory)\Packages
condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))

- task: PublishBuildArtifacts@1
displayName: Publish Artifacts
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
displayName: Publish Artifacts
inputs:
pathToPublish: $(Build.ArtifactStagingDirectory)\Packages
artifactType: container
artifactName: Package
condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
21 changes: 0 additions & 21 deletions .vsts-ci.yml

This file was deleted.

9 changes: 0 additions & 9 deletions .vsts-pr.yml

This file was deleted.

0 comments on commit 1105b07

Please sign in to comment.