Merge branch 'master' into Tools-update-12-20

.github/PULL_REQUEST_TEMPLATE.md

@@ -3,7 +3,7 @@
 - [ ] This PR only modifies one (1) manifest
 - [ ] Have you [validated](https://github.com/microsoft/winget-pkgs/blob/master/AUTHORING_MANIFESTS.md#validation) your manifest locally with `winget validate --manifest <path>`?
 - [ ] Have you tested your manifest locally with `winget install --manifest <path>`?
-- [ ] Does your manifest conform to the [1.5 schema](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.5.0)?
+- [ ] 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.
 

.github/policies/labelAdded.lastVersionRemaining.yml

@@ -0,0 +1,40 @@
+id: labelAdded.lastVersionRemaining
+name: GitOps.PullRequestIssueManagement
+description: Handlers when "Last-Version-Remaining" label is added
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: >-
+          When the label "Last-Version-Remaining" 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-Remaining
+        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/lastVersionRemaining
+          - 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.licenseBlocksInstall.yml

@@ -0,0 +1,72 @@
+id: labelAdded.licenseBlocksInstall
+name: GitOps.PullRequestIssueManagement
+description: Handlers when "License-Blocks-Install" label is added
+owner:
+resource: repository
+disabled: false
+where:
+configuration:
+  resourceManagementConfiguration:
+    eventResponderTasks:
+      - description: >-
+          When the label "License-Blocks-Install" is added to a pull request
+          * Add the PR specific reply notifying the issue author of a blocking issue
+          * Label the PR with Blocking-Issue
+          * Label with Needs-Author-Feedback
+          * Remove the Needs-Attention Label
+        if:
+          - payloadType: Pull_Request
+          - labelAdded:
+              label: License-Blocks-Install
+        then:
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+
+                This package appears to require user to accept a license agreement before installation.
+
+
+                This PR is blocked until support for agreements is added to the community repository.
+
+                * See microsoft/winget-pkgs/issues/131328
+
+
+                Template: msftbot/blockingIssue/licenseBlocksInstall
+          - addLabel:
+              label: Blocking-Issue
+          - addLabel:
+              label: Needs-Author-Feedback
+          - removeLabel:
+              label: Needs-Attention
+        # The policy service should trigger even when the label was added by the policy service
+        triggerOnOwnActions: true
+      - description: >-
+          When the label "License-Blocks-Install" is added to an issue
+          * Add the issue specific reply notifying the issue author of a blocking issue
+          * Label the issue with Blocking-Issue
+        if:
+          - payloadType: Issues
+          - labelAdded:
+              label: License-Blocks-Install
+        then:
+          - addReply:
+              reply: >-
+                Hello @${issueAuthor},
+
+
+                This package appears to require user to accept a license agreement before installation.
+
+
+                This issue is blocked until support for agreements is added to the community repository.
+
+                * See microsoft/winget-pkgs/issues/131328
+
+
+                Template: msftbot/blockingIssue/licenseBlocksInstall
+          - addLabel:
+              label: Blocking-Issue
+        # The policy service should trigger even when the label was added by the policy service
+        triggerOnOwnActions: true
+onFailure:
+onSuccess:

.github/policies/labelAdded.manifestVersionError.yml

@@ -24,7 +24,7 @@ configuration:
                 Hello @${issueAuthor},
 
 
-                The package manager bot determined that the ManifestVersion key does not match any version currently approved for release. Please verify the manifest file is compliant with the package manager [1.3 manifest specification](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.3.0), [1.4 manifest specification](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.4.0), or [1.5 manifest specification](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.5.0).
+                The package manager bot determined that the ManifestVersion key does not match any version currently approved for release. Please verify the manifest file is compliant with the package manager [1.5 manifest specification](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.5.0) or [1.6 manifest specification](https://github.com/microsoft/winget-pkgs/tree/master/doc/manifest/schema/1.6.0).
 
 
                 For details on the specific error, see the details link below in the build pipeline.

.github/policies/labelAdded.portableTar.yml

@@ -63,7 +63,7 @@ configuration:
 
                 This PR is blocked until support for additional archive formats is implemented in:
 
-                * microsoft/winget-cli/issues/1899
+                * microsoft/winget-cli/issues/2899
 
 
                 Be sure to add your 👍 to the issue to help raise the priority and avoid posting "Me too!" messages to respect those who have subscribed to the issue.

.github/policies/labelManagement.issueUpdated.yml

@@ -366,6 +366,8 @@ configuration:
               label: Manifest-Content-Incomplete
           - removeLabel:
               label: Validation-Open-Url-Failed
+          - removeLabel:
+              label: Last-Version-Remaining
       - description: Remove status labels when a PR is re-run
         if:
           - payloadType: Issue_Comment

.github/policies/moderatorTriggers.yml

@@ -201,6 +201,46 @@ configuration:
                 then:
                   - addLabel:
                       label: Manifest-Content-Incomplete
+              # Last-Version-Remaining
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Ll]ast[\s-][Vv]ersion([\s-][Rr]emaining)?'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: Last-Version-Remaining
+              # License-Blocks-Install
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Ll]icense[\s-][Bb]locks([\s-][Ii]nstall)?'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: License-Blocks-Install
+              # Scripted-Application
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Ss]cript(ed)?[\s-][Aa]pplication'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: Scripted-Application
+              # DriverInstall
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Dd]river[\s-][Ii]nstall'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: DriverInstall
+              # Network-Blocker
+              - if:
+                  - commentContains:
+                      pattern: '\[[Pp]olicy\]\s+[Nn]etwork[\s-][Bb]lock(?:er|ed)'
+                      isRegex: True
+                then:
+                  - addLabel:
+                      label: Network-Blocker
               # Unblocked
               - if:
                   - commentContains:
