diff --git a/.gitignore b/.gitignore
index 3eda7983a1e79067b5b851b34b6ecea48577d073..85b9272e82b40ff73f91a2b5023dd9dc6c9df350 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,7 @@ Release/
IUpnpErrFile.txt
IUpnpInfoFile.txt
pingme.txt
+_pkginfo.txt
# User-specific files (MonoDevelop/Xamarin Studio)
*.userprefs
@@ -248,4 +249,4 @@ _Pvt_Extensions
.fake/
!config.h
-Generated\ Files/
\ No newline at end of file
+Generated\ Files/
diff --git a/Package.appxmanifest b/Package.appxmanifest
index 31544e170bfdd99eea18e66a20d69975a6e71323..c188372732248e3ce7f134c3f48ebad9517167c6 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="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.0.0" />
+ <Identity Name="Savoir-faireLinux.GNURing" Publisher="CN=8121A5F7-3CA1-4CAA-92B2-4F595B011941" Version="1.1.6.0" />
<mp:PhoneIdentity PhoneProductId="2385953f-9019-423d-aa82-d1bbacfa258b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties>
<DisplayName>GNU Ring</DisplayName>
@@ -23,27 +23,12 @@
</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="musicLibrary" />
- <uap:Capability Name="objects3D" />
- <uap:Capability Name="phoneCall" />
- <uap:Capability Name="picturesLibrary" />
- <uap:Capability Name="removableStorage" />
<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/_language-fr.appx b/_language-fr.appx
index 4499648066b455d23074c34bf7a813c676dcec1d..49546c5da3f6d3be79b44c40b259a8206fd7b285 100644
Binary files a/_language-fr.appx and b/_language-fr.appx differ
diff --git a/_pkginfo.txt b/_pkginfo.txt
deleted file mode 100644
index c767856c8e2b06b2d8f6186a78bc0cb37be07ca1..0000000000000000000000000000000000000000
--- a/_pkginfo.txt
+++ /dev/null
@@ -1 +0,0 @@
-C:\Users\andreas.traczyk\Desktop\tests\ring-client-uwp_1.1.0.0\ring-client-uwp_1.1.0.0_x64.appxbundle
diff --git a/_scale-100.appx b/_scale-100.appx
index 60b3c6fb269b7d520201ae3b590d47f8ce83f6f1..2ddc1d5eff625a5c24c37d149cad23525f3c2d45 100644
Binary files a/_scale-100.appx and b/_scale-100.appx differ
diff --git a/_scale-125.appx b/_scale-125.appx
index 0d6bc4dd468dd245be121aed09087ff6361a5733..4696faa956d0bbfa2a9ea9acf8f212676ae44d47 100644
Binary files a/_scale-125.appx and b/_scale-125.appx differ
diff --git a/_scale-150.appx b/_scale-150.appx
index 7cdfbd1a42a98402ff7ef5185cf08e83ba0a14e4..04caab6f5e3fc98964adb0732257c1a7bff852a7 100644
Binary files a/_scale-150.appx and b/_scale-150.appx differ
diff --git a/_scale-400.appx b/_scale-400.appx
index 21884ba1c5d1b6b0d9e53b2b07ce81727eea070b..0b27623d07c12e86c82149aea9b233e170c6bc3f 100644
Binary files a/_scale-400.appx and b/_scale-400.appx differ
diff --git a/ring-client-uwp.sln b/ring-client-uwp.sln
index 74bca61b9888838fe509f53742e56e3180150292..c8640dfd771048145231c5ccbe35071ee94ad7db 100644
--- a/ring-client-uwp.sln
+++ b/ring-client-uwp.sln
@@ -5,7 +5,6 @@ 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}
{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} = {9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}
EndProjectSection
EndProject
@@ -17,6 +16,7 @@ EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "contrib daemon", "contrib daemon", "{96846C59-E0A1-4132-B779-065C2EAE3E51}"
EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "pjlib", "..\ring-daemon\contrib\pjproject\pjlib\build\pjlib.vcxproj", "{DA0E03ED-53A7-4050-8A85-90541C5509F8}"
+EndProject
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "libupnp", "..\ring-daemon\contrib\libupnp\build\VS2015\libupnp.vcxproj", "{6227F51A-1498-4C4A-B213-F6FDED605125}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "libupnp", "libupnp", "{27B9320A-DA7E-4849-BCB7-4DBA266499C8}"
@@ -544,6 +544,114 @@ Global
{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release-Static|x64.Build.0 = ReleaseLib|x64
{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release-Static|x86.ActiveCfg = ReleaseLib|Win32
{79F8DE42-595D-49D9-A66F-55244FD9DCC3}.Release-Static|x86.Build.0 = ReleaseLib|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.ActiveCfg = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.Build.0 = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.Build.0 = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x64.ActiveCfg = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x64.Build.0 = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x64.ActiveCfg = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x64.Build.0 = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x86.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x86.Build.0 = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x86.ActiveCfg = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x86.Build.0 = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x86.ActiveCfg = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x86.Build.0 = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x64.ActiveCfg = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x64.Build.0 = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x64.ActiveCfg = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x64.Build.0 = Debug-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x86.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x86.Build.0 = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x86.ActiveCfg = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x86.Build.0 = Debug-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x64.Build.0 = Debug-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x86.ActiveCfg = Debug-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x86.Build.0 = Debug-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x64.Build.0 = Debug|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x86.Build.0 = Debug|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x64.ActiveCfg = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x64.Build.0 = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x86.ActiveCfg = Release|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x86.Build.0 = Release|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM.ActiveCfg = Release|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.ActiveCfg = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.Build.0 = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x86.ActiveCfg = Release|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x86.Build.0 = Release|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x64.ActiveCfg = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x64.Build.0 = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x64.ActiveCfg = Release-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x64.Build.0 = Release-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x86.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x86.ActiveCfg = Release-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x86.Build.0 = Release-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x64.Build.0 = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x86.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x86.ActiveCfg = Release-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x86.Build.0 = Release-Dynamic|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x64.ActiveCfg = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x64.Build.0 = Release|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x64.ActiveCfg = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x64.Build.0 = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x86.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|ARM.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x64.ActiveCfg = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x64.Build.0 = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x86.Build.0 = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x64.ActiveCfg = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x64.Build.0 = Release-Static|x64
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x86.ActiveCfg = Release-Static|Win32
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x86.Build.0 = Release-Static|Win32
{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|ARM.ActiveCfg = Debug|Win32
{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.ActiveCfg = Debug|x64
{6227F51A-1498-4C4A-B213-F6FDED605125}.Debug|x64.Build.0 = Debug|x64
@@ -3596,114 +3704,6 @@ Global
{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Static|x64.Build.0 = Debug-Dll|Win32
{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Static|x86.ActiveCfg = Release-Lib|Win32
{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C}.Release-Static|x86.Build.0 = Release-Lib|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|ARM.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.ActiveCfg = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x64.Build.0 = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug|x86.Build.0 = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x64.ActiveCfg = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x64.Build.0 = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x64.ActiveCfg = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x64.Build.0 = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x86.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLL|x86.Build.0 = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x86.ActiveCfg = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dll|x86.Build.0 = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x64.ActiveCfg = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x64.Build.0 = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x86.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugDLLStaticDeps|x86.Build.0 = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|ARM.ActiveCfg = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x64.ActiveCfg = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x64.Build.0 = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x86.ActiveCfg = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Dynamic|x86.Build.0 = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x64.ActiveCfg = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x64.Build.0 = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x64.ActiveCfg = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x64.Build.0 = Debug-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x86.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DebugLib|x86.Build.0 = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x86.ActiveCfg = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Lib|x86.Build.0 = Debug-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|ARM.ActiveCfg = Debug-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x64.ActiveCfg = Debug-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x64.Build.0 = Debug-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x86.ActiveCfg = Debug-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Debug-Static|x86.Build.0 = Debug-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x64.ActiveCfg = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x64.Build.0 = Debug|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x86.ActiveCfg = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Debug|x86.Build.0 = Debug|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x64.ActiveCfg = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x64.Build.0 = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x86.ActiveCfg = Release|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.DLL-Import Release|x86.Build.0 = Release|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|ARM.ActiveCfg = Release|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.ActiveCfg = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x64.Build.0 = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x86.ActiveCfg = Release|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release|x86.Build.0 = Release|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x64.ActiveCfg = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x64.Build.0 = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x64.ActiveCfg = Release-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x64.Build.0 = Release-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLL|x86.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x86.ActiveCfg = Release-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dll|x86.Build.0 = Release-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x64.ActiveCfg = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x64.Build.0 = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseDLLStaticDeps|x86.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|ARM.ActiveCfg = Release-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x64.ActiveCfg = Release-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x64.Build.0 = Release-Dynamic|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x86.ActiveCfg = Release-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Dynamic|x86.Build.0 = Release-Dynamic|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x64.ActiveCfg = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x64.Build.0 = Release|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x64.ActiveCfg = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x64.Build.0 = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLib|x86.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Lib|x86.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|ARM.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x64.ActiveCfg = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x64.Build.0 = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.ReleaseLTO|x86.Build.0 = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|ARM.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x64.ActiveCfg = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x64.Build.0 = Release-Static|x64
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x86.ActiveCfg = Release-Static|Win32
- {DA0E03ED-53A7-4050-8A85-90541C5509F8}.Release-Static|x86.Build.0 = Release-Static|Win32
{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|ARM.ActiveCfg = Debug|Win32
{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x64.ActiveCfg = Debug|x64
{FE07F272-AE7F-4549-9E9F-EF9B80CB1693}.Debug|x64.Build.0 = Debug|x64
@@ -5977,6 +5977,7 @@ Global
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
+ {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {F6875B41-FE04-419C-B591-0301263BEA45}
{6227F51A-1498-4C4A-B213-F6FDED605125} = {27B9320A-DA7E-4849-BCB7-4DBA266499C8}
{27B9320A-DA7E-4849-BCB7-4DBA266499C8} = {96846C59-E0A1-4132-B779-065C2EAE3E51}
{805F73E9-495E-48F0-8C9A-7F050B524609} = {27B9320A-DA7E-4849-BCB7-4DBA266499C8}
@@ -6019,7 +6020,6 @@ Global
{A02FD1CC-618B-428D-AC46-91A2A12D0DCD} = {A185856B-E055-4594-9268-57C897A81F90}
{9A90BF5C-84B0-41F6-B83C-C20EADC1F46C} = {6EBA7EA6-20F5-40F9-96E3-32706D9ABD58}
{F6875B41-FE04-419C-B591-0301263BEA45} = {96846C59-E0A1-4132-B779-065C2EAE3E51}
- {DA0E03ED-53A7-4050-8A85-90541C5509F8} = {F6875B41-FE04-419C-B591-0301263BEA45}
{FE07F272-AE7F-4549-9E9F-EF9B80CB1693} = {F6875B41-FE04-419C-B591-0301263BEA45}
{7FDE3880-A4AB-49E3-B439-EBEF0A0C7A65} = {F6875B41-FE04-419C-B591-0301263BEA45}
{4281CA5E-1D48-45D4-A991-2718A454B4BA} = {F6875B41-FE04-419C-B591-0301263BEA45}
diff --git a/ring-client-uwp.vcxproj b/ring-client-uwp.vcxproj
index fea695b874b8048c1118461780a185df07c4517a..720d25da9a5a0ec583c3d05c5094bdcaa9e1fdc5 100644
--- a/ring-client-uwp.vcxproj
+++ b/ring-client-uwp.vcxproj
@@ -103,7 +103,7 @@
<AppxBundle>Always</AppxBundle>
<AppxBundlePlatforms>x64</AppxBundlePlatforms>
<PackageCertificateThumbprint>6E2CEF8A6A6A44314AB297CE41FC3BC8F2890973</PackageCertificateThumbprint>
- <AppxPackageDir>C:\</AppxPackageDir>
+ <AppxPackageDir>$(USERPROFILE)\ring_packaging\</AppxPackageDir>
</PropertyGroup>
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
<ClCompile>
@@ -163,7 +163,8 @@
</Link>
<Link>
<AdditionalOptions>/nodefaultlib:libcmt.lib /ignore:4006,4049,4099 %(AdditionalOptions)</AdditionalOptions>
- <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
+ <GenerateWindowsMetadata>true</GenerateWindowsMetadata>
+ <WindowsMetadataFile>$(OutDir)RingClientUWP.winmd</WindowsMetadataFile>
</Link>
</ItemDefinitionGroup>
<ItemGroup>