From b964d44ff2d76d9d25e05fa0a60fba306c2ad7aa Mon Sep 17 00:00:00 2001
From: Oren Novotny <oren@novotny.org>
Date: Thu, 13 Sep 2018 17:15:17 -0400
Subject: consolidate files

---
 .azure-pipelines.yml | 55 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 .vsts-ci.yml         | 19 ------------------
 .vsts-pr.yml         |  6 ------
 .vsts-shared.yml     | 41 ---------------------------------------
 4 files changed, 55 insertions(+), 66 deletions(-)
 create mode 100644 .azure-pipelines.yml
 delete mode 100644 .vsts-ci.yml
 delete mode 100644 .vsts-pr.yml
 delete mode 100644 .vsts-shared.yml

diff --git a/.azure-pipelines.yml b/.azure-pipelines.yml
new file mode 100644
index 000000000..7cb771f6f
--- /dev/null
+++ b/.azure-pipelines.yml
@@ -0,0 +1,55 @@
+trigger:
+- netstandard
+- rel/*
+
+queue: Hosted VS2017
+
+variables: 
+  BuildConfiguration: Release
+
+steps:
+- task: DotNetCoreCLI@2  
+  inputs:
+    command: custom
+    custom: tool
+    arguments: install --tool-path . nbgv
+  displayName: Install NBGV tool
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- script: nbgv cloud
+  displayName: Set Version
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+
+- task: DotNetCoreCLI@2
+  inputs:
+    command: pack
+    packagesToPack: .\crypto\src\crypto.csproj
+    packDirectory: $(Build.ArtifactStagingDirectory)\Packages
+    configuration: $(BuildConfiguration)
+    arguments: /p:PackageId="Portable.BouncyCastle" 
+  displayName: Build  
+  
+- task: DotNetCoreCLI@2
+  inputs:
+    command: test
+    projects: .\crypto\test\crypto.test.csproj
+    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings /p:DebugType=portable
+  displayName: Run Tests
+  
+- task: PowerShell@2
+  displayName: Authenticode Sign artifacts
+  inputs:
+    filePath: scripts/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 Package Artifacts
+  inputs:
+    pathToPublish: $(Build.ArtifactStagingDirectory)\Packages
+    artifactType: container
+    artifactName: Packages
+  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
diff --git a/.vsts-ci.yml b/.vsts-ci.yml
deleted file mode 100644
index 63f102462..000000000
--- a/.vsts-ci.yml
+++ /dev/null
@@ -1,19 +0,0 @@
-trigger:
-- netstandard
-- rel/*
-
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-steps:
-- template: .vsts-shared.yml
-  parameters:
-    signSteps:
-    - task: PowerShell@2
-      displayName: Authenticode Sign artifacts
-      inputs:
-        filePath: scripts/Sign-Package.ps1
-      env:
-        SignClientUser: $(SignClientUser)
-        SignClientSecret: $(SignClientSecret)
-        ArtifactDirectory: $(Build.ArtifactStagingDirectory)\Packages
diff --git a/.vsts-pr.yml b/.vsts-pr.yml
deleted file mode 100644
index 6209bba42..000000000
--- a/.vsts-pr.yml
+++ /dev/null
@@ -1,6 +0,0 @@
-trigger: none
-queue: Hosted VS2017
-variables: 
-  BuildConfiguration: Release
-steps:
-- template: .vsts-shared.yml
\ No newline at end of file
diff --git a/.vsts-shared.yml b/.vsts-shared.yml
deleted file mode 100644
index aff5d5927..000000000
--- a/.vsts-shared.yml
+++ /dev/null
@@ -1,41 +0,0 @@
-parameters: 
-  signSteps: []
-  
-steps:
-- task: DotNetCoreCLI@2  
-  inputs:
-    command: custom
-    custom: tool
-    arguments: install --tool-path . nbgv
-  displayName: Install NBGV tool
-  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
-
-- script: nbgv cloud
-  displayName: Set Version
-  condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
-
-- task: DotNetCoreCLI@2
-  inputs:
-    command: pack
-    packagesToPack: .\crypto\src\crypto.csproj
-    packDirectory: $(Build.ArtifactStagingDirectory)\Packages
-    configuration: $(BuildConfiguration)
-    arguments: /p:PackageId="Portable.BouncyCastle" 
-  displayName: Build  
-  
-- task: DotNetCoreCLI@2
-  inputs:
-    command: test
-    projects: .\crypto\test\crypto.test.csproj
-    arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)\CodeCoverage.runsettings /p:DebugType=portable
-  displayName: Run Tests
-  
-- ${{ parameters.signSteps }}
-
-- task: PublishBuildArtifacts@1
-  displayName: Publish Package Artifacts
-  inputs:
-    pathToPublish: $(Build.ArtifactStagingDirectory)\Packages
-    artifactType: container
-    artifactName: Packages
-  condition: eq(variables['system.pullrequest.isfork'], false)
-- 
cgit 1.4.1