Adam Gleitman (amgleitman) · Apr 15, 2021 · Mar 13, 2021 · Mar 13, 2021 · Mar 13, 2021 · Apr 2, 2021
diff --git a/apps/android/package.json b/apps/android/package.json
@@ -22,7 +22,7 @@
     "@fluentui-react-native/tester": "^0.22.0",
     "react": "16.13.1",
     "react-native": "^0.63.4",
-    "react-native-svg": "^12.1.0",
+    "react-native-svg": "^12.1.1-0",
     "react-native-test-app": "^0.3.2"
   },
   "devDependencies": {

diff --git a/apps/fluent-tester/package.json b/apps/fluent-tester/package.json
@@ -42,7 +42,7 @@
     "@fluentui/react-native": ">=0.23.5 <1.0.0",
     "@react-native-menu/menu": "^0.1.2",
     "@react-native-picker/picker": "^1.9.11",
-    "react-native-svg": "12.1.0"
+    "react-native-svg": "^12.1.1-0"
   },
   "devDependencies": {
     "@office-iss/react-native-win32": "^0.63.7",

diff --git a/apps/fluent-tester/src/FluentTester/TestComponents/Icon/IconTest.tsx b/apps/fluent-tester/src/FluentTester/TestComponents/Icon/IconTest.tsx
@@ -72,8 +72,9 @@ const icons: React.FunctionComponent<{}> = () => {
         <View>
           <Text>SVG icons</Text>
           {
-            // TODO: Enable on iOS once we get react-native-svg-transformer working properly
-            Platform.OS == 'ios' ? null : <Icon svgSource={svgProps} width={100} height={100} color="orange" />
+            // TODO: Enable on macOS and iOS once we get react-native-svg-transformer working properly
+            // See https://github.com/microsoft/fluentui-react-native/issues/644
+            (Platform.OS == 'ios' || Platform.OS == 'macos') ? null : <Icon svgSource={svgProps} width={100} height={100} color="orange" />
           }
           {
             // TODO: Causes TypeError: Network request failed on Android
@@ -106,7 +107,7 @@ export const IconTest: React.FunctionComponent<{}> = () => {
     win32Status: 'Experimental',
     uwpStatus: 'Backlog',
     iosStatus: 'Experimental',
-    macosStatus: 'Backlog',
+    macosStatus: 'Experimental',
     androidStatus: 'Backlog',
   };
 

diff --git a/apps/fluent-tester/src/FluentTester/testPages.macos.ts b/apps/fluent-tester/src/FluentTester/testPages.macos.ts
@@ -6,6 +6,7 @@ import { CheckboxTest, HOMEPAGE_CHECKBOX_BUTTON } from './TestComponents/Checkbo
 import { ContextualMenuTest, HOMEPAGE_CONTEXTUALMENU_BUTTON } from './TestComponents/ContextualMenu';
 import { ExperimentalButtonTest, HOMEPAGE_BUTTON_BUTTONEXPERIMENTAL } from './TestComponents/ButtonExperimental';
 import { FocusTrapTest, HOMEPAGE_FOCUSTRAPZONE_BUTTON } from './TestComponents/FocusTrapZone';
+import { HOMEPAGE_ICON_BUTTON, IconTest } from './TestComponents/Icon';
 import { HOMEPAGE_LINK_BUTTON, LinkTest } from './TestComponents/Link';
 import { NativeButtonTest, HOMEPAGE_NATIVEBUTTON_BUTTON } from './TestComponents/NativeButton';
 import { HOMEPAGE_PERSONA_BUTTON, PersonaTest } from './TestComponents/Persona';
@@ -103,4 +104,9 @@ export const tests: TestDescription[] = [
     component: SvgTest,
     testPage: HOMEPAGE_SVG_BUTTON,
   },
+  {
+    name: 'Icon Test',
+    component: IconTest,
+    testPage: HOMEPAGE_ICON_BUTTON,
+  },
 ];
diff --git a/apps/ios/src/Podfile.lock b/apps/ios/src/Podfile.lock
@@ -318,7 +318,7 @@ PODS:
     - React-jsi (= 0.63.4)
   - ReactTestApp-DevSupport (0.3.13)
   - ReactTestApp-Resources (1.0.0-dev)
-  - RNSVG (11.0.1):
+  - RNSVG (12.1.1-0):
     - React
   - SwiftLint (0.43.0)
   - Yoga (1.14.0)
@@ -442,15 +442,15 @@ EXTERNAL SOURCES:
 
 SPEC CHECKSUMS:
   boost-for-react-native: 39c7adb57c4e60d6c5479dd8623128eb5b3f0f2c
-  DoubleConversion: cde416483dac037923206447da6e1454df403714
+  DoubleConversion: 5805e889d232975c086db112ece9ed034df7a0b2
   FBLazyVector: 3bb422f41b18121b71783a905c10e58606f7dc3e
   FBReactNativeSpec: f2c97f2529dd79c083355182cc158c9f98f4bd6e
   FluentUI-React-Native-Apple-Theme: 5096ba1ccdce75cac6af8dfb6f43880828d6a8e1
   FluentUI-React-Native-Avatar: 1a463d15fe9cef99c18dcec0516ebd5459fe2e25
   FluentUI-React-Native-Button: b882911504fd4b8ad21b6391b6fb49d908276f5e
   FluentUI-React-Native-Shimmer: 73e604318cff67e942b04ac6b7f3908ce4fa6b38
   Folly: b73c3869541e86821df3c387eb0af5f65addfab4
-  glog: 40a13f7840415b9a77023fbcae0f1e6f43192af3
+  glog: 1f3da668190260b06b429bb211bfbee5cd790c28
   MicrosoftFluentUI: 8a1ef14a8479106c33822d05b774e04051bb33f2
   QRCodeReader.swift: 373a389fe9a22d513c879a32a6f647c58f4ef572
   RCTRequired: 082f10cd3f905d6c124597fd1c14f6f2655ff65e
@@ -476,7 +476,7 @@ SPEC CHECKSUMS:
   ReactCommon: 73d79c7039f473b76db6ff7c6b159c478acbbb3b
   ReactTestApp-DevSupport: 12d9f285a44ff0cb7962a213621f87d3e6de9288
   ReactTestApp-Resources: 5950ae44720217c6778ff03fb1d906c8fb3ce483
-  RNSVG: 67f1f12dae2cef6ed59a42cae74a6b8f5a9e7b46
+  RNSVG: 1a8855adeb20c5beb0a808281608315fc1092d15
   SwiftLint: 0c645fdc6feed3e390c1701ab3cc669f88b42752
   Yoga: 4bd86afe9883422a7c4028c00e34790f560923d6
 

diff --git a/apps/macos/src/Podfile b/apps/macos/src/Podfile
@@ -28,6 +28,7 @@ use_test_app! do |target|
     pod 'FluentUI-React-Native-Button', :path => '../../../packages/experimental/NativeButton/FluentUIReactNativeButton.podspec'
     pod 'FluentUI-React-Native-Avatar', :path => '../../../packages/experimental/Avatar/FluentUIReactNativeAvatar.podspec'
     pod 'RNCPicker', :path => '../../../node_modules/@react-native-picker/picker'
+    pod 'RNSVG', :path => '../../../node_modules/react-native-svg'
 
     script_phase name: 'Start Packager',
                  script: start_packager_script,

diff --git a/apps/macos/src/Podfile.lock b/apps/macos/src/Podfile.lock
@@ -9,13 +9,13 @@ PODS:
     - React-Core (= 0.63.1)
     - React-jsi (= 0.63.1)
     - ReactCommon/turbomodule/core (= 0.63.1)
-  - FluentUI-React-Native-Apple-Theme (0.4.0):
+  - FluentUI-React-Native-Apple-Theme (0.4.2):
     - MicrosoftFluentUI (~> 0.2.2)
     - React
-  - FluentUI-React-Native-Avatar (0.6.1):
+  - FluentUI-React-Native-Avatar (0.7.1):
     - MicrosoftFluentUI (~> 0.2.2)
     - React
-  - FluentUI-React-Native-Button (0.5.1):
+  - FluentUI-React-Native-Button (0.5.3):
     - MicrosoftFluentUI (~> 0.2.2)
     - React
   - glog (0.3.5)
@@ -292,6 +292,8 @@ PODS:
   - ReactTestApp-Resources (1.0.0-dev)
   - RNCPicker (1.9.11):
     - React-Core
+  - RNSVG (12.1.1-0):
+    - React
   - SwiftLint (0.43.0)
   - Yoga (1.14.0)
 
@@ -330,6 +332,7 @@ DEPENDENCIES:
   - ReactTestApp-DevSupport (from `../../../node_modules/react-native-test-app`)
   - ReactTestApp-Resources (from `..`)
   - "RNCPicker (from `../../../node_modules/@react-native-picker/picker`)"
+  - RNSVG (from `../../../node_modules/react-native-svg`)
   - SwiftLint
   - Yoga (from `../../../node_modules/react-native-macos/ReactCommon/yoga`)
 
@@ -403,6 +406,8 @@ EXTERNAL SOURCES:
     :path: ".."
   RNCPicker:
     :path: "../../../node_modules/@react-native-picker/picker"
+  RNSVG:
+    :path: "../../../node_modules/react-native-svg"
   Yoga:
     :path: "../../../node_modules/react-native-macos/ReactCommon/yoga"
 
@@ -411,9 +416,9 @@ SPEC CHECKSUMS:
   DoubleConversion: 56a44bcfd14ab2ff66f5a146b2e875eb4b69b19b
   FBLazyVector: 87ca368919ae0ec70816fb8a42252ef59dc05c94
   FBReactNativeSpec: 7c0591658d85effad209fc4f45b6c9760f9e5842
-  FluentUI-React-Native-Apple-Theme: cb23903e77760527bcda56506a8b2d795789b432
-  FluentUI-React-Native-Avatar: a3de9c856424439e0446c7db9f8e03bb0afccd3d
-  FluentUI-React-Native-Button: 0ea3402fe5403a8d0ab57c49c986c1de64ec900f
+  FluentUI-React-Native-Apple-Theme: 5096ba1ccdce75cac6af8dfb6f43880828d6a8e1
+  FluentUI-React-Native-Avatar: 20e879a5477bf6a32510796d139d699dad5f7f5f
+  FluentUI-React-Native-Button: b882911504fd4b8ad21b6391b6fb49d908276f5e
   glog: 1cb7c408c781ae8f35bbababe459b45e3dee4ec1
   MicrosoftFluentUI: 8a1ef14a8479106c33822d05b774e04051bb33f2
   RCT-Folly: 1347093ffe75e152d846f7e45a3ef901b60021aa
@@ -440,9 +445,10 @@ SPEC CHECKSUMS:
   ReactTestApp-DevSupport: 12d9f285a44ff0cb7962a213621f87d3e6de9288
   ReactTestApp-Resources: 5950ae44720217c6778ff03fb1d906c8fb3ce483
   RNCPicker: 6780c753e9e674065db90d9c965920516402579d
+  RNSVG: 1a8855adeb20c5beb0a808281608315fc1092d15
   SwiftLint: 0c645fdc6feed3e390c1701ab3cc669f88b42752
   Yoga: 6f6f412e10cf9acb93bb0e290613784603d2f0c9
 
-PODFILE CHECKSUM: ee017c1f20907cc14fb6752c327c0c0fc04bbde0
+PODFILE CHECKSUM: 601a04a4aafaf36828a33238273b0ee9dc566464
 
 COCOAPODS: 1.10.1
diff --git a/apps/win32/package.json b/apps/win32/package.json
@@ -30,7 +30,7 @@
     "@fluentui-react-native/tester": "^0.22.0",
     "react": "16.13.1",
     "react-native": "^0.63.4",
-    "react-native-svg": "12.1.0"
+    "react-native-svg": "^12.1.1-0"
   },
   "devDependencies": {
     "@office-iss/react-native-win32": "^0.63.7",

diff --git a/change/@fluentui-react-native-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui/react-native",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:41.967Z"
+}
diff --git a/change/@fluentui-react-native-android-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-android-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/android-theme",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:44.470Z"
+}
diff --git a/change/@fluentui-react-native-apple-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-apple-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/apple-theme",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:46.241Z"
+}
diff --git a/change/@fluentui-react-native-button-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-button-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/button",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:38.660Z"
+}
diff --git a/change/@fluentui-react-native-callout-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-callout-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/callout",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:43.764Z"
+}
diff --git a/change/@fluentui-react-native-checkbox-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-checkbox-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/checkbox",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:46.129Z"
+}
diff --git a/change/@fluentui-react-native-contextual-menu-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-contextual-menu-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/contextual-menu",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:48.608Z"
+}
diff --git a/change/@fluentui-react-native-default-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-default-theme-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/default-theme",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:47.783Z"
+}
diff --git a/...@fluentui-react-native-experimental-avatar-2021-04-15-10-42-49-amgleitman-icon-macos.json b/...@fluentui-react-native-experimental-avatar-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/experimental-avatar",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:05.335Z"
+}
diff --git a/...@fluentui-react-native-experimental-button-2021-04-15-10-42-49-amgleitman-icon-macos.json b/...@fluentui-react-native-experimental-button-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/experimental-button",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:06.932Z"
+}
diff --git a/...ui-react-native-experimental-native-button-2021-04-15-10-42-49-amgleitman-icon-macos.json b/...ui-react-native-experimental-native-button-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/experimental-native-button",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:26.432Z"
+}
diff --git a/...e/@fluentui-react-native-experimental-text-2021-04-15-10-42-49-amgleitman-icon-macos.json b/...e/@fluentui-react-native-experimental-text-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/experimental-text",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:28.799Z"
+}
diff --git a/change/@fluentui-react-native-framework-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-framework-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/framework",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:30.630Z"
+}
diff --git a/change/@fluentui-react-native-icon-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-icon-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "minor",
+  "comment": "Add macOS support",
+  "packageName": "@fluentui-react-native/icon",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "patch",
+  "date": "2021-04-15T17:42:22.667Z"
+}
diff --git a/change/@fluentui-react-native-link-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-link-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/link",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:50.234Z"
+}
diff --git a/change/@fluentui-react-native-persona-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-persona-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/persona",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:51.820Z"
+}
diff --git a/change/@fluentui-react-native-persona-coin-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-persona-coin-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/persona-coin",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:53.237Z"
+}
diff --git a/change/@fluentui-react-native-radio-group-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-radio-group-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/radio-group",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:56.656Z"
+}
diff --git a/change/@fluentui-react-native-separator-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-separator-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/separator",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:41:58.406Z"
+}
diff --git a/change/@fluentui-react-native-shimmer-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-shimmer-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/shimmer",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:00.391Z"
+}
diff --git a/change/@fluentui-react-native-stack-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-stack-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/stack",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:01.933Z"
+}
diff --git a/change/@fluentui-react-native-tester-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-tester-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "minor",
+  "comment": "Upgrade react-native-svg to 12.1.1-0 everywhere",
+  "packageName": "@fluentui-react-native/tester",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "patch",
+  "date": "2021-04-15T17:41:02.300Z"
+}
diff --git a/change/@fluentui-react-native-tester-win32-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-tester-win32-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "minor",
+  "comment": "Upgrade react-native-svg to 12.1.1-0 everywhere",
+  "packageName": "@fluentui-react-native/tester-win32",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "patch",
+  "date": "2021-04-15T17:41:08.254Z"
+}
diff --git a/change/@fluentui-react-native-text-2021-04-15-10-42-49-amgleitman-icon-macos.json b/change/@fluentui-react-native-text-2021-04-15-10-42-49-amgleitman-icon-macos.json
@@ -0,0 +1,8 @@
+{
+  "type": "none",
+  "comment": "Merge remote-tracking branch 'upstream/master' into amgleitman/icon-macos",
+  "packageName": "@fluentui-react-native/text",
+  "email": "adam.gleitman@gmail.com",
+  "dependentChangeType": "none",
+  "date": "2021-04-15T17:42:03.509Z"
+}