@@ -223,6 +263,16 @@ configuration:
                       label: Moderator-Approved
                   - removeLabel:
                       label: Changes-Requested
+                  - removeLabel:
+                      label: Last-Version-Remaining
+                  - removeLabel:
+                      label: License-Blocks-Install
+                  - removeLabel:
+                      label: Scripted-Application
+                  - removeLabel:
+                      label: DriverInstall
+                  - removeLabel:
+                      label: Network-Blocker
                   ## TODO: Dismiss All Pull Request Reviews
               # Duplicate of #
               - if:

AUTHORING_MANIFESTS.md

@@ -1,7 +1,7 @@
-[Manifest Specification]:   doc/manifest/schema/1.5.0
-[versionSchema]:            doc/manifest/schema/1.5.0/version.md
-[defaultLocaleSchema]:      doc/manifest/schema/1.5.0/defaultLocale.md
-[installerSchema]:          doc/manifest/schema/1.5.0/installer.md
+[Manifest Specification]:   doc/manifest/schema/1.6.0
+[versionSchema]:            doc/manifest/schema/1.6.0/version.md
+[defaultLocaleSchema]:      doc/manifest/schema/1.6.0/defaultLocale.md
+[installerSchema]:          doc/manifest/schema/1.6.0/installer.md
 
 # Authoring Manifests
 

Moderation.md

@@ -86,16 +86,31 @@ Moderators are often the first to see and triage new issues, and so they have th
 * `Area-Validation-Pipeline`
 * `Blocking-Issue`
 * `Dependencies`
+* `DriverInstall`
 * `Hardware`
 * `Installer-Issue`
 * `Interactive-Only-Installer`
+* `Last-Version-Remaining`
+* `License-Blocks-Install`
 * `Manifest-Content-Incomplete`
 * `Needs-Attention`
 * `Needs-Author-Feedback`
 * `Needs-CLA`
 * `Needs-Manual-Merge`
+* `Network-Blocker`
+* `Portable-Tar`
+* `Scripted-Application`
+* `Windows-Features`
 * `Zip-Binary`
 
 > [!NOTE]
