Merge branch 'develop' into samples_update

2016-04-14 15:33:30 -07:00 · 2016-04-14 15:33:30 -07:00 · eeb9fc50d1
--- a/.gitignore
+++ b/.gitignore
@ -5,6 +5,7 @@
 *.opensdf
 *.sdf
 *.suo
+*.VC.db
 AppPackages
 bin
 Debug
--- a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj
+++ b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj
@ -94,7 +94,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <PackageCertificateKeyFile>winsdkfb_testing_key.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\..\..\winsdkfb\winsdkfb_testing_key.pfx</PackageCertificateKeyFile>
    <PackageCertificateThumbprint>F4E6BFEE8265BFC1A3B4A18D7F46397C6891526C</PackageCertificateThumbprint>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
@ -170,7 +170,6 @@
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>
    </AppxManifest>
-    <None Include="winsdkfb_testing_key.pfx" />
  </ItemGroup>
  <ItemGroup>
    <Image Include="Assets\Logo.scale-100.png" />
@ -216,6 +215,9 @@
      <Project>{973a943b-ff77-4267-8f30-f5fe2b7f5583}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets" />
 </Project>
--- a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.filters
+++ b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.filters
@ -58,9 +58,6 @@
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest" />
  </ItemGroup>
-  <ItemGroup>
-    <None Include="winsdkfb_testing_key.pfx" />
-  </ItemGroup>
  <ItemGroup>
    <Page Include="MainPage.xaml" />
    <Page Include="UserInfo.xaml" />
@ -70,4 +67,7 @@
  <ItemGroup>
    <PRIResource Include="Resources.resw" />
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
 </Project>
--- a/samples/LoginCpp-UWP/LoginCpp/winsdkfb_testing_key.pfx
+++ b/samples/LoginCpp-UWP/LoginCpp/winsdkfb_testing_key.pfx
--- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj
+++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj
@ -94,7 +94,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <PackageCertificateKeyFile>LoginCpp.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\..\..\..\winsdkfb\winsdkfb_testing_key.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <ClCompile>
@ -163,7 +163,6 @@
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>
    </AppxManifest>
-    <None Include="LoginCpp.Windows_TemporaryKey.pfx" />
  </ItemGroup>
  <ItemGroup>
    <Image Include="Assets\Logo.scale-100.png" />
