0.60 stable

.ado/templates/apple-job-javascript.yml

@@ -2,6 +2,9 @@ parameters:
   apply_office_patches: ''
 
 steps:
+  - script: 'brew update'
+    displayName: 'brew update'
+
   - script: 'brew bundle'
     displayName: 'brew bundle'
 

.ado/templates/apple-job-react-native.yml

@@ -14,6 +14,9 @@ steps:
       rm -rf $(Build.Repository.LocalPath)/DerivedData
     displayName: 'Clean DerivedData'
 
+  - script: 'brew update'
+    displayName: 'brew update'
+
   # Install the required components specified in the Brewfile file.
   - script: 'brew bundle'
     displayName: 'brew bundle'

React/Base/RCTPlatformDisplayLink.h

@@ -9,8 +9,8 @@
 
 #include <TargetConditionals.h>
 
+#import <QuartzCore/CADisplayLink.h> // TODO GH#533, we need to explicitly pull in the framework to get the definition for CACurrentMediaTime()
 #if !TARGET_OS_OSX
-#import <QuartzCore/CADisplayLink.h>
 #define RCTPlatformDisplayLink CADisplayLink
 #else
 

React/Views/RCTPicker.h

@@ -18,8 +18,10 @@
 @property (nonatomic, assign) NSInteger selectedIndex;
 
 @property (nonatomic, strong) RCTUIColor *color; // TODO(OSS Candidate ISS#2710739)
-@property (nonatomic, strong) UIFont *font;
-@property (nonatomic, assign) NSTextAlignment textAlign;
+#if !TARGET_OS_OSX // [TODO(macOS GH#533) // NSControl defines font prop for macOS, but iOS superviews don't
+ @property (nonatomic, strong) UIFont *font;
+#endif // ]TODO(macOS GH#533)
+ @property (nonatomic, assign) NSTextAlignment textAlign;
 
 @property (nonatomic, copy) RCTBubblingEventBlock onChange;
 

React/Views/RCTPicker.m

@@ -26,9 +26,9 @@ - (instancetype)initWithFrame:(CGRect)frame
     _color = [RCTUIColor blackColor]; // TODO(OSS Candidate ISS#2710739)
 #if !TARGET_OS_OSX // TODO(macOS ISS#2323203)
     _font = [UIFont systemFontOfSize:21]; // TODO: selected title default should be 23.5
-#else // [TODO(macOS ISS#2323203)
-    _font = [UIFont systemFontOfSize:11];
-#endif // ]TODO(macOS ISS#2323203)
+#else // [TODO(macOS GH#533)
+    [self setFont:[NSFont systemFontOfSize:[NSFont systemFontSize]]];
+#endif // ]TODO(macOS GH#533)
     _selectedIndex = NSNotFound;
     _textAlign = NSTextAlignmentCenter;
     self.delegate = self;
@@ -63,7 +63,7 @@ - (void)setItems:(NSArray<NSDictionary *> *)items
     NSMutableDictionary *mutableItem = item.mutableCopy;
     NSAttributedString *attrString = [[NSAttributedString alloc] initWithString:[RCTConvert NSString:item[@"label"]]
                                                                      attributes:@{NSForegroundColorAttributeName : [RCTConvert UIColor:item[@"textColor"]] ?: _color,
-                                                                                  NSFontAttributeName: _font,
+                                                                                  NSFontAttributeName: [self font] /* Use the font prop instead of the ivar so it's compatible on iOS and macOS TODO(OSS Candidate ISS#2710739) */,
                                                                                   NSParagraphStyleAttributeName: paragraphStyle}];
     NSSize size = attrString.size;
     if (size.height > maxHeight) {

package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native",
-  "version": "0.60.0-microsoft.91",
+  "version": "0.60.0-microsoft.93",
   "description": "[Microsoft Fork] A framework for building native apps using React",
   "license": "MIT",
   "repository": {