From 7224c766ed152ddcd7fbb8a0b16d0909b6f571c6 Mon Sep 17 00:00:00 2001
From: Nicolas Jager <nicolas.jager@savoirfairelinux.com>
Date: Thu, 25 Aug 2016 10:06:53 -0400
Subject: [PATCH] fix: package, solution and project files

Change-Id: I8d94157069d48339dda1b13861eb65a4f9165656
---
 Package.appxmanifest            |  28 ++++-
 ring-client-uwp.sln             | 177 ++++++++++++++++----------------
 ring-client-uwp.vcxproj         |   8 +-
 ring-client-uwp.vcxproj.filters |  27 ++---
 4 files changed, 137 insertions(+), 103 deletions(-)

diff --git a/Package.appxmanifest b/Package.appxmanifest
index 5d650e6..bdb2ea3 100644
--- a/Package.appxmanifest
+++ b/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="PackageNameXXXXX" Publisher="CN=user" Version="1.0.0.0" />
+  <Identity Name="00000000-0000-0000-0000-000000000000" Publisher="CN=user" Version="1.0.0.0" />
   <mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ring-client-uwp</DisplayName>
@@ -22,4 +22,30 @@
       </uap:VisualElements>
     </Application>
   </Applications>
+  <Capabilities>
+    <Capability Name="allJoyn" />
+    <Capability Name="codeGeneration" />
+    <Capability Name="internetClientServer" />
+    <Capability Name="internetClient" />
+    <Capability Name="privateNetworkClientServer" />
+    <uap:Capability Name="appointments" />
+    <uap:Capability Name="blockedChatMessages" />
+    <uap:Capability Name="chat" />
+    <uap:Capability Name="contacts" />
+    <uap:Capability Name="enterpriseAuthentication" />
+    <uap:Capability Name="musicLibrary" />
+    <uap:Capability Name="objects3D" />
+    <uap:Capability Name="phoneCall" />
+    <uap:Capability Name="picturesLibrary" />
+    <uap:Capability Name="removableStorage" />
+    <uap:Capability Name="sharedUserCertificates" />
+    <uap:Capability Name="userAccountInformation" />
+    <uap:Capability Name="videosLibrary" />
+    <uap:Capability Name="voipCall" />
+    <DeviceCapability Name="bluetooth" />
+    <DeviceCapability Name="location" />
+    <DeviceCapability Name="microphone" />
+    <DeviceCapability Name="proximity" />
+    <DeviceCapability Name="webcam" />
+  </Capabilities>
 </Package>
