Merge pull request #3 from martijn00/master

Bring fork up to date with master
Baseflow · Oct 5, 2016 · 7d43dcc · 7d43dcc
2 parents b49c764 + 1fab05f
commit 7d43dcc
Show file tree

Hide file tree

Showing 9 changed files with 1,185 additions and 43 deletions.
diff --git a/MediaManager.sln b/MediaManager.sln
@@ -23,6 +23,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaSample.UWP", "Sample\M
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaManager.Sample.Core", "Sample\MediaSample.Core\MediaManager.Sample.Core.csproj", "{19955052-96FC-4149-84DD-C95A4C846C87}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.tvOS", "MediaManager\Plugin.MediaManager.tvOS\Plugin.MediaManager.tvOS.csproj", "{E8573584-8377-45DC-89C6-C34678DEB264}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Plugin.MediaManager.MacOS", "MediaManager\Plugin.MediaManager.MacOS\Plugin.MediaManager.MacOS.csproj", "{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -257,6 +261,54 @@ Global
 		{19955052-96FC-4149-84DD-C95A4C846C87}.Release|x64.Build.0 = Release|Any CPU
 		{19955052-96FC-4149-84DD-C95A4C846C87}.Release|x86.ActiveCfg = Release|Any CPU
 		{19955052-96FC-4149-84DD-C95A4C846C87}.Release|x86.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|ARM.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x64.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Debug|x86.Build.0 = Debug|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|ARM.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|ARM.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhone.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|x64.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|x64.Build.0 = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|x86.ActiveCfg = Release|Any CPU
+		{E8573584-8377-45DC-89C6-C34678DEB264}.Release|x86.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|ARM.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|ARM.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhone.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhone.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhoneSimulator.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|iPhoneSimulator.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x64.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|ARM.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|ARM.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhone.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhone.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhoneSimulator.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|iPhoneSimulator.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x64.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x64.Build.0 = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{7ED0F28D-8838-4E24-9FA9-E3FA0B5649BF}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE