Merge branch '0.63-stable' into backport-native-module-reinit-fix

Author: acoates-ms

packages/E2ETest/package.json

@@ -24,7 +24,7 @@
     "prompt-sync": "^4.2.0",
     "react": "16.13.1",
     "react-native": "0.63.2",
-    "react-native-windows": "0.63.3"
+    "react-native-windows": "0.63.4"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

packages/microsoft-reactnative-sampleapps/package.json

@@ -13,7 +13,7 @@
   "dependencies": {
     "react": "16.13.1",
     "react-native": "0.63.2",
-    "react-native-windows": "0.63.3"
+    "react-native-windows": "0.63.4"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

packages/playground/package.json

@@ -12,7 +12,7 @@
   "dependencies": {
     "react": "16.13.1",
     "react-native": "0.63.2",
-    "react-native-windows": "0.63.3"
+    "react-native-windows": "0.63.4"
   },
   "devDependencies": {
     "@babel/core": "^7.8.4",

vnext/CHANGELOG.json

@@ -1,6 +1,21 @@
 {
   "name": "react-native-windows",
   "entries": [
+    {
+      "date": "Mon, 05 Oct 2020 15:04:50 GMT",
+      "tag": "react-native-windows_v0.63.4",
+      "version": "0.63.4",
+      "comments": {
+        "patch": [
+          {
+            "comment": "Fix pre-1903 crash when loading certain images",
+            "author": "email not defined",
+            "commit": "976222751c7ea8486b8948c927935d1d9ee21277",
+            "package": "react-native-windows"
+          }
+        ]
+      }
+    },
     {
       "date": "Mon, 28 Sep 2020 15:04:34 GMT",
       "tag": "react-native-windows_v0.63.3",

vnext/CHANGELOG.md

@@ -1,9 +1,17 @@
 # Change Log - react-native-windows
 
-This log was last generated on Mon, 21 Sep 2020 15:04:59 GMT and should not be manually modified.
+This log was last generated on Mon, 05 Oct 2020 15:04:50 GMT and should not be manually modified.
 
 <!-- Start content -->
 
+## 0.63.4
+
+Mon, 05 Oct 2020 15:04:50 GMT
+
+### Patches
+
+- Fix pre-1903 crash when loading certain images (email not defined)
+
 ## 0.63.3
 
 Mon, 21 Sep 2020 15:04:59 GMT

vnext/Microsoft.ReactNative/Views/Image/ReactImage.cpp

@@ -248,9 +248,10 @@ winrt::fire_and_forget ReactImage::SetBackground(bool fireLoadEndEvent) {
 
                 // If we are dynamically switching the resizeMode to 'repeat', then
                 // the SizeChanged event has already fired and the ReactImageBrush's
-                // size has not been set. Use ActualSize in that case.
+                // size has not been set. Use ActualWidth/Height in that case.
                 if (compositionBrush->AvailableSize() == winrt::Size{0, 0}) {
-                  compositionBrush->AvailableSize(strong_this->ActualSize());
+                  compositionBrush->AvailableSize({static_cast<float>(strong_this->ActualWidth()),
+                                                   static_cast<float>(strong_this->ActualHeight())});
                 }
 
                 compositionBrush->Source(surface);

vnext/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-windows",
-  "version": "0.63.3",
+  "version": "0.63.4",
   "license": "MIT",
   "repository": {
     "type": "git",