Merge branch 'microsoft:master' into master

.github/ISSUE_TEMPLATE/feature_request.yml

@@ -1,6 +1,6 @@
 name: "🚀 Feature Request / Idea"
 title: "[New Feature]: "
-description: Suggest a new feature or improvement (this does not mean you have to implement it)
+description: Suggest a new feature or improvement (this does not mean you have to implement it).
 labels: ["Issue-Feature"]
 body:
   - type: markdown

.github/ISSUE_TEMPLATE/package_issue.yml

@@ -1,12 +1,12 @@
 name: '🐛 Package Issue'
-description: Report issues and unexpected behaviour of packages with WinGet Client
+description: Report issues and unexpected behaviour of packages with WinGet Client.
 title: "[Package Issue]: Package.Identifier"
 labels: ["Issue-Bug"]
 body:
   - type: markdown
     attributes:
       value: |
-        Please create issues related to the winget.exe client [here](https://github.com/microsoft/winget-cli/issues/new/choose)
+        Please create issues related to the winget.exe client [here](https://github.com/microsoft/winget-cli/issues/new/choose).
   - type: checkboxes
     attributes:
       label: Please confirm these before moving forward

.github/ISSUE_TEMPLATE/update_request.yml

@@ -1,5 +1,5 @@
 name: "✏️ Package Update Request"
-description: Suggest a package update such as a new version or change to the existing metadata
+description: Suggest a package update such as a new version or change to the existing metadata.
 labels: ["Help-Wanted","Package-Update"]
 title: "[Update Request]: "
 body:
@@ -25,14 +25,14 @@ body:
   - type: input
     attributes:
       label: Package Version
-      description: Please provide either the new version to be added or the existing version to be modified
+      description: Please provide either the new version to be added or the existing version to be modified.
       placeholder: '1.2.5.0'
     validations:
       required: true
   - type: textarea
     attributes:
       label: Please describe the changes you would like to see
-      description: The more detail provided, the easier it will be for the change to be incorporated
+      description: The more detail provided, the easier it will be for the change to be incorporated.
       placeholder: |
         There is a new release (1.2.5.0) available.
         Download Page Url: https://github.com/microsoft/winget-create/releases

.github/PULL_REQUEST_TEMPLATE.md

@@ -9,6 +9,6 @@ Manifests
 - [ ] Have you tested your manifest locally with `winget install --manifest <path>`?
 - [ ] Does your manifest conform to the [1.6 schema](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.6.0)?
 
-Note: `<path>` is the name of the directory containing the manifest you're submitting.
+Note: `<path>` is the directory's name containing the manifest you're submitting.
 
 ---

.github/policies/labelAdded.highestVersionRemoval.yml

@@ -0,0 +1,40 @@
+id: labelAdded.highestVersionRemoval
+name: GitOps.PullRequestIssueManagement
+description: Handlers when "Highest-Version-Removal" label is added
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: >-
+          When the label "Highest-Version-Removal" is added to a pull request
+          * Add a reply notifying the issue author
+          * Assign to the author
+          * Label with Needs-Author-Feedback
+        if:
+          - payloadType: Pull_Request
+          - labelAdded:
+              label: Highest-Version-Removal
+        then:
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+
+                This PR removes the highest available version of the package from the repository.
+
+
+                Please provide the reason for removal to help our moderators understand the context.
+
+
+                Template: msftbot/highestVersionRemoval
+          - assignTo:
+              author: True
+          - addLabel:
+              label: Needs-Author-Feedback
+        # The policy service should trigger even when the label was added by the policy service
+        triggerOnOwnActions: true
+onFailure:
+onSuccess:

.github/policies/labelAdded.lastVersionRemoval.yml

@@ -0,0 +1,40 @@
+id: labelAdded.lastVersionRemoval
+name: GitOps.PullRequestIssueManagement
+description: Handlers when "Last-Version-Removal" label is added
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: >-
+          When the label "Last-Version-Removal" is added to a pull request
+          * Add a reply notifying the issue author
+          * Assign to the author
+          * Label with Needs-Author-Feedback
+        if:
+          - payloadType: Pull_Request
+          - labelAdded:
+              label: Last-Version-Removal
+        then:
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+
+                This PR removes the last version of the package from the repository.
+
+
+                Please check if the package requires an update or is available from another source.
+
+
+                Template: msftbot/lastVersionRemoval
+          - assignTo:
+              author: True
+          - addLabel:
+              label: Needs-Author-Feedback
+        # The policy service should trigger even when the label was added by the policy service
+        triggerOnOwnActions: true
+onFailure:
+onSuccess:

.github/policies/moderatorTriggers.yml

@@ -172,6 +172,14 @@ configuration:
                 then:
                   - addLabel:
                       label: Help-Wanted
+              # Highest-Version-Removal
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Hh]ighest[\s-][Vv]ersion([\s-][Rr]emoval)?'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: Highest-Version-Removal
               # In-PR
               - if:
                   - commentContains:
@@ -222,14 +230,14 @@ configuration:
                 then:
                   - addLabel:
                       label: Issue-Feature
-              # Highest-Version-Remaining
+              # Last-Version-Removal
               - if:
                   - commentContains:
-                      pattern: '\[[Pp]olicy\]\s+[Hh]ighest[\s-][Vv]ersion([\s-][Rr]emaining)?'
+                      pattern: '\[[Pp]olicy\]\s+[Ll]ast[\s-][Vv]ersion([\s-][Rr]emoval)?'
                       isRegex: True
                 then:
                   - addLabel:
-                      label: Highest-Version-Remaining
+                      label: Last-Version-Removal
               # License-Blocks-Install
               - if:
                   - commentContains:
@@ -458,7 +466,7 @@ configuration:
                   - removeLabel:
                       label: Help-Wanted
                   - removeLabel:
-                      label: Highest-Version-Remaining
+                      label: Highest-Version-Removal
                   - removeLabel:
                       label: In-PR
                   - removeLabel:
@@ -471,6 +479,8 @@ configuration:
                       label: Issue-Docs
                   - removeLabel:
                       label: Issue-Feature
+                  - removeLabel:
+                      label: Last-Version-Removal
                   - removeLabel:
                       label: License-Blocks-Install
                   - removeLabel:

DevOpsPipelineDefinitions/publish-pipeline.yaml

@@ -31,7 +31,7 @@ extends:
       os: windows
     customBuildTags:
     - ES365AIMigrationTooling
-    
+
     stages:
     - stage: WinGetSvc_Publish 
       jobs:
@@ -42,18 +42,19 @@ extends:
           skipComponentGovernanceDetection: ${{ true }}
           runCodesignValidationInjection: ${{ false }}
         timeoutInMinutes: 0
-        
+
         steps:
-        
+
         # Downloads all the setup files and its dependencies.
-        - task: AzureCLI@1
+        - task: AzureCLI@2
           displayName: 'Azure Setup'
           inputs:
-            azureSubscription: '$(WinGet.Subscription)'
+            azureSubscription: '$(WinGetSvc.DataAccess)'
+            scriptType: batch
             scriptLocation: inlineScript
-            inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
-          env:
-            AZURE_STORAGE_CONNECTION_STRING: $(ValidationStorageAccountConnectionString)
+            inlineScript: |
+              az storage blob download-batch --auth-mode login -d . --pattern * -s servicewrapper --output none --account-name $(ValidationStorageAccountName)
+            addSpnToEnvironment: true
 
         # WinGet setup
         - task: CmdLine@2
@@ -71,20 +72,25 @@ extends:
             script: 'winget_publish_setup.cmd'
             workingDirectory: scripts
 
-        - task: CmdLine@2
+        - task: AzureCLI@2
           displayName: 'Validate Commits'
           inputs:
-            script: 'WinGetSvcWrapper.exe validate-commits --operationId %BUILD_BUILDNUMBER%'
-            failOnStderr: true
-          condition: succeeded()
+            azureSubscription: '$(WinGetSvc.DataAccess)'
+            scriptType: batch
+            scriptLocation: inlineScript
+            inlineScript: |
+              WinGetSvcWrapper.exe validate-commits --operationId %BUILD_BUILDNUMBER%
+            addSpnToEnvironment: true
+            failOnStandardError: true
           env:
-            ValidationConnectionString: $(ValidationStorageAccountConnectionString)
+            ValidationStorageAccountName: $(ValidationStorageAccountName)
+            CacheStorageAccountName: $(CacheStorageAccountName)
+            StorageManagedIdentityClientId: $(StorageManagedIdentityClientId)
             ExecutionEnvironment: $(ExecutionEnvironment)
-            CacheConnectionString: $(CacheStorageAccountConnectionString)
             PackagePublisher: $(PackagePublisher)
             DIApplicationInsightKey: $(DIApplicationInsightKey)
-            WinGet:AppConfig:Primary: $(AppConfigPrimary)
-            WinGet:AppConfig:Secondary: $(AppConfigSecondary)
+            WinGet:AppConfig:PrimaryEndpoint: $(AppConfigPrimaryEndpoint)
+            WinGet:AppConfig:SecondaryEndpoint: $(AppConfigSecondaryEndpoint)
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             GithubServiceAccountToken: $(GithubServiceAccountToken)
 

DevOpsPipelineDefinitions/rebuild-pipeline.yaml

@@ -38,7 +38,7 @@ extends:
           skipComponentGovernanceDetection: ${{ true }}
           runCodesignValidationInjection: ${{ false }}
         timeoutInMinutes: 0
-        
+
         steps:
 
         # Allow scripts to access the system token.
@@ -47,14 +47,15 @@ extends:
           clean: true
 
         # Downloads all the setup files and its dependencies.
-        - task: AzureCLI@1
+        - task: AzureCLI@2
           displayName: 'Azure Setup'
           inputs:
-            azureSubscription: '$(WinGet.Subscription)'
+            azureSubscription: '$(WinGetSvc.DataAccess)'
+            scriptType: batch
             scriptLocation: inlineScript
-            inlineScript: 'az storage blob download-batch -d . --pattern * -s servicewrapper --output none'
-          env:
-            AZURE_STORAGE_CONNECTION_STRING: $(ValidationStorageAccountConnectionString)
+            inlineScript: |
+              az storage blob download-batch --auth-mode login -d . --pattern * -s servicewrapper --output none --account-name $(ValidationStorageAccountName)
+            addSpnToEnvironment: true
 
         # WinGet setup
         - task: CmdLine@2
@@ -70,21 +71,26 @@ extends:
             script: 'winget_rebuild_setup.cmd'
             workingDirectory: scripts
 
-        - task: CmdLine@2
+        - task: AzureCLI@2
           displayName: 'Validate Manifests'
           inputs:
-            script: 'WinGetSvcWrapper.exe rebuild --operationId %BUILD_BUILDNUMBER%'
-            failOnStderr: true
-          condition: succeeded()
+            azureSubscription: '$(WinGetSvc.DataAccess)'
+            scriptType: batch
+            scriptLocation: inlineScript
+            inlineScript: |
+              WinGetSvcWrapper.exe rebuild --operationId %BUILD_BUILDNUMBER%
+            addSpnToEnvironment: true
+            failOnStandardError: true
           env:
-            ValidationConnectionString: $(ValidationStorageAccountConnectionString)
-            CacheConnectionString: $(CacheStorageAccountConnectionString)
+            ValidationStorageAccountName: $(ValidationStorageAccountName)
+            CacheStorageAccountName: $(CacheStorageAccountName)
+            StorageManagedIdentityClientId: $(StorageManagedIdentityClientId)
             ExecutionEnvironment: $(ExecutionEnvironment)
             PackagePublisher: $(PackagePublisher)
             SYSTEM_ACCESSTOKEN: $(System.AccessToken)
             DIApplicationInsightKey: $(DIApplicationInsightKey)
-            WinGet:AppConfig:Primary: $(AppConfigPrimary)
-            WinGet:AppConfig:Secondary: $(AppConfigSecondary)
+            WinGet:AppConfig:PrimaryEndpoint: $(AppConfigPrimaryEndpoint)
+            WinGet:AppConfig:SecondaryEndpoint: $(AppConfigSecondaryEndpoint)
             SkipPausePublishPipeline: $(Rebuild.SkipPausePublishPipeline)
 
       # Agentless phase. Depends on previous job.