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 examples in Windows installation options #415

Merged
merged 8 commits into from
Oct 8, 2023

Conversation

stevapple
Copy link
Contributor

@stevapple stevapple commented Sep 29, 2023

Fix typos caused by copy-pasting in Windows installation guide, and make some essential improvements.

Motivation:

Address https://forums.swift.org/t/swift-on-windows-guide/67534/8

Modifications:

  • Fix a typo caused by copy-pasting in WinGet and Scoop installation guide.
  • Use --id --exact to enforce WinGet package lookup result.
  • Bump recommended Visual Studio version from 2019 to 2022;
  • Bump recommended Windows SDK version from 10.0.19041 to 10.0.22000.

Result:

WinGet and Scoop guide should be usable again (and the WinGet part is more robust now).

@stevapple stevapple marked this pull request as ready for review September 29, 2023 11:46
@stevapple stevapple changed the title Improve example commands in _winget.md Improve example in Windows installation options Sep 29, 2023
@stevapple stevapple changed the title Improve example in Windows installation options Fix examples in Windows installation options Sep 29, 2023
@stevapple
Copy link
Contributor Author

Anyone to review & merge, perhaps @shahmishal?

Copy link
Member

@alexandersandberg alexandersandberg left a comment

Choose a reason for hiding this comment

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

Looks fine to me, but maybe @compnerd can have a look as well.

@compnerd
Copy link
Member

compnerd commented Oct 6, 2023

@swift-ci please test

@compnerd
Copy link
Member

compnerd commented Oct 7, 2023

@shahmishal @tomerd - can we get this merged?

@shahmishal
Copy link
Member

@stevapple @compnerd can you help resolve the merge conflict?

@compnerd
Copy link
Member

compnerd commented Oct 7, 2023

@shahmishal I don't see the resolve conflicts button (maybe because I'm not in the repository committers?). I suspect that the python version is the conflict and the versioning that was merged is the correct version.

@stevapple
Copy link
Contributor Author

@stevapple @compnerd can you help resolve the merge conflict?

Done.

@compnerd
Copy link
Member

compnerd commented Oct 8, 2023

@swift-ci please test

@compnerd
Copy link
Member

compnerd commented Oct 8, 2023

@shahmishal @tomerd - seems ready to merge?

@alexandersandberg alexandersandberg merged commit ed6abb2 into swiftlang:main Oct 8, 2023
1 check passed
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.

None yet

4 participants