Skip to content

Commit

Permalink
Added TempRootFolder and DocumentsFolder
Browse files Browse the repository at this point in the history
Added UWP and Test project
Replaced Storage word with Root in folders
ToString() returns the full path now
Fixed iOS test
Did something with Android project
  • Loading branch information
Aragas committed Oct 22, 2017
1 parent ab3ed05 commit 94d04d7
Show file tree
Hide file tree
Showing 55 changed files with 1,226 additions and 440 deletions.
180 changes: 179 additions & 1 deletion PCLExt.FileStorage.sln

Large diffs are not rendered by default.

2 changes: 2 additions & 0 deletions PCLExt.FileStorage.sln.DotSettings
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
<s:String x:Key="/Default/FilterSettingsManager/CoverageFilterXml/@EntryValue">&lt;data&gt;&lt;IncludeFilters /&gt;&lt;ExcludeFilters&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="CheckExistsAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="CreateFileAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="GetFileAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="GetFoldersAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="MoveAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="CopyAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="CreateFolderAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="DeleteAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="GetFilesAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="GetFolderAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFolderImplementation" FunctionMask="RenameAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="CopyAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="DeleteAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="MoveAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="OpenAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="ReadAllBytesAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="RenameAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.DefaultFileImplementation" FunctionMask="WriteAllBytesAsync" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.Exceptions.*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage.Abstractions" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage.Core.Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.Requires" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="PCLExt.FileStorage.Extensions.AwaitExtensions" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage.Android.Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage.iOS.Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage.NetFX.Test" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;Filter ModuleMask="PCLExt.FileStorage" ModuleVersionMask="*" ClassMask="*" FunctionMask="*" IsEnabled="True" /&gt;&lt;/ExcludeFilters&gt;&lt;/data&gt;</s:String></wpf:ResourceDictionary>
4 changes: 2 additions & 2 deletions common/CommonAssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

[assembly: AssemblyVersion("1.3.0.0")]
[assembly: AssemblyFileVersion("1.3.0.0")]
[assembly: AssemblyVersion("1.3.1.0")]
[assembly: AssemblyFileVersion("1.3.1.0")]
25 changes: 15 additions & 10 deletions common/PCLExt.FileStorage.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata>
<id>PCLExt.FileStorage</id>
<version>1.3.0.0</version>
<version>1.3.1.0</version>
<title>PCL Extension - File Storage API</title>
<authors>Daniel Plaisted,Aragas</authors>
<owners>Aragas</owners>
Expand All @@ -12,13 +12,13 @@
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<description>PCL Extension provides file system implementations for PCL, .NET Framework, .NET Core, Xamarin.iOS, Xamarin.Android and Xamarin.Mac. This makes it easier to create cross-platform .NET libraries and apps. Supports .NET Standard now.</description>
<summary>PCL Extension provides file system implementations for PCL platform</summary>
<tags>io storage file system filesystem filestorage portable pcl android mac ios xamarin monoandroid monotouch core netcore netstandard</tags>
<tags>io storage file system filesystem filestorage portable pcl android mac ios xamarin monoandroid monotouch core netcore netstandard uwp</tags>
</metadata>
<files>
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\MonoAndroid10\PCLExt.FileStorage.Abstractions.xml" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.dll" target="lib\MonoAndroid10\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.xml" target="lib\MonoAndroid10\PCLExt.FileStorage.xml" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\MonoAndroid\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\MonoAndroid\PCLExt.FileStorage.Abstractions.xml" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.dll" target="lib\MonoAndroid\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.Android\bin\Release\PCLExt.FileStorage.xml" target="lib\MonoAndroid\PCLExt.FileStorage.xml" />

<file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\net45\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.NetFX\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\net45\PCLExt.FileStorage.Abstractions.xml" />
Expand All @@ -35,10 +35,15 @@
<file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.dll" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.Portable111\bin\Release\PCLExt.FileStorage.xml" target="lib\portable-net45+win8+wpa81\PCLExt.FileStorage.xml" />

<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.iOS10\PCLExt.FileStorage.Abstractions.xml" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.dll" target="lib\Xamarin.iOS10\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.xml" target="lib\Xamarin.iOS10\PCLExt.FileStorage.xml" />
<file src="..\src\PCLExt.FileStorage.UWP\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\uap10.0\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.UWP\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\uap10.0\PCLExt.FileStorage.Abstractions.xml" />
<file src="..\src\PCLExt.FileStorage.UWP\bin\Release\PCLExt.FileStorage.dll" target="lib\uap10.0\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.UWP\bin\Release\PCLExt.FileStorage.xml" target="lib\uap10.0\PCLExt.FileStorage.xml" />

<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.iOS\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.iOS\PCLExt.FileStorage.Abstractions.xml" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.dll" target="lib\Xamarin.iOS\PCLExt.FileStorage.dll" />
<file src="..\src\PCLExt.FileStorage.iOS\bin\Release\PCLExt.FileStorage.xml" target="lib\Xamarin.iOS\PCLExt.FileStorage.xml" />

