From 1521fbf7dc8c8007faa68c1568cffe8300017be0 Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 10 Oct 2019 08:21:07 -0400
Subject: [PATCH] Split signing into separate stage (#1055)

* Split signing into separate stage

* Remove explicit SDK version
---
 Rx.NET/Source/build/Sign-Package.ps1          |  28 -
 .../{appsettings.json => signclient.json}     |   0
 Rx.NET/Source/global.json                     |   3 -
 azure-pipelines.rx.yml                        | 485 +++++++++---------
 4 files changed, 253 insertions(+), 263 deletions(-)
 delete mode 100644 Rx.NET/Source/build/Sign-Package.ps1
 rename Rx.NET/Source/build/{appsettings.json => signclient.json} (100%)

diff --git a/Rx.NET/Source/build/Sign-Package.ps1 b/Rx.NET/Source/build/Sign-Package.ps1
deleted file mode 100644
index 84580101e6..0000000000
--- a/Rx.NET/Source/build/Sign-Package.ps1
+++ /dev/null
@@ -1,28 +0,0 @@
-
-$currentDirectory = split-path $MyInvocation.MyCommand.Definition
-
-# See if we have the ClientSecret available
-if([string]::IsNullOrEmpty($Env:SignClientSecret)){
-	Write-Host "Client Secret not found, not signing packages"
-	return;
-}
-
-dotnet tool install --tool-path . SignClient
-
-# Setup Variables we need to pass into the sign client tool
-
-$appSettings = "$currentDirectory\appsettings.json"
-
-$nupkgs = gci $Env:ArtifactDirectory\*.nupkg -recurse | Select -ExpandProperty FullName
-
-foreach ($nupkg in $nupkgs){
-	Write-Host "Submitting $nupkg for signing"
-
-	.\SignClient 'sign' -c $appSettings -i $nupkg -r $Env:SignClientUser -s $Env:SignClientSecret -n 'Rx.NET' -d 'Rx.NET' -u 'https://github.com/dotnet/reactive' 
-  if ($LASTEXITCODE -ne 0) {
-    exit 1
-  }
-	Write-Host "Finished signing $nupkg"
-}
-
-Write-Host "Sign-package complete"
\ No newline at end of file
diff --git a/Rx.NET/Source/build/appsettings.json b/Rx.NET/Source/build/signclient.json
similarity index 100%
rename from Rx.NET/Source/build/appsettings.json
rename to Rx.NET/Source/build/signclient.json
diff --git a/Rx.NET/Source/global.json b/Rx.NET/Source/global.json
index 97596aaa68..80d84a257c 100644
--- a/Rx.NET/Source/global.json
+++ b/Rx.NET/Source/global.json
@@ -1,7 +1,4 @@
 {
-  "sdk": {
-    "version": "3.0.100-preview"
-  },
   "msbuild-sdks": {
     "MSBuild.Sdk.Extras": "2.0.54"
   }
diff --git a/azure-pipelines.rx.yml b/azure-pipelines.rx.yml
index f19364bc05..ddcb2db6e1 100644
--- a/azure-pipelines.rx.yml
+++ b/azure-pipelines.rx.yml
@@ -20,235 +20,256 @@ pr:
       - .editorconfig
       - azure-pipelines.rx.yml
 
-jobs:
-- job: Build
-  pool:
-    vmImage: windows-2019
-
-  variables:
-    BuildConfiguration: Release
-    BuildPlatform: Any CPU
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-
-  steps:
-  - task: UseDotNet@2
-    inputs:
-      version: '3.0.x'
-      includePreviewVersions: true
-      performMultiLevelLookup: true
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: custom
-      custom: tool
-      arguments: install --tool-path . nbgv
-    displayName: Install NBGV tool
-
-  - script: nbgv cloud -a -p Rx.NET/Source
-    displayName: Set Version
-
-  - task: MSBuild@1
-    displayName: Build System.Reactive.sln
-    inputs:
-      solution: Rx.NET/Source/System.Reactive.sln
-      msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
-      configuration: $(BuildConfiguration)
-      maximumCpuCount: true
-
-  - task: NuGetCommand@2
-    displayName: Pack compatibility package
-    inputs:
-      command: custom
-      arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: custom
-      custom: tool
-      arguments: install --tool-path . dotnet-reportgenerator-globaltool
-    displayName: Install ReportGenerator tool
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: test
-      projects: Rx.NET/Source/tests/Tests.System.Reactive/*.csproj
-      arguments: -c $(BuildConfiguration) --no-build --no-restore --filter "SkipCI!=true" --settings Rx.NET/Source/CodeCoverage.runsettings --collect:"XPlat Code Coverage" -- RunConfiguration.DisableAppDomain=true
-    displayName: Run Unit Tests
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: test
-      projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
-      arguments: -c $(BuildConfiguration) --no-build --no-restore
-    displayName: Run Api Approvals Tests
-
-  - script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
-    displayName: Create reports
-
-  - task: PublishCodeCoverageResults@1
-    displayName: 'Publish code coverage'
-    inputs:
-      codeCoverageTool: Cobertura
-      summaryFileLocation: $(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports/Cobertura.xml
-
-  - 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: always()
-
-- job: Integration_Linux_Tests
-  dependsOn: Build
-  pool:
-    vmImage: ubuntu-16.04
-
-  variables:
-    BuildConfiguration: Release
-    BuildPlatform: Any CPU
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-
-  steps:
-  - task: UseDotNet@2
-    inputs:
-      version: '3.0.x'
-      includePreviewVersions: true
-
-  - task: UseDotNet@2
-    inputs:
-      version: '2.2.x'
-      packageType: runtime
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: custom
-      custom: tool
-      arguments: install --tool-path . nbgv
-    displayName: Install NBGV tool
-
-  - script: ./nbgv cloud -a -p Rx.NET/Source
-    displayName: Set Version
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Build Artifacts'
-    inputs:
-      artifactName: artifacts
-      downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - script: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-    displayName: Move packages to LocalPackages directory
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Rx
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-      custom: add
-      arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Aliases
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-      custom: add
-      arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Testing
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-      custom: add
-      arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: test
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-      arguments: -c $(BuildConfiguration) -f netcoreapp3.0
-    displayName: Run 3.0 Tests on Linux
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: test
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
-      arguments: -c $(BuildConfiguration) -f netcoreapp2.1 /p:TargetFrameworks=netcoreapp2.1
-    displayName: Run 2.1 Tests on Linux
-
-- job: Integration_WindowsDesktop_Tests
-  dependsOn: Build
-  pool:
-    vmImage: windows-2019
-
-  variables:
-    BuildConfiguration: Release
-    BuildPlatform: Any CPU
-    DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
-
-  steps:
-  - task: UseDotNet@2
-    inputs:
-      version: '3.0.x'
-      includePreviewVersions: true
-      performMultiLevelLookup: true
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: custom
-      custom: tool
-      arguments: install --tool-path . nbgv
-    displayName: Install NBGV tool
-
-  - script: nbgv cloud -a -p Rx.NET/Source
-    displayName: Set Version
-
-  - task: DownloadBuildArtifacts@0
-    displayName: 'Download Build Artifacts'
-    inputs:
-      artifactName: artifacts
-      downloadPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - powershell: mv $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages/artifacts/*.* $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-    displayName: Move packages to LocalPackages directory
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Rx
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-      custom: add
-      arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Aliases
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-      custom: add
-      arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    displayName: Update Testing
-    inputs:
-      command: custom
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-      custom: add
-      arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
-
-  - task: DotNetCoreCLI@2
-    inputs:
-      command: test
-      projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
-      arguments: -c $(BuildConfiguration)
-    displayName: Run 3.0 Tests on WindowDesktop
+stages:
+- stage: Build
+  jobs:
+  - job: Build
+    pool:
+      vmImage: windows-2019
+
+    variables:
+      BuildConfiguration: Release
+      BuildPlatform: Any CPU
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+    steps:
+    - task: UseDotNet@2
+      inputs:
+        version: '3.0.x'
+        performMultiLevelLookup: true
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: custom
+        custom: tool
+        arguments: install --tool-path . nbgv
+      displayName: Install NBGV tool
+
+    - script: nbgv cloud -a -p Rx.NET/Source
+      displayName: Set Version
+
+    - task: MSBuild@1
+      displayName: Build System.Reactive.sln
+      inputs:
+        solution: Rx.NET/Source/System.Reactive.sln
+        msbuildArguments: /restore /t:build /p:CreatePackage=true /p:NoPackageAnalysis=true /p:PackageOutputPath=$(Build.ArtifactStagingDirectory)\artifacts
+        configuration: $(BuildConfiguration)
+        maximumCpuCount: true
+
+    - task: NuGetCommand@2
+      displayName: Pack compatibility package
+      inputs:
+        command: custom
+        arguments: pack Rx.NET/Source/facades/System.Reactive.Compatibility.nuspec -Version $(NBGV_NuGetPackageVersion) -MinClientVersion 2.12 -NoPackageAnalysis -outputdirectory $(Build.ArtifactStagingDirectory)\artifacts
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: custom
+        custom: tool
+        arguments: install --tool-path . dotnet-reportgenerator-globaltool
+      displayName: Install ReportGenerator tool
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: test
+        projects: Rx.NET/Source/tests/Tests.System.Reactive/*.csproj
+        arguments: -c $(BuildConfiguration) --no-build --no-restore --filter "SkipCI!=true" --settings Rx.NET/Source/CodeCoverage.runsettings --collect:"XPlat Code Coverage" -- RunConfiguration.DisableAppDomain=true
+      displayName: Run Unit Tests
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: test
+        projects: Rx.NET/Source/tests/Tests.System.Reactive.ApiApprovals/Tests.System.Reactive.ApiApprovals.csproj
+        arguments: -c $(BuildConfiguration) --no-build --no-restore
+      displayName: Run Api Approvals Tests
+
+    - script: reportgenerator -reports:$(Agent.TempDirectory)/**/coverage.cobertura.xml -targetdir:$(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports -reporttypes:"Cobertura"
+      displayName: Create reports
+
+    - task: PublishCodeCoverageResults@1
+      displayName: 'Publish code coverage'
+      inputs:
+        codeCoverageTool: Cobertura
+        summaryFileLocation: $(Build.SourcesDirectory)/Rx.NET/Source/coverlet/reports/Cobertura.xml
+
+    - publish:  Rx.NET/Source/build
+      artifact: config
+      displayName: Publish signing config
+
+    - publish: $(Build.ArtifactStagingDirectory)\artifacts
+      displayName: Publish artifacts
+      artifact: BuildPackages
+
+  - job: Integration_Linux_Tests
+    dependsOn: Build
+    pool:
+      vmImage: ubuntu-16.04
+
+    variables:
+      BuildConfiguration: Release
+      BuildPlatform: Any CPU
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+    steps:
+    - task: UseDotNet@2
+      inputs:
+        version: '3.0.x'
+
+    - task: UseDotNet@2
+      inputs:
+        version: '2.2.x'
+        packageType: runtime
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: custom
+        custom: tool
+        arguments: install --tool-path . nbgv
+      displayName: Install NBGV tool
+
+    - script: ./nbgv cloud -a -p Rx.NET/Source
+      displayName: Set Version
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Build Artifacts
+      inputs:
+        artifactName: BuildPackages
+        targetPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Rx
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+        custom: add
+        arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Aliases
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+        custom: add
+        arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Testing
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+        custom: add
+        arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: test
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+        arguments: -c $(BuildConfiguration) -f netcoreapp3.0
+      displayName: Run 3.0 Tests on Linux
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: test
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LinuxTests/LinuxTests.csproj
+        arguments: -c $(BuildConfiguration) -f netcoreapp2.1 /p:TargetFrameworks=netcoreapp2.1
+      displayName: Run 2.1 Tests on Linux
+
+  - job: Integration_WindowsDesktop_Tests
+    dependsOn: Build
+    pool:
+      vmImage: windows-2019
+
+    variables:
+      BuildConfiguration: Release
+      BuildPlatform: Any CPU
+      DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
+
+    steps:
+    - task: UseDotNet@2
+      inputs:
+        version: '3.0.x'
+        performMultiLevelLookup: true
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: custom
+        custom: tool
+        arguments: install --tool-path . nbgv
+      displayName: Install NBGV tool
+
+    - script: nbgv cloud -a -p Rx.NET/Source
+      displayName: Set Version
+
+    - task: DownloadPipelineArtifact@2
+      displayName: Download Build Artifacts
+      inputs:
+        artifactName: BuildPackages
+        targetPath: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Rx
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+        custom: add
+        arguments: package System.Reactive -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Aliases
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+        custom: add
+        arguments: package System.Reactive.Observable.Aliases -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      displayName: Update Testing
+      inputs:
+        command: custom
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+        custom: add
+        arguments: package Microsoft.Reactive.Testing -v $(NBGV_NuGetPackageVersion) -s $(System.DefaultWorkingDirectory)/Rx.NET/Integration/LocalPackages
+
+    - task: DotNetCoreCLI@2
+      inputs:
+        command: test
+        projects: $(System.DefaultWorkingDirectory)/Rx.NET/Integration/WindowsDesktopTests/WindowsDesktopTests.csproj
+        arguments: -c $(BuildConfiguration)
+      displayName: Run 3.0 Tests on WindowDesktop
+
+- stage: CodeSign
+  condition: and(succeeded('Build'), not(eq(variables['build.reason'], 'PullRequest')))
+  jobs:
+  - deployment: CodeSign
+    displayName: Code Signing
+    pool:
+      vmImage: windows-latest
+    environment: Code Sign
+    variables:
+    - group: SignClient Credentials
+    strategy:
+      runOnce:
+        deploy:
+          steps:
+          - task: DotNetCoreCLI@2
+            inputs:
+              command: custom
+              custom: tool
+              arguments: install --tool-path . SignClient
+            displayName: Install SignTool tool
+
+          - pwsh: |
+              .\SignClient "Sign" `
+              --baseDirectory "$(Pipeline.Workspace)\BuildPackages" `
+              --input "**/*.nupkg" `
+              --config "$(Pipeline.Workspace)\config\signclient.json" `
+              --user "$(SignClientUser)" `
+              --secret "$(SignClientSecret)" `
+              --name "Rx.NET" `
+              --description "Rx.NET" `
+              --descriptionUrl "https://github.com/dotnet/reactive"
+            displayName: Sign packages
+
+          - publish: $(Pipeline.Workspace)/BuildPackages
+            displayName: Publish Signed Packages
+            artifact: SignedPackages