-> * Adding `Hardware`, `Interactive-Only-Installer`,  or `Zip-Binary` will automatically add `Blocking-Issue`
+>
+> * Applying the following labels will automatically add `Blocking-Issue`
+>   * `Hardware`
+>   * `Interactive-Only-Installer`
+>   * `License-Blocks-Install`
+>   * `Portable-Tar`
+>   * `Windows-Features`
+>   * `Zip-Binary`
 > * Adding `Needs-Attention` to a PR will automatically assign the repository maintainers
+> * `[Policy] Unblocked` will remove `Blocking-Issue` label.

README.md

@@ -31,7 +31,7 @@ A few different tools are available to help you author a manifest.
 - [Windows Package Manager Manifest Creator](https://github.com/microsoft/winget-create)
 - [YamlCreate.ps1](doc/tools/YamlCreate.md)
 - Other WinGet Manifest Creators developed by the community:
-  - [Komac - Kotlin Manifest Creator for WinGet](https://github.com/russellbanks/Komac) (maintained by [**@russellbanks**](https://github.com/russellbanks))
+  - [Komac - Community Manifest Creator](https://github.com/russellbanks/Komac) (maintained by [**@russellbanks**](https://github.com/russellbanks))
 
 > Note: Only one manifest may be submitted per PR.
 
@@ -52,7 +52,7 @@ winget validate <path-to-manifest>
 2. Test the install by executing the following command:
 
 ```
-winget install -m <path-to-manifest>
+winget install --manifest <path-to-manifest>
 ```
 
 For more details, see ["Submit packages to Windows Package Manager"](https://docs.microsoft.com/windows/package-manager/package) at Microsoft Docs.

Tools/Auth.csv

@@ -24,7 +24,7 @@ Ferdium.Ferdium.Nightly,Alphrag,should
 File-New-Project.EarTrumpet,riverar,must
 Genivia.ugrep,genivia-inc,should
 igoogolx.lux,igoogolx,should
-JanDeDobbeleer.OhMyPosh,JanDeDobbeleer,should
+JanDeDobbeleer.OhMyPosh,JanDeDobbeleer,must
 junegunn.fzf,junegunn,should
 kairoaraujo.tufie,kairoaraujo,should
 Keboola.KeboolaCLI,KeboolaAsCodeBot,should
@@ -49,7 +49,7 @@ Microsoft.WindowsTerminal,(Microsoft)/consvc/DHowett,must
 Microsoft.VisualStudioCode,(Microsoft)/lszomoru,must
 Microsoft.VisualStudio,(Microsoft),must
 Momento.cli,momento-github-actions-machine-user,should
-Neovim.Neovim.Nightly,nvim-winget,should
+Neovim.Neovim.Nightly,nvim-winget,must
 Nervatura.Nervatura,Nervatura,should
 nginxinc.nginx-prometheus-exporter,nginx-bot,should
 NoMoreFood.PuTTY-CAC,NoMoreFood,should
@@ -69,7 +69,7 @@ SKDataAS.ORMCore,skdataas,should
 stacklok.frizbee,stacklok,should
 StandardNotes.StandardNotes,russellbanks,should
 swri.EverythingToolbar,stnkl,should
-t1m0thyj.WinDynamicDesktop,t1m0thyj,should
+t1m0thyj.WinDynamicDesktop,t1m0thyj,must
 Taozuhong.Kangaroo,taozuhong,should
 ThaUnknown.Miru,ThaUnknown,should
 the-sz.Auburn,the-sz,should
@@ -92,6 +92,7 @@ thebookisclosed.ViVeTool,thebookisclosed,must
 Toit.Jaguar,LeonGungadinMogensen,should
 TopalaSoftwareSolutions.SIW,gtopala,should
 twpayne.chezmoi,twpayne,should
+vedantmgoyal.sheltasks-cli,vedantmgoyal2009,must
 WerWolv.ImHex,WerWolv,should
 xavidop.cxcli,xavidop,should
 yetone.OpenAITranslator,yetone,should

Tools/SandboxTest.ps1

@@ -112,17 +112,18 @@ $oldProgressPreference = $ProgressPreference
 $ProgressPreference = 'SilentlyContinue'
 
 $latestRelease = Get-Release
+$versionTag = $latestRelease.releaseTag
 $desktopAppInstaller = @{
   url    = $latestRelease.msixFileUrl
   hash   = $latestRelease.shaFileContent
-  SaveTo = $(Join-Path $env:LOCALAPPDATA -ChildPath "Packages\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe\bin\$($latestRelease.releaseTag)\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle")
+  SaveTo = $(Join-Path $env:LOCALAPPDATA -ChildPath "Packages\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe\bin\$versionTag\Microsoft.DesktopAppInstaller_8wekyb3d8bbwe.msixbundle")
 }
 
 $ProgressPreference = $oldProgressPreference
 
 $vcLibsUwp = @{
   url    = 'https://aka.ms/Microsoft.VCLibs.x64.14.00.Desktop.appx'
-  hash   = '9BFDE6CFCC530EF073AB4BC9C4817575F63BE1251DD75AAA58CB89299697A569'
+  hash   = 'B56A9101F706F9D95F815F5B7FA6EFBAC972E86573D378B96A07CFF5540C5961'
   SaveTo = $(Join-Path $tempFolder -ChildPath 'Microsoft.VCLibs.x64.14.00.Desktop.appx')
 }
 $uiLibsUwp = @{
@@ -165,11 +166,15 @@ foreach ($dependency in $dependencies) {
       $WebClient.DownloadFile($dependency.url, $dependency.SaveTo)
 
     } catch {
-      #Pass the exception as an inner exception
-      throw [System.Net.WebException]::new("Error downloading $($dependency.url).", $_.Exception)
+      # If the download failed, remove the item so the sandbox can fall-back to using the PowerShell module
+      Remove-Item $dependency.SaveTo -Force | Out-Null
     }
     if (-not ($dependency.hash -eq $(Get-FileHash $dependency.SaveTo).Hash)) {
-      throw [System.Activities.VersionMismatchException]::new('Dependency hash does not match the downloaded file')
+      # If the hash didn't match, remove the item so the sandbox can fall-back to using the PowerShell module
+      Write-Host -ForegroundColor Red '      Dependency hash does not match the downloaded file'
+      Write-Host -ForegroundColor Red '      Please open an issue referencing this error at https://bit.ly/WinGet-SandboxTest-Needs-Update'
+      Write-Host
+      Remove-Item $dependency.SaveTo -Force | Out-Null
     }
   }
 }
@@ -226,7 +231,23 @@ Write-Host @'
 --> Installing WinGet
 '@
 `$ProgressPreference = 'SilentlyContinue'
-Add-AppxPackage -Path '$($desktopAppInstaller.pathInSandbox)' -DependencyPath '$($vcLibsUwp.pathInSandbox)','$($uiLibsUwp.pathInSandbox)'
+try {
+  Add-AppxPackage -Path '$($desktopAppInstaller.pathInSandbox)' -DependencyPath '$($vcLibsUwp.pathInSandbox)','$($uiLibsUwp.pathInSandbox)'
+} catch {
+  Write-Host -ForegroundColor Red 'Could not install from cached packages. Falling back to Repair-WinGetPackageManager cmdlet'
+  try {
+    Install-PackageProvider -Name NuGet -Force | Out-Null
+    Install-Module -Name Microsoft.WinGet.Client -Force -Repository PSGallery | Out-Null
+  } catch {
+    throw "Microsoft.Winget.Client was not installed successfully"
+  } finally {
+    # Check to be sure it acutally installed
+    if (-not(Get-Module -ListAvailable -Name Microsoft.Winget.Client)) {
+      throw "Microsoft.Winget.Client was not found. Check that the Windows Package Manager PowerShell module was installed correctly."
+    }
+  }
+  Repair-WinGetPackageManager -Version $versionTag
+}
 
 Write-Host @'
 --> Disabling safety warning when running installer