Merge branch 'music'

microsoft · Feb 6, 2018 · f398702 · f398702
2 parents 4392a71 + 44c07c7
commit f398702
Show file tree

Hide file tree

Showing 36 changed files with 181 additions and 553 deletions.
diff --git a/apps/music/Music.PCL/Music.PCL.csproj b/apps/music/Music.PCL/Music.PCL.csproj
diff --git a/apps/music/Music.PCL/Properties/AssemblyInfo.cs b/apps/music/Music.PCL/Properties/AssemblyInfo.cs
diff --git a/apps/music/Music.PCL/app.config b/apps/music/Music.PCL/app.config
diff --git a/apps/music/Music.PCL/packages.config b/apps/music/Music.PCL/packages.config
diff --git a/apps/music/Music.Shared.tvOS/Music.Shared.tvOS.csproj b/apps/music/Music.Shared.tvOS/Music.Shared.tvOS.csproj
diff --git a/apps/music/Music.Shared.tvOS/Properties/AssemblyInfo.cs b/apps/music/Music.Shared.tvOS/Properties/AssemblyInfo.cs
diff --git a/apps/music/Music.Shared.tvOS/app.config b/apps/music/Music.Shared.tvOS/app.config
diff --git a/apps/music/Music.Shared.tvOS/packages.config b/apps/music/Music.Shared.tvOS/packages.config
diff --git a/apps/music/Music.PCL/ClientViewModel.cs → apps/music/Music.Shared/ClientViewModel.cs b/apps/music/Music.PCL/ClientViewModel.cs → apps/music/Music.Shared/ClientViewModel.cs
diff --git a/apps/music/Music.PCL/IDispatcher.cs → apps/music/Music.Shared/IDispatcher.cs b/apps/music/Music.PCL/IDispatcher.cs → apps/music/Music.Shared/IDispatcher.cs
diff --git a/apps/music/Music.PCL/Keys.cs → apps/music/Music.Shared/Keys.cs b/apps/music/Music.PCL/Keys.cs → apps/music/Music.Shared/Keys.cs
diff --git a/...music/Music.PCL/MTObservableCollection.cs → ...ic/Music.Shared/MTObservableCollection.cs b/...music/Music.PCL/MTObservableCollection.cs → ...ic/Music.Shared/MTObservableCollection.cs
diff --git a/apps/music/Music.PCL/MainViewModel.cs → apps/music/Music.Shared/MainViewModel.cs b/apps/music/Music.PCL/MainViewModel.cs → apps/music/Music.Shared/MainViewModel.cs
diff --git a/apps/music/Music.PCL/Models/ChatMessage.cs → .../music/Music.Shared/Models/ChatMessage.cs b/apps/music/Music.PCL/Models/ChatMessage.cs → .../music/Music.Shared/Models/ChatMessage.cs
diff --git a/...music/Music.PCL/Models/PartyJoinResult.cs → ...ic/Music.Shared/Models/PartyJoinResult.cs b/...music/Music.PCL/Models/PartyJoinResult.cs → ...ic/Music.Shared/Models/PartyJoinResult.cs
diff --git a/apps/music/Music.PCL/Models/PartyStatus.cs → .../music/Music.Shared/Models/PartyStatus.cs b/apps/music/Music.PCL/Models/PartyStatus.cs → .../music/Music.Shared/Models/PartyStatus.cs
diff --git a/apps/music/Music.PCL/Models/Song.cs → apps/music/Music.Shared/Models/Song.cs b/apps/music/Music.PCL/Models/Song.cs → apps/music/Music.Shared/Models/Song.cs
diff --git a/apps/music/Music.PCL/Models/User.cs → apps/music/Music.Shared/Models/User.cs b/apps/music/Music.PCL/Models/User.cs → apps/music/Music.Shared/Models/User.cs
diff --git a/apps/music/Music.Shared/Music.Shared.csproj b/apps/music/Music.Shared/Music.Shared.csproj
@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.AspNet.SignalR.Client" Version="2.2.2" />
+    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
+  </ItemGroup>
+
+</Project>
diff --git a/apps/music/Music.PCL/SC/API.cs → apps/music/Music.Shared/SC/API.cs b/apps/music/Music.PCL/SC/API.cs → apps/music/Music.Shared/SC/API.cs
diff --git a/apps/music/Music.PCL/SC/Models/Categories.cs → ...usic/Music.Shared/SC/Models/Categories.cs b/apps/music/Music.PCL/SC/Models/Categories.cs → ...usic/Music.Shared/SC/Models/Categories.cs
diff --git a/apps/music/Music.PCL/SC/Models/Comment.cs → apps/music/Music.Shared/SC/Models/Comment.cs b/apps/music/Music.PCL/SC/Models/Comment.cs → apps/music/Music.Shared/SC/Models/Comment.cs
diff --git a/...ic/Music.PCL/SC/Models/DesignTimeClass.cs → ...Music.Shared/SC/Models/DesignTimeClass.cs b/...ic/Music.PCL/SC/Models/DesignTimeClass.cs → ...Music.Shared/SC/Models/DesignTimeClass.cs
diff --git a/apps/music/Music.PCL/SC/Models/Playlist.cs → .../music/Music.Shared/SC/Models/Playlist.cs b/apps/music/Music.PCL/SC/Models/Playlist.cs → .../music/Music.Shared/SC/Models/Playlist.cs
diff --git a/apps/music/Music.PCL/SC/Models/SCUser.cs → apps/music/Music.Shared/SC/Models/SCUser.cs b/apps/music/Music.PCL/SC/Models/SCUser.cs → apps/music/Music.Shared/SC/Models/SCUser.cs
diff --git a/...music/Music.PCL/SC/Models/StreamSource.cs → ...ic/Music.Shared/SC/Models/StreamSource.cs b/...music/Music.PCL/SC/Models/StreamSource.cs → ...ic/Music.Shared/SC/Models/StreamSource.cs
diff --git a/apps/music/Music.PCL/SC/Models/Track.cs → apps/music/Music.Shared/SC/Models/Track.cs b/apps/music/Music.PCL/SC/Models/Track.cs → apps/music/Music.Shared/SC/Models/Track.cs
diff --git a/apps/music/Music.PCL/SC/StreamObjects.cs → apps/music/Music.Shared/SC/StreamObjects.cs b/apps/music/Music.PCL/SC/StreamObjects.cs → apps/music/Music.Shared/SC/StreamObjects.cs
diff --git a/.../music/Music.PCL/Services/CloudService.cs → ...sic/Music.Shared/Services/CloudService.cs b/.../music/Music.PCL/Services/CloudService.cs → ...sic/Music.Shared/Services/CloudService.cs
diff --git a/apps/music/Music.PCL/Services/DataService.cs → ...usic/Music.Shared/Services/DataService.cs b/apps/music/Music.PCL/Services/DataService.cs → ...usic/Music.Shared/Services/DataService.cs
@@ -5,8 +5,6 @@
 using System.Threading.Tasks;
 using Music.PCL.Models;
 using System.Diagnostics;
-using System.ServiceModel;
-using System.Collections.ObjectModel;
 using System.Runtime.CompilerServices;
 
 namespace Music.PCL.Services