From 6544f618ec6718c89fa685297ac55ad73de4c4dc Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Fri, 13 Dec 2024 11:05:43 +0100 Subject: [PATCH 1/4] Add default value --- .../JSON/settings/settings.schema.0.2.json | 40 ++++--------------- 1 file changed, 8 insertions(+), 32 deletions(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index f2638f417f..265e289d92 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -23,13 +23,7 @@ "progressBar": { "description": "Progress bar display style", "type": "string", - "enum": [ - "accent", - "rainbow", - "retro", - "sixel", - "disabled" - ] + "enum": ["accent", "rainbow", "retro", "sixel", "disabled"] }, "anonymizeDisplayedPaths": { "description": "Replaces some known folder paths with their respective environment variable", @@ -50,13 +44,7 @@ "level": { "description": "Preferred logging level", "type": "string", - "enum": [ - "verbose", - "info", - "warning", - "error", - "critical" - ] + "enum": ["verbose", "info", "warning", "error", "critical"] }, "channels": { "description": "The logging channels to enable", @@ -90,10 +78,7 @@ "scope": { "description": "The scope of a package install", "type": "string", - "enum": [ - "user", - "machine" - ], + "enum": ["user", "machine"], "default": "user" }, "locale": { @@ -113,13 +98,7 @@ "items": { "uniqueItems": true, "type": "string", - "enum": [ - "neutral", - "x64", - "x86", - "arm64", - "arm" - ], + "enum": ["neutral", "x64", "x86", "arm64", "arm"], "minItems": 1, "maxItems": 4 } @@ -205,7 +184,8 @@ "defaultModuleRoot": { "description": "The default root directory where PowerShell modules are installed to when applying a configuration.", "type": "string", - "maxLength": 32767 + "maxLength": 32767, + "default": "%LOCALAPPDATA%/Microsoft/Winget/Configuration/Modules" } } }, @@ -238,11 +218,7 @@ "downloader": { "description": "Control which download code is used for packages", "type": "string", - "enum": [ - "default", - "wininet", - "do" - ], + "enum": ["default", "wininet", "do"], "default": "default" }, "doProgressTimeoutInSeconds": { @@ -302,7 +278,7 @@ "fonts": { "description": "Enable support for managing fonts", "type": "boolean", - "default": false + "default": false } } } From 1df1789c0373908f1c01e3efc962b4f759426be8 Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Fri, 13 Dec 2024 11:07:07 +0100 Subject: [PATCH 2/4] Add backslash --- schemas/JSON/settings/settings.schema.0.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index 265e289d92..ece40f6058 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -185,7 +185,7 @@ "description": "The default root directory where PowerShell modules are installed to when applying a configuration.", "type": "string", "maxLength": 32767, - "default": "%LOCALAPPDATA%/Microsoft/Winget/Configuration/Modules" + "default": "%LOCALAPPDATA%/Microsoft/Winget/Configuration/Modules/" } } }, From 0bdf762c357d181a6d16b1f72c8b3ee982b2591d Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Fri, 13 Dec 2024 15:11:26 +0100 Subject: [PATCH 3/4] Split enum --- .../JSON/settings/settings.schema.0.2.json | 35 ++++++++++++++++--- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index ece40f6058..ae840a58e4 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -23,7 +23,13 @@ "progressBar": { "description": "Progress bar display style", "type": "string", - "enum": ["accent", "rainbow", "retro", "sixel", "disabled"] + "enum": [ + "accent", + "rainbow", + "retro", + "sixel", + "disabled" + ] }, "anonymizeDisplayedPaths": { "description": "Replaces some known folder paths with their respective environment variable", @@ -44,7 +50,13 @@ "level": { "description": "Preferred logging level", "type": "string", - "enum": ["verbose", "info", "warning", "error", "critical"] + "enum": [ + "verbose", + "info", + "warning", + "error", + "critical" + ] }, "channels": { "description": "The logging channels to enable", @@ -78,7 +90,10 @@ "scope": { "description": "The scope of a package install", "type": "string", - "enum": ["user", "machine"], + "enum": [ + "user", + "machine" + ], "default": "user" }, "locale": { @@ -98,7 +113,13 @@ "items": { "uniqueItems": true, "type": "string", - "enum": ["neutral", "x64", "x86", "arm64", "arm"], + "enum": [ + "neutral", + "x64", + "x86", + "arm64", + "arm" + ], "minItems": 1, "maxItems": 4 } @@ -218,7 +239,11 @@ "downloader": { "description": "Control which download code is used for packages", "type": "string", - "enum": ["default", "wininet", "do"], + "enum": [ + "default", + "wininet", + "do" + ], "default": "default" }, "doProgressTimeoutInSeconds": { From be77179052b8b2c2d0a091ecab2f2e85781af191 Mon Sep 17 00:00:00 2001 From: "G.Reijn" Date: Sun, 15 Dec 2024 14:57:14 +0100 Subject: [PATCH 4/4] Resolve remark --- schemas/JSON/settings/settings.schema.0.2.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/schemas/JSON/settings/settings.schema.0.2.json b/schemas/JSON/settings/settings.schema.0.2.json index ae840a58e4..3aaf870bca 100644 --- a/schemas/JSON/settings/settings.schema.0.2.json +++ b/schemas/JSON/settings/settings.schema.0.2.json @@ -206,7 +206,7 @@ "description": "The default root directory where PowerShell modules are installed to when applying a configuration.", "type": "string", "maxLength": 32767, - "default": "%LOCALAPPDATA%/Microsoft/Winget/Configuration/Modules/" + "default": "%LOCALAPPDATA%/Microsoft/WinGet/Configuration/Modules/" } } },