Skip to content

Commit 02454cc

Browse files
yao-msftyao-msft
authored
Add msstore productId to export manifest and to wingetutil interop manifest object (#4934)
This change was needed as part of the effort to make exported manifest (from winget download msstore apps) to be re-parsed and uploaded to winget rest source.   Updated the some of the manifest schemas to add "required" for some required fields previously missing. Also, during my cross validation with the manifest schemas, I found ExpectedReturnCode::Custom was added in manifest but not actually updated in code. So I updated the ExpectedReturnCode map in code with this change too.
1 parent 03587c2 commit 02454cc

35 files changed

+227
-141
lines changed

‎doc/windows/package-manager/winget/returnCodes.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,7 @@ ms.localizationpriority: medium
160160
| 0x8A150107 | -1978334969 | APPINSTALLER_CLI_ERROR_INSTALL_NO_NETWORK | This application requires internet connectivity. Connect to a network then try again. |
161161
| 0x8A150108 | -1978334968 | APPINSTALLER_CLI_ERROR_INSTALL_CONTACT_SUPPORT | This application encountered an error during installation. Contact support. |
162162
| 0x8A150109 | -1978334967 | APPINSTALLER_CLI_ERROR_INSTALL_REBOOT_REQUIRED_TO_FINISH | Restart your PC to finish installation. |
163-
| 0x8A15010A | -1978334966 | APPINSTALLER_CLI_ERROR_INSTALL_REBOOT_REQUIRED_TO_INSTALL |
164-
Installation failed. Restart your PC then try again. |
163+
| 0x8A15010A | -1978334966 | APPINSTALLER_CLI_ERROR_INSTALL_REBOOT_REQUIRED_TO_INSTALL | Installation failed. Restart your PC then try again. |
165164
| 0x8A15010B | -1978334965 | APPINSTALLER_CLI_ERROR_INSTALL_REBOOT_INITIATED | Your PC will restart to finish installation. |
166165
| 0x8A15010C | -1978334964 | APPINSTALLER_CLI_ERROR_INSTALL_CANCELLED_BY_USER | You cancelled the installation. |
167166
| 0x8A15010D | -1978334963 | APPINSTALLER_CLI_ERROR_INSTALL_ALREADY_INSTALLED | Another version of this application is already installed. |
@@ -171,7 +170,8 @@ Installation failed. Restart your PC then try again. |
171170
| 0x8A150111 | -1978334959 | APPINSTALLER_CLI_ERROR_INSTALL_PACKAGE_IN_USE_BY_APPLICATION | Application is currently in use by another application. |
172171
| 0x8A150112 | -1978334958 | APPINSTALLER_CLI_ERROR_INSTALL_INVALID_PARAMETER | Invalid parameter. |
173172
| 0x8A150113 | -1978334957 | APPINSTALLER_CLI_ERROR_INSTALL_SYSTEM_NOT_SUPPORTED | Package not supported by the system. |
174-
| 0x8A150114 | -1978334956 | APPINSTALLER_CLI_ERROR_INSTALL_UPGRADE_NOT_SUPPORTED | The installer does not support upgrading an existing package. |
173+
| 0x8A150114 | -1978334956 | APPINSTALLER_CLI_ERROR_INSTALL_UPGRADE_NOT_SUPPORTED | The installer does not support upgrading an existing package. |
174+
| 0x8A150115 | -1978334955 | APPINSTALLER_CLI_ERROR_INSTALL_CUSTOM_ERROR | Installation failed with installer custom error. |
175175

176176
## Check for package installed status
177177

‎schemas/JSON/manifests/v1.1.0/manifest.installer.1.1.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -179,7 +179,8 @@
179179
"blockedByPolicy"
180180
]
181181
}
182-
}
182+
},
183+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
183184
},
184185
"maxItems": 128,
185186
"description": "Installer exit codes for common errors"
@@ -667,4 +668,4 @@
667668
"ManifestType",
668669
"ManifestVersion"
669670
]
670-
}
671+
}

‎schemas/JSON/manifests/v1.1.0/manifest.singleton.1.1.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,8 @@
212212
"blockedByPolicy"
213213
]
214214
}
215-
}
215+
},
216+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
216217
},
217218
"maxItems": 128,
218219
"description": "Installer exit codes for common errors"
@@ -803,4 +804,4 @@
803804
"ManifestType",
804805
"ManifestVersion"
805806
]
806-
}
807+
}

