Merge remote-tracking branch 'origin/master' into login_via_webview

.gitignore

@@ -1,16 +1,17 @@
+.nuget
 *.opensdf
 *.sdf
 *.suo
-ipch
+AppPackages
+bin
 Debug
-Release
+Doxygen
+fbwinsdk.githash.txt
 Generated
 Generated Files
-Doxygen
-AppPackages
-Packages.dgml
+ipch
 packages
-bin
-.nuget
-fbwinsdk.githash.txt
+Packages.dgml
+Release
+sdk-build.log
 

FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.22609.0
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBSDK-UAP", "FBSDK-UAP\FBSDK-UAP.vcxproj", "{973A943B-FF77-4267-8F30-F5FE2B7F5583}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBSDK-UWP", "FBSDK-UWP\FBSDK-UWP.vcxproj", "{973A943B-FF77-4267-8F30-F5FE2B7F5583}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

FBWinSDK/build/build-sdk.cmd

@@ -0,0 +1,119 @@
+rem ---------------------------------------------------------------------------
+rem Script to build the Microsoft SDK for Facebook Integration.  This script 
+rem will build the Windows 8.1 and Windows Phone 8.1 versions of the SDK, then
+rem the Windows 10 Universal version, then package everything up with NuGet.
+rem 
+rem On completion, the SDK packages should be located in the directory
+rem FBWinSDK\bin under the root of the repository. A synopsis of the build will
+rem exist in the file sdk-build.log in the same directory as the build script.
+rem 
+rem This script assumes it is located in the Git repository and location in 
+rem which it originated.  If it is moved, it will cease to function!
+rem ---------------------------------------------------------------------------
+
+set starting_dir=%cd%
+set script_dir=%~dp0
+set logfile=%script_dir%\sdk-build.log
+cd /d %script_dir%\..
+
+@echo Starting build... >%logfile%
+
+rem ---------------------------------------------------------------------------
+rem build for Windows 8.1 and Phone 8.1
+rem ---------------------------------------------------------------------------
+call :build_one_flavor FBWinSDK.sln Win32 Debug
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBWinSDK.sln Win32 Release 
+if errorlevel 1 goto errorExit
+k
+call :build_one_flavor FBWinSDK.sln x64 Debug 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBWinSDK.sln x64 Release 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBWinSDK.sln ARM Debug 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBWinSDK.sln ARM Release 
+if errorlevel 1 goto errorExit
+
+rem ---------------------------------------------------------------------------
+rem build for Windows 10 Universal 
+rem ---------------------------------------------------------------------------
+cd FBSDK-UWP
+
+call :build_one_flavor FBSDK-UWP.sln x86 Debug
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBSDK-UWP.sln x86 Release 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBSDK-UWP.sln x64 Debug 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBSDK-UWP.sln x64 Release 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBSDK-UWP.sln ARM Debug 
+if errorlevel 1 goto errorExit
+
+call :build_one_flavor FBSDK-UWP.sln ARM Release 
+if errorlevel 1 goto errorExit
+
+rem ---------------------------------------------------------------------------
+rem build NuGet packages
+rem ---------------------------------------------------------------------------
+:build_nuget
+cd %script_dir%\nuget
+
+rem Get version number, so we can test for packages after build attempt
+for /f "delims=" %%i in ('type VERSION') do set version=%%i
+
+@echo Checking for nuget.exe... >>%logfile%
+if not exist nuget.exe call download-nuget.cmd
+if not exist nuget.exe (
+    @echo Error: failed to download nuget.exe, can't package the SDK
+    goto :eof
+)
+
+@echo Packaging SDK... >>%logfile%
+
+call build-nupkg.cmd
+if not exist ..\..\bin\FBWinSDK.%version%.nupkg (
+    @echo Error: failed to build SDK NuGet package
+    goto :eof
+)
+
+if not exist ..\..\bin\FBWinSDK-debug.%version%.nupkg (
+    @echo Error: failed to build SDK debug NuGet package
+    goto :eof
+)
+
+cd /d %starting_dir%
+@echo Build successful >>%logfile%
+@echo "All done!"
+goto :eof
+
+rem ---------------------------------------------------------------------------
+rem Subroutine to build for one solution, platform, and configuration
+rem ---------------------------------------------------------------------------
+:build_one_flavor
+@echo Starting build for solution %1, platform %2, configuration %3 >>%logfile%
+msbuild %1 /p:Platform=%2;Configuration=%3
+if errorlevel 1 (
+    @echo Error building solution %1, platform %2, configuration %3 >>%logfile%
+    exit /b
+)
+@echo Completed build for solution %1, platform %2, configurattion %3 >>%logfile%
+exit /b
+
+rem ---------------------------------------------------------------------------
+rem In case of build failure, err out here
+rem ---------------------------------------------------------------------------
+:errorExit
+@echo "Error: one or more targets failed to build."
+cd /d %starting_dir%
+goto :eof
+

FBWinSDK/build/nuget/FBWinSDK-debug.nuspec

@@ -76,35 +76,35 @@
       <file src="ARM\Debug\FBWinSDK.WindowsPhone\Controls\FacebookLoginButton.xbf" target="bin\Phone\arm\Facebook\Controls"/>
       <file src="ARM\Debug\FBWinSDK.WindowsPhone\Images\fb_blank_profile_portrait.png" target="bin\Phone\arm\Facebook\Images"/>
 
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Facebook.dll" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Facebook.winmd" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Facebook.pri" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\x86\Facebook"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\x86\Facebook"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\x86\Facebook\Themes"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\x86\Facebook\Themes"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\x86\Facebook\Controls"/>
-      <file src="FBSDK-UAP\Debug\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Facebook.dll" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Facebook.winmd" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Facebook.pri" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\x86\Facebook\Themes"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\x86\Facebook\Themes"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\x86\Facebook\Controls"/>
+      <file src="FBSDK-UWP\Debug\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\x86\Facebook"/>
 
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Facebook.dll" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Facebook.winmd" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Facebook.pri" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\x64\Facebook"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\x64\Facebook"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\x64\Facebook\Themes"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\x64\Facebook\Themes"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\x64\Facebook\Controls"/>
-      <file src="FBSDK-UAP\x64\Debug\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Facebook.dll" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Facebook.winmd" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Facebook.pri" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\x64\Facebook\Themes"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\x64\Facebook\Themes"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\x64\Facebook\Controls"/>
+      <file src="FBSDK-UWP\x64\Debug\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\x64\Facebook"/>
 
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Facebook.dll" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Facebook.winmd" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Facebook.pri" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\arm\Facebook"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\arm\Facebook"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\arm\Facebook\Themes"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\arm\Facebook\Themes"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\arm\Facebook\Controls"/>
-      <file src="FBSDK-UAP\ARM\Debug\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Facebook.dll" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Facebook.winmd" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Facebook.pri" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\arm\Facebook\Themes"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\arm\Facebook\Themes"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\arm\Facebook\Controls"/>
+      <file src="FBSDK-UWP\ARM\Debug\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\arm\Facebook"/>
 
       <file src="build\nuget\FBWinSDK-debug.props" target="build" />
 

FBWinSDK/build/nuget/FBWinSDK-managed.targets

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</fbwinsdk-DeviceType>
     <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</fbwinsdk-DeviceType>
-    <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'UAP'">UAP</fbwinsdk-DeviceType>
+    <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'UWP'">UWP</fbwinsdk-DeviceType>
   </PropertyGroup>
 
   <Target Name="fbwinsdk-DeviceType-Check" BeforeTargets="InjectReference">

FBWinSDK/build/nuget/FBWinSDK-native.targets

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'Windows'">Windows</fbwinsdk-DeviceType>
     <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'WindowsPhoneApp'">Phone</fbwinsdk-DeviceType>
-    <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'UAP'">UAP</fbwinsdk-DeviceType>
+    <fbwinsdk-DeviceType Condition="'$(TargetPlatformIdentifier)' == 'UWP'">UWP</fbwinsdk-DeviceType>
   </PropertyGroup>
 
   <Target Name="fbwinsdk-DeviceType-Check" BeforeTargets="ResolveAssemblyReferences">

FBWinSDK/build/nuget/FBWinSDK.nuspec

@@ -108,35 +108,35 @@
       <file src="ARM\Release\FBWinSDK.WindowsPhone\Controls\FacebookLoginButton.xbf" target="bin\Phone\arm\Facebook\Controls"/>
       <file src="ARM\Release\FBWinSDK.WindowsPhone\Images\fb_blank_profile_portrait.png" target="bin\Phone\arm\Facebook\Images"/>
 
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Facebook.dll" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Facebook.winmd" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Facebook.pri" target="bin\UAP\x86"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\x86\Facebook"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\x86\Facebook"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\x86\Facebook\Themes"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\x86\Facebook\Themes"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\x86\Facebook\Controls"/>
-      <file src="FBSDK-UAP\Release\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Facebook.dll" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Facebook.winmd" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Facebook.pri" target="bin\UWP\x86"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\x86\Facebook"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\x86\Facebook\Themes"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\x86\Facebook\Themes"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\x86\Facebook\Controls"/>
+      <file src="FBSDK-UWP\Release\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\x86\Facebook"/>
 
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Facebook.dll" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Facebook.winmd" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Facebook.pri" target="bin\UAP\x64"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\x64\Facebook"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\x64\Facebook"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\x64\Facebook\Themes"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\x64\Facebook\Themes"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\x64\Facebook\Controls"/>
-      <file src="FBSDK-UAP\x64\Release\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Facebook.dll" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Facebook.winmd" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Facebook.pri" target="bin\UWP\x64"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\x64\Facebook"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\x64\Facebook\Themes"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\x64\Facebook\Themes"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\x64\Facebook\Controls"/>
+      <file src="FBSDK-UWP\x64\Release\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\x64\Facebook"/>
 
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Facebook.dll" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Facebook.winmd" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Facebook.pri" target="bin\UAP\arm"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\FacebookDialog.xbf" target="bin\UAP\arm\Facebook"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\FacebookProfilePictureControl.xbf" target="bin\UAP\arm\Facebook"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Themes\Generic.xbf" target="bin\UAP\arm\Facebook\Themes"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Themes\Styles.xbf" target="bin\UAP\arm\Facebook\Themes"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\Controls\FacebookLoginButton.xbf" target="bin\UAP\arm\Facebook\Controls"/>
-      <file src="FBSDK-UAP\ARM\Release\FBSDK-UAP\fb_blank_profile_portrait.png" target="bin\UAP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Facebook.dll" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Facebook.winmd" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Facebook.pri" target="bin\UWP\arm"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\FacebookDialog.xbf" target="bin\UWP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\FacebookProfilePictureControl.xbf" target="bin\UWP\arm\Facebook"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Themes\Generic.xbf" target="bin\UWP\arm\Facebook\Themes"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Themes\Styles.xbf" target="bin\UWP\arm\Facebook\Themes"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\Controls\FacebookLoginButton.xbf" target="bin\UWP\arm\Facebook\Controls"/>
+      <file src="FBSDK-UWP\ARM\Release\FBSDK-UWP\fb_blank_profile_portrait.png" target="bin\UWP\arm\Facebook"/>
 
         <!-- Build scripts used by managed Windows Store Apps -->
       <file src="build\nuget\FBWinSDK.props" target="build\win\FBWinSDK.props" />

README.md

@@ -1,6 +1,6 @@
-# **Microsoft SDK for Facebook Integration**
+# **Windows SDK for Facebook**
 
-The Microsoft SDK for Facebook Integration is geared towards app developers creating WinRT based apps on both desktop and phone. Easily integrate Facebook Auth, Like and other Facebook Graph functionality using this SDK.
+The Windows SDK for Facebook is geared towards app developers creating modern windows applications on both desktop and phone. Easily integrate Facebook Auth, Like and other Facebook Graph functionality using this SDK.
 
 
 ## **Features**

samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp

@@ -60,7 +60,7 @@ MainPage::MainPage()
 
 	// Assumes the Facebook App ID and Windows Phone Store ID have been saved
 	// in the default resource file.
-	// TODO: Commenting this out for now - resource loader isn't working for me in UAP app.
+	// TODO: Commenting this out for now - resource loader isn't working for me in UWP app.
 	ResourceLoader^ rl = ResourceLoader::GetForCurrentView();
 
 	String^ appId = rl->GetString(FBAppIDName);