Skip to content
This repository has been archived by the owner on Jul 15, 2023. It is now read-only.

Commit

Permalink
Merge pull request #71 from Microsoft/55_consistent_project_naming
Browse files Browse the repository at this point in the history
winsdkfb renaming
  • Loading branch information
Gilles Khouzam committed Nov 11, 2015
2 parents 73b5fc3 + e65d854 commit d011d93
Show file tree
Hide file tree
Showing 247 changed files with 449 additions and 440 deletions.
9 changes: 7 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp-UWP.sln
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/App.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -240,4 +240,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
(void)e; // Unused parameter

// TODO: Save application state and stop any background activity
}
}
2 changes: 1 addition & 1 deletion samples/LoginCpp-UWP/LoginCpp/Dialogs.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/FBPageBindable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/FBPageBindable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}

Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup Label="Globals">
<ProjectGuid>{351701a8-12d1-45b3-8e6a-164d796b0297}</ProjectGuid>
Expand Down Expand Up @@ -218,7 +218,7 @@
<PRIResource Include="Resources.resw" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\FBWinSDK\FBSDK-UWP\FBSDK-UWP\FBSDK-UWP.vcxproj">
<ProjectReference Include="..\..\..\winsdkfb\winsdkfb_uwp\winsdkfb_uwp\winsdkfb_uwp.vcxproj">
<Project>{973a943b-ff77-4267-8f30-f5fe2b7f5583}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
4 changes: 4 additions & 0 deletions samples/LoginCpp-UWP/LoginCpp/LoginCpp.vcxproj.user
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup />
</Project>
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions samples/LoginCpp-UWP/LoginCpp/MainPage.xaml.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
2 changes: 1 addition & 1 deletion samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/UserInfo.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion samples/LoginCpp-UWP/LoginCpp/UserLikes.xaml.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace LoginCpp
Platform::String^ prop
);

Facebook::Graph::FBPaginatedArray^ _likes;
winsdkfb::Graph::FBPaginatedArray^ _likes;
FBPageBindable^ _selectedItem;
Platform::Collections::Vector<FBPageBindable^>^ _listViewItems;
void ListView_SelectionChanged(
Expand Down
10 changes: 6 additions & 4 deletions samples/LoginCpp/LoginCpp.sln
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp/LoginCpp/LoginCpp.Shared/App.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down Expand Up @@ -179,4 +179,4 @@ void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
(void) e; // Unused parameter

// TODO: Save application state and stop any background activity
}
}
4 changes: 2 additions & 2 deletions samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp/LoginCpp/LoginCpp.Shared/FBPageBindable.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
};
}

Expand Down
2 changes: 1 addition & 1 deletion samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserInfo.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
2 changes: 1 addition & 1 deletion samples/LoginCpp/LoginCpp/LoginCpp.Shared/UserLikes.xaml.h
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ namespace LoginCpp
Platform::String^ prop
);

Facebook::Graph::FBPaginatedArray^ _likes;
winsdkfb::Graph::FBPaginatedArray^ _likes;
FBPageBindable^ _selectedItem;
Platform::Collections::Vector<FBPageBindable^>^ _listViewItems;
void ListView_SelectionChanged(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FBWinSDK\FBWinSDK\FBWinSDK.Windows\FBWinSDK.Windows.vcxproj">
<ProjectReference Include="..\..\..\..\winsdkfb\winsdkfb\winsdkfb.Windows\winsdkfb.Windows.vcxproj">
<Project>{418fc79b-aa0f-4951-a7d9-7da89bdf8fb6}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
6 changes: 3 additions & 3 deletions samples/LoginCpp/LoginCpp/LoginCpp.Windows/MainPage.xaml.h
Original file line number Diff line number Diff line change
Expand Up @@ -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(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@
</ClCompile>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\FBWinSDK\FBWinSDK\FBWinSDK.WindowsPhone\FBWinSDK.WindowsPhone.vcxproj">
<ProjectReference Include="..\..\..\..\winsdkfb\winsdkfb\winsdkfb.WindowsPhone\winsdkfb.WindowsPhone.vcxproj">
<Project>{f833b1e6-2866-4a47-89e2-c474983fe70f}</Project>
</ProjectReference>
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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(
Expand Down
Loading

0 comments on commit d011d93

Please sign in to comment.