‎schemas/JSON/manifests/v1.2.0/manifest.installer.1.2.0.json‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,9 +200,10 @@
200200
},
201201
"ReturnResponseUrl": {
202202
"$ref": "#/definitions/Url",
203-
"description": "The return response url to provide additional guidance for expected return codes"
203+
"description": "The return response url to provide additional guidance for expected return codes"
204204
}
205-
}
205+
},
206+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
206207
},
207208
"maxItems": 128,
208209
"description": "Installer exit codes for common errors"
@@ -710,4 +711,4 @@
710711
"ManifestType",
711712
"ManifestVersion"
712713
]
713-
}
714+
}

‎schemas/JSON/manifests/v1.2.0/manifest.singleton.1.2.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -244,7 +244,8 @@
244244
"$ref": "#/definitions/Url",
245245
"description": "The return response url to provide additional guidance for expected return codes"
246246
}
247-
}
247+
},
248+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
248249
},
249250
"maxItems": 128,
250251
"description": "Installer exit codes for common errors"
@@ -872,4 +873,4 @@
872873
"ManifestType",
873874
"ManifestVersion"
874875
]
875-
}
876+
}

‎schemas/JSON/manifests/v1.4.0/manifest.installer.1.4.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@
246246
"$ref": "#/definitions/Url",
247247
"description": "The return response url to provide additional guidance for expected return codes"
248248
}
249-
}
249+
},
250+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
250251
},
251252
"maxItems": 128,
252253
"description": "Installer exit codes for common errors"
@@ -831,4 +832,4 @@
831832
"ManifestType",
832833
"ManifestVersion"
833834
]
834-
}
835+
}

‎schemas/JSON/manifests/v1.4.0/manifest.singleton.1.4.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -288,7 +288,8 @@
288288
"$ref": "#/definitions/Url",
289289
"description": "The return response url to provide additional guidance for expected return codes"
290290
}
291-
}
291+
},
292+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
292293
},
293294
"maxItems": 128,
294295
"description": "Installer exit codes for common errors"
@@ -993,4 +994,4 @@
993994
"ManifestType",
994995
"ManifestVersion"
995996
]
996-
}
997+
}

‎schemas/JSON/manifests/v1.5.0/manifest.defaultLocale.1.5.0.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
"type": "object",
5656
"properties": {
5757
"IconUrl": {
58-
"$ref": "#/definitions/Url",
58+
"type": "string",
59+
"pattern": "^([Hh][Tt][Tt][Pp][Ss]?)://.+$",
60+
"maxLength": 2048,
5961
"description": "The url of the hosted icon file"
6062
},
6163
"IconFileType": {
@@ -275,4 +277,4 @@
275277
"ManifestType",
276278
"ManifestVersion"
277279
]
278-
}
280+
}

‎schemas/JSON/manifests/v1.5.0/manifest.installer.1.5.0.json‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,8 @@
246246
"$ref": "#/definitions/Url",
247247
"description": "The return response url to provide additional guidance for expected return codes"
248248
}
249-
}
249+
},
250+
"required": [ "InstallerReturnCode", "ReturnResponse" ]
250251
},
251252
"maxItems": 128,
252253
"description": "Installer exit codes for common errors"
@@ -831,4 +832,4 @@
831832
"ManifestType",
832833
"ManifestVersion"
833834
]
834-
}
835+
}

‎schemas/JSON/manifests/v1.5.0/manifest.locale.1.5.0.json‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,9 @@
5555
"type": "object",
5656
"properties": {
5757
"IconUrl": {
58-
"$ref": "#/definitions/Url",
58+
"type": "string",
59+
"pattern": "^([Hh][Tt][Tt][Pp][Ss]?)://.+$",
60+
"maxLength": 2048,
5961
"description": "The url of the hosted icon file"
6062
},
6163
"IconFileType": {
@@ -266,4 +268,4 @@
266268
"ManifestType",
267269
"ManifestVersion"
268270
]
269-
}
271+
}

0 commit comments

Comments
 (0)