@ -193,5 +192,8 @@
      <Project>{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
 </Project>
--- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj.filters
+++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj.filters
@ -48,9 +48,6 @@
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest" />
  </ItemGroup>
-  <ItemGroup>
-    <None Include="LoginCpp.Windows_TemporaryKey.pfx" />
-  </ItemGroup>
  <ItemGroup>
    <Image Include="Assets\Logo.scale-100.png">
      <Filter>Assets</Filter>
@ -65,4 +62,7 @@
      <Filter>Assets</Filter>
    </Image>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
 </Project>
--- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows_TemporaryKey.pfx
+++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows_TemporaryKey.pfx
--- a/samples/LoginCs/LoginCs.sln
+++ b/samples/LoginCs/LoginCs.sln
@ -1,7 +1,7 @@

 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
-VisualStudioVersion = 14.0.23107.0
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoginCs", "LoginCs", "{F3A8EFF0-4471-4905-B279-756B1D864AAB}"
 EndProject
--- a/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj
+++ b/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj
@ -15,7 +15,7 @@
    <FileAlignment>512</FileAlignment>
    <SynthesizeLinkMetadata>true</SynthesizeLinkMetadata>
    <ProjectTypeGuids>{BC8A1FFA-BEE3-4634-8014-F334798102B3};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
-    <PackageCertificateKeyFile>LoginCs.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\..\..\..\winsdkfb\winsdkfb_testing_key.pfx</PackageCertificateKeyFile>
    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
    <RestorePackages>true</RestorePackages>
    <NuGetPackageImportStamp>
@ -113,6 +113,9 @@
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>
    </AppxManifest>
+    <None Include="..\..\..\..\winsdkfb\winsdkfb_testing_key.pfx">
+      <Link>winsdkfb_testing_key.pfx</Link>
+    </None>
    <None Include="..\LoginCs.Shared\FBCSObjectImplementation.ttinclude">
      <Link>FBCSObjectImplementation.ttinclude</Link>
    </None>
@ -124,7 +127,6 @@
    <None Include="..\LoginCs.Shared\Utility.ttinclude">
      <Link>Utility.ttinclude</Link>
    </None>
-    <None Include="LoginCs.Windows_TemporaryKey.pfx" />
    <None Include="packages.config" />
  </ItemGroup>
  <ItemGroup>
--- a/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows_TemporaryKey.pfx
+++ b/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows_TemporaryKey.pfx
--- a/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj
+++ b/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup Label="ProjectConfigurations">
    <ProjectConfiguration Include="Debug|ARM">
@ -93,7 +93,7 @@
  </ImportGroup>
  <PropertyGroup Label="UserMacros" />
  <PropertyGroup>
-    <PackageCertificateKeyFile>SDKCppUnit.Windows_TemporaryKey.pfx</PackageCertificateKeyFile>
+    <PackageCertificateKeyFile>..\..\..\winsdkfb\winsdkfb_testing_key.pfx</PackageCertificateKeyFile>
  </PropertyGroup>
  <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|ARM'">
    <ClCompile>
@ -187,7 +187,6 @@ popd
    <AppxManifest Include="Package.appxmanifest">
      <SubType>Designer</SubType>
    </AppxManifest>
-    <None Include="SDKCppUnit.Windows_TemporaryKey.pfx" />
  </ItemGroup>
  <ItemGroup>
    <Image Include="Assets\animal-1409304111INq.jpg" />
@ -206,6 +205,9 @@ popd
      <Project>{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}</Project>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
  </ImportGroup>
--- a/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj.filters
+++ b/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj.filters
@ -18,9 +18,6 @@
  <ItemGroup>
    <AppxManifest Include="Package.appxmanifest" />
  </ItemGroup>
-  <ItemGroup>
-    <None Include="SDKCppUnit.Windows_TemporaryKey.pfx" />
-  </ItemGroup>
  <ItemGroup>
    <Image Include="Assets\Logo.scale-100.png">
      <Filter>Assets</Filter>
@ -38,4 +35,7 @@
      <Filter>Assets</Filter>
    </Image>
  </ItemGroup>
+  <ItemGroup>
+    <None Include="..\..\..\winsdkfb\winsdkfb_testing_key.pfx" />
+  </ItemGroup>
 </Project>
--- a/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows_TemporaryKey.pfx
+++ b/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows_TemporaryKey.pfx
--- a/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests_TemporaryKey.pfx
+++ b/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests_TemporaryKey.pfx
--- a/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests_TemporaryKey.pfx
+++ b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests_TemporaryKey.pfx
--- a/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests_TemporaryKey.pfx
+++ b/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests_TemporaryKey.pfx
--- a/winsdkfb/winsdkfb/winsdkfb.Shared/FacebookSession.cpp
+++ b/winsdkfb/winsdkfb/winsdkfb.Shared/FacebookSession.cpp
@ -905,6 +905,14 @@ task<FBResult^> FBSession::RunWebViewLoginOnUIThread(
    });
 }

+IAsyncOperation<FBResult^>^ FBSession::LoginAsync(
+    )
+{
+    return LoginAsync(
+        nullptr,
+        SessionLoginBehavior::DefaultOrdering);
+}
+
 IAsyncOperation<FBResult^>^ FBSession::LoginAsync(
    FBPermissions^ Permissions
    )
