New arch (not working)

FoxTube/FoxTube.csproj

@@ -2,6 +2,7 @@
 <Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
+    <LangVersion>8.0</LangVersion>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <ProjectGuid>{2597B816-7316-4D20-BA6C-D78001E89C1A}</ProjectGuid>
@@ -83,6 +84,7 @@
     <UseVSHostingProcess>false</UseVSHostingProcess>
     <ErrorReport>prompt</ErrorReport>
     <Prefer32Bit>true</Prefer32Bit>
+    <LangVersion>default</LangVersion>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
     <OutputPath>bin\x64\Release\</OutputPath>
@@ -104,15 +106,27 @@
       <DependentUpon>App.xaml</DependentUpon>
     </Compile>
     <Compile Include="Classes\AdaptiveCommandBar.cs" />
+    <Compile Include="Classes\Extensions.cs" />
     <Compile Include="Classes\HistorySet.cs" />
     <Compile Include="Classes\InboxItem.cs" />
     <Compile Include="Classes\Methods.cs" />
+    <Compile Include="Classes\Navigation.cs" />
+    <Compile Include="Classes\Processes.cs" />
+    <Compile Include="Classes\QualityComparer.cs" />
     <Compile Include="Classes\SearchParameters.cs" />
     <Compile Include="Classes\SettingsStorage.cs" />
     <Compile Include="Classes\ManifestGenerator.cs" />
+    <Compile Include="Classes\StreamInfo.cs" />
+    <Compile Include="Controls\Common\AccountManager.xaml.cs">
+      <DependentUpon>AccountManager.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\Common\AddToPlaylist.cs" />
     <Compile Include="Controls\Adverts\CardAdvert.xaml.cs">
       <DependentUpon>CardAdvert.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\Adverts\ChatAdvert.xaml.cs">
+      <DependentUpon>ChatAdvert.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\Adverts\CommentAdvert.xaml.cs">
       <DependentUpon>CommentAdvert.xaml</DependentUpon>
     </Compile>
@@ -122,7 +136,8 @@
     <Compile Include="Controls\ChannelCard.xaml.cs">
       <DependentUpon>ChannelCard.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\Chat.xaml.cs">
+    <Compile Include="Controls\Common\DownloadSelector.cs" />
+    <Compile Include="Controls\VideoPage\Chat.xaml.cs">
       <DependentUpon>Chat.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\CommentCard.xaml.cs">
@@ -132,34 +147,44 @@
     <Compile Include="Controls\ContentFrame.xaml.cs">
       <DependentUpon>ContentFrame.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Controls\Common\CreateAndAddPlaylist.xaml.cs">
+      <DependentUpon>CreateAndAddPlaylist.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Controls\DownloadItem.xaml.cs">
       <DependentUpon>DownloadItem.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\LiveCaptions.xaml.cs">
+    <Compile Include="Controls\Player\LiveCaptions.xaml.cs">
       <DependentUpon>LiveCaptions.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\Player\PlayerControls.cs" />
+    <Compile Include="Controls\Player\PlayerMain.cs" />
     <Compile Include="Controls\PlaylistCard.xaml.cs">
       <DependentUpon>PlaylistCard.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Controls\ReportVideo.xaml.cs">
+    <Compile Include="Controls\VideoPage\ReportVideo.xaml.cs">
       <DependentUpon>ReportVideo.xaml</DependentUpon>
     </Compile>
     <Compile Include="Controls\ShowMore.xaml.cs">
       <DependentUpon>ShowMore.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\Browser.xaml.cs">
-      <DependentUpon>Browser.xaml</DependentUpon>
+    <Compile Include="Controls\VideoPage\RelatedVideos.xaml.cs">
+      <DependentUpon>RelatedVideos.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Controls\VideoPage\VideoPlaylist.xaml.cs">
+      <DependentUpon>VideoPlaylist.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\ChannelPage.xaml.cs">
       <DependentUpon>ChannelPage.xaml</DependentUpon>
     </Compile>
-    <Compile Include="Pages\CommentsPage.xaml.cs">
-      <DependentUpon>CommentsPage.xaml</DependentUpon>
+    <Compile Include="Controls\VideoPage\Comments.xaml.cs">
+      <DependentUpon>Comments.xaml</DependentUpon>
     </Compile>
     <Compile Include="Pages\Downloads.xaml.cs">
       <DependentUpon>Downloads.xaml</DependentUpon>
     </Compile>
+    <Compile Include="Pages\MainFrame.xaml.cs">
+      <DependentUpon>MainFrame.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Pages\SettingsPages\About.xaml.cs">
       <DependentUpon>About.xaml</DependentUpon>
     </Compile>
@@ -293,10 +318,18 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Page Include="Controls\Common\AccountManager.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\Adverts\CardAdvert.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\Adverts\ChatAdvert.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\Adverts\CommentAdvert.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
@@ -309,7 +342,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\Chat.xaml">
+    <Page Include="Controls\VideoPage\Chat.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -321,11 +354,15 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Controls\Common\CreateAndAddPlaylist.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Controls\DownloadItem.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\LiveCaptions.xaml">
+    <Page Include="Controls\Player\LiveCaptions.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -333,7 +370,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Controls\ReportVideo.xaml">
+    <Page Include="Controls\VideoPage\ReportVideo.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -341,7 +378,11 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\Browser.xaml">
+    <Page Include="Controls\VideoPage\RelatedVideos.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Controls\VideoPage\VideoPlaylist.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -349,7 +390,7 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
-    <Page Include="Pages\CommentsPage.xaml">
+    <Page Include="Controls\VideoPage\Comments.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
@@ -357,6 +398,10 @@
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Pages\MainFrame.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Pages\SettingsPages\About.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>