Multi targeting (#116)

* added multi-targeting project Plugin.FilePicker changed solution to only include one project renamed all shared, abstraction and implementation files according to their platforms removed platform specific .csproj files removed AssemblyInfo.cs and resources; infos now also in .csproj new project generated by jamesmontemagno's "Cross-Platform .NET Standard Plugin Templates" project template see: https://marketplace.visualstudio.com/items?itemName=vs-publisher-473885.PluginForXamarinTemplates * updated sample projects to use multi-targeting project updated solution files with single new csproj file replaced direct references from sample platform project to plugin platform project with reference to multi-targeting project * made FilePickerEventArgs and FilePickerCancelledEventArgs internal * made ReadFully() internal and removed Obsolete attribute
jfversluis · Nov 28, 2018 · 752f6b6 · 752f6b6
1 parent 68721fa
commit 752f6b6
Show file tree

Hide file tree

Showing 40 changed files with 168 additions and 1,181 deletions.
diff --git a/nuget/Plugin.FilePicker.nuspec b/nuget/Plugin.FilePicker.nuspec
diff --git a/samples/Plugin.FilePicker.Sample.Forms.sln b/samples/Plugin.FilePicker.Sample.Forms.sln
diff --git a/samples/Plugin.FilePicker.Sample.Forms/Droid/Plugin.FilePicker.Sample.Forms.Droid.csproj b/samples/Plugin.FilePicker.Sample.Forms/Droid/Plugin.FilePicker.Sample.Forms.Droid.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -46,14 +46,14 @@
     <Reference Include="Mono.Android" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj">
+      <Project>{507fa967-a579-44fe-9ca3-7cee18b5257b}</Project>
+      <Name>Plugin.FilePicker</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Forms\Plugin.FilePicker.Sample.Forms.csproj">
       <Project>{bc539575-3b77-4a4a-8f3a-2203bb590674}</Project>
       <Name>Plugin.FilePicker.Sample.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.Android\Plugin.FilePicker.Android.csproj">
-      <Project>{56A56F17-7DE1-4CA1-9617-BF32E971AC84}</Project>
-      <Name>Plugin.FilePicker.Android</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MainActivity.cs" />

diff --git a/samples/Plugin.FilePicker.Sample.Forms/Forms/Plugin.FilePicker.Sample.Forms.csproj b/samples/Plugin.FilePicker.Sample.Forms/Forms/Plugin.FilePicker.Sample.Forms.csproj
@@ -8,16 +8,9 @@
     <DebugSymbols>true</DebugSymbols>
   </PropertyGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.Abstractions\Plugin.FilePicker.Abstractions.csproj">
-      <Project>{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}</Project>
-      <Name>Plugin.FilePicker.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker\Plugin.FilePicker.csproj">
-      <Project>{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}</Project>
-      <Name>Plugin.FilePicker</Name>
-    </ProjectReference>
+    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Xamarin.Forms" Version="3.3.0.912540" />
+    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj" />
   </ItemGroup>
 </Project>
diff --git a/samples/Plugin.FilePicker.Sample.Forms/UWP/Plugin.FilePicker.Sample.Forms.UWP.csproj b/samples/Plugin.FilePicker.Sample.Forms/UWP/Plugin.FilePicker.Sample.Forms.UWP.csproj
@@ -147,9 +147,9 @@
     <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.1.9" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.UWP\Plugin.FilePicker.UWP.csproj">
-      <Project>{e34b516d-c0d8-450f-9db0-bb6a5b04aef1}</Project>
-      <Name>Plugin.FilePicker.UWP</Name>
+    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj">
+      <Project>{507fa967-a579-44fe-9ca3-7cee18b5257b}</Project>
+      <Name>Plugin.FilePicker</Name>
     </ProjectReference>
     <ProjectReference Include="..\Forms\Plugin.FilePicker.Sample.Forms.csproj">
       <Project>{bc539575-3b77-4a4a-8f3a-2203bb590674}</Project>

diff --git a/samples/Plugin.FilePicker.Sample.Forms/WPF/Plugin.FilePicker.Sample.Forms.WPF.csproj b/samples/Plugin.FilePicker.Sample.Forms/WPF/Plugin.FilePicker.Sample.Forms.WPF.csproj
@@ -103,9 +103,9 @@
     </PackageReference>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.WPF\Plugin.FilePicker.WPF.csproj">
-      <Project>{73df68cb-676a-48c2-9f2c-87a713746c39}</Project>
-      <Name>Plugin.FilePicker.WPF</Name>
+    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj">
+      <Project>{507fa967-a579-44fe-9ca3-7cee18b5257b}</Project>
+      <Name>Plugin.FilePicker</Name>
     </ProjectReference>
     <ProjectReference Include="..\Forms\Plugin.FilePicker.Sample.Forms.csproj">
       <Project>{bc539575-3b77-4a4a-8f3a-2203bb590674}</Project>

diff --git a/samples/Plugin.FilePicker.Sample.Forms/iOS/Plugin.FilePicker.Sample.Forms.iOS.csproj b/samples/Plugin.FilePicker.Sample.Forms/iOS/Plugin.FilePicker.Sample.Forms.iOS.csproj
@@ -88,14 +88,14 @@
     <Reference Include="Xamarin.iOS" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj">
+      <Project>{507fa967-a579-44fe-9ca3-7cee18b5257b}</Project>
+      <Name>Plugin.FilePicker</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Forms\Plugin.FilePicker.Sample.Forms.csproj">
       <Project>{BC539575-3B77-4A4A-8F3A-2203BB590674}</Project>
       <Name>Plugin.FilePicker.Sample.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\src\Plugin.FilePicker\Plugin.FilePicker.iOS\Plugin.FilePicker.iOS.csproj">
-      <Project>{2882AEEB-D4CD-4EB9-8A6C-6653B33681F0}</Project>
-      <Name>Plugin.FilePicker.iOS</Name>
-    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <ImageAsset Include="Assets.xcassets\AppIcon.appiconset\Contents.json">

diff --git a/samples/Plugin.FilePicker.Sample.MacOS.sln b/samples/Plugin.FilePicker.Sample.MacOS.sln
@@ -1,13 +1,10 @@
-
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2012
+# Visual Studio 15
+VisualStudioVersion = 15.0.28307.106
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FilePicker.Sample.MacOS", "Plugin.FilePicker.Sample.MacOS\Plugin.FilePicker.Sample.MacOS.csproj", "{92CFD27C-94BF-42CB-B60D-30CE3406A611}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FilePicker", "..\src\Plugin.FilePicker\Plugin.FilePicker\Plugin.FilePicker.csproj", "{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FilePicker.Abstractions", "..\src\Plugin.FilePicker\Plugin.FilePicker.Abstractions\Plugin.FilePicker.Abstractions.csproj", "{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.FilePicker.Mac", "..\src\Plugin.FilePicker\Plugin.FilePicker.Mac\Plugin.FilePicker.Mac.csproj", "{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Plugin.FilePicker", "..\src\Plugin.FilePicker\Plugin.FilePicker.csproj", "{AFA28E9B-19A5-4E80-83CE-DD4C551646A1}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -19,17 +16,15 @@ Global
 		{92CFD27C-94BF-42CB-B60D-30CE3406A611}.Debug|x86.Build.0 = Debug|x86
 		{92CFD27C-94BF-42CB-B60D-30CE3406A611}.Release|x86.ActiveCfg = Release|x86
 		{92CFD27C-94BF-42CB-B60D-30CE3406A611}.Release|x86.Build.0 = Release|x86
-		{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Debug|x86.Build.0 = Debug|Any CPU
-		{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x86.ActiveCfg = Release|Any CPU
-		{A6FCEF44-D2BA-42C7-B3CB-13667BCD7B54}.Release|x86.Build.0 = Release|Any CPU
-		{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Debug|x86.Build.0 = Debug|Any CPU
-		{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.ActiveCfg = Release|Any CPU
-		{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}.Release|x86.Build.0 = Release|Any CPU
-		{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}.Debug|x86.Build.0 = Debug|Any CPU
-		{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}.Release|x86.ActiveCfg = Release|Any CPU
-		{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}.Release|x86.Build.0 = Release|Any CPU
+		{AFA28E9B-19A5-4E80-83CE-DD4C551646A1}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{AFA28E9B-19A5-4E80-83CE-DD4C551646A1}.Debug|x86.Build.0 = Debug|Any CPU
+		{AFA28E9B-19A5-4E80-83CE-DD4C551646A1}.Release|x86.ActiveCfg = Release|Any CPU
+		{AFA28E9B-19A5-4E80-83CE-DD4C551646A1}.Release|x86.Build.0 = Release|Any CPU
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {7C7657A2-4EFE-4922-B459-384342B7E7F9}
 	EndGlobalSection
 EndGlobal
diff --git a/samples/Plugin.FilePicker.Sample.MacOS/Plugin.FilePicker.Sample.MacOS.csproj b/samples/Plugin.FilePicker.Sample.MacOS/Plugin.FilePicker.Sample.MacOS.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -83,13 +83,9 @@
     <InterfaceDefinition Include="Main.storyboard" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Plugin.FilePicker\Plugin.FilePicker.Abstractions\Plugin.FilePicker.Abstractions.csproj">
-      <Project>{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}</Project>
-      <Name>Plugin.FilePicker.Abstractions</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\src\Plugin.FilePicker\Plugin.FilePicker.Mac\Plugin.FilePicker.Mac.csproj">
-      <Project>{C1E6D43D-38EB-4673-A9AA-8B1116CE9C10}</Project>
-      <Name>Plugin.FilePicker.Mac</Name>
+    <ProjectReference Include="..\..\src\Plugin.FilePicker\Plugin.FilePicker.csproj">
+      <Project>{afa28e9b-19a5-4e80-83ce-dd4c551646a1}</Project>
+      <Name>Plugin.FilePicker</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.CSharp.targets" />