<file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.Abstractions.dll" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.dll" />
<file src="..\src\PCLExt.FileStorage.macOS\bin\Release\PCLExt.FileStorage.Abstractions.xml" target="lib\Xamarin.Mac20\PCLExt.FileStorage.Abstractions.xml" />
Expand Down
19 changes: 0 additions & 19 deletions src/PCLExt.FileStorage.Android.Test/Assets/AboutAssets.txt

This file was deleted.

2 changes: 1 addition & 1 deletion src/PCLExt.FileStorage.Android.Test/MainActivity.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

namespace PCLExt.FileStorage.Android.Test
{
[Activity(Label = "PCLExt.FileStorage.Android.Test", MainLauncher = true, Icon = "@drawable/icon")]
[Activity(Label = "PCLExt.FileStorage.Android.Test", MainLauncher = true)]
public class MainActivity : TestSuiteActivity
{
protected override void OnCreate(Bundle bundle)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v8.0</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
Expand All @@ -30,6 +30,9 @@
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>PdbOnly</DebugType>
Expand Down Expand Up @@ -68,19 +71,8 @@
<Link>FoldersTest.cs</Link>
</Compile>
<Compile Include="MainActivity.cs" />
<Compile Include="Resources\Resource.Designer.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\AboutResources.txt" />
<None Include="Assets\AboutAssets.txt" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\drawable\Icon.png" />
</ItemGroup>
<ItemGroup>
<AndroidResource Include="Resources\values\Strings.xml" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
Expand All @@ -94,6 +86,7 @@
<Name>PCLExt.FileStorage.Standard.Abstractions</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.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.
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,98 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProductVersion>8.0.30703</ProductVersion>
<SchemaVersion>2.0</SchemaVersion>
<ProjectGuid>{CB89F319-1C9D-4574-8874-25F592EC76CD}</ProjectGuid>
<ProjectTypeGuids>{EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>PCLExt.FileStorage.Android.Test</RootNamespace>
<AssemblyName>PCLExt.FileStorage.Android.Test</AssemblyName>
<FileAlignment>512</FileAlignment>
<AndroidApplication>True</AndroidApplication>
<AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
<GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
<AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
<TargetFrameworkVersion>v7.1</TargetFrameworkVersion>
<AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>True</DebugSymbols>
<DebugType>Full</DebugType>
<Optimize>False</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>TRACE;DEBUG;NUNIT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>True</AndroidUseSharedRuntime>
<AndroidLinkMode>None</AndroidLinkMode>
<EmbedAssembliesIntoApk>False</EmbedAssembliesIntoApk>
<AotAssemblies>false</AotAssemblies>
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>PdbOnly</DebugType>
<DebugSymbols>True</DebugSymbols>
<Optimize>True</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE;NUNIT</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<AndroidUseSharedRuntime>False</AndroidUseSharedRuntime>
<AndroidLinkMode>SdkOnly</AndroidLinkMode>
<EmbedAssembliesIntoApk>True</EmbedAssembliesIntoApk>
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Android" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.Core" />
<Reference Include="System.Xml" />
<Reference Include="Xamarin.Android.NUnitLite" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
<Link>Properties\CommonAssemblyInfo.cs</Link>
</Compile>
<Compile Include="..\PCLExt.FileStorage.NetFX.Test\FilesTest.cs">
<Link>FilesTest.cs</Link>
</Compile>
<Compile Include="..\PCLExt.FileStorage.NetFX.Test\StandardFoldersTest.cs">
<Link>StandardFoldersTest.cs</Link>
</Compile>
<Compile Include="..\PCLExt.FileStorage.NetFX.Test\TestFolder.cs">
<Link>TestFolder.cs</Link>
</Compile>
<Compile Include="..\PCLExt.FileStorage.NetFX.Test\FoldersTest.cs">
<Link>FoldersTest.cs</Link>
</Compile>
<Compile Include="MainActivity.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="Properties\AndroidManifest.xml" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\PCLExt.FileStorage.Android\PCLExt.FileStorage.Android.csproj">
<Project>{8efc0559-3c9c-4d0c-a5a5-579e58ffe621}</Project>
<Name>PCLExt.FileStorage.Android</Name>
</ProjectReference>
<ProjectReference Include="..\PCLExt.FileStorage.Standard.Abstractions\PCLExt.FileStorage.Standard.Abstractions.csproj">
<Project>{5d529a12-f49c-40fe-b3c3-17747d73879e}</Project>
<Name>PCLExt.FileStorage.Standard.Abstractions</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.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">
</Target>
<Target Name="AfterBuild">
</Target>
-->
</Project>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="PCLExt.FileStorage.Android.Test.PCLExt.FileStorage.Android.Test" android:versionCode="1" android:versionName="1.0">
<uses-sdk android:minSdkVersion="16" />
<application android:label="PCLExt.FileStorage.Android.Test"></application>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" package="org.FileStorage.PCLExt" android:versionCode="1" android:versionName="1.0" android:installLocation="auto">
<uses-sdk android:minSdkVersion="16" />
<application android:label="PCLExt.FileStorage.Android.Test"></application>
</manifest>
Loading

0 comments on commit 94d04d7

Please sign in to comment.