Merge branch 'master' of https://github.com/itinance/react-native-fs

itinance · May 10, 2018 · 600e3b3 · 600e3b3
2 parents 8290ac2 + 9b130ad
commit 600e3b3
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 47 deletions.
diff --git a/README.md b/README.md
@@ -4,7 +4,7 @@ Native filesystem access for react-native
 
 ## Changes for v2.9
 - (iOS only) Resumable downloads and better background downloads handling [#335](https://github.com/itinance/react-native-fs/pull/335) by [ptelad](https://github.com/ptelad)
-- (ANdroid only) getAllExternalFilesDirs() added by [ngrj](https://github.com/ngrj)
+- (Android only) getAllExternalFilesDirs() added by [ngrj](https://github.com/ngrj)
 - Content URI support [#395](https://github.com/itinance/react-native-fs/pull/395) by [krzysztof-miemiec](https://github.com/krzysztof-miemiec)
 - Fixed Cocoapods-Installation
 
@@ -228,6 +228,8 @@ RNFS.readDir(RNFS.MainBundlePath) // On Android, use "RNFS.DocumentDirectoryPath
 var RNFS = require('react-native-fs');
 
 // create a path you want to write to
+// :warning: on iOS, you cannot write into `RNFS.MainBundlePath`, 
+// but `RNFS.DocumentDirectoryPath` exists on both platforms and is writable
 var path = RNFS.DocumentDirectoryPath + '/test.txt';
 
 // write the file
@@ -654,7 +656,7 @@ type FSInfoResult = {
 };
 ```
 
-### `getAllExternalFilesDirs(): Promise<string>`
+### (Android only) `getAllExternalFilesDirs(): Promise<string[]>`
 
 Returns an array with the absolute paths to application-specific directories on all shared/external storage devices where the application can place persistent files it owns. 
 

diff --git a/package.json b/package.json
@@ -38,7 +38,6 @@
   "peerDependencies": {
     "react": "^16.2.0",
     "react-native": "^0.51.0",
-    "prop-types": "15.6.0",
-    "create-react-class": "^15.6.2"
+    "prop-types": "15.6.0"
   }
 }
diff --git a/windows/RNFS.Tests/RNFS.Tests.csproj b/windows/RNFS.Tests/RNFS.Tests.csproj
@@ -18,6 +18,7 @@
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <PackageCertificateKeyFile>RNFS.Tests_TemporaryKey.pfx</PackageCertificateKeyFile>
     <UnitTestPlatformVersion Condition="'$(UnitTestPlatformVersion)' == ''">$(VisualStudioVersion)</UnitTestPlatformVersion>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
     <DebugSymbols>true</DebugSymbols>
@@ -88,10 +89,6 @@
     <Prefer32Bit>true</Prefer32Bit>
     <UseDotNetNativeToolchain>true</UseDotNetNativeToolchain>
   </PropertyGroup>
-  <ItemGroup>
-    <!--A reference to the entire .Net Framework and Windows SDK are automatically included-->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <SDKReference Include="TestPlatform.Universal, Version=$(UnitTestPlatformVersion)" />
   </ItemGroup>
@@ -137,6 +134,11 @@
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.6</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>
@@ -148,4 +150,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
diff --git a/windows/RNFS.Tests/project.json b/windows/RNFS.Tests/project.json
diff --git a/windows/RNFS/RNFS.csproj b/windows/RNFS/RNFS.csproj
@@ -17,6 +17,7 @@
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <ReactWindowsRoot>..\..\node_modules</ReactWindowsRoot>
+    <RestoreProjectStyle>PackageReference</RestoreProjectStyle>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)' != 'Development'">
     <ReactWindowsRoot>..\..</ReactWindowsRoot>
@@ -123,10 +124,6 @@
     <ErrorReport>prompt</ErrorReport>
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
-  <ItemGroup>
-    <!-- A reference to the entire .Net Framework and Windows SDK are automatically included -->
-    <None Include="project.json" />
-  </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RNFSManager.cs" />
@@ -139,6 +136,11 @@
       <Name>ReactNative</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.0.6</Version>
+    </PackageReference>
+  </ItemGroup>
   <PropertyGroup Condition=" '$(VisualStudioVersion)' == '' or '$(VisualStudioVersion)' &lt; '14.0' ">
     <VisualStudioVersion>14.0</VisualStudioVersion>
   </PropertyGroup>

diff --git a/windows/RNFS/project.json b/windows/RNFS/project.json