\ No newline at end of file
diff --git a/ring-client-uwp.sln b/ring-client-uwp.sln
index 4f8989c..b0c0f41 100644
--- a/ring-client-uwp.sln
+++ b/ring-client-uwp.sln
@@ -1,88 +1,89 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-uwp", "ring-client-uwp.vcxproj", "{90928671-346F-42E4-934F-7A7A512A2D11}"
-       ProjectSection(ProjectDependencies) = postProject
-               {79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {79F8DE42-595D-49D9-A66F-55244FD9DCC3}
-       EndProjectSection
-EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\ring-daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|ARM = Debug|ARM
-		Debug|x64 = Debug|x64
-		Debug|x86 = Debug|x86
-		DebugLib|ARM = DebugLib|ARM
-		DebugLib|x64 = DebugLib|x64
-		DebugLib|x86 = DebugLib|x86
-		Release|ARM = Release|ARM
-		Release|x64 = Release|x64
-		Release|x86 = Release|x86
-		ReleaseLib|ARM = ReleaseLib|ARM
-		ReleaseLib|x64 = ReleaseLib|x64
-		ReleaseLib|x86 = ReleaseLib|x86
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.ActiveCfg = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.Build.0 = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.Deploy.0 = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.ActiveCfg = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.Build.0 = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.Deploy.0 = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.ActiveCfg = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.Build.0 = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.Deploy.0 = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.ActiveCfg = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.Build.0 = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.Deploy.0 = Debug|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.ActiveCfg = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.Build.0 = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.Deploy.0 = Debug|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.ActiveCfg = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.Build.0 = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.Deploy.0 = Debug|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.ActiveCfg = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.Build.0 = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.Deploy.0 = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.ActiveCfg = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.Build.0 = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.Deploy.0 = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.ActiveCfg = Release|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.Build.0 = Release|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.Deploy.0 = Release|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.ActiveCfg = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.Build.0 = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.Deploy.0 = Release|ARM
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.ActiveCfg = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.Build.0 = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.Deploy.0 = Release|x64
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.ActiveCfg = Release|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.Build.0 = Release|Win32
-		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.Deploy.0 = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|ARM.ActiveCfg = Debug|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x64.ActiveCfg = Debug|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x64.Build.0 = Debug|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.ActiveCfg = Debug|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.Build.0 = Debug|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|ARM.ActiveCfg = DebugLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.ActiveCfg = DebugLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.Build.0 = DebugLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x86.ActiveCfg = DebugLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x86.Build.0 = DebugLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|ARM.ActiveCfg = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.ActiveCfg = Release|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.Build.0 = Release|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.ActiveCfg = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.Build.0 = Release|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|ARM.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.ActiveCfg = ReleaseLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.Build.0 = ReleaseLib|x64
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.ActiveCfg = ReleaseLib|Win32
-		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.Build.0 = ReleaseLib|Win32
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-EndGlobal
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+VisualStudioVersion = 14.0.25420.1
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-client-uwp", "ring-client-uwp.vcxproj", "{90928671-346F-42E4-934F-7A7A512A2D11}"
+	ProjectSection(ProjectDependencies) = postProject
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3} = {79F8DE42-595D-49D9-A66F-55244FD9DCC3}
+	EndProjectSection
+EndProject
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "ring-daemon", "..\ring-daemon\MSVC\ring-daemon.vcxproj", "{79F8DE42-595D-49D9-A66F-55244FD9DCC3}"
+EndProject
+Global
+	GlobalSection(SolutionConfigurationPlatforms) = preSolution
+		Debug|ARM = Debug|ARM
+		Debug|x64 = Debug|x64
+		Debug|x86 = Debug|x86
+		DebugLib|ARM = DebugLib|ARM
+		DebugLib|x64 = DebugLib|x64
+		DebugLib|x86 = DebugLib|x86
+		Release|ARM = Release|ARM
+		Release|x64 = Release|x64
+		Release|x86 = Release|x86
+		ReleaseLib|ARM = ReleaseLib|ARM
+		ReleaseLib|x64 = ReleaseLib|x64
+		ReleaseLib|x86 = ReleaseLib|x86
+	EndGlobalSection
+	GlobalSection(ProjectConfigurationPlatforms) = postSolution
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.ActiveCfg = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.Build.0 = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|ARM.Deploy.0 = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.ActiveCfg = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.Build.0 = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x64.Deploy.0 = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.ActiveCfg = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.Build.0 = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Debug|x86.Deploy.0 = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.ActiveCfg = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.Build.0 = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|ARM.Deploy.0 = Debug|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.ActiveCfg = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.Build.0 = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x64.Deploy.0 = Debug|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.ActiveCfg = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.Build.0 = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.DebugLib|x86.Deploy.0 = Debug|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.ActiveCfg = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.Build.0 = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|ARM.Deploy.0 = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.ActiveCfg = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.Build.0 = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x64.Deploy.0 = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.ActiveCfg = Release|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.Build.0 = Release|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.Release|x86.Deploy.0 = Release|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.ActiveCfg = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.Build.0 = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|ARM.Deploy.0 = Release|ARM
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.ActiveCfg = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.Build.0 = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x64.Deploy.0 = Release|x64
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.ActiveCfg = Release|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.Build.0 = Release|Win32
+		{90928671-346F-42E4-934F-7A7A512A2D11}.ReleaseLib|x86.Deploy.0 = Release|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|ARM.ActiveCfg = Debug|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x64.ActiveCfg = Debug|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x64.Build.0 = Debug|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.ActiveCfg = Debug|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Debug|x86.Build.0 = Debug|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|ARM.ActiveCfg = DebugLib|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.ActiveCfg = DebugLib|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x64.Build.0 = DebugLib|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x86.ActiveCfg = DebugLib|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.DebugLib|x86.Build.0 = DebugLib|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|ARM.ActiveCfg = Release|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.ActiveCfg = Release|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x64.Build.0 = Release|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.ActiveCfg = Release|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release|x86.Build.0 = Release|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|ARM.ActiveCfg = ReleaseLib|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.ActiveCfg = ReleaseLib|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x64.Build.0 = ReleaseLib|x64
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.ActiveCfg = ReleaseLib|Win32
+		{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.ReleaseLib|x86.Build.0 = ReleaseLib|Win32
+	EndGlobalSection
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/ring-client-uwp.vcxproj b/ring-client-uwp.vcxproj
index 8d2bcd4..656d2c3 100644
--- a/ring-client-uwp.vcxproj
+++ b/ring-client-uwp.vcxproj
@@ -180,7 +180,9 @@
     <ClInclude Include="RingConsolePanel.xaml.h">
       <DependentUpon>RingConsolePanel.xaml</DependentUpon>
     </ClInclude>
-    <ClInclude Include="RingD.h" />
+    <ClInclude Include="RingD.h">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClInclude>
     <ClInclude Include="RingDebug.h" />
     <ClInclude Include="SmartPanel.xaml.h">
       <DependentUpon>SmartPanel.xaml</DependentUpon>
@@ -281,7 +283,9 @@
     <ClCompile Include="RingConsolePanel.xaml.cpp">
       <DependentUpon>RingConsolePanel.xaml</DependentUpon>
     </ClCompile>
-    <ClCompile Include="RingD.cpp" />
+    <ClCompile Include="RingD.cpp">
+      <ExcludedFromBuild Condition="'$(Configuration)|$(Platform)'=='Release|x64'">false</ExcludedFromBuild>
+    </ClCompile>
     <ClCompile Include="RingDebug.cpp" />
     <ClCompile Include="SmartPanel.xaml.cpp">
       <DependentUpon>SmartPanel.xaml</DependentUpon>
diff --git a/ring-client-uwp.vcxproj.filters b/ring-client-uwp.vcxproj.filters
index 2ce05bc..fb11f41 100644
--- a/ring-client-uwp.vcxproj.filters
+++ b/ring-client-uwp.vcxproj.filters
@@ -46,10 +46,10 @@
     <ClCompile Include="WelcomePage.xaml.cpp" />
     <ClCompile Include="SmartPanel.xaml.cpp" />
     <ClCompile Include="RingConsolePanel.xaml.cpp" />
-    <ClCompile Include="Account.cpp">
+    <ClCompile Include="Contact.cpp">
       <Filter>Model</Filter>
     </ClCompile>
-    <ClCompile Include="Contact.cpp">
+    <ClCompile Include="Account.cpp">
       <Filter>Model</Filter>
     </ClCompile>
     <ClCompile Include="AccountsViewModel.cpp">
@@ -61,15 +61,15 @@
     <ClCompile Include="RingDebug.cpp">
       <Filter>Common</Filter>
     </ClCompile>
+    <ClCompile Include="MessageTextPage.xaml.cpp" />
+    <ClCompile Include="VideoPage.xaml.cpp" />
     <ClCompile Include="RingD.cpp">
       <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="LoadingPage.xaml.cpp" />
-    <ClCompile Include="MessageTextPage.xaml.cpp" />
-    <ClCompile Include="VideoPage.xaml.cpp" />
     <ClCompile Include="Wizard.xaml.cpp" />
     <ClCompile Include="Call.cpp">
-      <Filter>Model</Filter>
+      <Filter>Common</Filter>
     </ClCompile>
     <ClCompile Include="CallsViewModel.cpp">
       <Filter>ModelViews</Filter>
@@ -82,10 +82,10 @@
     <ClInclude Include="WelcomePage.xaml.h" />
     <ClInclude Include="SmartPanel.xaml.h" />
     <ClInclude Include="RingConsolePanel.xaml.h" />
-    <ClInclude Include="Account.h">
+    <ClInclude Include="Contact.h">
       <Filter>Model</Filter>
     </ClInclude>
-    <ClInclude Include="Contact.h">
+    <ClInclude Include="Account.h">
       <Filter>Model</Filter>
     </ClInclude>
     <ClInclude Include="AccountsViewModel.h">
@@ -100,15 +100,15 @@
     <ClInclude Include="Utils.h">
       <Filter>Common</Filter>
     </ClInclude>
+    <ClInclude Include="MessageTextPage.xaml.h" />
+    <ClInclude Include="VideoPage.xaml.h" />
     <ClInclude Include="RingD.h">
       <Filter>Common</Filter>
     </ClInclude>
     <ClInclude Include="LoadingPage.xaml.h" />
-    <ClInclude Include="MessageTextPage.xaml.h" />
-    <ClInclude Include="VideoPage.xaml.h" />
     <ClInclude Include="Wizard.xaml.h" />
     <ClInclude Include="Call.h">
-      <Filter>Model</Filter>
+      <Filter>Common</Filter>
     </ClInclude>
     <ClInclude Include="CallsViewModel.h">
       <Filter>ModelViews</Filter>
@@ -137,10 +137,10 @@
       <Filter>Assets</Filter>
     </Image>
     <Image Include="Assets\TESTS\contactAvatar.png">
-      <Filter>Assets</Filter>
+      <Filter>Assets\TESTS</Filter>
     </Image>
     <Image Include="Assets\TESTS\qrcode.png">
-      <Filter>Assets</Filter>
+      <Filter>Assets\TESTS</Filter>
     </Image>
   </ItemGroup>
   <ItemGroup>
@@ -184,6 +184,9 @@
     <Page Include="SmartPanel.xaml">
       <Filter>Views</Filter>
     </Page>
+    <Page Include="SmartPanel.xaml">
+      <Filter>Views</Filter>
+    </Page>
     <Page Include="VideoPage.xaml">
       <Filter>Views</Filter>
     </Page>
-- 
2.22.0