From 882746f62ec61fd294d10062211b8dbaeac88aa8 Mon Sep 17 00:00:00 2001 From: Daniel Morales Date: Wed, 24 Jan 2024 15:40:24 -0800 Subject: [PATCH 1/3] Respecting avatarOverrideStyle when setting TitleView style (#1949) Respecting avatarOverrideStyle when setting TitleView style --- ios/FluentUI/Navigation/Views/AvatarTitleView.swift | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ios/FluentUI/Navigation/Views/AvatarTitleView.swift b/ios/FluentUI/Navigation/Views/AvatarTitleView.swift index 96e6c05bbf..cf4ec12c7d 100644 --- a/ios/FluentUI/Navigation/Views/AvatarTitleView.swift +++ b/ios/FluentUI/Navigation/Views/AvatarTitleView.swift @@ -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 } } From 5e902abba35ace02698c789ae915ba0e04bad425 Mon Sep 17 00:00:00 2001 From: Mike Schreiber Date: Thu, 25 Jan 2024 08:42:58 -0800 Subject: [PATCH 2/3] Bump Xcode version to 15.2 (#1953) --- README.md | 2 +- scripts/xcode_select_current_version.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index bea8b229e0..4177efc16c 100644 --- a/README.md +++ b/README.md @@ -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 diff --git a/scripts/xcode_select_current_version.sh b/scripts/xcode_select_current_version.sh index f7c1667c21..99ecee7307 100755 --- a/scripts/xcode_select_current_version.sh +++ b/scripts/xcode_select_current_version.sh @@ -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" From adfc8982b0d7ef05a17698ea332f26726a2fe251 Mon Sep 17 00:00:00 2001 From: Mohammed Imthathullah Date: Wed, 31 Jan 2024 12:13:38 +0530 Subject: [PATCH 3/3] Fix typo (#1959) --- SECURITY.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/SECURITY.md b/SECURITY.md index f78304ea7a..29ed9e13c5 100644 --- a/SECURITY.md +++ b/SECURITY.md @@ -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