@ -919,15 +927,16 @@ IAsyncOperation<FBResult^>^ FBSession::LoginAsync(
 	SessionLoginBehavior behavior
    )
 {
+    if (!Permissions)
+    {
+        Permissions = ref new FBPermissions((ref new Vector<String^>())->GetView());
+    }
    _dialog = ref new FacebookDialog();

    return create_async([=]()
    {
        PropertySet^ parameters = ref new PropertySet();
-        if (Permissions)
-        {
-            parameters->Insert(ScopeKey, Permissions->ToString());
-        }
+        parameters->Insert(ScopeKey, Permissions->ToString());

        if (LoggedIn)
        {
--- a/winsdkfb/winsdkfb/winsdkfb.Shared/FacebookSession.h
+++ b/winsdkfb/winsdkfb/winsdkfb.Shared/FacebookSession.h
@ -179,6 +179,15 @@ namespace winsdkfb
                Windows::Foundation::Collections::PropertySet^ Parameters
                );

+            /**
+             * Login to Facebook. This method defaults to SessionLoginBehavior::DefaultOrdering
+             * for its login method. The permissions requested are public_profile, email,
+             * user_friends.
+             * @return FBResult indicating the result of the Login attempt.
+             */
+            Windows::Foundation::IAsyncOperation<FBResult^>^ LoginAsync(
+                );
+
            /**
             * Login to Facebook. This method defaults to SessionLoginBehavior::DefaultOrdering
             * for its login method.
--- a/winsdkfb/winsdkfb/winsdkfb.Shared/winsdkfb.Shared.vcxitems
+++ b/winsdkfb/winsdkfb/winsdkfb.Shared/winsdkfb.Shared.vcxitems
@ -23,7 +23,9 @@
    </ClInclude>
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookError.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookFeedRequest.h" />
-    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookLoginButton.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookLoginButton.h">
+      <DependentUpon>$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml</DependentUpon>
+    </ClInclude>
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookMediaObject.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookMediaStream.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookPaginatedArray.h" />
@ -35,6 +37,7 @@
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookResult.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookSendRequest.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookSession.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FBConstants.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)Generated\FBAppRequest.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)Generated\FBCursors.h" />
    <ClInclude Include="$(MSBuildThisFileDirectory)Generated\FBGroup.h" />
@ -62,7 +65,9 @@
    </ClCompile>
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookError.cpp" />
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookFeedRequest.cpp" />
-    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookLoginButton.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookLoginButton.cpp">
+      <DependentUpon>$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml</DependentUpon>
+    </ClCompile>
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookMediaObject.cpp" />
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookMediaStream.cpp" />
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookPaginatedArray.cpp" />
@ -93,9 +98,9 @@
    <ProjectCapability Include="SourceItemsFromImports" />
  </ItemGroup>
  <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)FacebookDialog.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)FacebookProfilePictureControl.xaml" />
+    <Page Include="$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)Themes\Generic.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles.xaml" />
  </ItemGroup>
--- a/winsdkfb/winsdkfb/winsdkfb.Shared/winsdkfb.Shared.vcxitems.filters
+++ b/winsdkfb/winsdkfb/winsdkfb.Shared/winsdkfb.Shared.vcxitems.filters
@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <ItemGroup>
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookDialog.xaml.cpp" />
@ -36,9 +36,6 @@
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookFeedRequest.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
-    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookLoginButton.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookMediaStream.cpp">
      <Filter>Source Files</Filter>
    </ClCompile>
@ -82,6 +79,7 @@
      <Filter>Source Files</Filter>
    </ClCompile>
    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookSendRequest.cpp" />
+    <ClCompile Include="$(MSBuildThisFileDirectory)FacebookLoginButton.cpp" />
  </ItemGroup>
  <ItemGroup>
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookDialog.xaml.h" />
@ -104,9 +102,6 @@
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookFeedRequest.h">
      <Filter>Header Files</Filter>
    </ClInclude>
-    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookLoginButton.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookMediaObject.h">
      <Filter>Header Files</Filter>
    </ClInclude>
@ -177,6 +172,8 @@
      <Filter>Header Files</Filter>
    </ClInclude>
    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookSendRequest.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FBConstants.h" />
+    <ClInclude Include="$(MSBuildThisFileDirectory)FacebookLoginButton.h" />
  </ItemGroup>
  <ItemGroup>
    <Image Include="$(MSBuildThisFileDirectory)Images\fb_blank_profile_portrait.png" />
@ -280,9 +277,9 @@
    </None>
  </ItemGroup>
  <ItemGroup>
-    <Page Include="$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)FacebookDialog.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)FacebookProfilePictureControl.xaml" />
+    <Page Include="$(MSBuildThisFileDirectory)Controls\FacebookLoginButton.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)Themes\Generic.xaml" />
    <Page Include="$(MSBuildThisFileDirectory)Themes\Styles.xaml" />
  </ItemGroup>