Skip to content

Commit 9c0ccb5

Browse files
AragasAragas
committed
Fix
1 parent af42741 commit 9c0ccb5

File tree

8 files changed

+88
-37
lines changed

8 files changed

+88
-37
lines changed

‎common/PCLExt.FileStorage.nuspec‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
33
<metadata>
44
<id>PCLExt.FileStorage</id>
5-
<version>1.0.4</version>
5+
<version>1.0.5</version>
66
<title>PCL Extension - File Storage API</title>
77
<authors>Daniel Plaisted,Aragas</authors>
88
<owners>Aragas</owners>

‎src/PCLExt.FileStorage.Abstractions/PCLExt.FileStorage.Abstractions.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
<DocumentationFile>bin\Release\PCLExt.FileStorage.Abstractions.xml</DocumentationFile>
3535
</PropertyGroup>
3636
<ItemGroup>
37-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
37+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
3838
<Link>Properties\CommonAssemblyInfo.cs</Link>
3939
</Compile>
4040
<Compile Include="ExistenceCheckResult.cs" />

‎src/PCLExt.FileStorage.Android/PCLExt.FileStorage.Android.csproj‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,34 +41,37 @@
4141
<Reference Include="System.Xml" />
4242
</ItemGroup>
4343
<ItemGroup>
44-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
44+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
4545
<Link>Properties\CommonAssemblyInfo.cs</Link>
4646
</Compile>
47-
<Compile Include="..\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
47+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
4848
<Link>DesktopFileSystem.cs</Link>
4949
</Compile>
50-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
50+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
5151
<Link>FileSystemFile.cs</Link>
5252
</Compile>
53-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
53+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
5454
<Link>FileSystemFolder.cs</Link>
5555
</Compile>
56-
<Compile Include="..\PCLExt.FileStorage\AwaitExtensions.cs">
56+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\AwaitExtensions.cs">
5757
<Link>AwaitExtensions.cs</Link>
5858
</Compile>
59-
<Compile Include="..\PCLExt.FileStorage\PortablePath.cs">
59+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\PortablePath.cs">
6060
<Link>PortablePath.cs</Link>
6161
</Compile>
62-
<Compile Include="..\PCLExt.FileStorage\Requires.cs">
62+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Requires.cs">
6363
<Link>Requires.cs</Link>
6464
</Compile>
65+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Storage.cs">
66+
<Link>Storage.cs</Link>
67+
</Compile>
6568
<Compile Include="Properties\AssemblyInfo.cs" />
66-
<Compile Include="..\PCLExt.FileStorage\FileSystem.cs">
69+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\FileSystem.cs">
6770
<Link>FileSystem.cs</Link>
6871
</Compile>
6972
</ItemGroup>
7073
<ItemGroup>
71-
<ProjectReference Include="..\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
74+
<ProjectReference Include="$(SolutionDir)\src\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
7275
<Project>{3F8D0494-6EE2-47FE-B263-F09A5EA3D0B3}</Project>
7376
<Name>PCLExt.FileStorage.Abstractions</Name>
7477
</ProjectReference>

‎src/PCLExt.FileStorage.Desktop/PCLExt.FileStorage.Desktop.csproj‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -42,28 +42,31 @@
4242
<Reference Include="System.Xml" />
4343
</ItemGroup>
4444
<ItemGroup>
45-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
45+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
4646
<Link>Properties\CommonAssemblyInfo.cs</Link>
4747
</Compile>
48-
<Compile Include="..\PCLExt.FileStorage\AwaitExtensions.cs">
48+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\AwaitExtensions.cs">
4949
<Link>AwaitExtensions.cs</Link>
5050
</Compile>
51-
<Compile Include="..\PCLExt.FileStorage\FileSystem.cs">
51+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\FileSystem.cs">
5252
<Link>FileSystem.cs</Link>
5353
</Compile>
54-
<Compile Include="..\PCLExt.FileStorage\PortablePath.cs">
54+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\PortablePath.cs">
5555
<Link>PortablePath.cs</Link>
5656
</Compile>
57-
<Compile Include="..\PCLExt.FileStorage\Requires.cs">
57+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Requires.cs">
5858
<Link>Requires.cs</Link>
5959
</Compile>
60+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Storage.cs">
61+
<Link>Storage.cs</Link>
62+
</Compile>
6063
<Compile Include="DesktopFileSystem.cs" />
6164
<Compile Include="FileSystemFile.cs" />
6265
<Compile Include="FileSystemFolder.cs" />
6366
<Compile Include="Properties\AssemblyInfo.cs" />
6467
</ItemGroup>
6568
<ItemGroup>
66-
<ProjectReference Include="..\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
69+
<ProjectReference Include="$(SolutionDir)\src\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
6770
<Project>{3F8D0494-6EE2-47FE-B263-F09A5EA3D0B3}</Project>
6871
<Name>PCLExt.FileStorage.Abstractions</Name>
6972
</ProjectReference>

‎src/PCLExt.FileStorage.Mac/PCLExt.FileStorage.Mac.csproj‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -51,38 +51,41 @@
5151
<Reference Include="Xamarin.Mac" />
5252
</ItemGroup>
5353
<ItemGroup>
54-
<Compile Include="..\PCLExt.FileStorage\AwaitExtensions.cs">
54+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\AwaitExtensions.cs">
5555
<Link>AwaitExtensions.cs</Link>
5656
</Compile>
57-
<Compile Include="..\PCLExt.FileStorage\FileSystem.cs">
57+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\FileSystem.cs">
5858
<Link>FileSystem.cs</Link>
5959
</Compile>
60-
<Compile Include="..\PCLExt.FileStorage\PortablePath.cs">
60+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\PortablePath.cs">
6161
<Link>PortablePath.cs</Link>
6262
</Compile>
63-
<Compile Include="..\PCLExt.FileStorage\Requires.cs">
63+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Requires.cs">
6464
<Link>Requires.cs</Link>
6565
</Compile>
66-
<Compile Include="..\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
66+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
6767
<Link>DesktopFileSystem.cs</Link>
6868
</Compile>
69-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
69+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
7070
<Link>FileSystemFolder.cs</Link>
7171
</Compile>
72-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
72+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
7373
<Link>FileSystemFile.cs</Link>
7474
</Compile>
75-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
75+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
7676
<Link>Properties\CommonAssemblyInfo.cs</Link>
7777
</Compile>
7878
<Compile Include="Properties\AssemblyInfo.cs" />
79+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Storage.cs">
80+
<Link>Storage.cs</Link>
81+
</Compile>
7982
</ItemGroup>
8083
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
8184
<ItemGroup>
8285
<Folder Include="Properties\" />
8386
</ItemGroup>
8487
<ItemGroup>
85-
<ProjectReference Include="..\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
88+
<ProjectReference Include="$(SolutionDir)\src\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
8689
<Project>{3F8D0494-6EE2-47FE-B263-F09A5EA3D0B3}</Project>
8790
<Name>PCLExt.FileStorage.Abstractions</Name>
8891
</ProjectReference>

‎src/PCLExt.FileStorage.iOS/PCLExt.FileStorage.iOS.csproj‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -43,34 +43,37 @@
4343
</ItemGroup>
4444
<ItemGroup />
4545
<ItemGroup>
46-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
46+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
4747
<Link>Properties\CommonAssemblyInfo.cs</Link>
4848
</Compile>
49-
<Compile Include="..\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
49+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\DesktopFileSystem.cs">
5050
<Link>DesktopFileSystem.cs</Link>
5151
</Compile>
52-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
52+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFile.cs">
5353
<Link>FileSystemFile.cs</Link>
5454
</Compile>
55-
<Compile Include="..\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
55+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage.Desktop\FileSystemFolder.cs">
5656
<Link>FileSystemFolder.cs</Link>
5757
</Compile>
58-
<Compile Include="..\PCLExt.FileStorage\AwaitExtensions.cs">
58+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\AwaitExtensions.cs">
5959
<Link>AwaitExtensions.cs</Link>
6060
</Compile>
61-
<Compile Include="..\PCLExt.FileStorage\PortablePath.cs">
61+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\PortablePath.cs">
6262
<Link>PortablePath.cs</Link>
6363
</Compile>
64-
<Compile Include="..\PCLExt.FileStorage\Requires.cs">
64+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Requires.cs">
6565
<Link>Requires.cs</Link>
6666
</Compile>
67+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\Storage.cs">
68+
<Link>Storage.cs</Link>
69+
</Compile>
6770
<Compile Include="Properties\AssemblyInfo.cs" />
68-
<Compile Include="..\PCLExt.FileStorage\FileSystem.cs">
71+
<Compile Include="$(SolutionDir)\src\PCLExt.FileStorage\FileSystem.cs">
6972
<Link>FileSystem.cs</Link>
7073
</Compile>
7174
</ItemGroup>
7275
<ItemGroup>
73-
<ProjectReference Include="..\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
76+
<ProjectReference Include="$(SolutionDir)\src\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
7477
<Project>{3F8D0494-6EE2-47FE-B263-F09A5EA3D0B3}</Project>
7578
<Name>PCLExt.FileStorage.Abstractions</Name>
7679
</ProjectReference>

