Move Forms

Baseflow · Mar 17, 2017 · 6c58d37 · 6c58d37
1 parent 1b2b989
commit 6c58d37
Show file tree

Hide file tree

Showing 26 changed files with 16 additions and 15 deletions.
diff --git a/.../Plugin.MediaManager.Forms.Android.csproj → .../Plugin.MediaManager.Forms.Android.csproj b/.../Plugin.MediaManager.Forms.Android.csproj → .../Plugin.MediaManager.Forms.Android.csproj
@@ -129,7 +129,7 @@
       <Project>{56A56F17-7DE1-4CA1-9617-BF32E971AC84}</Project>
       <Name>Plugin.MediaManager.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>

diff --git a/....Forms.Android/Properties/AssemblyInfo.cs → ....Forms.Android/Properties/AssemblyInfo.cs b/....Forms.Android/Properties/AssemblyInfo.cs → ....Forms.Android/Properties/AssemblyInfo.cs
diff --git a/...orms.Android/Resources/AboutResources.txt → ...orms.Android/Resources/AboutResources.txt b/...orms.Android/Resources/AboutResources.txt → ...orms.Android/Resources/AboutResources.txt
diff --git a/...orms.Android/Resources/Values/Strings.xml → ...orms.Android/Resources/Values/Strings.xml b/...orms.Android/Resources/Values/Strings.xml → ...orms.Android/Resources/Values/Strings.xml
diff --git a/...anager.Forms.Android/VideoViewRenderer.cs → ...anager.Forms.Android/VideoViewRenderer.cs b/...anager.Forms.Android/VideoViewRenderer.cs → ...anager.Forms.Android/VideoViewRenderer.cs
diff --git a/...ediaManager.Forms.Android/packages.config → ...ediaManager.Forms.Android/packages.config b/...ediaManager.Forms.Android/packages.config → ...ediaManager.Forms.Android/packages.config
diff --git a/....UWP/Plugin.MediaManager.Forms.UWP.csproj → ....UWP/Plugin.MediaManager.Forms.UWP.csproj b/....UWP/Plugin.MediaManager.Forms.UWP.csproj → ....UWP/Plugin.MediaManager.Forms.UWP.csproj
@@ -121,7 +121,7 @@
       <Project>{e34b516d-c0d8-450f-9db0-bb6a5b04aef1}</Project>
       <Name>Plugin.MediaManager.UWP</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67f9d3a8-f71e-4428-913f-c37ae82cdb24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>

diff --git a/...ugin.MediaManager.Forms.UWP.nuget.targets → ...ugin.MediaManager.Forms.UWP.nuget.targets b/...ugin.MediaManager.Forms.UWP.nuget.targets → ...ugin.MediaManager.Forms.UWP.nuget.targets
@@ -3,7 +3,7 @@
   <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
     <RestoreSuccess Condition=" '$(RestoreSuccess)' == '' ">True</RestoreSuccess>
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
-    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">Y:\Documents\XamarinMediaManager\MediaManager.Forms\Plugin.MediaManager.Forms.UWP\project.lock.json</ProjectAssetsFile>
+    <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">Y:\Documents\XamarinMediaManager\MediaManager.Forms\MediaManager.Forms.UWP\project.lock.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
     <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Martijn\.nuget\packages\</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">ProjectJson</NuGetProjectStyle>

diff --git a/...diaManager.XamarinForms.UWP.nuget.targets → ...diaManager.XamarinForms.UWP.nuget.targets b/...diaManager.XamarinForms.UWP.nuget.targets → ...diaManager.XamarinForms.UWP.nuget.targets
diff --git a/...ager.Forms.UWP/Properties/AssemblyInfo.cs → ...ager.Forms.UWP/Properties/AssemblyInfo.cs b/...ager.Forms.UWP/Properties/AssemblyInfo.cs → ...ager.Forms.UWP/Properties/AssemblyInfo.cs
diff --git a/...ugin.MediaManager.XamarinForms.UWP.rd.xml → ...ugin.MediaManager.XamarinForms.UWP.rd.xml b/...ugin.MediaManager.XamarinForms.UWP.rd.xml → ...ugin.MediaManager.XamarinForms.UWP.rd.xml
diff --git a/...diaManager.Forms.UWP/VideoViewRenderer.cs → ...diaManager.Forms.UWP/VideoViewRenderer.cs b/...diaManager.Forms.UWP/VideoViewRenderer.cs → ...diaManager.Forms.UWP/VideoViewRenderer.cs
diff --git a/...lugin.MediaManager.Forms.UWP/project.json → ...Forms/MediaManager.Forms.UWP/project.json b/...lugin.MediaManager.Forms.UWP/project.json → ...Forms/MediaManager.Forms.UWP/project.json
diff --git a/....iOS/Plugin.MediaManager.Forms.iOS.csproj → ....iOS/Plugin.MediaManager.Forms.iOS.csproj b/....iOS/Plugin.MediaManager.Forms.iOS.csproj → ....iOS/Plugin.MediaManager.Forms.iOS.csproj
@@ -66,7 +66,7 @@
       <Project>{6EDB0588-FFC5-4EF5-8A99-9E241D0F878D}</Project>
       <Name>Plugin.MediaManager.Abstractions</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>

