Update pipelines (#6)

DevOpsPipelineDefinitions/rebuild-pipeline.yaml

@@ -1,4 +1,4 @@
-# Rebuild pipeline for Windows Package Manager.
+# Rebuild pipeline for WinGet.
 
 # Name of the run
 name: '$(Build.DefinitionName)-$(Build.DefinitionVersion)-$(Date:yyyyMMdd)-$(Rev:r)'
@@ -27,30 +27,29 @@ jobs:
   - task: AzureCLI@1
     displayName: 'Azure Setup'
     inputs:
-      azureSubscription: '$(PackageManagerSubscription)'
+      azureSubscription: '$(WinGet.Subscription)'
       scriptLocation: inlineScript
       inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
     env:
       AZURE_STORAGE_CONNECTION_STRING: $(ValidationStorageAccountConnectionString)
 
-  # PackageManager setup
-  - script: 'pkgmgr_publish_setup.cmd'
-    name: 'pkgmgrsetup'
-    displayName: 'PackageManager Setup'
+  # WinGet setup
+  - script: 'winget_publish_setup.cmd'
+    name: 'wingetsetup'
+    displayName: 'WinGet Setup'
     workingDirectory: scripts
     env:
       HOST_KEY: $(AzureFunctionHostKey)
-      SIGN_ENDPOINT: $(PackageManagerSignEndpoint)
+      SIGN_ENDPOINT: $(AzFuncSignEndpoint)
 
   - task: CmdLine@2
     displayName: 'Validate Manifests'
     inputs:
-      script: 'PackageManagerServiceWrapper.exe rebuild --operationId %BUILD_BUILDNUMBER%'
+      script: 'WinGetSvcWrapper.exe rebuild --operationId %BUILD_BUILDNUMBER%'
       failOnStderr: true
     condition: succeeded()
     env:
       AzureWebJobsStorage: $(ValidationStorageAccountConnectionString)
-      PackageManagerEnvironment: $(PackageManagerEnvironment)
       PackagePublisher: $(PackagePublisher)
       SYSTEM_ACCESSTOKEN: $(System.AccessToken)
       DIApplicationInsightKey: $(DIApplicationInsightKey)
@@ -63,11 +62,11 @@ jobs:
   dependsOn:
     - 'Rebuild'
   variables:
-    HostKeySecret: $[ dependencies.Rebuild.outputs['pkgmgrsetup.hostkey']]
-    SignEndpointSecret: $[ dependencies.Rebuild.outputs['pkgmgrsetup.signEndpoint']]
+    HostKeySecret: $[ dependencies.Rebuild.outputs['wingetsetup.hostkey']]
+    SignEndpointSecret: $[ dependencies.Rebuild.outputs['wingetsetup.signEndpoint']]
   steps:
 
-  # Sign Package Manager package.
+  # Sign package.
   - task: AzureFunction@1
     displayName: 'Signing package'
     inputs:
@@ -76,6 +75,8 @@ jobs:
       body: |
         {
         "operationId": "$(Build.BuildNumber)",
+        "PlanUrl": "$(system.CollectionUri)",
+        "HubName": "$(system.HostType)",
         "pipelineType": "RebuildPipeline",
         "ProjectId": "$(system.TeamProjectId)",
         "PlanId": "$(system.PlanId)", 
@@ -102,7 +103,7 @@ jobs:
   - task: AzureCLI@1
     displayName: 'Azure Setup'
     inputs:
-      azureSubscription: '$(PackageManagerSubscription)'
+      azureSubscription: '$(WinGet.Subscription)'
       scriptLocation: inlineScript
       inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
     env:
@@ -112,20 +113,12 @@ jobs:
   - task: CmdLine@2
     displayName: 'Publish'
     inputs:
-      script: 'PackageManagerServiceWrapper.exe rebuild-publish --operationId %BUILD_BUILDNUMBER%'
+      script: 'WinGetSvcWrapper.exe rebuild-publish --operationId %BUILD_BUILDNUMBER%'
       failOnStderr: true
     condition: succeeded()
     env:
       AzureWebJobsStorage: $(ValidationStorageAccountConnectionString)
-      AzureServicesAuthConnectionString: $(AzureServicesAuthConnectionString)
-      CacheConnectionString: $(BackupCacheConnectionString)
-      CacheAStorageAccountConnectionString: $(CacheAStorageAccountConnectionString)
-      CacheAStorageAccountName: $(CacheAStorageAccountName)
-      CacheBStorageAccountConnectionString: $(CacheBStorageAccountConnectionString)
-      CacheBStorageAccountName: $(CacheBStorageAccountName)
-      PackageManagerSubscriptionId: $(PackageManagerSubscriptionId)
-      PackageManagerCdnProfile: $(PackageManagerCdnProfile)
-      PackageManagerConnectionStringKv: $(PackageManagerConnectionStringKv)
+      CacheConnectionString: $(CacheStorageAccountConnectionString)
       DIApplicationInsightKey: $(DIApplicationInsightKey)
 
 # Agent phase. Depends on previous job.
@@ -149,16 +142,16 @@ jobs:
   - task: AzureCLI@1
     displayName: 'Azure Setup'
     inputs:
-      azureSubscription: '$(PackageManagerSubscription)'
+      azureSubscription: '$(WinGet.Subscription)'
       scriptLocation: inlineScript
       inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
     env:
       AZURE_STORAGE_CONNECTION_STRING: $(ValidationStorageAccountConnectionString)
 
   - task: CmdLine@2
-    displayName: 'Package Manager Cleanup'
+    displayName: 'WinGet Cleanup'
     inputs:
-      script: 'PackageManagerServiceWrapper.exe rebuild-cleanup --operationId %BUILD_BUILDNUMBER%'
+      script: 'WinGetSvcWrapper.exe rebuild-cleanup --operationId %BUILD_BUILDNUMBER%'
       failOnStderr: true
     condition: succeeded()
     env: