From e6fa7ebf393b29a0345fa2756e50e3f8b5347311 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 09:43:18 -0700 Subject: [PATCH 1/9] Update README.md Rename project to "Windows SDK for Facebook". --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index cd4ac05..768db06 100644 --- a/README.md +++ b/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 WinRT based apps on both desktop and phone. Easily integrate Facebook Auth, Like and other Facebook Graph functionality using this SDK. ## **Features** From f2340b269b650e0729bbc2e4c2629f9f166359f3 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 10:01:44 -0700 Subject: [PATCH 2/9] Rename UAP->UWP in sample app. --- .../LoginCpp-UWP.sln} | 0 .../LoginCpp/App.xaml | 0 .../LoginCpp/App.xaml.cpp | 0 .../LoginCpp/App.xaml.h | 0 .../LoginCpp/Assets/Logo.scale-100.png | Bin .../LoginCpp/Assets/SmallLogo.scale-100.png | Bin .../LoginCpp/Assets/SplashScreen.scale-100.png | Bin .../LoginCpp/Assets/StoreLogo.scale-100.png | Bin .../LoginCpp/Assets/WideLogo.scale-100.png | Bin .../LoginCpp/Common/NavigationHelper.cpp | 0 .../LoginCpp/Common/NavigationHelper.h | 0 .../LoginCpp/Common/RelayCommand.cpp | 0 .../LoginCpp/Common/RelayCommand.h | 0 .../LoginCpp/Common/SuspensionManager.cpp | 0 .../LoginCpp/Common/SuspensionManager.h | 0 .../LoginCpp/FBPageBindable.cpp | 0 .../LoginCpp/FBPageBindable.h | 0 .../LoginCpp/LoginCpp.vcxproj | 0 .../LoginCpp/LoginCpp.vcxproj.filters | 0 .../LoginCpp/MainPage.xaml | 0 .../LoginCpp/MainPage.xaml.cpp | 2 +- .../LoginCpp/MainPage.xaml.h | 0 .../LoginCpp/Package.appxmanifest | 0 .../LoginCpp/Resources.resw | 0 .../LoginCpp/UserInfo.xaml | 0 .../LoginCpp/UserInfo.xaml.cpp | 0 .../LoginCpp/UserInfo.xaml.h | 0 .../LoginCpp/UserLikes.xaml | 0 .../LoginCpp/UserLikes.xaml.cpp | 0 .../LoginCpp/UserLikes.xaml.h | 0 .../LoginCpp/packages.config | 0 .../{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/pch.cpp | 0 .../{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/pch.h | 0 33 files changed, 1 insertion(+), 1 deletion(-) rename samples/{LoginCpp-UAP/LoginCpp-UAP.sln => LoginCpp-UWP/LoginCpp-UWP.sln} (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/App.xaml (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/App.xaml.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/App.xaml.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Assets/Logo.scale-100.png (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Assets/SmallLogo.scale-100.png (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Assets/SplashScreen.scale-100.png (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Assets/StoreLogo.scale-100.png (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Assets/WideLogo.scale-100.png (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/NavigationHelper.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/NavigationHelper.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/RelayCommand.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/RelayCommand.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/SuspensionManager.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Common/SuspensionManager.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/FBPageBindable.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/FBPageBindable.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/LoginCpp.vcxproj (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/LoginCpp.vcxproj.filters (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/MainPage.xaml (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/MainPage.xaml.cpp (99%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/MainPage.xaml.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Package.appxmanifest (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/Resources.resw (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserInfo.xaml (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserInfo.xaml.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserInfo.xaml.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserLikes.xaml (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserLikes.xaml.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/UserLikes.xaml.h (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/packages.config (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/pch.cpp (100%) rename samples/{LoginCpp-UAP => LoginCpp-UWP}/LoginCpp/pch.h (100%) diff --git a/samples/LoginCpp-UAP/LoginCpp-UAP.sln b/samples/LoginCpp-UWP/LoginCpp-UWP.sln similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp-UAP.sln rename to samples/LoginCpp-UWP/LoginCpp-UWP.sln diff --git a/samples/LoginCpp-UAP/LoginCpp/App.xaml b/samples/LoginCpp-UWP/LoginCpp/App.xaml similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/App.xaml rename to samples/LoginCpp-UWP/LoginCpp/App.xaml diff --git a/samples/LoginCpp-UAP/LoginCpp/App.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/App.xaml.cpp rename to samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/App.xaml.h b/samples/LoginCpp-UWP/LoginCpp/App.xaml.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/App.xaml.h rename to samples/LoginCpp-UWP/LoginCpp/App.xaml.h diff --git a/samples/LoginCpp-UAP/LoginCpp/Assets/Logo.scale-100.png b/samples/LoginCpp-UWP/LoginCpp/Assets/Logo.scale-100.png similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Assets/Logo.scale-100.png rename to samples/LoginCpp-UWP/LoginCpp/Assets/Logo.scale-100.png diff --git a/samples/LoginCpp-UAP/LoginCpp/Assets/SmallLogo.scale-100.png b/samples/LoginCpp-UWP/LoginCpp/Assets/SmallLogo.scale-100.png similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Assets/SmallLogo.scale-100.png rename to samples/LoginCpp-UWP/LoginCpp/Assets/SmallLogo.scale-100.png diff --git a/samples/LoginCpp-UAP/LoginCpp/Assets/SplashScreen.scale-100.png b/samples/LoginCpp-UWP/LoginCpp/Assets/SplashScreen.scale-100.png similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Assets/SplashScreen.scale-100.png rename to samples/LoginCpp-UWP/LoginCpp/Assets/SplashScreen.scale-100.png diff --git a/samples/LoginCpp-UAP/LoginCpp/Assets/StoreLogo.scale-100.png b/samples/LoginCpp-UWP/LoginCpp/Assets/StoreLogo.scale-100.png similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Assets/StoreLogo.scale-100.png rename to samples/LoginCpp-UWP/LoginCpp/Assets/StoreLogo.scale-100.png diff --git a/samples/LoginCpp-UAP/LoginCpp/Assets/WideLogo.scale-100.png b/samples/LoginCpp-UWP/LoginCpp/Assets/WideLogo.scale-100.png similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Assets/WideLogo.scale-100.png rename to samples/LoginCpp-UWP/LoginCpp/Assets/WideLogo.scale-100.png diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/NavigationHelper.cpp b/samples/LoginCpp-UWP/LoginCpp/Common/NavigationHelper.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/NavigationHelper.cpp rename to samples/LoginCpp-UWP/LoginCpp/Common/NavigationHelper.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/NavigationHelper.h b/samples/LoginCpp-UWP/LoginCpp/Common/NavigationHelper.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/NavigationHelper.h rename to samples/LoginCpp-UWP/LoginCpp/Common/NavigationHelper.h diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/RelayCommand.cpp b/samples/LoginCpp-UWP/LoginCpp/Common/RelayCommand.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/RelayCommand.cpp rename to samples/LoginCpp-UWP/LoginCpp/Common/RelayCommand.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/RelayCommand.h b/samples/LoginCpp-UWP/LoginCpp/Common/RelayCommand.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/RelayCommand.h rename to samples/LoginCpp-UWP/LoginCpp/Common/RelayCommand.h diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/SuspensionManager.cpp b/samples/LoginCpp-UWP/LoginCpp/Common/SuspensionManager.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/SuspensionManager.cpp rename to samples/LoginCpp-UWP/LoginCpp/Common/SuspensionManager.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/Common/SuspensionManager.h b/samples/LoginCpp-UWP/LoginCpp/Common/SuspensionManager.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Common/SuspensionManager.h rename to samples/LoginCpp-UWP/LoginCpp/Common/SuspensionManager.h diff --git a/samples/LoginCpp-UAP/LoginCpp/FBPageBindable.cpp b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/FBPageBindable.cpp rename to samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/FBPageBindable.h b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/FBPageBindable.h rename to samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h diff --git a/samples/LoginCpp-UAP/LoginCpp/LoginCpp.vcxproj b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/LoginCpp.vcxproj rename to samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj diff --git a/samples/LoginCpp-UAP/LoginCpp/LoginCpp.vcxproj.filters b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.filters similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/LoginCpp.vcxproj.filters rename to samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.filters diff --git a/samples/LoginCpp-UAP/LoginCpp/MainPage.xaml b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/MainPage.xaml rename to samples/LoginCpp-UWP/LoginCpp/MainPage.xaml diff --git a/samples/LoginCpp-UAP/LoginCpp/MainPage.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp similarity index 99% rename from samples/LoginCpp-UAP/LoginCpp/MainPage.xaml.cpp rename to samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp index 71f324a..172c86e 100644 --- a/samples/LoginCpp-UAP/LoginCpp/MainPage.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp @@ -59,7 +59,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); diff --git a/samples/LoginCpp-UAP/LoginCpp/MainPage.xaml.h b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/MainPage.xaml.h rename to samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h diff --git a/samples/LoginCpp-UAP/LoginCpp/Package.appxmanifest b/samples/LoginCpp-UWP/LoginCpp/Package.appxmanifest similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Package.appxmanifest rename to samples/LoginCpp-UWP/LoginCpp/Package.appxmanifest diff --git a/samples/LoginCpp-UAP/LoginCpp/Resources.resw b/samples/LoginCpp-UWP/LoginCpp/Resources.resw similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/Resources.resw rename to samples/LoginCpp-UWP/LoginCpp/Resources.resw diff --git a/samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml rename to samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml diff --git a/samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml.cpp rename to samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml.h b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserInfo.xaml.h rename to samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.h diff --git a/samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml rename to samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml diff --git a/samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml.cpp rename to samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml.h b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/UserLikes.xaml.h rename to samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h diff --git a/samples/LoginCpp-UAP/LoginCpp/packages.config b/samples/LoginCpp-UWP/LoginCpp/packages.config similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/packages.config rename to samples/LoginCpp-UWP/LoginCpp/packages.config diff --git a/samples/LoginCpp-UAP/LoginCpp/pch.cpp b/samples/LoginCpp-UWP/LoginCpp/pch.cpp similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/pch.cpp rename to samples/LoginCpp-UWP/LoginCpp/pch.cpp diff --git a/samples/LoginCpp-UAP/LoginCpp/pch.h b/samples/LoginCpp-UWP/LoginCpp/pch.h similarity index 100% rename from samples/LoginCpp-UAP/LoginCpp/pch.h rename to samples/LoginCpp-UWP/LoginCpp/pch.h From cab94f1818ecf038a98dcfeb2bf321a1d16a49cc Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 10:03:24 -0700 Subject: [PATCH 3/9] Rename FBSDK-UAP->FBSDK->UWP. --- FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.sln | 0 FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/FBSDK-UAP.vcxproj | 0 .../{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/FBSDK-UAP.vcxproj.filters | 0 FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/pch.cpp | 0 FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/pch.h | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.sln (100%) rename FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/FBSDK-UAP.vcxproj (100%) rename FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/FBSDK-UAP.vcxproj.filters (100%) rename FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/pch.cpp (100%) rename FBWinSDK/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP/pch.h (100%) diff --git a/FBWinSDK/FBSDK-UAP/FBSDK-UAP.sln b/FBWinSDK/FBSDK-UWP/FBSDK-UAP.sln similarity index 100% rename from FBWinSDK/FBSDK-UAP/FBSDK-UAP.sln rename to FBWinSDK/FBSDK-UWP/FBSDK-UAP.sln diff --git a/FBWinSDK/FBSDK-UAP/FBSDK-UAP/FBSDK-UAP.vcxproj b/FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj similarity index 100% rename from FBWinSDK/FBSDK-UAP/FBSDK-UAP/FBSDK-UAP.vcxproj rename to FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj diff --git a/FBWinSDK/FBSDK-UAP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters b/FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters similarity index 100% rename from FBWinSDK/FBSDK-UAP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters rename to FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters diff --git a/FBWinSDK/FBSDK-UAP/FBSDK-UAP/pch.cpp b/FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.cpp similarity index 100% rename from FBWinSDK/FBSDK-UAP/FBSDK-UAP/pch.cpp rename to FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.cpp diff --git a/FBWinSDK/FBSDK-UAP/FBSDK-UAP/pch.h b/FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.h similarity index 100% rename from FBWinSDK/FBSDK-UAP/FBSDK-UAP/pch.h rename to FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.h From 60412e132e6a99c9cda7f54f8233558e80642ef1 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 10:05:18 -0700 Subject: [PATCH 4/9] Rename UAP->UWP solution file and project directory. --- FBWinSDK/FBSDK-UWP/{FBSDK-UAP.sln => FBSDK-UWP.sln} | 0 FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.vcxproj | 0 .../FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.vcxproj.filters | 0 FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/pch.cpp | 0 FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/pch.h | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename FBWinSDK/FBSDK-UWP/{FBSDK-UAP.sln => FBSDK-UWP.sln} (100%) rename FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.vcxproj (100%) rename FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/FBSDK-UAP.vcxproj.filters (100%) rename FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/pch.cpp (100%) rename FBWinSDK/FBSDK-UWP/{FBSDK-UAP => FBSDK-UWP}/pch.h (100%) diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UAP.sln b/FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UAP.sln rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj.filters similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UAP/FBSDK-UAP.vcxproj.filters rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj.filters diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.cpp b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/pch.cpp similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.cpp rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/pch.cpp diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.h b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/pch.h similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UAP/pch.h rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/pch.h From 70360a04a5cf790bf0d500f305f4fac432118425 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 10:08:32 -0700 Subject: [PATCH 5/9] Rename UAP->UWP in solution file, rename project files. --- FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln | 2 +- .../FBSDK-UWP/{FBSDK-UAP.vcxproj => FBSDK-UWP.vcxproj} | 0 .../{FBSDK-UAP.vcxproj.filters => FBSDK-UWP.vcxproj.filters} | 0 3 files changed, 1 insertion(+), 1 deletion(-) rename FBWinSDK/FBSDK-UWP/FBSDK-UWP/{FBSDK-UAP.vcxproj => FBSDK-UWP.vcxproj} (100%) rename FBWinSDK/FBSDK-UWP/FBSDK-UWP/{FBSDK-UAP.vcxproj.filters => FBSDK-UWP.vcxproj.filters} (100%) diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln b/FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln index 202c374..ef8b40e 100644 --- a/FBWinSDK/FBSDK-UWP/FBSDK-UWP.sln +++ b/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 diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UWP.vcxproj similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UWP.vcxproj diff --git a/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj.filters b/FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UWP.vcxproj.filters similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UAP.vcxproj.filters rename to FBWinSDK/FBSDK-UWP/FBSDK-UWP/FBSDK-UWP.vcxproj.filters From 54ede3ba678fc7970d951bfe746b7f67c9821855 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 10:12:38 -0700 Subject: [PATCH 6/9] Rename UAP->UWP in NuGet support files. --- FBWinSDK/build/nuget/FBWinSDK-debug.nuspec | 54 +++++++++---------- FBWinSDK/build/nuget/FBWinSDK-managed.targets | 2 +- FBWinSDK/build/nuget/FBWinSDK-native.targets | 2 +- FBWinSDK/build/nuget/FBWinSDK.nuspec | 54 +++++++++---------- 4 files changed, 56 insertions(+), 56 deletions(-) diff --git a/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec b/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec index 9709f76..135adf3 100644 --- a/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec +++ b/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec @@ -76,35 +76,35 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + diff --git a/FBWinSDK/build/nuget/FBWinSDK-managed.targets b/FBWinSDK/build/nuget/FBWinSDK-managed.targets index a7c338e..84f059d 100644 --- a/FBWinSDK/build/nuget/FBWinSDK-managed.targets +++ b/FBWinSDK/build/nuget/FBWinSDK-managed.targets @@ -4,7 +4,7 @@ Windows Phone - UAP + UWP diff --git a/FBWinSDK/build/nuget/FBWinSDK-native.targets b/FBWinSDK/build/nuget/FBWinSDK-native.targets index 937a87c..f12c645 100644 --- a/FBWinSDK/build/nuget/FBWinSDK-native.targets +++ b/FBWinSDK/build/nuget/FBWinSDK-native.targets @@ -4,7 +4,7 @@ Windows Phone - UAP + UWP diff --git a/FBWinSDK/build/nuget/FBWinSDK.nuspec b/FBWinSDK/build/nuget/FBWinSDK.nuspec index 40a1c9e..ef565d8 100644 --- a/FBWinSDK/build/nuget/FBWinSDK.nuspec +++ b/FBWinSDK/build/nuget/FBWinSDK.nuspec @@ -108,35 +108,35 @@ - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + From c8e47292e34d34c1218f453da4e96e1de02c1246 Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Wed, 17 Jun 2015 09:59:00 -0700 Subject: [PATCH 7/9] Add command-line build script to build all flavors of SDK and create NuGet packages. --- .gitignore | 17 ++--- FBWinSDK/build/build-sdk.cmd | 119 +++++++++++++++++++++++++++++++++++ 2 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 FBWinSDK/build/build-sdk.cmd diff --git a/.gitignore b/.gitignore index d55bf87..c385c37 100644 --- a/.gitignore +++ b/.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 diff --git a/FBWinSDK/build/build-sdk.cmd b/FBWinSDK/build/build-sdk.cmd new file mode 100644 index 0000000..97e1689 --- /dev/null +++ b/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-UAP + +call :build_one_flavor FBSDK-UAP.sln x86 Debug +if errorlevel 1 goto errorExit + +call :build_one_flavor FBSDK-UAP.sln x86 Release +if errorlevel 1 goto errorExit + +call :build_one_flavor FBSDK-UAP.sln x64 Debug +if errorlevel 1 goto errorExit + +call :build_one_flavor FBSDK-UAP.sln x64 Release +if errorlevel 1 goto errorExit + +call :build_one_flavor FBSDK-UAP.sln ARM Debug +if errorlevel 1 goto errorExit + +call :build_one_flavor FBSDK-UAP.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 + From 8fda05127d23be8f9c16d4039ad7937d896ecd0a Mon Sep 17 00:00:00 2001 From: Blake Bender Date: Tue, 23 Jun 2015 11:20:24 -0700 Subject: [PATCH 8/9] Rename UAP->UWP in build script. --- FBWinSDK/build/build-sdk.cmd | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/FBWinSDK/build/build-sdk.cmd b/FBWinSDK/build/build-sdk.cmd index 97e1689..5c0c024 100644 --- a/FBWinSDK/build/build-sdk.cmd +++ b/FBWinSDK/build/build-sdk.cmd @@ -42,24 +42,24 @@ if errorlevel 1 goto errorExit rem --------------------------------------------------------------------------- rem build for Windows 10 Universal rem --------------------------------------------------------------------------- -cd FBSDK-UAP +cd FBSDK-UWP -call :build_one_flavor FBSDK-UAP.sln x86 Debug +call :build_one_flavor FBSDK-UWP.sln x86 Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBSDK-UAP.sln x86 Release +call :build_one_flavor FBSDK-UWP.sln x86 Release if errorlevel 1 goto errorExit -call :build_one_flavor FBSDK-UAP.sln x64 Debug +call :build_one_flavor FBSDK-UWP.sln x64 Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBSDK-UAP.sln x64 Release +call :build_one_flavor FBSDK-UWP.sln x64 Release if errorlevel 1 goto errorExit -call :build_one_flavor FBSDK-UAP.sln ARM Debug +call :build_one_flavor FBSDK-UWP.sln ARM Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBSDK-UAP.sln ARM Release +call :build_one_flavor FBSDK-UWP.sln ARM Release if errorlevel 1 goto errorExit rem --------------------------------------------------------------------------- From 703b5e36ee2d368da8b4076c25acf3574fb03a7e Mon Sep 17 00:00:00 2001 From: Gilles Khouzam Date: Wed, 24 Jun 2015 11:54:42 -0700 Subject: [PATCH 9/9] Update the Readme. --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 768db06..7fd5016 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ # **Windows SDK for Facebook** -The Windows SDK for Facebook 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**