Merge branch 'master' of https://github.com/Microsoft/react-native-code-push into upstream/master

Author: sergey-akhalkov

.github/ISSUE_TEMPLATE.md

@@ -1,14 +1,25 @@
 Thanks so much for filing an issue or feature request! Please fill out the following (wherever relevant):
 
-### Description
+### Steps to Reproduce
+1.
+2. 
+3.
 
-[FILL THIS OUT: Explain what you did, what you expected to happen, and what actually happens. Also exact reproduction steps and stack trace will be much appreciated.]
+### Expected Behavior
+What you expected to happen?
 
-### Reproduction
+### Actual Behavior
+What actually happens?
+```
+  STACK TRACE AND/OR SCREENSHOTS
+```
 
-[FILL THIS OUT: If possible try to reproduce your bug on our basic sample: https://github.com/Microsoft/react-native-code-push/tree/master/Examples/CodePushDemoApp. If you can't reproduce the bug on it, provide us as much info as possible about your project.]
+### Reproducible Demo
 
-### Additional Information
+* Download https://github.com/Microsoft/react-native-code-push/archive/master.zip and unzip. From `Examples` folder run `node create-app.js appName react-native@0.47.1 react-native-code-push@5.0.0-beta` command to generate plain CodePushified React Native app. Please see description on top of `create-app.js` file content if needed
+* If you can't reproduce the bug on it, provide us as much info as possible about your project
+
+### Environment
 
 * react-native-code-push version:
 * react-native version:
@@ -17,4 +28,3 @@ Thanks so much for filing an issue or feature request! Please fill out the follo
 * Does this reproduce on a simulator, or only on a physical device?
 
 (The more info the faster we will be able to address it!)
-

Examples/CodePushDemoApp/windows/CodePushDemoApp.Wpf/CodePushDemoApp.Wpf.csproj

@@ -102,7 +102,7 @@
   <ItemGroup>
     <Reference Include="Facebook.Yoga, Version=1.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\Facebook.Yoga.1.2.0-pre1\lib\net45\Facebook.Yoga.dll</HintPath>
+      <HintPath>..\packages\Facebook.Yoga.1.5.0-pre1\lib\net45\Facebook.Yoga.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -171,9 +171,9 @@
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
     <Error Condition="!Exists('..\packages\Microsoft.ChakraCore.1.4.1\build\netstandard1.0\Microsoft.ChakraCore.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.ChakraCore.1.4.1\build\netstandard1.0\Microsoft.ChakraCore.props'))" />
-    <Error Condition="!Exists('..\packages\Facebook.Yoga.1.2.0-pre1\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.2.0-pre1\build\net45\Facebook.Yoga.targets'))" />
+    <Error Condition="!Exists('..\packages\Facebook.Yoga.1.5.0-pre1\build\net45\Facebook.Yoga.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Facebook.Yoga.1.5.0-pre1\build\net45\Facebook.Yoga.targets'))" />
   </Target>
-  <Import Project="..\packages\Facebook.Yoga.1.2.0-pre1\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.2.0-pre1\build\net45\Facebook.Yoga.targets')" />
+  <Import Project="..\packages\Facebook.Yoga.1.5.0-pre1\build\net45\Facebook.Yoga.targets" Condition="Exists('..\packages\Facebook.Yoga.1.5.0-pre1\build\net45\Facebook.Yoga.targets')" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">

Examples/CodePushDemoApp/windows/CodePushDemoApp.Wpf/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Facebook.Yoga" version="1.2.0-pre1" targetFramework="net46" />
+  <package id="Facebook.Yoga" version="1.5.0-pre1" targetFramework="net46" />
   <package id="Microsoft.ChakraCore" version="1.4.1" targetFramework="net46" developmentDependency="true" />
 </packages>

Examples/CodePushDemoApp/windows/CodePushDemoApp/project.json

@@ -1,6 +1,6 @@
 {
   "dependencies": {
-    "Facebook.Yoga": "1.2.0-pre1",
+    "Facebook.Yoga": "1.5.0-pre1",
     "Microsoft.NETCore.UniversalWindowsPlatform": "5.2.2"
   },
   "frameworks": {

README.md

@@ -63,8 +63,8 @@ We try our best to maintain backwards compatability of our plugin with previous
 | v0.43-v0.44             | v2.0+ *(RN refactored uimanager dependencies)*       |
 | v0.45                   | v3.0+ *(RN refactored instance manager code)*        |
 | v0.46                   | v4.0+ *(RN refactored js bundle loader code)*        |
-| v0.47                   | v5.0+ *(RN removed unused registration of JS modules)*|
-| v0.48+                  | TBD :) We work hard to respond to new RN releases, but they do occasionally break us. We will update this chart with each RN release, so that users can check to see what our "official" support is.
+| v0.47-v0.48             | v5.0+ *(RN removed unused registration of JS modules)*|
+| v0.49+                  | TBD :) We work hard to respond to new RN releases, but they do occasionally break us. We will update this chart with each RN release, so that users can check to see what our "official" support is.
 
 ### Supported Components
 
@@ -101,6 +101,7 @@ As with all other React Native plugins, the integration experience is different
 
 If you want to see how other projects have integrated with CodePush, you can check out the excellent [example apps](#example-apps--starters) provided by the community. Additionally, if you'd like to quickly familiarize yourself with CodePush + React Native, you can check out the awesome getting started videos produced by [Bilal Budhani](https://www.youtube.com/watch?v=uN0FRWk-YW8&feature=youtu.be) and/or [Deepak Sisodiya ](https://www.youtube.com/watch?v=f6I9y7V-Ibk).
 
+*NOTE: This guide assumes you have used the `react-native init` command to initialize your React Native project. As of March 2017, the command `create-react-native-app` can also be used to initialize a React Native project. If using this command, please run `npm run eject` in your project's home directory to get a project very similar to what `react-native init` would have created.*
 
 Then continue with installing the native module
   * [iOS Setup](docs/setup-ios.md)

windows/CodePush.Net46/UpdateManager.cs

@@ -266,13 +266,27 @@ internal async Task RollbackPackageAsync()
         private async Task<IFolder> GetCurrentPackageFolderAsync()
         {
             var info = await GetCurrentPackageInfoAsync().ConfigureAwait(false);
+            if (info == null)
+            {
+                return null;
+            }
             var packageHash = (string)info[CodePushConstants.CurrentPackageKey];
             return packageHash == null ? null : await GetPackageFolderAsync(packageHash, false).ConfigureAwait(false);
         }
 
         private async Task<JObject> GetCurrentPackageInfoAsync()
         {
             var statusFile = await GetStatusFileAsync().ConfigureAwait(false);
+            var info = await CodePushUtils.GetJObjectFromFileAsync(statusFile).ConfigureAwait(false);
+
+            if (info != null)
+            {
+                return info;
+            }
+
+            // info file has been corrupted - re-create it
+            await statusFile.DeleteAsync().ConfigureAwait(false);
+            statusFile = await GetStatusFileAsync().ConfigureAwait(false);
             return await CodePushUtils.GetJObjectFromFileAsync(statusFile).ConfigureAwait(false);
         }