diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBGroup.h.tt b/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBGroup.h.tt deleted file mode 100644 index 38fb6c4..0000000 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBGroup.h.tt +++ /dev/null @@ -1,3 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<# string classDefFile = "..\\FBWinSDK.Shared\\FBGroup.xml"; #> -<#@ include file="FBGraphObjectHeader.ttinclude" #> \ No newline at end of file diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBObject.h.tt b/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBObject.h.tt deleted file mode 100644 index ea2a0e0..0000000 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBObject.h.tt +++ /dev/null @@ -1,3 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<# string classDefFile = "..\\FBWinSDK.Shared\\FBObject.xml"; #> -<#@ include file="FBGraphObjectHeader.ttinclude" #> \ No newline at end of file diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPage.h.tt b/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPage.h.tt deleted file mode 100644 index ab07c68..0000000 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPage.h.tt +++ /dev/null @@ -1,3 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<# string classDefFile = "..\\FBWinSDK.Shared\\FacebookPage.xml"; #> -<#@ include file="FBGraphObjectHeader.ttinclude" #> \ No newline at end of file diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPageCategory.h.tt b/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPageCategory.h.tt deleted file mode 100644 index 91e327b..0000000 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPageCategory.h.tt +++ /dev/null @@ -1,3 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<# string classDefFile = "..\\FBWinSDK.Shared\\FacebookPageCategory.xml"; #> -<#@ include file="FBGraphObjectHeader.ttinclude" #> \ No newline at end of file diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPaging.h.tt b/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPaging.h.tt deleted file mode 100644 index 1b1c52a..0000000 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/FBPaging.h.tt +++ /dev/null @@ -1,3 +0,0 @@ -<#@ template debug="false" hostspecific="false" language="C#" #> -<# string classDefFile = "..\\FBWinSDK.Shared\\FBPaging.xml"; #> -<#@ include file="FBGraphObjectHeader.ttinclude" #> \ No newline at end of file diff --git a/samples/LoginCpp-UWP/LoginCpp-UWP.sln b/samples/LoginCpp-UWP/LoginCpp-UWP.sln index 5375e8e..94bc717 100644 --- a/samples/LoginCpp-UWP/LoginCpp-UWP.sln +++ b/samples/LoginCpp-UWP/LoginCpp-UWP.sln @@ -1,13 +1,18 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LoginCpp", "LoginCpp\LoginCpp.vcxproj", "{351701A8-12D1-45B3-8E6A-164D796B0297}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Facebook", "..\..\FBWinSDK\FBSDK-UWP\FBSDK-UWP\FBSDK-UWP.vcxproj", "{973A943B-FF77-4267-8F30-F5FE2B7F5583}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb", "..\..\winsdkfb\winsdkfb_uwp\winsdkfb_uwp\winsdkfb_uwp.vcxproj", "{973A943B-FF77-4267-8F30-F5FE2B7F5583}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}" EndProject Global + GlobalSection(SharedMSBuildProjectFiles) = preSolution + ..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{973a943b-ff77-4267-8f30-f5fe2b7f5583}*SharedItemsImports = 4 + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|x64 = Debug|x64 diff --git a/samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp index 4cbfae1..75cd3f6 100644 --- a/samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp @@ -42,7 +42,7 @@ using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Interop; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -using namespace Facebook; +using namespace winsdkfb; // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 @@ -240,4 +240,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) (void)e; // Unused parameter // TODO: Save application state and stop any background activity -} \ No newline at end of file +} diff --git a/samples/LoginCpp-UWP/LoginCpp/Dialogs.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/Dialogs.xaml.cpp index 787699e..7279bab 100644 --- a/samples/LoginCpp-UWP/LoginCpp/Dialogs.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/Dialogs.xaml.cpp @@ -25,7 +25,7 @@ using namespace LoginCpp; using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace Platform; using namespace Platform::Collections; using namespace Windows::Foundation; diff --git a/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp index 0ef57f1..b77d51f 100644 --- a/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp @@ -17,8 +17,8 @@ #include "pch.h" #include "FBPageBindable.h" -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace LoginCpp; using namespace Platform; using namespace Windows::Data::Json; diff --git a/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h index 58c749e..9a9df77 100644 --- a/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h +++ b/samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h @@ -76,14 +76,14 @@ namespace LoginCpp private: FBPageBindable( - Facebook::Graph::FBPage^ page + winsdkfb::Graph::FBPage^ page ); void NotifyPropertyChanged( Platform::String^ prop ); - Facebook::Graph::FBPage^ _page; + winsdkfb::Graph::FBPage^ _page; }; } diff --git a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj index d26b68b..f41231b 100644 --- a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj +++ b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj @@ -1,4 +1,4 @@ - + {351701a8-12d1-45b3-8e6a-164d796b0297} @@ -218,7 +218,7 @@ - + {973a943b-ff77-4267-8f30-f5fe2b7f5583} diff --git a/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user new file mode 100644 index 0000000..abe8dd8 --- /dev/null +++ b/samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp index 40c08cb..ea54fe7 100644 --- a/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp @@ -24,7 +24,7 @@ #include "OptionsPage.xaml.h" using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace LoginCpp; using namespace Platform; using namespace Platform::Collections; @@ -118,7 +118,7 @@ BOOL MainPage::WasAppPermissionRemovedByUser( { return (result && (!result->Succeeded) && - (result->ErrorInfo->Code == (int)Facebook::ErrorCode::ErrorCodeOauthException)); + (result->ErrorInfo->Code == (int)winsdkfb::ErrorCode::ErrorCodeOauthException)); } BOOL MainPage::ShouldRerequest( diff --git a/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h index f28ea90..1a1c8fd 100644 --- a/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h +++ b/samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h @@ -37,18 +37,18 @@ namespace LoginCpp void MainPage::SetSessionAppIds( ); - Facebook::FBPermissions^ BuildPermissions( + winsdkfb::FBPermissions^ BuildPermissions( ); BOOL DidGetAllRequestedPermissions( ); BOOL MainPage::WasAppPermissionRemovedByUser( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); BOOL ShouldRerequest( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); void NavigateToOptionsPage( diff --git a/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml index 4468b1a..a562e45 100644 --- a/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml +++ b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:LoginCpp" - xmlns:fbsdk="using:Facebook" + xmlns:fbsdk="using:winsdkfb" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" diff --git a/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp index 6c14eb3..d3e5182 100644 --- a/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp @@ -25,8 +25,8 @@ using namespace LoginCpp; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Platform::Collections; using namespace Windows::Foundation; diff --git a/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp index 5bd09e0..3b38fa3 100644 --- a/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp +++ b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp @@ -37,8 +37,8 @@ using namespace Windows::UI::Xaml::Data; using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 diff --git a/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h index 0d3f484..c4af469 100644 --- a/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h +++ b/samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h @@ -61,7 +61,7 @@ namespace LoginCpp Platform::String^ prop ); - Facebook::Graph::FBPaginatedArray^ _likes; + winsdkfb::Graph::FBPaginatedArray^ _likes; FBPageBindable^ _selectedItem; Platform::Collections::Vector^ _listViewItems; void ListView_SelectionChanged( diff --git a/samples/LoginCpp/LoginCpp.sln b/samples/LoginCpp/LoginCpp.sln index 0e56e0b..cf7bf2c 100644 --- a/samples/LoginCpp/LoginCpp.sln +++ b/samples/LoginCpp/LoginCpp.sln @@ -11,15 +11,17 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LoginCpp.Windows", "LoginCp EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "LoginCpp.WindowsPhone", "LoginCpp\LoginCpp.WindowsPhone\LoginCpp.WindowsPhone.vcxproj", "{45BAA3AB-92F6-4DB0-B008-FDDD73D1659B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.Windows", "..\..\FBWinSDK\FBWinSDK\FBWinSDK.Windows\FBWinSDK.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Windows", "..\..\winsdkfb\winsdkfb\winsdkfb.Windows\winsdkfb.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.WindowsPhone", "..\..\FBWinSDK\FBWinSDK\FBWinSDK.WindowsPhone\FBWinSDK.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.WindowsPhone", "..\..\winsdkfb\winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution LoginCpp\LoginCpp.Shared\LoginCpp.Shared.vcxitems*{079ac050-7d48-41f0-83c2-f4c4da7f21d4}*SharedItemsImports = 9 - ..\..\FBWinSDK\FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 - ..\..\FBWinSDK\FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 + ..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 + ..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 LoginCpp\LoginCpp.Shared\LoginCpp.Shared.vcxitems*{45baa3ab-92f6-4db0-b008-fddd73d1659b}*SharedItemsImports = 4 LoginCpp\LoginCpp.Shared\LoginCpp.Shared.vcxitems*{4fdef5bd-ed11-49a1-b6c6-d9f0ab7eb7e2}*SharedItemsImports = 4 EndGlobalSection diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/App.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/App.xaml.cpp index eb366dc..bfb3a8e 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/App.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/App.xaml.cpp @@ -42,7 +42,7 @@ using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Interop; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -using namespace Facebook; +using namespace winsdkfb; // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 @@ -179,4 +179,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) (void) e; // Unused parameter // TODO: Save application state and stop any background activity -} \ No newline at end of file +} diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.cpp index 0ef57f1..b77d51f 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.cpp @@ -17,8 +17,8 @@ #include "pch.h" #include "FBPageBindable.h" -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace LoginCpp; using namespace Platform; using namespace Windows::Data::Json; diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.h b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.h index 58c749e..9a9df77 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.h +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.h @@ -76,14 +76,14 @@ namespace LoginCpp private: FBPageBindable( - Facebook::Graph::FBPage^ page + winsdkfb::Graph::FBPage^ page ); void NotifyPropertyChanged( Platform::String^ prop ); - Facebook::Graph::FBPage^ _page; + winsdkfb::Graph::FBPage^ _page; }; } diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml index 4468b1a..a562e45 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml @@ -3,7 +3,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:local="using:LoginCpp" - xmlns:fbsdk="using:Facebook" + xmlns:fbsdk="using:winsdkfb" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="d" diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml.cpp index 6c14eb3..d3e5182 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml.cpp @@ -25,8 +25,8 @@ using namespace LoginCpp; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Platform::Collections; using namespace Windows::Foundation; diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.cpp index 5bd09e0..3b38fa3 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.cpp @@ -37,8 +37,8 @@ using namespace Windows::UI::Xaml::Data; using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.h b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.h index 0d3f484..c4af469 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.h +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.h @@ -61,7 +61,7 @@ namespace LoginCpp Platform::String^ prop ); - Facebook::Graph::FBPaginatedArray^ _likes; + winsdkfb::Graph::FBPaginatedArray^ _likes; FBPageBindable^ _selectedItem; Platform::Collections::Vector^ _listViewItems; void ListView_SelectionChanged( diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/Dialogs.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/Dialogs.xaml.cpp index 9995540..d429e25 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/Dialogs.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/Dialogs.xaml.cpp @@ -25,7 +25,7 @@ using namespace LoginCpp; using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace Platform; using namespace Windows::Foundation; using namespace Windows::Foundation::Collections; diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj index cc02b15..e6365aa 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/LoginCpp.Windows.vcxproj @@ -184,7 +184,7 @@ - + {418fc79b-aa0f-4951-a7d9-7da89bdf8fb6} diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.cpp index d02e9fb..ef1b440 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.cpp @@ -24,7 +24,7 @@ #include "OptionsPage.xaml.h" using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace LoginCpp; using namespace Platform; using namespace Platform::Collections; @@ -122,8 +122,8 @@ BOOL MainPage::WasAppPermissionRemovedByUser( { return (result && (!result->Succeeded) && - ((result->ErrorInfo->Code == (int)Facebook::ErrorCode::ErrorCodeOauthException) && - (result->ErrorInfo->Subcode == (int)Facebook::ErrorSubcode::ErrorSubcodeSessionInvalidated))); + ((result->ErrorInfo->Code == (int)winsdkfb::ErrorCode::ErrorCodeOauthException) && + (result->ErrorInfo->Subcode == (int)winsdkfb::ErrorSubcode::ErrorSubcodeSessionInvalidated))); } BOOL MainPage::ShouldRerequest( diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.h b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.h index f28ea90..1a1c8fd 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.h +++ b/samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.h @@ -37,18 +37,18 @@ namespace LoginCpp void MainPage::SetSessionAppIds( ); - Facebook::FBPermissions^ BuildPermissions( + winsdkfb::FBPermissions^ BuildPermissions( ); BOOL DidGetAllRequestedPermissions( ); BOOL MainPage::WasAppPermissionRemovedByUser( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); BOOL ShouldRerequest( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); void NavigateToOptionsPage( diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/Dialogs.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/Dialogs.xaml.cpp index 6ceb393..a5f89fc 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/Dialogs.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/Dialogs.xaml.cpp @@ -25,7 +25,7 @@ using namespace LoginCpp; using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace Platform; using namespace Platform::Collections; using namespace Windows::Foundation; diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/LoginCpp.WindowsPhone.vcxproj b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/LoginCpp.WindowsPhone.vcxproj index e8ce4ac..1c46b08 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/LoginCpp.WindowsPhone.vcxproj +++ b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/LoginCpp.WindowsPhone.vcxproj @@ -143,7 +143,7 @@ - + {f833b1e6-2866-4a47-89e2-c474983fe70f} diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.cpp b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.cpp index 80908b1..893b6d6 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.cpp +++ b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.cpp @@ -24,7 +24,7 @@ #include "OptionsPage.xaml.h" using namespace concurrency; -using namespace Facebook; +using namespace winsdkfb; using namespace LoginCpp; using namespace Platform; using namespace Platform::Collections; @@ -122,8 +122,8 @@ BOOL MainPage::WasAppPermissionRemovedByUser( { return (result && (!result->Succeeded) && - ((result->ErrorInfo->Code == (int)Facebook::ErrorCode::ErrorCodeOauthException) && - (result->ErrorInfo->Subcode == (int)Facebook::ErrorSubcode::ErrorSubcodeSessionInvalidated))); + ((result->ErrorInfo->Code == (int)winsdkfb::ErrorCode::ErrorCodeOauthException) && + (result->ErrorInfo->Subcode == (int)winsdkfb::ErrorSubcode::ErrorSubcodeSessionInvalidated))); } BOOL MainPage::ShouldRerequest( diff --git a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.h b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.h index fb0e2c3..4f5e2cc 100644 --- a/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.h +++ b/samples/LoginCpp/LoginCpp/LoginCpp.WindowsPhone/MainPage.xaml.h @@ -37,18 +37,18 @@ namespace LoginCpp void MainPage::SetSessionAppIds( ); - Facebook::FBPermissions^ BuildPermissions( + winsdkfb::FBPermissions^ BuildPermissions( ); BOOL DidGetAllRequestedPermissions( ); BOOL MainPage::WasAppPermissionRemovedByUser( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); BOOL ShouldRerequest( - Facebook::FBResult^ result + winsdkfb::FBResult^ result ); void NavigateToOptionsPage( diff --git a/samples/LoginCs/LoginCs.sln b/samples/LoginCs/LoginCs.sln index aa489cd..8010d8b 100644 --- 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 2013 -VisualStudioVersion = 12.0.31101.0 +# Visual Studio 14 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoginCs", "LoginCs", "{F3A8EFF0-4471-4905-B279-756B1D864AAB}" EndProject @@ -11,16 +11,18 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoginCs.Windows", "LoginCs\ EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoginCs.WindowsPhone", "LoginCs\LoginCs.WindowsPhone\LoginCs.WindowsPhone.csproj", "{EF5F7E3E-8E45-4027-846C-3349247C065D}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.Windows", "..\..\FBWinSDK\FBWinSDK\FBWinSDK.Windows\FBWinSDK.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Windows", "..\..\winsdkfb\winsdkfb\winsdkfb.Windows\winsdkfb.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.WindowsPhone", "..\..\FBWinSDK\FBWinSDK\FBWinSDK.WindowsPhone\FBWinSDK.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.WindowsPhone", "..\..\winsdkfb\winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}" EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - ..\..\FBWinSDK\FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 + ..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 LoginCs\LoginCs.Shared\LoginCs.Shared.projitems*{a506e326-7a59-479e-8e80-65fb73ae94d8}*SharedItemsImports = 4 LoginCs\LoginCs.Shared\LoginCs.Shared.projitems*{5364ddc1-f2ca-4959-9292-546c26254cd2}*SharedItemsImports = 13 - ..\..\FBWinSDK\FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 + ..\..\winsdkfb\winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 LoginCs\LoginCs.Shared\LoginCs.Shared.projitems*{ef5f7e3e-8e45-4027-846c-3349247c065d}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/App.xaml.cs b/samples/LoginCs/LoginCs/LoginCs.Shared/App.xaml.cs index 79601be..2ce06a3 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/App.xaml.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/App.xaml.cs @@ -33,7 +33,7 @@ using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Media.Animation; using Windows.UI.Xaml.Navigation; -using Facebook; +using winsdkfb; // The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/FBCSObjectImplementation.ttinclude b/samples/LoginCs/LoginCs/LoginCs.Shared/FBCSObjectImplementation.ttinclude index a7e0052..f592d43 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/FBCSObjectImplementation.ttinclude +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/FBCSObjectImplementation.ttinclude @@ -19,7 +19,7 @@ using System; using System.ComponentModel; using Newtonsoft.Json; -using Facebook; +using winsdkfb; <# string interfaces = ""; diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/MyFBPage.cs b/samples/LoginCs/LoginCs/LoginCs.Shared/MyFBPage.cs index 7526cdf..8d6c224 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/MyFBPage.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/MyFBPage.cs @@ -8,7 +8,7 @@ using System; using System.ComponentModel; using Newtonsoft.Json; -using Facebook; +using winsdkfb; using Windows.ApplicationModel.Core; using Windows.UI.Xaml.Data; diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/PageGetter.cs b/samples/LoginCs/LoginCs/LoginCs.Shared/PageGetter.cs index 7ee7da6..70300a7 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/PageGetter.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/PageGetter.cs @@ -20,8 +20,8 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using Facebook; -using Facebook.Graph; +using winsdkfb; +using winsdkfb.Graph; namespace LoginCs { diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml b/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml index 6becce6..4e58bc8 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml @@ -2,7 +2,7 @@ x:Class="LoginCs.UserInfo" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:fbsdk="using:Facebook" + xmlns:fbsdk="using:winsdkfb" xmlns:local="using:LoginCs" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml.cs b/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml.cs index 8e2eb27..f6a0a05 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/UserInfo.xaml.cs @@ -29,8 +29,8 @@ using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; -using Facebook; -using Facebook.Graph; +using winsdkfb; +using winsdkfb.Graph; using Windows.UI.Xaml.Media.Imaging; // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/UserLikes.xaml.cs b/samples/LoginCs/LoginCs/LoginCs.Shared/UserLikes.xaml.cs index 6356490..f3d965a 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/UserLikes.xaml.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/UserLikes.xaml.cs @@ -31,8 +31,8 @@ using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; -using Facebook; -using Facebook.Graph; +using winsdkfb; +using winsdkfb.Graph; // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 diff --git a/samples/LoginCs/LoginCs/LoginCs.Shared/Utility.ttinclude b/samples/LoginCs/LoginCs/LoginCs.Shared/Utility.ttinclude index 73f31f1..909701c 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Shared/Utility.ttinclude +++ b/samples/LoginCs/LoginCs/LoginCs.Shared/Utility.ttinclude @@ -95,7 +95,7 @@ } else if (type.Equals("fbclass")) { - result = "Facebook::" + node.Attributes["className"].Value + "^"; + result = "winsdkfb::" + node.Attributes["className"].Value + "^"; } return result; diff --git a/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj b/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj index d057826..e63cdf1 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj +++ b/samples/LoginCs/LoginCs/LoginCs.Windows/LoginCs.Windows.csproj @@ -1,4 +1,4 @@ - + @@ -161,9 +161,9 @@ - + {418fc79b-aa0f-4951-a7d9-7da89bdf8fb6} - FBWinSDK.Windows + winsdkfb.Windows diff --git a/samples/LoginCs/LoginCs/LoginCs.Windows/MainPage.xaml.cs b/samples/LoginCs/LoginCs/LoginCs.Windows/MainPage.xaml.cs index f40cb1e..417fa7e 100644 --- a/samples/LoginCs/LoginCs/LoginCs.Windows/MainPage.xaml.cs +++ b/samples/LoginCs/LoginCs/LoginCs.Windows/MainPage.xaml.cs @@ -30,7 +30,7 @@ using Windows.UI.Xaml.Input; using Windows.UI.Xaml.Media; using Windows.UI.Xaml.Navigation; -using Facebook; +using winsdkfb; using Windows.Globalization; using Windows.ApplicationModel.Resources; using System.Threading.Tasks; @@ -115,7 +115,7 @@ namespace LoginCs { return ((Result != null) && (!Result.Succeeded) && - (Result.ErrorInfo.Code == (int)Facebook.ErrorCode.ErrorCodeOauthException)); + (Result.ErrorInfo.Code == (int)winsdkfb.ErrorCode.ErrorCodeOauthException)); } bool ShouldRerequest( diff --git a/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/LoginCs.WindowsPhone.csproj b/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/LoginCs.WindowsPhone.csproj index 110bb62..13fac9b 100644 --- a/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/LoginCs.WindowsPhone.csproj +++ b/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/LoginCs.WindowsPhone.csproj @@ -1,4 +1,4 @@ - + @@ -141,9 +141,9 @@ - + {f833b1e6-2866-4a47-89e2-c474983fe70f} - FBWinSDK.WindowsPhone + winsdkfb.WindowsPhone diff --git a/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/MainPage.xaml.cs b/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/MainPage.xaml.cs index f4607f9..822b180 100644 --- a/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/MainPage.xaml.cs +++ b/samples/LoginCs/LoginCs/LoginCs.WindowsPhone/MainPage.xaml.cs @@ -14,7 +14,7 @@ // //****************************************************************************** -using Facebook; +using winsdkfb; using System; using System.Collections.Generic; using System.IO; @@ -116,7 +116,7 @@ namespace LoginCs { return ((Result != null) && (!Result.Succeeded) && - (Result.ErrorInfo.Code == (int)Facebook.ErrorCode.ErrorCodeOauthException)); + (Result.ErrorInfo.Code == (int)winsdkfb.ErrorCode.ErrorCodeOauthException)); } bool ShouldRerequest( diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/AppToken.cpp b/samples/SDKCppUnit/SDKCppUnit.Shared/AppToken.cpp index fbd7d45..1b63d40 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/AppToken.cpp +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/AppToken.cpp @@ -18,8 +18,8 @@ #include "AppToken.h" using namespace concurrency; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace SDKCppUnit; using namespace Windows::Data::Json; diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/SDKCppUnitObjectImplementation.ttinclude b/samples/SDKCppUnit/SDKCppUnit.Shared/SDKCppUnitObjectImplementation.ttinclude index 26d004f..9a9d553 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/SDKCppUnitObjectImplementation.ttinclude +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/SDKCppUnitObjectImplementation.ttinclude @@ -37,8 +37,8 @@ #include "<#= className #>.h" using namespace <#= classNamespace #>; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Windows::Data::Json; using namespace Windows::Foundation::Collections; diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.cpp b/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.cpp index a1f7b62..db6454a 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.cpp +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.cpp @@ -22,8 +22,8 @@ #include "TestUser.h" using namespace concurrency; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Platform::Collections; using namespace SDKCppUnit; diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.h b/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.h index 095d540..037556f 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.h +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/TestContext.h @@ -40,11 +40,11 @@ namespace SDKCppUnit concurrency::task GetAppToken( ); - concurrency::task CreateTestUser( + concurrency::task CreateTestUser( Windows::Foundation::Collections::PropertySet^ Parameters ); - concurrency::task DeleteTestUser( + concurrency::task DeleteTestUser( TestUser^ user ); @@ -59,6 +59,6 @@ namespace SDKCppUnit TestContext(); AppToken^ _Token; Platform::Collections::Vector^ _testUsers; - Facebook::Graph::FBPaginatedArray^ _pagedResult; + winsdkfb::Graph::FBPaginatedArray^ _pagedResult; }; } diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.cpp b/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.cpp index 105390b..7e85979 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.cpp +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.cpp @@ -30,8 +30,8 @@ using namespace SDKCppUnit; using namespace concurrency; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Platform::Collections; using namespace std; diff --git a/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.h b/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.h index 2a54a44..256ea21 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.h +++ b/samples/SDKCppUnit/SDKCppUnit.Shared/TestRunner.h @@ -71,22 +71,23 @@ namespace SDKCppUnit Platform::String^ path ); - Windows::Foundation::IAsyncOperation^ + Windows::Foundation::IAsyncOperation^ TestRunner::UploadPhotoFromStreamAsync( Platform::String^ Path, Windows::Storage::Streams::IRandomAccessStreamWithContentType^ Stream, Windows::Foundation::Collections::PropertySet^ Parameters ); - Windows::Foundation::IAsyncOperation^ + Windows::Foundation::IAsyncOperation^ TestRunner::GetExtendedPhotoInfoForAsync( - Facebook::FBResult^ Result, + winsdkfb::FBResult^ Result, Windows::Foundation::Collections::PropertySet^ Parameters ); Windows::Foundation::IAsyncOperation^ TestRunner::DownloadPhotoAsync( - Facebook::FBResult^ Result, + + winsdkfb::FBResult^ Result, Windows::Foundation::Collections::PropertySet^ Parameters ); diff --git a/samples/SDKCppUnit/SDKCppUnit.Windows/MainPage.xaml.cpp b/samples/SDKCppUnit/SDKCppUnit.Windows/MainPage.xaml.cpp index 7eb3ac2..777da83 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Windows/MainPage.xaml.cpp +++ b/samples/SDKCppUnit/SDKCppUnit.Windows/MainPage.xaml.cpp @@ -45,7 +45,7 @@ using namespace Windows::UI::Xaml::Data; using namespace Windows::UI::Xaml::Input; using namespace Windows::UI::Xaml::Media; using namespace Windows::UI::Xaml::Navigation; -using namespace Facebook; +using namespace winsdkfb; // The Blank Page item template is documented at http://go.microsoft.com/fwlink/?LinkId=234238 diff --git a/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj b/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj index a199a4f..ff40b17 100644 --- a/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj +++ b/samples/SDKCppUnit/SDKCppUnit.Windows/SDKCppUnit.Windows.vcxproj @@ -202,13 +202,8 @@ popd - + {418fc79b-aa0f-4951-a7d9-7da89bdf8fb6} - true - true - false - true - false diff --git a/samples/SDKCppUnit/SDKCppUnit.WindowsPhone/SDKCppUnit.WindowsPhone.vcxproj b/samples/SDKCppUnit/SDKCppUnit.WindowsPhone/SDKCppUnit.WindowsPhone.vcxproj index 5b664bc..91320ac 100644 --- a/samples/SDKCppUnit/SDKCppUnit.WindowsPhone/SDKCppUnit.WindowsPhone.vcxproj +++ b/samples/SDKCppUnit/SDKCppUnit.WindowsPhone/SDKCppUnit.WindowsPhone.vcxproj @@ -149,13 +149,8 @@ popd - + {f833b1e6-2866-4a47-89e2-c474983fe70f} - true - true - false - true - false diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/Logo.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/Logo.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/Logo.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/Logo.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/SmallLogo.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/SmallLogo.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/SmallLogo.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/SmallLogo.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/SplashScreen.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/SplashScreen.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/SplashScreen.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/SplashScreen.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/Square71x71Logo.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/Square71x71Logo.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/Square71x71Logo.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/Square71x71Logo.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/StoreLogo.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/StoreLogo.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/StoreLogo.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/StoreLogo.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Assets/WideLogo.scale-240.png b/winsdkfb/FBWinPhoneStoreCppTests/Assets/WideLogo.scale-240.png similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Assets/WideLogo.scale-240.png rename to winsdkfb/FBWinPhoneStoreCppTests/Assets/WideLogo.scale-240.png diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj b/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj similarity index 98% rename from FBWinSDK/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj rename to winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj index 0bc21a8..37ba798 100644 --- a/FBWinSDK/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj +++ b/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj @@ -152,7 +152,7 @@ - + {f833b1e6-2866-4a47-89e2-c474983fe70f} diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj.filters b/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj.filters similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj.filters rename to winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests.vcxproj.filters diff --git a/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests_TemporaryKey.pfx b/winsdkfb/FBWinPhoneStoreCppTests/FBWinPhoneStoreCppTests_TemporaryKey.pfx new file mode 100644 index 0000000..e69de29 diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/Package.appxmanifest b/winsdkfb/FBWinPhoneStoreCppTests/Package.appxmanifest similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/Package.appxmanifest rename to winsdkfb/FBWinPhoneStoreCppTests/Package.appxmanifest diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/pch.cpp b/winsdkfb/FBWinPhoneStoreCppTests/pch.cpp similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/pch.cpp rename to winsdkfb/FBWinPhoneStoreCppTests/pch.cpp diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/pch.h b/winsdkfb/FBWinPhoneStoreCppTests/pch.h similarity index 100% rename from FBWinSDK/FBWinPhoneStoreCppTests/pch.h rename to winsdkfb/FBWinPhoneStoreCppTests/pch.h diff --git a/FBWinSDK/FBWinPhoneStoreCppTests/unittest1.cpp b/winsdkfb/FBWinPhoneStoreCppTests/unittest1.cpp similarity index 97% rename from FBWinSDK/FBWinPhoneStoreCppTests/unittest1.cpp rename to winsdkfb/FBWinPhoneStoreCppTests/unittest1.cpp index 8622a1a..60a3dbf 100644 --- a/FBWinSDK/FBWinPhoneStoreCppTests/unittest1.cpp +++ b/winsdkfb/FBWinPhoneStoreCppTests/unittest1.cpp @@ -20,8 +20,8 @@ //#include "AppRequest.h" using namespace concurrency; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; using namespace Platform; using namespace Windows::Data::Json; using namespace Windows::Foundation; @@ -90,7 +90,7 @@ namespace FBWinPhoneStoreCppTests TEST_METHOD(ParseSuccessfulFBAppRequestOneRecipient) { Uri^ fbResponse = ref new Uri(FBSuccessfulAppRequestResponse); - Facebook::FBAppRequest^ info = Facebook::FBAppRequest::FromRequestDialogResponse(fbResponse); + winsdkfb::FBAppRequest^ info = winsdkfb::FBAppRequest::FromRequestDialogResponse(fbResponse); Assert::IsNotNull(info); Assert::IsTrue(String::CompareOrdinal(info->RequestId, ref new String(FBTestRequestId)) == 0); @@ -101,7 +101,7 @@ namespace FBWinPhoneStoreCppTests TEST_METHOD(ParseSuccessfulFBAppRequestMultipleRecipients) { Uri^ fbResponse = ref new Uri(FBSuccessfulMultiRecipientResponse); - Facebook::FBAppRequest^ info = Facebook::FBAppRequest::FromRequestDialogResponse(fbResponse); + winsdkfb::FBAppRequest^ info = winsdkfb::FBAppRequest::FromRequestDialogResponse(fbResponse); Assert::IsNotNull(info); Assert::IsTrue(String::CompareOrdinal(info->RequestId, ref new String(FBTestRequestId)) == 0); @@ -115,7 +115,7 @@ namespace FBWinPhoneStoreCppTests TEST_METHOD(ParseCanceledFBAppRequest) { Uri^ fbResponse = ref new Uri(FBCanceledRequestResponse); - Facebook::FBAppRequest^ info = Facebook::FBAppRequest::FromRequestDialogResponse(fbResponse); + winsdkfb::FBAppRequest^ info = winsdkfb::FBAppRequest::FromRequestDialogResponse(fbResponse); Assert::IsNull(info); } TEST_METHOD(ParseSuccessfulFBFeedPostResponse) diff --git a/FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj similarity index 99% rename from FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj rename to winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj index 66b8778..4bcb394 100644 --- a/FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj +++ b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj @@ -1,4 +1,4 @@ - + @@ -251,7 +251,7 @@ - + {418fc79b-aa0f-4951-a7d9-7da89bdf8fb6} @@ -263,4 +263,4 @@ - \ No newline at end of file + diff --git a/FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters rename to winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.filters diff --git a/FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user rename to winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests.vcxproj.user diff --git a/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests_TemporaryKey.pfx b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests_TemporaryKey.pfx new file mode 100644 index 0000000..e2ad612 Binary files /dev/null and b/winsdkfb/FBWinStoreCppTests/FBWinStoreCppTests_TemporaryKey.pfx differ diff --git a/FBWinSDK/FBWinStoreCppTests/Images/UnitTestLogo.scale-100.png b/winsdkfb/FBWinStoreCppTests/Images/UnitTestLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/Images/UnitTestLogo.scale-100.png rename to winsdkfb/FBWinStoreCppTests/Images/UnitTestLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCppTests/Images/UnitTestSmallLogo.scale-100.png b/winsdkfb/FBWinStoreCppTests/Images/UnitTestSmallLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/Images/UnitTestSmallLogo.scale-100.png rename to winsdkfb/FBWinStoreCppTests/Images/UnitTestSmallLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCppTests/Images/UnitTestSplashScreen.scale-100.png b/winsdkfb/FBWinStoreCppTests/Images/UnitTestSplashScreen.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/Images/UnitTestSplashScreen.scale-100.png rename to winsdkfb/FBWinStoreCppTests/Images/UnitTestSplashScreen.scale-100.png diff --git a/FBWinSDK/FBWinStoreCppTests/Images/UnitTestStoreLogo.scale-100.png b/winsdkfb/FBWinStoreCppTests/Images/UnitTestStoreLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/Images/UnitTestStoreLogo.scale-100.png rename to winsdkfb/FBWinStoreCppTests/Images/UnitTestStoreLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCppTests/LoginTests.cpp b/winsdkfb/FBWinStoreCppTests/LoginTests.cpp similarity index 96% rename from FBWinSDK/FBWinStoreCppTests/LoginTests.cpp rename to winsdkfb/FBWinStoreCppTests/LoginTests.cpp index 7eab7ce..7b65511 100644 --- a/FBWinSDK/FBWinStoreCppTests/LoginTests.cpp +++ b/winsdkfb/FBWinStoreCppTests/LoginTests.cpp @@ -22,8 +22,8 @@ using namespace Platform; using namespace Microsoft::VisualStudio::CppUnitTestFramework; using namespace Windows::ApplicationModel::Store; using namespace Windows::Foundation::Collections; -using namespace Facebook; -using namespace Facebook::Graph; +using namespace winsdkfb; +using namespace winsdkfb::Graph; #define FBArrayOfLikes \ L"{\"data\":[{\"category\":\"Clothing\",\"name\":\"Frockasaur" \ @@ -79,4 +79,4 @@ namespace FBWinStoreCppTests })); } }; -} \ No newline at end of file +} diff --git a/FBWinSDK/FBWinStoreCppTests/Package.appxmanifest b/winsdkfb/FBWinStoreCppTests/Package.appxmanifest similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/Package.appxmanifest rename to winsdkfb/FBWinStoreCppTests/Package.appxmanifest diff --git a/FBWinSDK/FBWinStoreCppTests/pch.cpp b/winsdkfb/FBWinStoreCppTests/pch.cpp similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/pch.cpp rename to winsdkfb/FBWinStoreCppTests/pch.cpp diff --git a/FBWinSDK/FBWinStoreCppTests/pch.h b/winsdkfb/FBWinStoreCppTests/pch.h similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/pch.h rename to winsdkfb/FBWinStoreCppTests/pch.h diff --git a/FBWinSDK/FBWinStoreCppTests/targetver.h b/winsdkfb/FBWinStoreCppTests/targetver.h similarity index 100% rename from FBWinSDK/FBWinStoreCppTests/targetver.h rename to winsdkfb/FBWinStoreCppTests/targetver.h diff --git a/FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/.gitignore b/winsdkfb/FBWinStoreCsTests/.gitignore similarity index 100% rename from FBWinSDK/FBSDK-UWP/FBWinStoreCsTests/.gitignore rename to winsdkfb/FBWinStoreCsTests/.gitignore diff --git a/FBWinSDK/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude b/winsdkfb/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude similarity index 98% rename from FBWinSDK/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude rename to winsdkfb/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude index c1f644f..2bc8e1d 100644 --- a/FBWinSDK/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude +++ b/winsdkfb/FBWinStoreCsTests/FBCSObjectImplementation.ttinclude @@ -32,14 +32,14 @@ if (appNamespace.Length == 0) { // Default to same namespace as the SDK. - appNamespace = "Facebook"; + appNamespace = "winsdkfb"; } #> using System; using System.ComponentModel; using Newtonsoft.Json; -using Facebook; +using winsdkfb; <# string interfaces = ""; diff --git a/FBWinSDK/FBWinStoreCsTests/FBObject.tt b/winsdkfb/FBWinStoreCsTests/FBObject.tt similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBObject.tt rename to winsdkfb/FBWinStoreCsTests/FBObject.tt diff --git a/FBWinSDK/FBWinStoreCsTests/FBObject.xml b/winsdkfb/FBWinStoreCsTests/FBObject.xml similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBObject.xml rename to winsdkfb/FBWinStoreCsTests/FBObject.xml diff --git a/FBWinSDK/FBWinStoreCsTests/FBPhoto.tt b/winsdkfb/FBWinStoreCsTests/FBPhoto.tt similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBPhoto.tt rename to winsdkfb/FBWinStoreCsTests/FBPhoto.tt diff --git a/FBWinSDK/FBWinStoreCsTests/FBPhoto.xml b/winsdkfb/FBWinStoreCsTests/FBPhoto.xml similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBPhoto.xml rename to winsdkfb/FBWinStoreCsTests/FBPhoto.xml diff --git a/FBWinSDK/FBWinStoreCsTests/FBSuccess.tt b/winsdkfb/FBWinStoreCsTests/FBSuccess.tt similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBSuccess.tt rename to winsdkfb/FBWinStoreCsTests/FBSuccess.tt diff --git a/FBWinSDK/FBWinStoreCsTests/FBSuccess.xml b/winsdkfb/FBWinStoreCsTests/FBSuccess.xml similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBSuccess.xml rename to winsdkfb/FBWinStoreCsTests/FBSuccess.xml diff --git a/FBWinSDK/FBWinStoreCsTests/FBTestUser.tt b/winsdkfb/FBWinStoreCsTests/FBTestUser.tt similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBTestUser.tt rename to winsdkfb/FBWinStoreCsTests/FBTestUser.tt diff --git a/FBWinSDK/FBWinStoreCsTests/FBTestUser.xml b/winsdkfb/FBWinStoreCsTests/FBTestUser.xml similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/FBTestUser.xml rename to winsdkfb/FBWinStoreCsTests/FBTestUser.xml diff --git a/FBWinSDK/FBWinStoreCsTests/FBWinStoreCsTests.csproj b/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests.csproj similarity index 98% rename from FBWinSDK/FBWinStoreCsTests/FBWinStoreCsTests.csproj rename to winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests.csproj index ff1eabf..d664895 100644 --- a/FBWinSDK/FBWinStoreCsTests/FBWinStoreCsTests.csproj +++ b/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests.csproj @@ -143,9 +143,9 @@ - + {418fc79b-aa0f-4951-a7d9-7da89bdf8fb6} - FBWinSDK.Windows + winsdkfb.Windows diff --git a/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests_TemporaryKey.pfx b/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests_TemporaryKey.pfx new file mode 100644 index 0000000..a243004 Binary files /dev/null and b/winsdkfb/FBWinStoreCsTests/FBWinStoreCsTests_TemporaryKey.pfx differ diff --git a/FBWinSDK/FBWinStoreCsTests/Images/UnitTestLogo.scale-100.png b/winsdkfb/FBWinStoreCsTests/Images/UnitTestLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Images/UnitTestLogo.scale-100.png rename to winsdkfb/FBWinStoreCsTests/Images/UnitTestLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCsTests/Images/UnitTestSmallLogo.scale-100.png b/winsdkfb/FBWinStoreCsTests/Images/UnitTestSmallLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Images/UnitTestSmallLogo.scale-100.png rename to winsdkfb/FBWinStoreCsTests/Images/UnitTestSmallLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCsTests/Images/UnitTestSplashScreen.scale-100.png b/winsdkfb/FBWinStoreCsTests/Images/UnitTestSplashScreen.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Images/UnitTestSplashScreen.scale-100.png rename to winsdkfb/FBWinStoreCsTests/Images/UnitTestSplashScreen.scale-100.png diff --git a/FBWinSDK/FBWinStoreCsTests/Images/UnitTestStoreLogo.scale-100.png b/winsdkfb/FBWinStoreCsTests/Images/UnitTestStoreLogo.scale-100.png similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Images/UnitTestStoreLogo.scale-100.png rename to winsdkfb/FBWinStoreCsTests/Images/UnitTestStoreLogo.scale-100.png diff --git a/FBWinSDK/FBWinStoreCsTests/Images/animal-1409304111INq.jpg b/winsdkfb/FBWinStoreCsTests/Images/animal-1409304111INq.jpg similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Images/animal-1409304111INq.jpg rename to winsdkfb/FBWinStoreCsTests/Images/animal-1409304111INq.jpg diff --git a/FBWinSDK/FBWinStoreCsTests/Package.appxmanifest b/winsdkfb/FBWinStoreCsTests/Package.appxmanifest similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Package.appxmanifest rename to winsdkfb/FBWinStoreCsTests/Package.appxmanifest diff --git a/FBWinSDK/FBWinStoreCsTests/Properties/AssemblyInfo.cs b/winsdkfb/FBWinStoreCsTests/Properties/AssemblyInfo.cs similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/Properties/AssemblyInfo.cs rename to winsdkfb/FBWinStoreCsTests/Properties/AssemblyInfo.cs diff --git a/FBWinSDK/FBWinStoreCsTests/UnitTest1.cs b/winsdkfb/FBWinStoreCsTests/UnitTest1.cs similarity index 99% rename from FBWinSDK/FBWinStoreCsTests/UnitTest1.cs rename to winsdkfb/FBWinStoreCsTests/UnitTest1.cs index 694df3a..d6840f0 100644 --- a/FBWinSDK/FBWinStoreCsTests/UnitTest1.cs +++ b/winsdkfb/FBWinStoreCsTests/UnitTest1.cs @@ -24,8 +24,8 @@ using Microsoft.VisualStudio.TestPlatform.UnitTestFramework; using Windows.Foundation; using Windows.Foundation.Collections; using Windows.Data.Json; -using Facebook; -using Facebook.Graph; +using winsdkfb; +using winsdkfb.Graph; using Windows.Storage; using Windows.Storage.Streams; diff --git a/FBWinSDK/FBWinStoreCsTests/Utility.ttinclude b/winsdkfb/FBWinStoreCsTests/Utility.ttinclude similarity index 98% rename from FBWinSDK/FBWinStoreCsTests/Utility.ttinclude rename to winsdkfb/FBWinStoreCsTests/Utility.ttinclude index 71f907a..08146ba 100644 --- a/FBWinSDK/FBWinStoreCsTests/Utility.ttinclude +++ b/winsdkfb/FBWinStoreCsTests/Utility.ttinclude @@ -152,7 +152,7 @@ } else if (type.Equals("fbclass")) { - result = "Facebook::Graph::" + node.Attributes["className"].Value + "^"; + result = "winsdkfb::Graph::" + node.Attributes["className"].Value + "^"; } return result; diff --git a/FBWinSDK/FBWinStoreCsTests/codegen.cmd b/winsdkfb/FBWinStoreCsTests/codegen.cmd similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/codegen.cmd rename to winsdkfb/FBWinStoreCsTests/codegen.cmd diff --git a/FBWinSDK/FBWinStoreCsTests/packages.config b/winsdkfb/FBWinStoreCsTests/packages.config similarity index 100% rename from FBWinSDK/FBWinStoreCsTests/packages.config rename to winsdkfb/FBWinStoreCsTests/packages.config diff --git a/FBWinSDK/build/build-sdk.cmd b/winsdkfb/build/build-sdk.cmd similarity index 88% rename from FBWinSDK/build/build-sdk.cmd rename to winsdkfb/build/build-sdk.cmd index 2bcffab..0ece7ae 100644 --- a/FBWinSDK/build/build-sdk.cmd +++ b/winsdkfb/build/build-sdk.cmd @@ -4,7 +4,7 @@ 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 winsdkfb\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 @@ -21,22 +21,22 @@ cd /d %script_dir%\.. rem --------------------------------------------------------------------------- rem build for Windows 8.1 and Phone 8.1 rem --------------------------------------------------------------------------- -call :build_one_flavor FBWinSDK.sln Win32 Debug +call :build_one_flavor winsdkfb.sln Win32 Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBWinSDK.sln Win32 Release +call :build_one_flavor winsdkfb.sln Win32 Release if errorlevel 1 goto errorExit -call :build_one_flavor FBWinSDK.sln x64 Debug +call :build_one_flavor winsdkfb.sln x64 Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBWinSDK.sln x64 Release +call :build_one_flavor winsdkfb.sln x64 Release if errorlevel 1 goto errorExit -call :build_one_flavor FBWinSDK.sln ARM Debug +call :build_one_flavor winsdkfb.sln ARM Debug if errorlevel 1 goto errorExit -call :build_one_flavor FBWinSDK.sln ARM Release +call :build_one_flavor winsdkfb.sln ARM Release if errorlevel 1 goto errorExit rem --------------------------------------------------------------------------- @@ -81,12 +81,12 @@ if not exist nuget.exe ( @echo Packaging SDK... >>%logfile% call build-nupkg.cmd -if not exist ..\..\bin\FBWinSDK.%version%.nupkg ( +if not exist ..\..\bin\winsdkfb.%version%.nupkg ( @echo Error: failed to build SDK NuGet package goto :eof ) -if not exist ..\..\bin\FBWinSDK-debug.%version%.nupkg ( +if not exist ..\..\bin\winsdkfb-debug.%version%.nupkg ( @echo Error: failed to build SDK debug NuGet package goto :eof ) diff --git a/FBWinSDK/build/nuget/.gitignore b/winsdkfb/build/nuget/.gitignore similarity index 100% rename from FBWinSDK/build/nuget/.gitignore rename to winsdkfb/build/nuget/.gitignore diff --git a/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec b/winsdkfb/build/nuget/FBWinSDK-debug.nuspec similarity index 64% rename from FBWinSDK/build/nuget/FBWinSDK-debug.nuspec rename to winsdkfb/build/nuget/FBWinSDK-debug.nuspec index 135adf3..82a20d0 100644 --- a/FBWinSDK/build/nuget/FBWinSDK-debug.nuspec +++ b/winsdkfb/build/nuget/FBWinSDK-debug.nuspec @@ -1,12 +1,12 @@ - FBWinSDK-debug + winsdkfb-debug 0.0.0-SpecifyVersionOnCommandline - FBWinSDK (debug) + winsdkfb (debug) Microsoft fbwinsdk,microsoft - FBWinSDK debug build. Suitable for debugging FBWinSDK itself. + winsdkfb debug build. Suitable for debugging winsdkfb itself. http://www.microsoft.com $LicenseUrl$ $RequireLicenseAcceptance$ @@ -14,7 +14,7 @@ Facebook C# C++ Windows - + @@ -26,55 +26,55 @@ Running with -NoPackageAnalysis suppresses the warnings. --> - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -106,7 +106,7 @@ - + diff --git a/FBWinSDK/build/nuget/FBWinSDK-debug.props b/winsdkfb/build/nuget/FBWinSDK-debug.props similarity index 100% rename from FBWinSDK/build/nuget/FBWinSDK-debug.props rename to winsdkfb/build/nuget/FBWinSDK-debug.props diff --git a/FBWinSDK/build/nuget/FBWinSDK-managed.targets b/winsdkfb/build/nuget/FBWinSDK-managed.targets similarity index 100% rename from FBWinSDK/build/nuget/FBWinSDK-managed.targets rename to winsdkfb/build/nuget/FBWinSDK-managed.targets diff --git a/FBWinSDK/build/nuget/FBWinSDK-native.targets b/winsdkfb/build/nuget/FBWinSDK-native.targets similarity index 100% rename from FBWinSDK/build/nuget/FBWinSDK-native.targets rename to winsdkfb/build/nuget/FBWinSDK-native.targets diff --git a/FBWinSDK/build/nuget/FBWinSDK.nuspec b/winsdkfb/build/nuget/FBWinSDK.nuspec similarity index 61% rename from FBWinSDK/build/nuget/FBWinSDK.nuspec rename to winsdkfb/build/nuget/FBWinSDK.nuspec index ef565d8..ce68ce8 100644 --- a/FBWinSDK/build/nuget/FBWinSDK.nuspec +++ b/winsdkfb/build/nuget/FBWinSDK.nuspec @@ -1,9 +1,9 @@ - FBWinSDK + winsdkfb 0.0.0-SpecifyVersionOnCommandline - FBWinSDK + winsdkfb Microsoft microsoft An easy-to-use Windows Runtime API for integrating Facebook login and API support with your app. @@ -31,23 +31,23 @@ and Windows Phone Apps (wpa). --> - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + - - - - - - - - - + + + + + + + + + @@ -139,16 +139,16 @@ - - + + - - + + - - + + diff --git a/FBWinSDK/build/nuget/FBWinSDK.props b/winsdkfb/build/nuget/FBWinSDK.props similarity index 100% rename from FBWinSDK/build/nuget/FBWinSDK.props rename to winsdkfb/build/nuget/FBWinSDK.props diff --git a/FBWinSDK/build/nuget/VERSION b/winsdkfb/build/nuget/VERSION similarity index 100% rename from FBWinSDK/build/nuget/VERSION rename to winsdkfb/build/nuget/VERSION diff --git a/FBWinSDK/build/nuget/build-nupkg.cmd b/winsdkfb/build/nuget/build-nupkg.cmd similarity index 95% rename from FBWinSDK/build/nuget/build-nupkg.cmd rename to winsdkfb/build/nuget/build-nupkg.cmd index 01f669b..ad18a8a 100644 --- a/FBWinSDK/build/nuget/build-nupkg.cmd +++ b/winsdkfb/build/nuget/build-nupkg.cmd @@ -58,11 +58,11 @@ SET NUGET_ARGS=^ -version %VERSION% ^ -properties bin=%BIN%;LicenseUrl=%LICENSE_URL%;RequireLicenseAcceptance=%REQUIRE_LICENSE_ACCEPTANCE% -nuget pack FBWinSDK.nuspec %NUGET_ARGS% +nuget pack winsdkfb.nuspec %NUGET_ARGS% IF %ERRORLEVEL% NEQ 0 GOTO END IF NOT "%1" == "signed" ( - nuget pack FBWinSDK-debug.nuspec %NUGET_ARGS% + nuget pack winsdkfb-debug.nuspec %NUGET_ARGS% IF %ERRORLEVEL% NEQ 0 GOTO END ) diff --git a/FBWinSDK/build/nuget/download-nuget.cmd b/winsdkfb/build/nuget/download-nuget.cmd similarity index 100% rename from FBWinSDK/build/nuget/download-nuget.cmd rename to winsdkfb/build/nuget/download-nuget.cmd diff --git a/FBWinSDK/build/nuget/nuget.exe.config b/winsdkfb/build/nuget/nuget.exe.config similarity index 100% rename from FBWinSDK/build/nuget/nuget.exe.config rename to winsdkfb/build/nuget/nuget.exe.config diff --git a/FBWinSDK/Doxygen-FBWinSDK.cfg b/winsdkfb/doxygen_winsdkfb.cfg similarity index 99% rename from FBWinSDK/Doxygen-FBWinSDK.cfg rename to winsdkfb/doxygen_winsdkfb.cfg index 7be11b6..6bf5075 100644 --- a/FBWinSDK/Doxygen-FBWinSDK.cfg +++ b/winsdkfb/doxygen_winsdkfb.cfg @@ -32,7 +32,7 @@ DOXYFILE_ENCODING = UTF-8 # title of most generated pages and in a few other places. # The default value is: My Project. -PROJECT_NAME = FBWinSDK +PROJECT_NAME = winsdkfb # The PROJECT_NUMBER tag can be used to enter a project or revision number. This # could be handy for archiving the generated documentation or if some version diff --git a/FBWinSDK/FBWinSDK.sln b/winsdkfb/winsdkfb.sln similarity index 93% rename from FBWinSDK/FBWinSDK.sln rename to winsdkfb/winsdkfb.sln index cb99343..39eb665 100644 --- a/FBWinSDK/FBWinSDK.sln +++ b/winsdkfb/winsdkfb.sln @@ -1,15 +1,15 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 14 -VisualStudioVersion = 14.0.22823.1 +VisualStudioVersion = 14.0.23107.0 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FBWinSDK", "FBWinSDK", "{A5BE3147-4D21-457F-A11E-0D0B0C5A5ED8}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "winsdkfb", "winsdkfb", "{A5BE3147-4D21-457F-A11E-0D0B0C5A5ED8}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.Shared", "FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Shared", "winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems", "{5C0B24D0-BA5F-490A-AB3E-71265D4A0A4B}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.Windows", "FBWinSDK\FBWinSDK.Windows\FBWinSDK.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.Windows", "winsdkfb\winsdkfb.Windows\winsdkfb.Windows.vcxproj", "{418FC79B-AA0F-4951-A7D9-7DA89BDF8FB6}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinSDK.WindowsPhone", "FBWinSDK\FBWinSDK.WindowsPhone\FBWinSDK.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "winsdkfb.WindowsPhone", "winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj", "{F833B1E6-2866-4A47-89E2-C474983FE70F}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FBWinStoreCppTests", "FBWinStoreCppTests\FBWinStoreCppTests.vcxproj", "{180A2C23-770B-4D54-9D51-11368FDDBE57}" EndProject @@ -27,9 +27,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "SDKCppUnit.WindowsPhone", " EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution - FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 - FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{5c0b24d0-ba5f-490a-ab3e-71265d4a0a4b}*SharedItemsImports = 9 - FBWinSDK\FBWinSDK.Shared\FBWinSDK.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 + winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}*SharedItemsImports = 4 + winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{5c0b24d0-ba5f-490a-ab3e-71265d4a0a4b}*SharedItemsImports = 9 + winsdkfb\winsdkfb.Shared\winsdkfb.Shared.vcxitems*{f833b1e6-2866-4a47-89e2-c474983fe70f}*SharedItemsImports = 4 ..\samples\SDKCppUnit\SDKCppUnit.Shared\SDKCppUnit.Shared.vcxitems*{ba94bfb2-5f5d-4693-88f3-f866da55efd0}*SharedItemsImports = 4 ..\samples\SDKCppUnit\SDKCppUnit.Shared\SDKCppUnit.Shared.vcxitems*{382dc0b6-f27d-476b-888b-d4b40fe3490b}*SharedItemsImports = 4 ..\samples\SDKCppUnit\SDKCppUnit.Shared\SDKCppUnit.Shared.vcxitems*{19e70697-aa80-43af-b1e4-c49c5b402d48}*SharedItemsImports = 9 diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.cpp b/winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.cpp similarity index 99% rename from FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.cpp rename to winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.cpp index cd3e451..f055d70 100644 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.cpp +++ b/winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.cpp @@ -19,7 +19,7 @@ #include "HlsColor.h" #include -using namespace Facebook; +using namespace winsdkfb; using namespace Platform; using namespace std; using namespace Windows::Foundation::Collections; diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.h b/winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.h similarity index 98% rename from FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.h rename to winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.h index df3a5e1..99461de 100644 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/ColorLuminosityConverter.h +++ b/winsdkfb/winsdkfb/winsdkfb.Shared/ColorLuminosityConverter.h @@ -16,7 +16,7 @@ #pragma once -namespace Facebook +namespace winsdkfb { [Windows::Foundation::Metadata::WebHostHidden] public ref class ColorLuminosityConverter sealed : diff --git a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/Controls/FacebookLoginButton.xaml b/winsdkfb/winsdkfb/winsdkfb.Shared/Controls/FacebookLoginButton.xaml similarity index 99% rename from FBWinSDK/FBWinSDK/FBWinSDK.Shared/Controls/FacebookLoginButton.xaml rename to winsdkfb/winsdkfb/winsdkfb.Shared/Controls/FacebookLoginButton.xaml index 6f58911..1980826 100644 --- a/FBWinSDK/FBWinSDK/FBWinSDK.Shared/Controls/FacebookLoginButton.xaml +++ b/winsdkfb/winsdkfb/winsdkfb.Shared/Controls/FacebookLoginButton.xaml @@ -1,7 +1,7 @@ + xmlns:local="using:winsdkfb">