Skip to content

Remove the custom winget schema version restriction #265

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yiguodev merged 2 commits into from
Nov 6, 2026
Merged

Remove the custom winget schema version restriction #265

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20b30ab
fix(release): validate declared winget manifest schemas
Nov 5, 2026
1dd58b6
fix(release): remove custom manifest schema version checks
Nov 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build_scripts/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,8 @@ build jobs together.
The workflow pipes `komac update --dry-run` output through `awk` to save separate
YAML files by manifest type and locale; dry-run returns before handling `--output`.
[winget_manifest.py](winget_manifest.py) retains identity, release URL and user
installation policy checks. Komac supplies the schema-required `InstallerSha256`;
installation policy checks and validates each file against Microsoft's JSON
schema for its declared `ManifestVersion`. Komac supplies the schema-required `InstallerSha256`;
no extra comparison with GitHub asset digests is performed. Before submission,
`komac sync-fork` updates the organization fork using the same PAT and
`KOMAC_FORK_OWNER` as the final submit. Fork synchronization changes GitHub;
Expand Down
10 changes: 7 additions & 3 deletions build_scripts/tests/test_winget_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
INSTALL_DIRECTORY,
INSTALLER_NAMES,
PACKAGE_ID,
SCHEMA_VERSION,
fix_installer,
validate_manifests,
)
Expand All @@ -29,7 +28,7 @@ def setUp(self):
base = {
"PackageIdentifier": PACKAGE_ID,
"PackageVersion": "26.9.3",
"ManifestVersion": SCHEMA_VERSION,
"ManifestVersion": "1.12.0",
}
self.generated = base | {
"ManifestType": "installer",
Expand Down Expand Up @@ -139,7 +138,6 @@ def test_rejects_mixed_package_version_and_locale(self):
for index, field, value in (
(1, "PackageVersion", "26.9.2"),
(0, "PackageIdentifier", "Other.Package"),
(0, "ManifestVersion", "1.10.0"),
(2, "DefaultLocale", "zh-CN"),
):
with self.subTest(field=field):
Expand All @@ -153,6 +151,12 @@ def test_rejects_non_release(self):
with self.subTest(field=field), self.assertRaises(ValueError):
validate_manifests(self.manifests, self.release | {field: True})

def test_release_policy_does_not_pin_manifest_schema_versions(self):
manifests = deepcopy(self.manifests)
for manifest, version in zip(manifests, ("1.10.0", "1.12.0", "1.28.0")):
manifest["ManifestVersion"] = version
validate_manifests(manifests, self.release)


if __name__ == "__main__":
unittest.main()
7 changes: 3 additions & 4 deletions build_scripts/winget_manifest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
from copy import deepcopy
from pathlib import Path
from typing import ClassVar
from urllib.parse import quote
from urllib.request import urlopen

PACKAGE_ID = "YuanDevLLC.OneXray"
Expand All @@ -19,7 +20,6 @@
"x64": "OneXray-windows-amd64.exe",
"arm64": "OneXray-windows-arm64.exe",
}
SCHEMA_VERSION = "1.12.0"


def fix_installer(manifest):
Expand Down Expand Up @@ -56,8 +56,6 @@ def validate_manifests(manifests, release):
for item in manifests:
if item.get("PackageIdentifier") != PACKAGE_ID or item.get("PackageVersion") != version:
raise ValueError("Manifest package/version does not match the release")
if item.get("ManifestVersion") != SCHEMA_VERSION:
raise ValueError(f"Expected manifest schema {SCHEMA_VERSION}")
by_type = {item["ManifestType"]: item for item in manifests}
if by_type["version"]["DefaultLocale"] != by_type["defaultLocale"]["PackageLocale"]:
raise ValueError("DefaultLocale does not match the default locale manifest")
Expand Down Expand Up @@ -129,6 +127,7 @@ def validate_directory(directory, release):
validate_manifests(manifests, release)
for path, manifest in zip(paths, manifests):
kind = manifest["ManifestType"]
schema_version = quote(manifest["ManifestVersion"], safe="")
suffix = {
"installer": ".installer",
"version": "",
Expand All @@ -139,7 +138,7 @@ def validate_directory(directory, release):
raise ValueError(f"Unexpected manifest filename: {path.name}")
url = (
"https://raw.githubusercontent.com/microsoft/winget-cli/master/schemas/JSON/manifests/"
f"v{SCHEMA_VERSION}/manifest.{kind}.{SCHEMA_VERSION}.json"
f"v{schema_version}/manifest.{kind}.{schema_version}.json"
)
with urlopen(url, timeout=30) as response:
schema = json.load(response)
Expand Down