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

Fix the build when using PSDesiredStateConfiguration module from PS Gallery #15355

Merged
merged 2 commits into from
May 5, 2021

Conversation

anmenaga
Copy link
Contributor

@anmenaga anmenaga commented May 5, 2021

PR Summary

The build is now using the PSDesiredStateConfiguration module from PS Gallery but has a check for a catalog file which is no longer there. This PR removes the check.

PR Checklist

@anmenaga anmenaga requested a review from TravisEz13 May 5, 2021 18:46
@ghost ghost assigned adityapatwardhan May 5, 2021
@anmenaga anmenaga added the CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log label May 5, 2021
@@ -1678,9 +1678,6 @@
<File Id="filD2DD9066D1A148EBB7AD542DAC529862" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSDesiredStateConfiguration\en-US\about_PSDesiredStateConfiguration.md" />
</Component>
</Directory>
<Component Id="cmp67C4A6FC5E48487BB31DE411CF38B0B2">
<File Id="fil747B2801746E4FFCB93000BBA1089F15" KeyPath="yes" Source="$(var.ProductSourcePath)\Modules\PSDesiredStateConfiguration\PSDesiredStateConfiguration.cat" />
Copy link
Member

Choose a reason for hiding this comment

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

Revert this change and let the code generate the update and check that in.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

updated.

@ghost ghost added the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label May 5, 2021
@ghost ghost removed the Waiting on Author The PR was reviewed and requires changes or comments from the author before being accept label May 5, 2021
@adityapatwardhan adityapatwardhan merged commit e0a4855 into PowerShell:master May 5, 2021
@adityapatwardhan adityapatwardhan added this to the 7.2.0-preview.6 milestone May 5, 2021
@ghost
Copy link

ghost commented May 27, 2021

🎉v7.2.0-preview.6 has been released which incorporates this pull request.:tada:

Handy links:

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
CL-BuildPackaging Indicates that a PR should be marked as a build or packaging change in the Change Log
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants