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

[pull] main from microsoft:main #67

Merged
merged 3 commits into from
Jan 31, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ Fluent UI Apple contains native UIKit and AppKit controls aligned with [Microsof
#### Requirements

- iOS 15+ or macOS 12+
- Xcode 15.0.1+
- Xcode 15.2+
- Swift 5.9+

#### Using Swift Package Manager
Expand Down
2 changes: 1 addition & 1 deletion SECURITY.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

Microsoft takes the security of our software products and services seriously, which includes all source code repositories managed through our GitHub organizations, which include [Microsoft](https://github.com/Microsoft), [Azure](https://github.com/Azure), [DotNet](https://github.com/dotnet), [AspNet](https://github.com/aspnet), [Xamarin](https://github.com/xamarin), and [our GitHub organizations](https://opensource.microsoft.com/).

If you believe you have found a security vulnerability in any Microsoft-owned repository that meets Microsoft's [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)) of a security vulnerability, please report it to us as described below.
If you believe you have found a security vulnerability in any Microsoft-owned repository that meets [Microsoft's definition of a security vulnerability](https://docs.microsoft.com/en-us/previous-versions/tn-archive/cc751383(v=technet.10)), please report it to us as described below.

## Reporting Security Issues

Expand Down
8 changes: 7 additions & 1 deletion ios/FluentUI/Navigation/Views/AvatarTitleView.swift
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,13 @@ class AvatarTitleView: UIView, TokenizedControlInternal, TwoLineTitleViewDelegat
didSet {
updateAppearance()
twoLineTitleView.currentStyle = style == .primary ? .primary : .system
avatar?.state.style = style == .primary ? .default : .accent
let avatarStyle: MSFAvatarStyle
if let avatarOverrideStyle {
avatarStyle = avatarOverrideStyle
} else {
avatarStyle = (style == .primary) ? .default : .accent
}
avatar?.state.style = avatarStyle
}
}

Expand Down
2 changes: 1 addition & 1 deletion scripts/xcode_select_current_version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
if [ -n "$XCODE_PATH_OVERRIDE" ]; then # If someone calls this with the XCODE_PATH_OVERRIDE variable set to a path to a developer dir, use it instead
XCODE_PATH="$XCODE_PATH_OVERRIDE"
else
XCODE_PATH='/Applications/Xcode_15.0.1.app/Contents/Developer'
XCODE_PATH='/Applications/Xcode_15.2.app/Contents/Developer'
fi

echo "Running command: sudo xcode-select --switch $XCODE_PATH"
Expand Down
Loading