Fixed macOS project

PCLExt · Oct 8, 2017 · 54ccde1 · 54ccde1
1 parent 848287e
commit 54ccde1
Show file tree

Hide file tree

Showing 3 changed files with 48 additions and 41 deletions.
diff --git a/PCLExt.FileStorage.sln b/PCLExt.FileStorage.sln
@@ -7,7 +7,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Android"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.iOS", "src\PCLExt.FileStorage.iOS\PCLExt.FileStorage.iOS.csproj", "{03DA3968-61A3-44D1-9F99-F55D31E07813}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.Core", "src\PCLExt.FileStorage.Core\PCLExt.FileStorage.Core.csproj", "{94E4FE17-7F2B-4623-8FFA-12F4056CCB2A}"
 EndProject
 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}"
 EndProject
@@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.NetFX",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PCLExt.FileStorage.macOS", "src\PCLExt.FileStorage.macOS\PCLExt.FileStorage.macOS.csproj", "{0B02DE9A-C3C5-4DB9-B87F-6B05C3566946}"
 EndProject
-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}"
+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}"
 EndProject
 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}"
 EndProject

diff --git a/src/PCLExt.FileStorage.Portable111/PortablePath.cs b/src/PCLExt.FileStorage.Portable111/PortablePath.cs
@@ -23,8 +23,8 @@ public static char DirectorySeparatorChar
         {
             get
             {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-                return System.IO.Path.DirectorySeparatorChar;
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+				return System.IO.Path.DirectorySeparatorChar;
 #endif
 
 				throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -38,8 +38,8 @@ public static char DirectorySeparatorChar
         /// <returns>A combined path.</returns>
         public static string Combine(params string[] paths)
         {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-            return System.IO.Path.Combine(paths);
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+			return System.IO.Path.Combine(paths);
 #endif
 
             throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -58,8 +58,8 @@ public static string Combine(params string[] paths)
         /// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
         public static string GetExtension(string path)
         {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-            return System.IO.Path.GetExtension(path);
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+			return System.IO.Path.GetExtension(path);
 #endif
 
             throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -82,8 +82,8 @@ public static string GetExtension(string path)
         /// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
         public static string GetFileName(string path)
         {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-            return System.IO.Path.GetFileName(path);
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+			return System.IO.Path.GetFileName(path);
 #endif
 
             throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -101,8 +101,8 @@ public static string GetFileName(string path)
         /// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
         public static string GetFileNameWithoutExtension(string path)
         {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-            return System.IO.Path.GetFileNameWithoutExtension(path);
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+			return System.IO.Path.GetFileNameWithoutExtension(path);
 #endif
 
             throw ExceptionsHelper.NotImplementedInReferenceAssembly();
@@ -121,8 +121,8 @@ public static string GetFileNameWithoutExtension(string path)
         /// <exception cref="System.ArgumentException"><paramref name="path" /> contains one or more invalid characters.</exception>
         public static bool HasExtension(string path)
         {
-#if NETSTANDARD2_0 || DESKTOP || MAC || ANDROID || __IOS__
-            return System.IO.Path.HasExtension(path);
+#if NETSTANDARD2_0 || DESKTOP || __MACOS__ || ANDROID || __IOS__
+			return System.IO.Path.HasExtension(path);
 #endif
 
             throw ExceptionsHelper.NotImplementedInReferenceAssembly();

diff --git a/src/PCLExt.FileStorage.macOS/PCLExt.FileStorage.macOS.csproj b/src/PCLExt.FileStorage.macOS/PCLExt.FileStorage.macOS.csproj
@@ -17,7 +17,7 @@
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
-    <DefineConstants>DEBUG;__UNIFIED__;MAC;COMMON;</DefineConstants>
+    <DefineConstants>__MACOS__;DEBUG;__UNIFIED__;</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <ConsolePause>false</ConsolePause>
@@ -57,58 +57,58 @@
     <Compile Include="..\PCLExt.FileStorage.NetFX\DefaultFolderImplementation.cs">
       <Link>DefaultFolderImplementation.cs</Link>
     </Compile>
-    <Compile Include="..\pclext.filestorage.portable\exceptions\ExceptionsHelper.cs">
+    <Compile Include="..\..\common\CommonAssemblyInfo.cs">
+      <Link>Properties\CommonAssemblyInfo.cs</Link>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\AwaitExtensions.cs">
+      <Link>Extensions\AwaitExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\FileExtensions.cs">
+      <Link>Extensions\FileExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Extensions\FolderExtensions.cs">
+      <Link>Extensions\FolderExtensions.cs</Link>
+    </Compile>
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\ExceptionsHelper.cs">
       <Link>Exceptions\ExceptionsHelper.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FileExistException.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FileExistException.cs">
       <Link>Exceptions\FileExistException.cs</Link>
     </Compile>
-    <Compile Include="..\pclext.filestorage.portable\exceptions\FileNotFoundException.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FileNotFoundException.cs">
       <Link>Exceptions\FileNotFoundException.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FolderExistException.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FolderExistException.cs">
       <Link>Exceptions\FolderExistException.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\FolderNotFoundException.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\FolderNotFoundException.cs">
       <Link>Exceptions\FolderNotFoundException.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Exceptions\RootFolderDeletionException.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Exceptions\RootFolderDeletionException.cs">
       <Link>Exceptions\RootFolderDeletionException.cs</Link>
     </Compile>
-    <Compile Include="..\pclext.filestorage.portable\extensions\AwaitExtensions.cs">
-      <Link>Extensions\AwaitExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\pclext.filestorage.portable\extensions\FileExtensions.cs">
-      <Link>Extensions\FileExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\pclext.filestorage.portable\extensions\FolderExtensions.cs">
-      <Link>Extensions\FolderExtensions.cs</Link>
-    </Compile>
-    <Compile Include="..\pclext.filestorage.portable\files\FileFromPath.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Files\FileFromPath.cs">
       <Link>Files\FileFromPath.cs</Link>
     </Compile>
-    <Compile Include="..\pclext.filestorage.portable\folders\ApplicationFolder.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Folders\ApplicationFolder.cs">
       <Link>Folders\ApplicationFolder.cs</Link>
     </Compile>
-    <Compile Include="..\pclext.filestorage.portable\folders\FolderFromPath.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Folders\FolderFromPath.cs">
       <Link>Folders\FolderFromPath.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Folders\LocalStorageFolder.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Folders\LocalStorageFolder.cs">
       <Link>Folders\LocalStorageFolder.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Folders\RoamingStorageFolder.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Folders\RoamingStorageFolder.cs">
       <Link>Folders\RoamingStorageFolder.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\PortablePath.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\PortablePath.cs">
       <Link>PortablePath.cs</Link>
     </Compile>
-    <Compile Include="..\PCLExt.FileStorage.Portable\Requires.cs">
+    <Compile Include="..\PCLExt.FileStorage.Portable111\Requires.cs">
       <Link>Requires.cs</Link>
     </Compile>
-    <Compile Include="..\..\common\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
-    </Compile>
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />
   <ItemGroup>
@@ -117,4 +117,11 @@
       <Name>PCLExt.FileStorage.Standard.Abstractions</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="Extensions\" />
+    <Folder Include="Extensions\" />
+    <Folder Include="Exceptions\" />
+    <Folder Include="Files\" />
+    <Folder Include="Folders\" />
+  </ItemGroup>
 </Project>