Skip to content

Conversation

@DHowett
Copy link
Member

@DHowett DHowett commented Sep 15, 2021

This pull request replaces all references to PowerToys' master branch
with "main" in documentation, code and build rules.

  • Linked issue: Change Master to Main #5433
  • Communication: I've discussed this with core contributors in
    the issue.
  • Tests: Added/updated and all pass (not applicable)
  • Installer: Added/updated and all pass (not applicable)
  • Localization: All end user facing strings can be localized
    (not applicable)
  • Docs: Updated
  • Binaries: Any new files are added to WXS / YML
    • No new binaries

@noraa-junker
Copy link
Collaborator

@DHowett The linked issue is #5433

@noraa-junker
Copy link
Collaborator

@DHowett We don't have to keep the master branch after this, becuase GitHub automatically redirects to the renamed branch

@DHowett
Copy link
Member Author

DHowett commented Oct 28, 2021

That makes sense. Thanks!

I'll update this to the latest and we can get it merged sooner rather than later.

@DHowett DHowett marked this pull request as ready for review October 28, 2021 16:51
<controls:SettingsPageControl.SecondaryLinks>
<controls:PageLink x:Uid="GeneralPage_PrivacyStatement_URL" Link="http://go.microsoft.com/fwlink/?LinkId=521839"/>
<controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/master/NOTICE.md"/>
<controls:PageLink x:Uid="OpenSource_Notice" Link="https://github.com/microsoft/PowerToys/blob/main/NOTICE.md"/>
Copy link
Member Author

@DHowett DHowett Oct 28, 2021

Choose a reason for hiding this comment

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

@crutkas: we need to file a followup to fix this.

To my understanding, the open source notices need to be bundled with the product and accessible offline. They must be present in all binary distributions of the product.

Copy link
Member Author

Choose a reason for hiding this comment

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

Terminal handles this by converting the markdown notice to HTML and bundling it in the package. The open-source version contains only a link to the repository, but the final release build contains the actual notices.

Copy link
Member

Choose a reason for hiding this comment

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

We do bundle so it is on disk with the installer.

Copy link
Member

Choose a reason for hiding this comment

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

image

@DHowett DHowett merged commit fa3a5f8 into master Nov 1, 2021
@DHowett DHowett deleted the users/duhowett/mastermain branch November 1, 2021 17:21
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.

4 participants