Merge pull request #819 from dotnet/bump-to-411

Bump to 411
dotnet · Oct 1, 2018 · aeaf0e8 · aeaf0e8
2 parents 57bcb6e + 44ef422
commit aeaf0e8
Show file tree

Hide file tree

Showing 7 changed files with 55 additions and 97 deletions.
diff --git a/.vsts.ix-ci.yml b/.vsts.ix-ci.yml
diff --git a/.vsts.ix-pr.yml b/.vsts.ix-pr.yml
diff --git a/.vsts.rx-ci.yml b/.vsts.rx-ci.yml
diff --git a/.vsts.rx-pr.yml b/.vsts.rx-pr.yml
diff --git a/Rx.NET/Source/version.json b/Rx.NET/Source/version.json
@@ -1,5 +1,5 @@
 {
-  "version": "4.1.0",
+  "version": "4.1.1",
   "publicReleaseRefSpec": [
     "^refs/heads/master$", // we release out of master
     "^refs/heads/rel/v\\d+\\.\\d+" // we also release branches starting with rel/vN.N

diff --git a/.vsts.ix-shared.yml → azure-pipelines.ix.yml b/.vsts.ix-shared.yml → azure-pipelines.ix.yml
@@ -1,6 +1,20 @@
-parameters: 
-  signStep: []
-
+trigger:
+  branches:
+    include:
+      - master
+      - rel/*
+  paths:
+    include:
+      - Ix.NET/Source/*
+      - .editorconfig
+      - azure-pipelines.ix.yml
+
+pool:
+  vmImage: vs2017-win2016
+
+variables: 
+  BuildConfiguration: Release
+
 steps:
 - task: DotNetCoreCLI@2  
   inputs:
@@ -13,10 +27,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-preview-009171'
 
 - task: DotNetCoreCLI@2
   inputs:
@@ -34,11 +44,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))
diff --git a/.vsts.rx-shared.yml → azure-pipelines.rx.yml b/.vsts.rx-shared.yml → azure-pipelines.rx.yml
@@ -1,5 +1,20 @@
-parameters: 
-  signStep: []
+trigger:
+  branches:
+    include:
+      - master
+      - rel/*
+  paths:
+    include:
+      - Rx.NET/Source/*
+      - .editorconfig
+      - azure-pipelines.rx.yml
+
+pool:
+  vmImage: vs2017-win2016
+
+variables: 
+  BuildConfiguration: Release
+  BuildPlatform: Any CPU
 
 steps:
 - task: DotNetCoreCLI@2  
@@ -13,10 +28,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-preview-009171'
 
 - task: MSBuild@1
   displayName: Build System.Reactive.sln
@@ -57,11 +68,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))