Merge pull request #811 from dotnet/build-update

Consolidate pipelines

.vsts.ix-shared.yml → .azure-pipelines.ix.yml

@@ -1,6 +1,18 @@
-parameters: 
-  signStep: []
-    
+trigger:
+  branches:
+    include:
+      - master
+      - rel/*
+  paths:
+    include:
+      - Ix.NET/Source/*
+      - .editorconfig
+      - .azure-pipelines.ix.yml
+
+queue: Hosted VS2017
+variables: 
+  BuildConfiguration: Release
+  
 steps:
 - task: DotNetCoreCLI@2  
   inputs:
@@ -13,10 +25,6 @@ steps:
 - script: nbgv cloud -p Ix.NET\Source
   displayName: Set Version
   condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
-  
-- task: DotNetCoreInstaller@0
-  inputs:
-    version: '2.1.400'
 
 - task: DotNetCoreCLI@2
   inputs:
@@ -34,11 +42,19 @@ steps:
     arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/Ix.NET/Source/CodeCoverage.runsettings /p:DebugType=Full 
   displayName: Run Tests
   
-- ${{ parameters.signStep }}
+- task: PowerShell@2
+  displayName: Authenticode Sign Packages
+  inputs:
+    filePath: Ix.NET/Source/build/Sign-Package.ps1
+  env:
+    SignClientUser: $(SignClientUser)
+    SignClientSecret: $(SignClientSecret)
+    ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
+  condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
 
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
     ArtifactName: artifacts
     publishLocation: Container
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

.vsts.rx-shared.yml → .azure-pipelines.rx.yml

@@ -1,5 +1,19 @@
-parameters: 
-  signStep: []
+trigger:
+  branches:
+    include:
+      - master
+      - rel/*
+  paths:
+    include:
+      - Rx.NET/Source/*
+      - .editorconfig
+      - .azure-pipelines.rx.yml
+
+queue: Hosted VS2017
+
+variables: 
+  BuildConfiguration: Release
+  BuildPlatform: Any CPU
     
 steps:
 - task: DotNetCoreCLI@2  
@@ -13,10 +27,6 @@ steps:
 - script: nbgv cloud -a -p Rx.NET\Source
   displayName: Set Version
   condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
-  
-- task: DotNetCoreInstaller@0
-  inputs:
-    version: '2.1.400'
 
 - task: MSBuild@1
   displayName: Build System.Reactive.sln
@@ -57,11 +67,19 @@ steps:
     arguments: -c $(BuildConfiguration) --no-build --no-restore 
   displayName: Run Api Approvals Tests
   
-- ${{ parameters.signStep }}
+- task: PowerShell@2
+  displayName: Authenticode Sign Packages
+  inputs:
+    filePath: Rx.NET/Source/build/Sign-Package.ps1
+  env:
+    SignClientUser: $(SignClientUser)
+    SignClientSecret: $(SignClientSecret)
+    ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts
+  condition: and(succeeded(), not(eq(variables['build.reason'], 'PullRequest')), not(eq(variables['SignClientSecret'], '')), not(eq(variables['SignClientUser'], '')))
 
 - task: PublishBuildArtifacts@1
   inputs:
     PathtoPublish: $(Build.ArtifactStagingDirectory)\artifacts
     ArtifactName: artifacts
     publishLocation: Container
-  condition: eq(variables['system.pullrequest.isfork'], false)
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))

.vsts.ix-ci.yml

@@ -1,29 +0,0 @@
-trigger:
-  branches:
-    include:
-      - master
-      - rel/*
-  paths:
-    include:
-      - Ix.NET/Source/*
-      - .editorconfig
-      - .vsts.ix-ci.yml
-      - NuGet.Config
-
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  
-steps:
-- template: .vsts.ix-shared.yml
-  parameters:
-    signStep:
-    - task: PowerShell@2
-      displayName: Authenticode Sign Packages
-      inputs:
-        filePath: Ix.NET/Source/build/Sign-Package.ps1
-      env:
-        SignClientUser: $(SignClientUser)
-        SignClientSecret: $(SignClientSecret)
-        ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts

.vsts.ix-pr.yml

@@ -1,9 +0,0 @@
-trigger: none
-
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-  
-steps:
-- template: .vsts.ix-shared.yml

.vsts.rx-ci.yml

@@ -1,31 +0,0 @@
-trigger:
-  branches:
-    include:
-      - master
-      - rel/*
-  paths:
-    include:
-      - Rx.NET/Source/*
-      - .editorconfig
-      - .vsts.rx-ci.yml
-      - .vsts.rx-shared.yml
-
-queue: Hosted VS2017
-
-variables: 
-  BuildConfiguration: Release
-  BuildPlatform: Any CPU
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    
-steps:
-- template: .vsts.rx-shared.yml
-  parameters:
-    signStep:
-    - task: PowerShell@2
-      displayName: Authenticode Sign Packages
-      inputs:
-        filePath: Rx.NET/Source/build/Sign-Package.ps1
-      env:
-        SignClientUser: $(SignClientUser)
-        SignClientSecret: $(SignClientSecret)
-        ArtifactDirectory: $(Build.ArtifactStagingDirectory)\artifacts

.vsts.rx-pr.yml

@@ -1,10 +0,0 @@
-trigger: none
-queue: Hosted VS2017
-
-variables: 
-  BuildConfiguration: Release
-  BuildPlatform: Any CPU
-  DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-    
-steps:
-- template: .vsts.rx-shared.yml