Skip to content
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.

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

Add msstore productId to export manifest and to wingetutil interop manifest object #4934

Merged
merged 3 commits into from
Nov 4, 2024

Conversation

yao-msft
Copy link
Contributor

@yao-msft yao-msft commented Nov 1, 2024

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.

@yao-msft yao-msft requested a review from a team as a code owner November 1, 2024 08:32
ryfu-msft
ryfu-msft previously approved these changes Nov 1, 2024
@@ -1284,6 +1284,9 @@ Do you agree to the terms?</value>
<data name="InstallFlowReturnCodeSystemNotSupported" xml:space="preserve">
<value>The current system configuration does not support the installation of this package.</value>
</data>
<data name="InstallFlowReturnCodeCustomError" xml:space="preserve">
<value>Installation failed with installer custom error. Contact package support.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit:

Suggested change
<value>Installation failed with installer custom error. Contact package support.</value>
<value>Installation failed with a custom installer error. Contact package support.</value>

@@ -2521,6 +2524,9 @@ Please specify one of them using the --source option to proceed.</value>
<data name="APPINSTALLER_CLI_ERROR_INSTALL_UPGRADE_NOT_SUPPORTED" xml:space="preserve">
<value>The installer does not support upgrading an existing package.</value>
</data>
<data name="APPINSTALLER_CLI_ERROR_INSTALL_CUSTOM_ERROR" xml:space="preserve">
<value>Installation failed with installer custom error.</value>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
<value>Installation failed with installer custom error.</value>
<value>Installation failed with a custom installer error.</value>

@@ -244,6 +244,7 @@ namespace AppInstaller
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_INVALID_PARAMETER, "Invalid parameter."),
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_SYSTEM_NOT_SUPPORTED, "Package not supported by the system."),
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_UPGRADE_NOT_SUPPORTED, "The installer does not support upgrading an existing package."),
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_CUSTOM_ERROR, "Installation failed with installer custom error."),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_CUSTOM_ERROR, "Installation failed with installer custom error."),
WINGET_HRESULT_INFO(APPINSTALLER_CLI_ERROR_INSTALL_CUSTOM_ERROR, "Installation failed with a custom installer error."),

@yao-msft
Copy link
Contributor Author

yao-msft commented Nov 1, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@yao-msft
Copy link
Contributor Author

yao-msft commented Nov 4, 2024

@microsoft-github-policy-service agree

@yao-msft yao-msft merged commit 02454cc into microsoft:master Nov 4, 2024
8 checks passed
@yao-msft yao-msft deleted the yamlwritermsstore branch November 4, 2024 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants