Skip to content

Commit 54ccde1

Browse files
AragasAragas
committed
Fixed macOS project
1 parent 848287e commit 54ccde1

File tree

3 files changed

+48
-41
lines changed

3 files changed

+48
-41
lines changed

‎PCLExt.FileStorage.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Android"
77
EndProject
88
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.iOS", "src\PCLExt.FileStorage.iOS\PCLExt.FileStorage.iOS.csproj", "{03DA3968-61A3-44D1-9F99-F55D31E07813}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
10+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
1111
EndProject
1212
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Android.Test", "src\PCLExt.FileStorage.Android.Test\PCLExt.FileStorage.Android.Test.csproj", "{CB89F319-1C9D-4574-8874-25F592EC76CD}"
1313
EndProject
@@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.NetFX",
1717
EndProject
1818
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.macOS", "src\PCLExt.FileStorage.macOS\PCLExt.FileStorage.macOS.csproj", "{0B02DE9A-C3C5-4DB9-B87F-6B05C3566946}"
1919
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Core.Test", "src\PCLExt.FileStorage.Core.Test\PCLExt.FileStorage.Core.Test.csproj", "{316FFBA8-57A8-4B4A-8352-F1E3361D8710}"
20+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Core.Test", "src\PCLExt.FileStorage.Core.Test\PCLExt.FileStorage.Core.Test.csproj", "{316FFBA8-57A8-4B4A-8352-F1E3361D8710}"
2121
EndProject
2222
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.NetFX.Test", "src\PCLExt.FileStorage.NetFX.Test\PCLExt.FileStorage.NetFX.Test.csproj", "{119368DE-E6BD-4746-BCD8-BBFE458579CC}"
2323
EndProject

‎src/PCLExt.FileStorage.Portable111/PortablePath.cs‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ public static char DirectorySeparatorChar
2323
{
2424
get
2525
{
26-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
27-
return System.IO.Path.DirectorySeparatorChar;
26+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
27+
return System.IO.Path.DirectorySeparatorChar;
2828
#endif
2929

3030
throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -38,8 +38,8 @@ public static char DirectorySeparatorChar
3838
/// <returns>A combined path.</returns>
3939
public static string Combine(params string[] paths)
4040
{
41-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
42-
return System.IO.Path.Combine(paths);
41+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
42+
return System.IO.Path.Combine(paths);
4343
#endif
4444

4545
throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -58,8 +58,8 @@ public static string Combine(params string[] paths)
5858
/// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
5959
public static string GetExtension(string path)
6060
{
61-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
62-
return System.IO.Path.GetExtension(path);
61+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
62+
return System.IO.Path.GetExtension(path);
6363
#endif
6464

6565
throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -82,8 +82,8 @@ public static string GetExtension(string path)
8282
/// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
8383
public static string GetFileName(string path)
8484
{
85-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
86-
return System.IO.Path.GetFileName(path);
85+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
86+
return System.IO.Path.GetFileName(path);
8787
#endif
8888

8989
throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -101,8 +101,8 @@ public static string GetFileName(string path)
101101
/// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
102102
public static string GetFileNameWithoutExtension(string path)
103103
{
104-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
105-
return System.IO.Path.GetFileNameWithoutExtension(path);
104+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
105+
return System.IO.Path.GetFileNameWithoutExtension(path);
106106
#endif
107107

108108
throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -121,8 +121,8 @@ public static string GetFileNameWithoutExtension(string path)
121121
/// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
122122
public static bool HasExtension(string path)
123123
{
124-
#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
125-
return System.IO.Path.HasExtension(path);
124+
#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
125+
return System.IO.Path.HasExtension(path);
126126
#endif
127127

128128
throw ExceptionsHelper.NotImplementedInReferenceAssembly();

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

Lines changed: 34 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
<DebugType>full</DebugType>
1818
<Optimize>false</Optimize>
1919
<OutputPath>bin\Debug</OutputPath>
20-
<DefineConstants>DEBUG;__UNIFIED__;MAC;COMMON;</DefineConstants>
20+
<DefineConstants>__MACOS__;DEBUG;__UNIFIED__;</DefineConstants>
2121
<ErrorReport>prompt</ErrorReport>
2222
<WarningLevel>4</WarningLevel>
2323
<ConsolePause>false</ConsolePause>
@@ -57,58 +57,58 @@
5757
<Compile Include="..\PCLExt.FileStorage.NetFX\DefaultFolderImplementation.cs">
5858
<Link>DefaultFolderImplementation.cs</Link>
5959
</Compile>
60-
<Compile Include="..\pclext.filestorage.portable\exceptions\ExceptionsHelper.cs">
60+
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
61+
<Link>Properties\CommonAssemblyInfo.cs</Link>
62+
</Compile>
63+
<Compile Include="Properties\AssemblyInfo.cs" />
64+
<Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\AwaitExtensions.cs">
65+
<Link>Extensions\AwaitExtensions.cs</Link>
66+
</Compile>
67+
<Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\FileExtensions.cs">
68+
<Link>Extensions\FileExtensions.cs</Link>
69+
</Compile>
70+
<Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\FolderExtensions.cs">
71+
<Link>Extensions\FolderExtensions.cs</Link>
72+
</Compile>
73+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\ExceptionsHelper.cs">
6174
<Link>Exceptions\ExceptionsHelper.cs</Link>
6275
</Compile>
63-
<Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FileExistException.cs">
76+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FileExistException.cs">
6477
<Link>Exceptions\FileExistException.cs</Link>
6578
</Compile>
66-
<Compile Include="..\pclext.filestorage.portable\exceptions\FileNotFoundException.cs">
79+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FileNotFoundException.cs">
6780
<Link>Exceptions\FileNotFoundException.cs</Link>
6881
</Compile>
69-
<Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FolderExistException.cs">
82+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FolderExistException.cs">
7083
<Link>Exceptions\FolderExistException.cs</Link>
7184
</Compile>
72-
<Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FolderNotFoundException.cs">
85+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FolderNotFoundException.cs">
7386
<Link>Exceptions\FolderNotFoundException.cs</Link>
7487
</Compile>
75-
<Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\RootFolderDeletionException.cs">
88+
<Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\RootFolderDeletionException.cs">
7689
<Link>Exceptions\RootFolderDeletionException.cs</Link>
7790
</Compile>
78-
<Compile Include="..\pclext.filestorage.portable\extensions\AwaitExtensions.cs">
79-
<Link>Extensions\AwaitExtensions.cs</Link>
80-
</Compile>
81-
<Compile Include="..\pclext.filestorage.portable\extensions\FileExtensions.cs">
82-
<Link>Extensions\FileExtensions.cs</Link>
83-
</Compile>
84-
<Compile Include="..\pclext.filestorage.portable\extensions\FolderExtensions.cs">
85-
<Link>Extensions\FolderExtensions.cs</Link>
86-
</Compile>
87-
<Compile Include="..\pclext.filestorage.portable\files\FileFromPath.cs">
91+
<Compile Include="..\PCLExt.FileStorage.Portable111\Files\FileFromPath.cs">
8892
<Link>Files\FileFromPath.cs</Link>
8993
</Compile>
90-
<Compile Include="..\pclext.filestorage.portable\folders\ApplicationFolder.cs">
94+
<Compile Include="..\PCLExt.FileStorage.Portable111\Folders\ApplicationFolder.cs">
9195
<Link>Folders\ApplicationFolder.cs</Link>
9296
</Compile>
93-
<Compile Include="..\pclext.filestorage.portable\folders\FolderFromPath.cs">
97+
<Compile Include="..\PCLExt.FileStorage.Portable111\Folders\FolderFromPath.cs">
9498
<Link>Folders\FolderFromPath.cs</Link>
9599
</Compile>
96-
<Compile Include="..\PCLExt.FileStorage.Portable\Folders\LocalStorageFolder.cs">
100+
<Compile Include="..\PCLExt.FileStorage.Portable111\Folders\LocalStorageFolder.cs">
97101
<Link>Folders\LocalStorageFolder.cs</Link>
98102
</Compile>
99-
<Compile Include="..\PCLExt.FileStorage.Portable\Folders\RoamingStorageFolder.cs">
103+
<Compile Include="..\PCLExt.FileStorage.Portable111\Folders\RoamingStorageFolder.cs">
100104
<Link>Folders\RoamingStorageFolder.cs</Link>
101105
</Compile>
102-
<Compile Include="..\PCLExt.FileStorage.Portable\PortablePath.cs">
106+
<Compile Include="..\PCLExt.FileStorage.Portable111\PortablePath.cs">
103107
<Link>PortablePath.cs</Link>
104108
</Compile>
105-
<Compile Include="..\PCLExt.FileStorage.Portable\Requires.cs">
109+
<Compile Include="..\PCLExt.FileStorage.Portable111\Requires.cs">
106110
<Link>Requires.cs</Link>
107111
</Compile>
108-
<Compile Include="..\..\common\CommonAssemblyInfo.cs">
109-
<Link>Properties\CommonAssemblyInfo.cs</Link>
110-
</Compile>
111-
<Compile Include="Properties\AssemblyInfo.cs" />
112112
</ItemGroup>
113113
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
114114
<ItemGroup>
@@ -117,4 +117,11 @@
117117
<Name>PCLExt.FileStorage.Standard.Abstractions</Name>
118118
</ProjectReference>
119119
</ItemGroup>
120+
<ItemGroup>
121+
<Folder Include="Extensions\" />
122+
<Folder Include="Extensions\" />
123+
<Folder Include="Exceptions\" />
124+
<Folder Include="Files\" />
125+
<Folder Include="Folders\" />
126+
</ItemGroup>
120127
</Project>

0 commit comments

Comments
 (0)