Skip to content

Commit 2ee1f09

Browse files
authored
Lower Schema Header Validation to include 1.7+ manifests (#5330)
<!-- To check a checkbox place an "x" between the brackets. e.g: [x] --> - [x] I have signed the [Contributor License Agreement](https://cla.opensource.microsoft.com/microsoft/winget-pkgs). - [ ] This pull request is related to an issue. Many contributors to the community repository may not upgrade to schema 1.10 unless necessary to do so, as there were no additional fields in the manifest that are usable in the community repository. In addition to manifest creation tools lagging behind a little bit (as of this PR, both Komac and WingetCreate are still at version 1.9 manifests), some submitters use mechanisms outside of these tools which use older manifest versions. This first PR changes the schema header validation so that it happens for any manifest schema 1.7 or newer to cover a larger range of submissions. I have manually validated this change against *every* manifest currently in the community repository. Three had to be corrected, and now none are failing validation.
1 parent 39b8b5a commit 2ee1f09

158 files changed

Lines changed: 971 additions & 658 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

src/AppInstallerCLIE2ETests/TestData/Manifests/TestArpVersionMapping_OppositeOrder_1.0.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.2.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestArpVersionOppositeOrder
2-
PackageVersion: 1.0
4+
PackageVersion: '1.0'
35
PackageName: TestArpVersionOppositeOrder
46
PackageLocale: en-US
57
Publisher: Microsoft
@@ -14,4 +16,4 @@ Installers:
1416
- DisplayVersion: "10.0"
1517
- DisplayVersion: "10.5"
1618
ManifestType: singleton
17-
ManifestVersion: 1.2.0
19+
ManifestVersion: 1.2.0

src/AppInstallerCLIE2ETests/TestData/Manifests/TestArpVersionMapping_OppositeOrder_2.0.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.2.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestArpVersionOppositeOrder
2-
PackageVersion: 2.0
4+
PackageVersion: '2.0'
35
PackageName: TestArpVersionOppositeOrder
46
PackageLocale: en-US
57
Publisher: Microsoft
@@ -14,4 +16,4 @@ Installers:
1416
- DisplayVersion: "9.0"
1517
- DisplayVersion: "9.5"
1618
ManifestType: singleton
17-
ManifestVersion: 1.2.0
19+
ManifestVersion: 1.2.0

src/AppInstallerCLIE2ETests/TestData/Manifests/TestArpVersionMapping_SameAsPackageVersion.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.2.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestArpVersionSameVersion
2-
PackageVersion: 1.0
4+
PackageVersion: '1.0'
35
PackageName: TestArpVersionSameVersion
46
PackageLocale: en-US
57
Publisher: Microsoft
@@ -13,4 +15,4 @@ Installers:
1315
AppsAndFeaturesEntries:
1416
- DisplayVersion: "1.0"
1517
ManifestType: singleton
16-
ManifestVersion: 1.2.0
18+
ManifestVersion: 1.2.0

src/AppInstallerCLIE2ETests/TestData/Manifests/TestArpVersionMapping_SameOrder_1.0.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.2.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestArpVersionSameOrder
2-
PackageVersion: 1.0
4+
PackageVersion: '1.0'
35
PackageName: TestArpVersionSameOrder
46
PackageLocale: en-US
57
Publisher: Microsoft
@@ -14,4 +16,4 @@ Installers:
1416
- DisplayVersion: "10.0"
1517
- DisplayVersion: "10.5"
1618
ManifestType: singleton
17-
ManifestVersion: 1.2.0
19+
ManifestVersion: 1.2.0

src/AppInstallerCLIE2ETests/TestData/Manifests/TestArpVersionMapping_SameOrder_2.0.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.2.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestArpVersionSameOrder
2-
PackageVersion: 2.0
4+
PackageVersion: '2.0'
35
PackageName: TestArpVersionSameOrder
46
PackageLocale: en-US
57
Publisher: Microsoft
@@ -14,4 +16,4 @@ Installers:
1416
- DisplayVersion: "11.0"
1517
- DisplayVersion: "11.5"
1618
ManifestType: singleton
17-
ManifestVersion: 1.2.0
19+
ManifestVersion: 1.2.0

src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.MissingRepairBehavior.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.7.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestMissingRepairBehavior
24
PackageVersion: 2.0.0.0
35
PackageLocale: en-US

src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.ModifyRepair.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.7.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestModifyRepair
24
PackageVersion: 2.0.0.0
35
PackageLocale: en-US

src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.ModifyRepairWithNoModify.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.7.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestModifyRepairWithNoModify
24
PackageVersion: 2.0.0.0
35
PackageLocale: en-US

src/AppInstallerCLIE2ETests/TestData/Manifests/TestBurnInstaller.UserScopeInstallRepairInAdminContext.yaml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.7.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.TestUserScopeInstallRepairInAdminContext
24
PackageVersion: 2.0.0.0
35
PackageLocale: en-US

src/AppInstallerCLIE2ETests/TestData/Manifests/TestExeInstaller.RebootRequired.yaml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# yaml-language-server: $schema=https://aka.ms/winget-manifest.singleton.1.6.0.schema.json
2+
13
PackageIdentifier: AppInstallerTest.RebootRequired
24
PackageVersion: 1.0.0.0
35
PackageLocale: en-US
@@ -25,4 +27,4 @@ Installers:
2527
ReturnResponse: rebootRequiredForInstall
2628
ReturnResponseUrl: https://DefaultReturnResponseUrl.com
2729
ManifestType: singleton
28-
ManifestVersion: 1.6.0
30+
ManifestVersion: 1.6.0

0 commit comments

Comments
 (0)