‎src/PCLExt.FileStorage/PCLExt.FileStorage.csproj‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
<!-- A reference to the entire .NET Framework is automatically included -->
3838
</ItemGroup>
3939
<ItemGroup>
40-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
40+
<Compile Include="$(SolutionDir)\common\CommonAssemblyInfo.cs">
4141
<Link>Properties\CommonAssemblyInfo.cs</Link>
4242
</Compile>
4343
<Compile Include="AwaitExtensions.cs" />
@@ -46,9 +46,10 @@
4646
<Compile Include="Properties\AssemblyInfo.cs" />
4747
<Compile Include="Requires.cs" />
4848
<Compile Include="Exceptions.cs" />
49+
<Compile Include="Storage.cs" />
4950
</ItemGroup>
5051
<ItemGroup>
51-
<ProjectReference Include="..\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
52+
<ProjectReference Include="$(SolutionDir)\src\PCLExt.FileStorage.Abstractions\PCLExt.FileStorage.Abstractions.csproj">
5253
<Project>{3F8D0494-6EE2-47FE-B263-F09A5EA3D0B3}</Project>
5354
<Name>PCLExt.FileStorage.Abstractions</Name>
5455
</ProjectReference>

‎src/PCLExt.FileStorage/Storage.cs‎

Lines changed: 38 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,38 @@
1+
namespace PCLExt.FileStorage
2+
{
3+
public static class Storage
4+
{
5+
public static IFolder BaseFolder { get; }
6+
7+
public static IFolder SettingsFolder { get; }
8+
9+
public static IFolder LogFolder { get; }
10+
public static IFolder CrashLogFolder { get; }
11+
12+
public static IFolder LuaFolder { get; }
13+
14+
public static IFolder DatabaseFolder { get; }
15+
16+
public static IFolder ContentFolder { get; }
17+
18+
static Storage()
19+
{
20+
IFolder BaseFolder = null;
21+
if (FileSystem.Current.BaseStorage != null)
22+
BaseFolder = FileSystem.Current.BaseStorage;
23+
else if (FileSystem.Current.LocalStorage != null)
24+
BaseFolder = FileSystem.Current.LocalStorage;
25+
else if (FileSystem.Current.RoamingStorage != null)
26+
BaseFolder = FileSystem.Current.RoamingStorage;
27+
28+
29+
30+
SettingsFolder = BaseFolder.CreateFolderAsync("Settings", CreationCollisionOption.OpenIfExists).Result;
31+
LogFolder = BaseFolder.CreateFolderAsync("Logs", CreationCollisionOption.OpenIfExists).Result;
32+
CrashLogFolder = LogFolder.CreateFolderAsync("CrashLogs", CreationCollisionOption.OpenIfExists).Result;
33+
LuaFolder = BaseFolder.CreateFolderAsync("Lua", CreationCollisionOption.OpenIfExists).Result;
34+
DatabaseFolder = BaseFolder.CreateFolderAsync("Database", CreationCollisionOption.OpenIfExists).Result;
35+
ContentFolder = BaseFolder.CreateFolderAsync("Content", CreationCollisionOption.OpenIfExists).Result;
36+
}
37+
}
38+
}

0 commit comments

Comments
 (0)