Skip to content

Update description for 1.10 schema #5014

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
ryfu-msft merged 2 commits into from
Dec 4, 2024
Merged

Update description for 1.10 schema #5014

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
22d25b1
fix 1.10 initial schema
ryfu-msft Nov 26, 2024
f683ab6
asdf
ryfu-msft Nov 26, 2024
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
4 changes: 2 additions & 2 deletions schemas/JSON/manifests/v1.10.0/manifest.defaultLocale.1.10.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://aka.ms/winget-manifest.defaultlocale.1.9.0.schema.json",
"$id": "https://aka.ms/winget-manifest.defaultlocale.1.10.0.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A representation of a multiple-file manifest representing a default app metadata in the OWC. v1.9.0",
"description": "A representation of a multiple-file manifest representing a default app metadata in the OWC. v1.10.0",
"definitions": {
"Url": {
"type": [ "string", "null" ],
Expand Down
4 changes: 2 additions & 2 deletions schemas/JSON/manifests/v1.10.0/manifest.installer.1.10.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://aka.ms/winget-manifest.installer.1.9.0.schema.json",
"$id": "https://aka.ms/winget-manifest.installer.1.10.0.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A representation of a single-file manifest representing an app installers in the OWC. v1.9.0",
"description": "A representation of a single-file manifest representing an app installers in the OWC. v1.10.0",
"definitions": {
"PackageIdentifier": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions schemas/JSON/manifests/v1.10.0/manifest.locale.1.10.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://aka.ms/winget-manifest.locale.1.9.0.schema.json",
"$id": "https://aka.ms/winget-manifest.locale.1.10.0.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A representation of a multiple-file manifest representing app metadata in other locale in the OWC. v1.9.0",
"description": "A representation of a multiple-file manifest representing app metadata in other locale in the OWC. v1.10.0",
"definitions": {
"Url": {
"type": [ "string", "null" ],
Expand Down
4 changes: 2 additions & 2 deletions schemas/JSON/manifests/v1.10.0/manifest.singleton.1.10.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://aka.ms/winget-manifest.singleton.1.9.0.schema.json",
"$id": "https://aka.ms/winget-manifest.singleton.1.10.0.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A representation of a single-file manifest representing an app in the OWC. v1.9.0",
"description": "A representation of a single-file manifest representing an app in the OWC. v1.10.0",
"definitions": {
"PackageIdentifier": {
"type": "string",
Expand Down
4 changes: 2 additions & 2 deletions schemas/JSON/manifests/v1.10.0/manifest.version.1.10.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"$id": "https://aka.ms/winget-manifest.version.1.9.0.schema.json",
"$id": "https://aka.ms/winget-manifest.version.1.10.0.schema.json",
"$schema": "http://json-schema.org/draft-07/schema#",
"description": "A representation of a multi-file manifest representing an app version in the OWC. v1.9.0",
"description": "A representation of a multi-file manifest representing an app version in the OWC. v1.10.0",
"type": "object",
"properties": {
"PackageIdentifier": {
Expand Down
31 changes: 31 additions & 0 deletions src/AppInstallerCLITests/YamlManifest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1386,6 +1386,37 @@ TEST_CASE("WriteV1_9SingletonManifestAndVerifyContents", "[ManifestCreation]")
VerifyV1ManifestContent(generatedMultiFileManifest, false, ManifestVer{ s_ManifestVersionV1_9 }, true);
}

TEST_CASE("WriteV1_10SingletonManifestAndVerifyContents", "[ManifestCreation]")
{
TempDirectory singletonDirectory{ "SingletonManifest" };
CopyTestDataFilesToFolder({ "ManifestV1_10-Singleton.yaml" }, singletonDirectory);
Manifest singletonManifest = YamlParser::CreateFromPath(singletonDirectory);

TempDirectory exportedSingletonDirectory{ "exportedSingleton" };
std::filesystem::path generatedSingletonManifestPath = exportedSingletonDirectory.GetPath() / "testSingletonManifest.yaml";
YamlWriter::OutputYamlFile(singletonManifest, singletonManifest.Installers[0], generatedSingletonManifestPath);

REQUIRE(std::filesystem::exists(generatedSingletonManifestPath));
Manifest generatedSingletonManifest = YamlParser::CreateFromPath(exportedSingletonDirectory);
VerifyV1ManifestContent(generatedSingletonManifest, true, ManifestVer{ s_ManifestVersionV1_10 }, true);

TempDirectory multiFileDirectory{ "MultiFileManifest" };
CopyTestDataFilesToFolder({
"ManifestV1_10-MultiFile-Version.yaml",
"ManifestV1_10-MultiFile-Installer.yaml",
"ManifestV1_10-MultiFile-DefaultLocale.yaml",
"ManifestV1_10-MultiFile-Locale.yaml" }, multiFileDirectory);

Manifest multiFileManifest = YamlParser::CreateFromPath(multiFileDirectory);
TempDirectory exportedMultiFileDirectory{ "exportedMultiFile" };
std::filesystem::path generatedMultiFileManifestPath = exportedMultiFileDirectory.GetPath() / "testMultiFileManifest.yaml";
YamlWriter::OutputYamlFile(multiFileManifest, multiFileManifest.Installers[0], generatedMultiFileManifestPath);

REQUIRE(std::filesystem::exists(generatedMultiFileManifestPath));
Manifest generatedMultiFileManifest = YamlParser::CreateFromPath(exportedMultiFileDirectory);
VerifyV1ManifestContent(generatedMultiFileManifest, false, ManifestVer{ s_ManifestVersionV1_10 }, true);
}

TEST_CASE("WriteManifestWithMultipleLocale", "[ManifestCreation]")
{
Manifest multiLocaleManifest = YamlParser::CreateFromPath(TestDataFile("Manifest-Good-MultiLocale.yaml"));
Expand Down
Loading