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

Rename $IsOSX to $IsMacOS #4757

Merged
merged 3 commits into from
Sep 7, 2017
Merged

Conversation

SteveL-MSFT
Copy link
Member

PS-Committee decided we should be consistent with our naming and conform to Apple's use of macOS instead of OSX, however, for readability and consistently we are staying with Pascal casing.

Also renamed instances of variations of OSX to macOS for consistency in comments/text (separate commit to make it easier to review)

Fix #4700

@daxian-dbw
Copy link
Member

I don't see changes to build.psm1, is that file missed from this PR?

@SteveL-MSFT
Copy link
Member Author

SteveL-MSFT commented Sep 6, 2017

@daxian-dbw ok, looks like VSCode cached exclusion list and I previously excluded build.psm1, will fix. looks like .md files were excluded as well.

@iSazonov
Copy link
Collaborator

iSazonov commented Sep 6, 2017

Apple Inc. uses macOS not MacOS - maybe we should use the same too? - $IsmacOS

@SteveL-MSFT
Copy link
Member Author

@iSazonov we had that discussion in the issue, the consensus is that $IsMacOS is preferred over $IsmacOS for readability and other languages (like Java) use isMacOS, so it's already somewhat common.

Copy link
Collaborator

@iSazonov iSazonov left a comment

Choose a reason for hiding this comment

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

LGTM

@@ -42,7 +42,7 @@ function Set-DailyBuildBadge
$storageAccountKey = $Env:TestResultAccountKey

# this is the url referenced in README.MD which displays the badge
$platform = if ( $IsOSX ) { "OSX" } else { "Linux" }
$platform = if ( $IsLinux ) { "Linux" } else { "OSX" }
Copy link
Collaborator

Choose a reason for hiding this comment

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

Minor comment - maybe replace "OSX" too?

Copy link
Member Author

Choose a reason for hiding this comment

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

The file stored in Azure for the badge has OSX in the filename. I'm fine leaving that one.

Copy link
Member

@daxian-dbw daxian-dbw left a comment

Choose a reason for hiding this comment

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

The package name for macOS should also be changed, but that can be a separate PR.

@markekraus
Copy link
Contributor

Should this run through the CI with [feature] to ensure none of the feature tests broke with the change?

@SteveL-MSFT
Copy link
Member Author

@markekraus good point, I'll resubmit

@SteveL-MSFT
Copy link
Member Author

AppVeyor failure is due to the current issue causing nightly to fail and @dantraMSFT is looking into it

@dantraMSFT
Copy link
Contributor

Yes, the failure is due to #4763. You can ignore it.

@SteveL-MSFT
Copy link
Member Author

Rebased to pick up fix

@TravisEz13 TravisEz13 merged commit 7c9b188 into PowerShell:master Sep 7, 2017
@mirichmo mirichmo added the Breaking-Change breaking change that may affect users label Sep 12, 2017
@SteveL-MSFT SteveL-MSFT deleted the rename-ismacos branch October 16, 2017 21:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Breaking-Change breaking change that may affect users
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

8 participants