From 074f2a423d3d2988b0d47ed9696e76bcbe0b19c0 Mon Sep 17 00:00:00 2001
From: Nate McMaster <natemcmaster@users.noreply.github.com>
Date: Tue, 25 Sep 2018 17:24:04 -0700
Subject: [PATCH] Switch queue name for dnceng and rename yaml files directory
 (#1481)

Update queue names to to work on https://dev.azure.com/dnceng. Also, react to VSTS => Azure DevOps rebranding.
---
 .../pipelines}/ci-official.yml                |   6 +-
 .../builds => .azure/pipelines}/ci-public.yml |   0
 {.vsts => .azure}/templates/blazor-build.yml  | 102 +++++++++---------
 3 files changed, 54 insertions(+), 54 deletions(-)
 rename {.vsts/builds => .azure/pipelines}/ci-official.yml (72%)
 rename {.vsts/builds => .azure/pipelines}/ci-public.yml (100%)
 rename {.vsts => .azure}/templates/blazor-build.yml (96%)

diff --git a/.vsts/builds/ci-official.yml b/.azure/pipelines/ci-official.yml
similarity index 72%
rename from .vsts/builds/ci-official.yml
rename to .azure/pipelines/ci-official.yml
index 4e0e5772b9..6cbe006ba8 100644
--- a/.vsts/builds/ci-official.yml
+++ b/.azure/pipelines/ci-official.yml
@@ -5,7 +5,7 @@ trigger:
 phases:
 - template: ../templates/blazor-build.yml
   parameters:
-    queueName: VSEng-MicroBuildVS2017
+    queueName: DotNetCore-Windows
     variables:
       SignType: real
       TeamName: AspNetCore
@@ -14,13 +14,13 @@ phases:
       displayName: 'Run compliance check'
       inputs:
         targetType: F
-    - task: ms-vseng.MicroBuildTasks.30666190-6959-11e5-9f96-f56098202fef.MicroBuildSigningPlugin@1
+    - task: MicroBuildSigningPlugin@1
       displayName: Install CodeSigning plugin
       inputs:
         signType: $(SignType)
       condition: and(succeeded(), in(variables['SignType'], 'test', 'real'))
 
     afterBuild:
-    - task: ms-vseng.MicroBuildTasks.521a94ea-9e68-468a-8167-6dcf361ea776.MicroBuildCleanup@1
+    - task: MicroBuildCleanup@1
       displayName: Perform Cleanup Tasks
       condition: succeededOrFailed()
diff --git a/.vsts/builds/ci-public.yml b/.azure/pipelines/ci-public.yml
similarity index 100%
rename from .vsts/builds/ci-public.yml
rename to .azure/pipelines/ci-public.yml
diff --git a/.vsts/templates/blazor-build.yml b/.azure/templates/blazor-build.yml
similarity index 96%
rename from .vsts/templates/blazor-build.yml
rename to .azure/templates/blazor-build.yml
index 3b9a6d68aa..7244168373 100644
--- a/.vsts/templates/blazor-build.yml
+++ b/.azure/templates/blazor-build.yml
@@ -1,51 +1,51 @@
-parameters:
-  queueName: ''
-  beforeBuild: []
-  afterBuild: []
-  variables:
-
-phases:
-- phase: Windows
-  queue:
-    name: ${{ parameters.queueName }}
-    parallel: 2
-    matrix:
-      Release:
-        BuildConfiguration: Release
-      Debug:
-        BuildConfiguration: Debug
-  variables:
-    ${{ insert }}: ${{ parameters.variables }}
-  steps:
-  - checkout: self
-    clean: true
-
-  - ${{ parameters.beforeBuild }}
-
-  - script: .\build.cmd -ci /p:Configuration=$(BuildConfiguration)
-    displayName: Run build.cmd
-
-  - task: PublishTestResults@2
-    displayName: Publish test results
-    condition: always()
-    inputs:
-      testRunner: vstest
-      testResultsFiles: 'artifacts/logs/**/*.trx'
-
-  - task: PublishBuildArtifacts@1
-    displayName: Upload artifacts
-    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
-    inputs:
-      pathtoPublish: artifacts/$(BuildConfiguration)/
-      artifactName: artifacts-$(BuildConfiguration)
-      artifactType: Container
-
-  - task: PublishBuildArtifacts@1
-    displayName: Upload logs
-    condition: and(failed(), eq(variables['system.pullrequest.isfork'], false))
-    inputs:
-      pathtoPublish: artifacts/logs/
-      artifactName: logs-$(BuildConfiguration)
-      artifactType: Container
-
-  - ${{ parameters.afterBuild }}
+parameters:
+  queueName: ''
+  beforeBuild: []
+  afterBuild: []
+  variables:
+
+phases:
+- phase: Windows
+  queue:
+    name: ${{ parameters.queueName }}
+    parallel: 2
+    matrix:
+      Release:
+        BuildConfiguration: Release
+      Debug:
+        BuildConfiguration: Debug
+  variables:
+    ${{ insert }}: ${{ parameters.variables }}
+  steps:
+  - checkout: self
+    clean: true
+
+  - ${{ parameters.beforeBuild }}
+
+  - script: .\build.cmd -ci /p:Configuration=$(BuildConfiguration)
+    displayName: Run build.cmd
+
+  - task: PublishTestResults@2
+    displayName: Publish test results
+    condition: always()
+    inputs:
+      testRunner: vstest
+      testResultsFiles: 'artifacts/logs/**/*.trx'
+
+  - task: PublishBuildArtifacts@1
+    displayName: Upload artifacts
+    condition: and(succeeded(), eq(variables['system.pullrequest.isfork'], false))
+    inputs:
+      pathtoPublish: artifacts/$(BuildConfiguration)/
+      artifactName: artifacts-$(BuildConfiguration)
+      artifactType: Container
+
+  - task: PublishBuildArtifacts@1
+    displayName: Upload logs
+    condition: and(failed(), eq(variables['system.pullrequest.isfork'], false))
+    inputs:
+      pathtoPublish: artifacts/logs/
+      artifactName: logs-$(BuildConfiguration)
+      artifactType: Container
+
+  - ${{ parameters.afterBuild }}