diff --git a/...ager.Forms.iOS/Properties/AssemblyInfo.cs → ...ager.Forms.iOS/Properties/AssemblyInfo.cs b/...ager.Forms.iOS/Properties/AssemblyInfo.cs → ...ager.Forms.iOS/Properties/AssemblyInfo.cs
diff --git a/...diaManager.Forms.iOS/VideoViewRenderer.cs → ...diaManager.Forms.iOS/VideoViewRenderer.cs b/...diaManager.Forms.iOS/VideoViewRenderer.cs → ...diaManager.Forms.iOS/VideoViewRenderer.cs
diff --git a/...in.MediaManager.Forms.iOS/packages.config → ...ms/MediaManager.Forms.iOS/packages.config b/...in.MediaManager.Forms.iOS/packages.config → ...ms/MediaManager.Forms.iOS/packages.config
diff --git a/...er.Forms/Plugin.MediaManager.Forms.csproj → ...er.Forms/Plugin.MediaManager.Forms.csproj b/...er.Forms/Plugin.MediaManager.Forms.csproj → ...er.Forms/Plugin.MediaManager.Forms.csproj
diff --git a/...aManager.Forms/Properties/AssemblyInfo.cs → ...aManager.Forms/Properties/AssemblyInfo.cs b/...aManager.Forms/Properties/AssemblyInfo.cs → ...aManager.Forms/Properties/AssemblyInfo.cs
diff --git a/...ms/Plugin.MediaManager.Forms/VideoView.cs → ...ger.Forms/MediaManager.Forms/VideoView.cs b/...ms/Plugin.MediaManager.Forms/VideoView.cs → ...ger.Forms/MediaManager.Forms/VideoView.cs
diff --git a/...Plugin.MediaManager.Forms/packages.config → ....Forms/MediaManager.Forms/packages.config b/...Plugin.MediaManager.Forms/packages.config → ....Forms/MediaManager.Forms/packages.config
diff --git a/MediaManager.sln b/MediaManager.sln
@@ -21,13 +21,13 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Reactiv
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Forms", "Forms", "{4D6DBE82-C4E6-4FFB-9D1F-4AE23CF42435}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms", "MediaManager.Forms\MediaManager.Forms\Plugin.MediaManager.Forms.csproj", "{67F9D3A8-F71E-4428-913F-C37AE82CDB24}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.Android", "MediaManager.Forms\MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj", "{C8566A9E-FB6B-4459-AC87-5DB16D221D29}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.iOS", "MediaManager.Forms\MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj", "{586D5119-52D8-40B1-9BB5-CC7FDB033B86}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.Forms.UWP", "MediaManager.Forms\MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj", "{2230DCD0-118B-4021-B0B2-71CE00111D5E}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Extentions", "Extentions", "{D603F379-90E7-46B0-9827-306B51D82F9D}"
 EndProject

diff --git a/Samples/Forms/Droid/MediaForms.Android.csproj b/Samples/Forms/Droid/MediaForms.Android.csproj
@@ -134,7 +134,7 @@
       <Project>{7469C2C8-209A-4202-AEE9-E2B3F451BDD4}</Project>
       <Name>MediaForms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms.Android\Plugin.MediaManager.Forms.Android.csproj">
       <Project>{C8566A9E-FB6B-4459-AC87-5DB16D221D29}</Project>
       <Name>Plugin.MediaManager.Forms.Android</Name>
     </ProjectReference>
@@ -146,7 +146,7 @@
       <Project>{56A56F17-7DE1-4CA1-9617-BF32E971AC84}</Project>
       <Name>Plugin.MediaManager.Android</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>

diff --git a/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj b/Samples/Forms/MediaForms.UWP/MediaForms.UWP.csproj
@@ -127,7 +127,7 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms.UWP\Plugin.MediaManager.Forms.UWP.csproj">
       <Project>{2230dcd0-118b-4021-b0b2-71ce00111d5e}</Project>
       <Name>Plugin.MediaManager.Forms.UWP</Name>
     </ProjectReference>

diff --git a/Samples/Forms/MediaForms/MediaForms.csproj b/Samples/Forms/MediaForms/MediaForms.csproj
@@ -58,7 +58,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>

diff --git a/Samples/Forms/iOS/MediaForms.iOS.csproj b/Samples/Forms/iOS/MediaForms.iOS.csproj
@@ -30,7 +30,8 @@
     <MtouchArch>i386, x86_64</MtouchArch>
     <MtouchHttpClientHandler>HttpClientHandler</MtouchHttpClientHandler>
     <MtouchTlsProvider>Default</MtouchTlsProvider>
-    <MtouchSdkVersion></MtouchSdkVersion>
+    <MtouchSdkVersion>
+    </MtouchSdkVersion>
     <MtouchUseLlvm>False</MtouchUseLlvm>
     <MtouchUseThumb>False</MtouchUseThumb>
     <MtouchEnableBitcode>False</MtouchEnableBitcode>
@@ -141,11 +142,11 @@
       <Project>{7469C2C8-209A-4202-AEE9-E2B3F451BDD4}</Project>
       <Name>MediaForms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms\Plugin.MediaManager.Forms.csproj">
       <Project>{67F9D3A8-F71E-4428-913F-C37AE82CDB24}</Project>
       <Name>Plugin.MediaManager.Forms</Name>
     </ProjectReference>
-    <ProjectReference Include="..\..\..\MediaManager.Forms\Plugin.MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj">
+    <ProjectReference Include="..\..\..\MediaManager.Forms\MediaManager.Forms.iOS\Plugin.MediaManager.Forms.iOS.csproj">
       <Project>{586D5119-52D8-40B1-9BB5-CC7FDB033B86}</Project>
       <Name>Plugin.MediaManager.Forms.iOS</Name>
     </ProjectReference>