diff --git a/Release/casablanca110.sln b/Release/casablanca110.sln index 2875b493fd..e1c9390496 100644 --- a/Release/casablanca110.sln +++ b/Release/casablanca110.sln @@ -29,13 +29,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.winrt", "src\ EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HttpListener110_test", "tests\Functional\http\listener\VS11\HttpListener110_test.vcxproj", "{2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils110_test.xp", "tests\Functional\utils\VS11.xp\utils110_test.xp.vcxproj", "{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils110_test", "tests\Functional\utils\VS11\utils110_test.vcxproj", "{77BD8C21-0E78-46AD-8420-09F36FC192AA}" -EndProject Global GlobalSection(TeamFoundationVersionControl) = preSolution - SccNumberOfProjects = 16 + SccNumberOfProjects = 14 SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2 SccProjectUniqueName0 = src\\build\\casablanca110.vcxproj @@ -108,16 +104,6 @@ Global SccAuxPath13 = http://tkbgitvstfat01:8080/devdiv2 SccLocalPath13 = tests\\Functional\\http\\listener\\VS11 SccProvider13 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccProjectUniqueName14 = tests\\Functional\\utils\\VS11.xp\\utils110_test.xp.vcxproj - SccProjectName14 = tests/Functional/utils/VS11.xp - SccAuxPath14 = http://tkbgitvstfat01:8080/devdiv2 - SccLocalPath14 = tests\\Functional\\utils\\VS11.xp - SccProvider14 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} - SccProjectUniqueName15 = tests\\Functional\\utils\\VS11\\utils110_test.vcxproj - SccProjectName15 = tests/Functional/utils/VS11 - SccAuxPath15 = http://tkbgitvstfat01:8080/devdiv2 - SccLocalPath15 = tests\\Functional\\utils\\VS11 - SccProvider15 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -294,30 +280,6 @@ Global {2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|Win32.Build.0 = Release|Win32 {2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|x64.ActiveCfg = Release|x64 {2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|x64.Build.0 = Release|x64 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|ARM.ActiveCfg = Debug|ARM - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|ARM.Build.0 = Debug|ARM - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|Win32.ActiveCfg = Debug|Win32 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|Win32.Build.0 = Debug|Win32 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|x64.ActiveCfg = Debug|x64 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|x64.Build.0 = Debug|x64 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|ARM.ActiveCfg = Release|ARM - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|ARM.Build.0 = Release|ARM - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|Win32.ActiveCfg = Release|Win32 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|Win32.Build.0 = Release|Win32 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|x64.ActiveCfg = Release|x64 - {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|x64.Build.0 = Release|x64 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|ARM.ActiveCfg = Debug|ARM - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|ARM.Build.0 = Debug|ARM - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|Win32.ActiveCfg = Debug|Win32 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|Win32.Build.0 = Debug|Win32 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|x64.ActiveCfg = Debug|x64 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|x64.Build.0 = Debug|x64 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|ARM.ActiveCfg = Release|ARM - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|ARM.Build.0 = Release|ARM - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|Win32.ActiveCfg = Release|Win32 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|Win32.Build.0 = Release|Win32 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|x64.ActiveCfg = Release|x64 - {77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Release/casablanca120.sln b/Release/casablanca120.sln index 0e146c290a..e8bdf74e86 100644 --- a/Release/casablanca120.sln +++ b/Release/casablanca120.sln @@ -1,7 +1,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.20930.1 +VisualStudioVersion = 12.0.20625.1 MAIN MinimumVisualStudioVersion = 10.0.40219.1 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca120", "src\build\casablanca120.vcxproj", "{1014C621-BC2D-4813-B8C1-6D83AD6F9249}" EndProject @@ -29,11 +29,82 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uri120_test", "tests\Functi EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils120_test", "tests\Functional\utils\VS12\Utils120_test.vcxproj", "{50386698-0180-4EBC-8827-F2C36561F6B4}" EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca120.winrt", "src\build\casablanca120.winrt.vcxproj", "{9AD285A2-301E-47A0-A299-14AD5D4F2758}" -EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "streams120_test.winrt", "tests\Functional\streams\vs12.winrt\streams120_test.winrt.vcxproj", "{337E0660-2300-4DC6-883E-283D5A7281B5}" -EndProject Global + GlobalSection(TeamFoundationVersionControl) = preSolution + SccNumberOfProjects = 14 + SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2 + SccProjectUniqueName0 = src\\build\\casablanca120.vcxproj + SccProjectName0 = src/build + SccAuxPath0 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath0 = src\\build + SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName1 = tests\\Common\\TestRunner\\VS11\\TestRunner120.vcxproj + SccProjectName1 = tests/Common/TestRunner/VS11 + SccAuxPath1 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath1 = tests\\Common\\TestRunner\\VS11 + SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName2 = tests\\Common\\UnitTestpp\\VS11\\TestUnitTestpp120.vcxproj + SccProjectName2 = tests/Common/UnitTestpp/VS11 + SccAuxPath2 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath2 = tests\\Common\\UnitTestpp\\VS11 + SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName3 = tests\\Common\\UnitTestpp\\VS11\\UnitTestpp120.vcxproj + SccProjectName3 = tests/Common/UnitTestpp/VS11 + SccAuxPath3 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath3 = tests\\Common\\UnitTestpp\\VS11 + SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName4 = tests\\Common\\utilities\\VS11\\CommonUtilities120.vcxproj + SccProjectName4 = tests/Common/utilities/VS11 + SccAuxPath4 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath4 = tests\\Common\\utilities\\VS11 + SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName5 = tests\\Functional\\http\\client\\VS11\\HttpClient110_test.vcxproj + SccProjectName5 = tests/Functional/http/client/VS11 + SccAuxPath5 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath5 = tests\\Functional\\http\\client\\VS11 + SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName6 = tests\\Functional\\http\\utilities\\VS11\\HttpTestUtilities120.vcxproj + SccProjectName6 = tests/Functional/http/utilities/VS11 + SccAuxPath6 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath6 = tests\\Functional\\http\\utilities\\VS11 + SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName7 = tests\\Functional\\json\\VS11\\JSON110_test.vcxproj + SccProjectName7 = tests/Functional/json/VS11 + SccAuxPath7 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath7 = tests\\Functional\\json\\VS11 + SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName8 = tests\\Functional\\misc\\atl_headers\\VS11\\header_test120.vcxproj + SccProjectName8 = tests/Functional/misc/atl_headers/VS11 + SccAuxPath8 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath8 = tests\\Functional\\misc\\atl_headers\\VS11 + SccProvider8 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName9 = tests\\Functional\\pplx\\pplx_test\\VS11\\pplx110_test.vcxproj + SccProjectName9 = tests/Functional/pplx/pplx_test/VS11 + SccAuxPath9 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath9 = tests\\Functional\\pplx\\pplx_test\\VS11 + SccProvider9 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName10 = tests\\Functional\\streams\\VS11\\streams110_test.vcxproj + SccProjectName10 = tests/Functional/streams/VS11 + SccAuxPath10 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath10 = tests\\Functional\\streams\\VS11 + SccProvider10 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName11 = tests\\Functional\\uri\\VS11\\Uri110_test.vcxproj + SccProjectName11 = tests/Functional/uri/VS11 + SccAuxPath11 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath11 = tests\\Functional\\uri\\VS11 + SccProvider11 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName12 = src\\build\\casablanca110.winrt.vcxproj + SccProjectName12 = src/build + SccAuxPath12 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath12 = src\\build + SccProvider12 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + SccProjectUniqueName13 = tests\\Functional\\http\\listener\\VS11\\HttpListener110_test.vcxproj + SccProjectName13 = tests/Functional/http/listener/VS11 + SccAuxPath13 = http://tkbgitvstfat01:8080/devdiv2 + SccLocalPath13 = tests\\Functional\\http\\listener\\VS11 + SccProvider13 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C} + EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM Debug|Win32 = Debug|Win32 @@ -197,30 +268,6 @@ Global {50386698-0180-4EBC-8827-F2C36561F6B4}.Release|Win32.Build.0 = Release|Win32 {50386698-0180-4EBC-8827-F2C36561F6B4}.Release|x64.ActiveCfg = Release|x64 {50386698-0180-4EBC-8827-F2C36561F6B4}.Release|x64.Build.0 = Release|x64 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|ARM.ActiveCfg = Debug|ARM - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|ARM.Build.0 = Debug|ARM - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|Win32.ActiveCfg = Debug|Win32 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|Win32.Build.0 = Debug|Win32 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|x64.ActiveCfg = Debug|x64 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|x64.Build.0 = Debug|x64 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|ARM.ActiveCfg = Release|ARM - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|ARM.Build.0 = Release|ARM - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|Win32.ActiveCfg = Release|Win32 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|Win32.Build.0 = Release|Win32 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|x64.ActiveCfg = Release|x64 - {9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|x64.Build.0 = Release|x64 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|ARM.ActiveCfg = Debug|ARM - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|ARM.Build.0 = Debug|ARM - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|Win32.ActiveCfg = Debug|Win32 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|Win32.Build.0 = Debug|Win32 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|x64.ActiveCfg = Debug|x64 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|x64.Build.0 = Debug|x64 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|ARM.ActiveCfg = Release|ARM - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|ARM.Build.0 = Release|ARM - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|Win32.ActiveCfg = Release|Win32 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|Win32.Build.0 = Release|Win32 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|x64.ActiveCfg = Release|x64 - {337E0660-2300-4DC6-883E-283D5A7281B5}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Release/collateral/MakeZip/MakeZip.proj b/Release/collateral/MakeZip/MakeZip.proj index 8bf5fe95a4..33932fcdfe 100644 --- a/Release/collateral/MakeZip/MakeZip.proj +++ b/Release/collateral/MakeZip/MakeZip.proj @@ -16,22 +16,38 @@ - - - + - + - + - + - + - - - + + + + + + + + + + + + + + + + + + + + + diff --git a/Release/collateral/Samples/BingRequest/VC10/BingRequest.sln b/Release/collateral/Samples/BingRequest/VC10/BingRequest.sln deleted file mode 100644 index 462103b053..0000000000 --- a/Release/collateral/Samples/BingRequest/VC10/BingRequest.sln +++ /dev/null @@ -1,26 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 11.00 -# Visual Studio 2010 -Project("{B63AE46C-557F-4286-99C7-9CB72861F3DE}") = "BingRequest", "BingRequest.vcxproj", "{BC7664BD-F33B-433C-AB8D-3530A914F5EC}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|x64 = Debug|x64 - Debug|Win32 = Debug|Win32 - Release|x64 = Release|x64 - Release|Win32 = Release|Win32 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|x64.ActiveCfg = Debug|x64 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|x64.Build.0 = Debug|x64 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|x64.ActiveCfg = Release|x64 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|x64.Build.0 = Release|x64 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|Win32.ActiveCfg = Debug|Win32 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Debug|Win32.Build.0 = Debug|Win32 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|Win32.ActiveCfg = Release|Win32 - {BC7664BD-F33B-433C-AB8D-3530A914F5EC}.Release|Win32.Build.0 = Release|Win32 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal diff --git a/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj b/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj index d94457f6f2..cfbc039120 100644 --- a/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj +++ b/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj @@ -142,5 +142,5 @@ - + diff --git a/Release/collateral/Samples/BingRequest/VC12/BingRequest.sln b/Release/collateral/Samples/BingRequest/VC12/BingRequest.sln new file mode 100644 index 0000000000..232f6141e3 --- /dev/null +++ b/Release/collateral/Samples/BingRequest/VC12/BingRequest.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BingRequest", "BingRequest.vcxproj", "{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|Win32 = Debug|Win32 + Release|x64 = Release|x64 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.ActiveCfg = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.Build.0 = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.ActiveCfg = Release|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.Build.0 = Release|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.Build.0 = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.ActiveCfg = Release|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj b/Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj similarity index 91% rename from Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj rename to Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj index 155ea82c90..db3437c7c4 100644 --- a/Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj +++ b/Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj @@ -1,5 +1,5 @@ - + Debug @@ -19,32 +19,36 @@ - {BC7664BD-F33B-433C-AB8D-3530A914F5EC} + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2} Win32Proj + $(VCTargetsPath12) - Application true NotSet + v120 Application true NotSet + v120 Application false true NotSet + v120 Application false true NotSet + v120 @@ -138,5 +142,5 @@ - - + + \ No newline at end of file diff --git a/Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj.filters b/Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj.filters similarity index 71% rename from Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj.filters rename to Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj.filters index cc8ef60d0e..5ae72c973f 100644 --- a/Release/collateral/Samples/BingRequest/VC10/BingRequest.vcxproj.filters +++ b/Release/collateral/Samples/BingRequest/VC12/BingRequest.vcxproj.filters @@ -2,15 +2,15 @@ - {5F53B50E-7194-449A-BCCF-D96F3AF03313} + {38A93F39-58D3-41BE-BC35-8A6A5EC8A77A} cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - {EA78B598-9609-4B60-838A-082852B6283F} + {0E02715E-CB4F-4242-8ABB-82CD8957AE60} h;hpp;hxx;hm;inl;inc;xsd - {6DCCD474-5A98-452E-B076-F2EE08AFEF1D} + {E398B0B5-A881-47AC-A3FC-36EF67919143} rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms @@ -19,9 +19,4 @@ Source Files - - - Source Files - - \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack/VC11/BlackJack_Client/BlackJack_Client.vcxproj b/Release/collateral/Samples/BlackJack/VC11/BlackJack_Client/BlackJack_Client.vcxproj index 33ddfc1e33..d65f65c07f 100644 --- a/Release/collateral/Samples/BlackJack/VC11/BlackJack_Client/BlackJack_Client.vcxproj +++ b/Release/collateral/Samples/BlackJack/VC11/BlackJack_Client/BlackJack_Client.vcxproj @@ -149,5 +149,5 @@ - + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack/VC11/BlackJack_Server/BlackJack_Server.vcxproj b/Release/collateral/Samples/BlackJack/VC11/BlackJack_Server/BlackJack_Server.vcxproj index a01ac6b420..44d43f18cb 100644 --- a/Release/collateral/Samples/BlackJack/VC11/BlackJack_Server/BlackJack_Server.vcxproj +++ b/Release/collateral/Samples/BlackJack/VC11/BlackJack_Server/BlackJack_Server.vcxproj @@ -98,7 +98,7 @@ - + \ No newline at end of file diff --git a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj similarity index 55% rename from Release/tests/Functional/json/VS10/JSON100_test.vcxproj rename to Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj index 2488e1c751..9e2a7f366d 100644 --- a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj +++ b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj @@ -1,5 +1,5 @@ - + Debug @@ -19,127 +19,135 @@ - {7400759E-DA5D-482E-90AA-49A3004DFEDD} - SAK - SAK - SAK - SAK + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB} Win32Proj + BlackJackClient + $(VCTargetsPath12) + + - DynamicLibrary + Application true - Unicode + NotSet + v120 - DynamicLibrary + Application true - Unicode + NotSet + v120 - DynamicLibrary + Application false true - Unicode + NotSet + v120 - DynamicLibrary + Application false true - Unicode + NotSet + v120 - + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + Use + Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) + WIN32;DEBUG;_CONSOLE + Async + /Zm150 %(AdditionalOptions) Console true - $(OutDir);%(AdditionalLibraryDirectories) Use + Level3 Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) + WIN32;DEBUG;_CONSOLE + Async + /Zm150 %(AdditionalOptions) Console true - $(OutDir);%(AdditionalLibraryDirectories) + Level3 Use MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) + WIN32;NDEBUG;_CONSOLE + Async + /Zm150 %(AdditionalOptions) Console true true true - $(OutDir);%(AdditionalLibraryDirectories) + Level3 Use MaxSpeed true true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) + WIN32;NDEBUG;_CONSOLE + Async + /Zm150 %(AdditionalOptions) Console true true true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - + + + + + + Create - Create Create + Create Create - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - - - + \ No newline at end of file diff --git a/Release/tests/Functional/utils/VS10/utils100_test.vcxproj.filters b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj.filters similarity index 62% rename from Release/tests/Functional/utils/VS10/utils100_test.vcxproj.filters rename to Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj.filters index e988ef228f..d97310f8f6 100644 --- a/Release/tests/Functional/utils/VS10/utils100_test.vcxproj.filters +++ b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Client/BlackJack_Client.vcxproj.filters @@ -9,27 +9,25 @@ {93995380-89BD-4b04-88EB-625FBE52EBFB} h;hpp;hxx;hm;inl;inc;xsd + + {67DA6AB6-F800-4c08-8B7A-83BB121AAD01} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - + Header Files - + Header Files + + + Source Files + + + Source Files + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server.sln b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server.sln new file mode 100644 index 0000000000..0634b608e1 --- /dev/null +++ b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server.sln @@ -0,0 +1,36 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlackJack_Server", "BlackJack_Server\BlackJack_Server.vcxproj", "{0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}" +EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "BlackJack_Client", "BlackJack_Client\BlackJack_Client.vcxproj", "{8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Debug|Win32.ActiveCfg = Debug|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Debug|Win32.Build.0 = Debug|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Debug|x64.ActiveCfg = Debug|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Debug|x64.Build.0 = Debug|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Release|Win32.ActiveCfg = Release|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Release|Win32.Build.0 = Release|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Release|x64.ActiveCfg = Release|x64 + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39}.Release|x64.Build.0 = Release|x64 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Debug|Win32.ActiveCfg = Debug|Win32 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Debug|Win32.Build.0 = Debug|Win32 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Debug|x64.ActiveCfg = Debug|x64 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Debug|x64.Build.0 = Debug|x64 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Release|Win32.ActiveCfg = Release|Win32 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Release|Win32.Build.0 = Release|Win32 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Release|x64.ActiveCfg = Release|x64 + {8944AD2A-7314-4BBF-A0A3-352EBD43CDBB}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj new file mode 100644 index 0000000000..d7bec7fac2 --- /dev/null +++ b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj @@ -0,0 +1,104 @@ + + + + + Debug + x64 + + + Release + x64 + + + + + + + Create + Create + + + + + + + + + + {0E2614E0-9936-4A45-AE88-A2FA0F9B8B39} + $(VCTargetsPath12) + + + + + Application + false + Unicode + v120 + + + Application + false + true + Unicode + v120 + + + + + + + + + + + + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + + + + Level3 + Disabled + WIN32;DEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDebugDLL + ProgramDatabase + Use + stdafx.h + /Zm150 %(AdditionalOptions) + + + true + + + + + Level3 + MaxSpeed + true + true + WIN32;NDEBUG;_USRDLL;%(PreprocessorDefinitions) + MultiThreadedDLL + + + Use + stdafx.h + /Zm150 %(AdditionalOptions) + + + true + true + true + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj.filters b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj.filters new file mode 100644 index 0000000000..1bf2137444 --- /dev/null +++ b/Release/collateral/Samples/BlackJack/VC12/BlackJack_Server/BlackJack_Server.vcxproj.filters @@ -0,0 +1,24 @@ + + + + + {cac70ed0-f5bc-4fd2-a130-ddde51adff8f} + .cpp;.cxx;.c + + + {5ce05162-33b0-49d2-8d0b-f86f26442541} + .h;.hpp + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml b/Release/collateral/Samples/BlackJack_UIClient/App.xaml similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml rename to Release/collateral/Samples/BlackJack_UIClient/App.xaml diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml.cpp b/Release/collateral/Samples/BlackJack_UIClient/App.xaml.cpp similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml.cpp rename to Release/collateral/Samples/BlackJack_UIClient/App.xaml.cpp diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml.h b/Release/collateral/Samples/BlackJack_UIClient/App.xaml.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/App.xaml.h rename to Release/collateral/Samples/BlackJack_UIClient/App.xaml.h diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/Logo.png b/Release/collateral/Samples/BlackJack_UIClient/Assets/Logo.png similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/Logo.png rename to Release/collateral/Samples/BlackJack_UIClient/Assets/Logo.png diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/SmallLogo.png b/Release/collateral/Samples/BlackJack_UIClient/Assets/SmallLogo.png similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/SmallLogo.png rename to Release/collateral/Samples/BlackJack_UIClient/Assets/SmallLogo.png diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/SplashScreen.png b/Release/collateral/Samples/BlackJack_UIClient/Assets/SplashScreen.png similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/SplashScreen.png rename to Release/collateral/Samples/BlackJack_UIClient/Assets/SplashScreen.png diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/StoreLogo.png b/Release/collateral/Samples/BlackJack_UIClient/Assets/StoreLogo.png similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Assets/StoreLogo.png rename to Release/collateral/Samples/BlackJack_UIClient/Assets/StoreLogo.png diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client_TemporaryKey.pfx b/Release/collateral/Samples/BlackJack_UIClient/Blackjack Client_TemporaryKey.pfx similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client_TemporaryKey.pfx rename to Release/collateral/Samples/BlackJack_UIClient/Blackjack Client_TemporaryKey.pfx diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml b/Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml rename to Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml.cpp b/Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml.cpp similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml.cpp rename to Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml.cpp diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml.h b/Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/CardShape.xaml.h rename to Release/collateral/Samples/BlackJack_UIClient/CardShape.xaml.h diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Cards.PNG b/Release/collateral/Samples/BlackJack_UIClient/Cards.PNG similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Cards.PNG rename to Release/collateral/Samples/BlackJack_UIClient/Cards.PNG diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Common/StandardStyles.xaml b/Release/collateral/Samples/BlackJack_UIClient/Common/StandardStyles.xaml similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Common/StandardStyles.xaml rename to Release/collateral/Samples/BlackJack_UIClient/Common/StandardStyles.xaml diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Package.appxmanifest b/Release/collateral/Samples/BlackJack_UIClient/Package.appxmanifest similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Package.appxmanifest rename to Release/collateral/Samples/BlackJack_UIClient/Package.appxmanifest diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml b/Release/collateral/Samples/BlackJack_UIClient/Player.xaml similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml rename to Release/collateral/Samples/BlackJack_UIClient/Player.xaml diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml.cpp b/Release/collateral/Samples/BlackJack_UIClient/Player.xaml.cpp similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml.cpp rename to Release/collateral/Samples/BlackJack_UIClient/Player.xaml.cpp diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml.h b/Release/collateral/Samples/BlackJack_UIClient/Player.xaml.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/Player.xaml.h rename to Release/collateral/Samples/BlackJack_UIClient/Player.xaml.h diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml b/Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml rename to Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml.cpp b/Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml.cpp similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml.cpp rename to Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml.cpp diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml.h b/Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/PlayingTable.xaml.h rename to Release/collateral/Samples/BlackJack_UIClient/PlayingTable.xaml.h diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client.vcxproj b/Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client.vcxproj index dd91865a6d..cab63f30f5 100644 --- a/Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client.vcxproj +++ b/Release/collateral/Samples/BlackJack_UIClient/VC11/Blackjack Client.vcxproj @@ -73,27 +73,27 @@ - + - + - + - + - + - + @@ -204,4 +204,26 @@ + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.sln b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.sln new file mode 100644 index 0000000000..cc04ff438c --- /dev/null +++ b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Blackjack Client", "Blackjack Client.vcxproj", "{475CD6F5-C129-4405-AEB4-A0A915BC08FB}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|ARM.ActiveCfg = Debug|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|ARM.Build.0 = Debug|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|ARM.Deploy.0 = Debug|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|Win32.ActiveCfg = Debug|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|Win32.Build.0 = Debug|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|Win32.Deploy.0 = Debug|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|x64.ActiveCfg = Debug|x64 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|x64.Build.0 = Debug|x64 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Debug|x64.Deploy.0 = Debug|x64 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|ARM.ActiveCfg = Release|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|ARM.Build.0 = Release|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|ARM.Deploy.0 = Release|ARM + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|Win32.ActiveCfg = Release|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|Win32.Build.0 = Release|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|Win32.Deploy.0 = Release|Win32 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|x64.ActiveCfg = Release|x64 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|x64.Build.0 = Release|x64 + {475CD6F5-C129-4405-AEB4-A0A915BC08FB}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj new file mode 100644 index 0000000000..4004e2698e --- /dev/null +++ b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj @@ -0,0 +1,229 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {475cd6f5-c129-4405-aeb4-a0a915bc08fb} + Blackjack_Client + en-US + 12.0 + true + + + + + Application + true + v120 + + + Application + true + v120 + + + Application + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Blackjack Client_TemporaryKey.pfx + 02495E80EA1A5A73F4C276F730BCFB049D4BB006 + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + CardShape.xaml + + + + + App.xaml + + + Player.xaml + + + PlayingTable.xaml + + + + + Designer + + + + Designer + + + + + + + Designer + + + + + + + + + + + + + App.xaml + + + CardShape.xaml + + + Create + Create + Create + Create + Create + Create + + + Player.xaml + + + PlayingTable.xaml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj.filters b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj.filters new file mode 100644 index 0000000000..0b4ecc0c23 --- /dev/null +++ b/Release/collateral/Samples/BlackJack_UIClient/VC12/Blackjack Client.vcxproj.filters @@ -0,0 +1,58 @@ + + + + + 475cd6f5-c129-4405-aeb4-a0a915bc08fb + + + afde3f48-5194-487f-9741-8e47cd122a67 + + + Common + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/messagetypes.h b/Release/collateral/Samples/BlackJack_UIClient/messagetypes.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/messagetypes.h rename to Release/collateral/Samples/BlackJack_UIClient/messagetypes.h diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/pch.cpp b/Release/collateral/Samples/BlackJack_UIClient/pch.cpp similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/pch.cpp rename to Release/collateral/Samples/BlackJack_UIClient/pch.cpp diff --git a/Release/collateral/Samples/BlackJack_UIClient/VC11/pch.h b/Release/collateral/Samples/BlackJack_UIClient/pch.h similarity index 100% rename from Release/collateral/Samples/BlackJack_UIClient/VC11/pch.h rename to Release/collateral/Samples/BlackJack_UIClient/pch.h diff --git a/Release/collateral/Samples/CasaLens/AppCode.html b/Release/collateral/Samples/CasaLens/AppCode.html new file mode 100644 index 0000000000..60ab734521 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/AppCode.html @@ -0,0 +1,157 @@ + + + + Casa Lens | Casablana Test App + + + + + + + + + + + + + + + Search + + + + + + + + Failed to fetch the data! Please try again later. + + + + + + + Attractions + + + + + + + + + + + + + + + + + Image results by + + + + + + + Current Weather + + + + %wt%°F + + %wdesc% + + + + + + + + Min. Temperature + %wtmin%°F + + + Max. Temperature + %wtmax%°F + + + Pressure + %wp%mb + + + + + + + + Weather by OpenWeatherMap + Postal code to location conversion by Google Maps API + + + + + + + + + + Events around you + + + + %eventtitle% + + %eventdescription% + ... + + + %eventvenue% + %eventstarttime% + + + + + Events by Eventful + + + + + + Now playing in Theaters + + + + + + %mtitle% + %mtheater% + + + + + + + + + + + Movie data by OnConnect TMS API services + + Movie poster results by + + + + + + + + + + + + diff --git a/Release/collateral/Samples/CasaLens/ReadMe.txt b/Release/collateral/Samples/CasaLens/ReadMe.txt new file mode 100644 index 0000000000..84098c8bda --- /dev/null +++ b/Release/collateral/Samples/CasaLens/ReadMe.txt @@ -0,0 +1,49 @@ +======================================================================== + CasaLens Project Overview +======================================================================== + +CasaLens is a data mash-up sample i.e use the Casablanca features to build a service that can collate data from different services and provide them to the user. +Given the postal code/city name, the service overlays events, movies, weather, pictures around the place. + +To run the sample, obtain the api keys from the different services (listed below) and update them in casalens.cpp (see Services section below for more details). +The sample takes one parameter: the port to listen for requests. + +Services: +Here are the details about the services the sample is interacting with, how to obtain the api keys for using these services and how to pass it to the sample. +1. Bing image search: http://datamarket.azure.com/dataset/bing/search + Sign UP at the above link to obtain the api key. + In casalens.cpp, set the value of bmaps_key variable to this key. + Query this service for pictures of a place and return it to the client. + This service is also used to collect movie posters. + +2. OpenWeatherMap:http://openweathermap.org/ + Fetch weather data: current temperature, pressure at the location. + +3. Eventful: http://http://api.eventful.com/ + Follow the "Get Started" steps -> "Register a new account" at the eventful website to obtain the application key. + In casalens.cpp, set the value of events_key variable to this key. + Fetch different events happening at the specified location. + +4. OnConnect tmsapi: http://developer.tmsapi.com/ + Register at the above website and obtain a new key for the TMS API package. + In casalens.cpp, set the value of movies_key variable to this key. + Get currently playing movies in local theaters along with the show times. + +5. Google maps: https://developers.google.com/maps + This does not require a key. + Given a postal code, use google maps API to get the location (city name) corresponding to that code. + +6. Bing maps: http://dev.virtualearth.net/ + The key populated in step 1 should work for both bing maps and search. + Given a location (city name), use bing maps API to get the postal code. + +Files: +1. casalens.cpp: + Main file that contains code to initialize and start the http_listener. + We add two GET and POST handlers handle_get and handle_post and open the listener to listen for requests. + +2. datafetcher.cpp: + This file contains logic to collect data from different services, create JSON objects with the data and return it to the client. + +This sample is merely a demonstration of how one can use Casablanca to author data mash-ups. +If you plan to use/deploy the sample, do not forget to read and follow the "Terms and Conditions" for each service and ensure that you are adhering to all the requirements. diff --git a/Release/collateral/Samples/CasaLens/VC11/CasaLens.sln b/Release/collateral/Samples/CasaLens/VC11/CasaLens.sln new file mode 100644 index 0000000000..18cb9b2c50 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC11/CasaLens.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CasaLens", "CasaLens.vcxproj", "{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.Build.0 = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.ActiveCfg = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.Build.0 = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.ActiveCfg = Release|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.Build.0 = Release|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.ActiveCfg = Release|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj b/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj new file mode 100644 index 0000000000..e57d8d94a1 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj @@ -0,0 +1,194 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2} + Win32Proj + $(VCTargetsPath11) + + + + Application + true + NotSet + v110 + + + Application + true + NotSet + v110 + + + Application + false + true + NotSet + v110 + + + Application + false + true + NotSet + v110 + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + + + + + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + + + + + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + true + true + + + + + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + true + true + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj.filters b/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj.filters new file mode 100644 index 0000000000..f843fb7f1f --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC11/CasaLens.vcxproj.filters @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + {533be0b0-b498-43fb-84df-f6ab98cac4c5} + + + {4a5308b5-e4a1-4632-80c6-3b3150fa32b4} + + + {19c36670-919d-4a7a-b7ab-12aa48a36865} + + + + + css + + + js + + + + + + image + + + image + + + \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/VC12/CasaLens.sln b/Release/collateral/Samples/CasaLens/VC12/CasaLens.sln new file mode 100644 index 0000000000..18cb9b2c50 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC12/CasaLens.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2012 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CasaLens", "CasaLens.vcxproj", "{31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.ActiveCfg = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|Win32.Build.0 = Debug|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.ActiveCfg = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Debug|x64.Build.0 = Debug|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.ActiveCfg = Release|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|Win32.Build.0 = Release|Win32 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.ActiveCfg = Release|x64 + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2}.Release|x64.Build.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj b/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj new file mode 100644 index 0000000000..56b1dc1c67 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj @@ -0,0 +1,194 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {31C2DFBB-159D-4EEE-A067-3ED0A287B7C2} + Win32Proj + $(VCTargetsPath12) + + + + Application + true + NotSet + v120 + + + Application + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + + + + + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + + + + + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + true + true + + + + + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + true + true + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj.filters b/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj.filters new file mode 100644 index 0000000000..f843fb7f1f --- /dev/null +++ b/Release/collateral/Samples/CasaLens/VC12/CasaLens.vcxproj.filters @@ -0,0 +1,40 @@ + + + + + + + + + + + + + + {533be0b0-b498-43fb-84df-f6ab98cac4c5} + + + {4a5308b5-e4a1-4632-80c6-3b3150fa32b4} + + + {19c36670-919d-4a7a-b7ab-12aa48a36865} + + + + + css + + + js + + + + + + image + + + image + + + \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/casalens.cpp b/Release/collateral/Samples/CasaLens/casalens.cpp new file mode 100644 index 0000000000..e6256f156b --- /dev/null +++ b/Release/collateral/Samples/CasaLens/casalens.cpp @@ -0,0 +1,170 @@ +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* casalens.cpp: Listener code: Given a location/postal code, the listener queries different services +* for weather, things to do: events, movie and pictures and returns it to the client. +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "stdafx.h" +#include "casalens.h" + +using namespace web; +using namespace http; +using namespace utility; +using namespace http::experimental::listener; + +const utility::string_t casalens_creds::events_url=U("http://api.eventful.com/json/events/search?...&location="); +const utility::string_t casalens_creds::movies_url=U("http://data.tmsapi.com/v1/movies/showings?"); +const utility::string_t casalens_creds::images_url=U("https://api.datamarket.azure.com/Bing/Search/Image?$format=json"); +const utility::string_t casalens_creds::bmaps_url=U("http://dev.virtualearth.net/REST/v1/Locations"); +const utility::string_t casalens_creds::gmaps_url=U("http://maps.googleapis.com/maps/api/geocode/json"); +const utility::string_t casalens_creds::weather_url=U("http://api.openweathermap.org/data/2.1/find/name?q="); + +// FILL IN THE API KEYS FOR THE DIFFERENT SERVICES HERE. +// Refer Readme.txt for details on how to obtain the key for the services. +const utility::string_t casalens_creds::events_keyname=U("app_key"); +const utility::string_t casalens_creds::events_key=U(""); +const utility::string_t casalens_creds::movies_keyname=U("api_key"); +const utility::string_t casalens_creds::movies_key=U(""); +const utility::string_t casalens_creds::images_keyname=U("username"); +const utility::string_t casalens_creds::images_key=U(""); +const utility::string_t casalens_creds::bmaps_keyname=U("key"); +const utility::string_t casalens_creds::bmaps_key=U(""); + +const utility::string_t CasaLens::events_json_key=U("events"); +const utility::string_t CasaLens::movies_json_key=U("movies"); +const utility::string_t CasaLens::weather_json_key=U("weather"); +const utility::string_t CasaLens::images_json_key=U("images"); +const utility::string_t CasaLens::error_json_key=U("error"); + +CasaLens::CasaLens(utility::string_t url) : m_listener(url) +{ + m_listener.support(methods::GET, std::bind(&CasaLens::handle_get, this, std::placeholders::_1)); + m_listener.support(methods::POST, std::bind(&CasaLens::handle_post, this, std::placeholders::_1)); + + m_htmlcontentmap[U("/")] = std::make_tuple(U("AppCode.html"), U("text/html")); + m_htmlcontentmap[U("/js/default.js")] = std::make_tuple(U("js/default.js"), U("application/javascript")); + m_htmlcontentmap[U("/css/default.css")] = std::make_tuple(U("css/default.css"), U("text/css")); + m_htmlcontentmap[U("/image/logo.png")] = std::make_tuple(U("image/logo.png"), U("application/octet-stream")); + m_htmlcontentmap[U("/image/bing-logo.jpg")] = std::make_tuple(U("image/bing-logo.jpg"), U("application/octet-stream")); + m_htmlcontentmap[U("/image/wall.jpg")] = std::make_tuple(U("image/wall.jpg"), U("application/octet-stream")); +} + +void CasaLens::handle_error(pplx::task& t) +{ + try + { + t.get(); + } + catch(...) + { + // Ignore the error, Log it if a logger is available + } +} + +pplx::task CasaLens::open() +{ + return m_listener.open().then(std::bind(&handle_error, std::placeholders::_1)); +} + +pplx::task CasaLens::close() +{ + return m_listener.close().then(std::bind(&handle_error, std::placeholders::_1)); +} + +// Handler to process HTTP::GET requests. +// Replies to the request with data. +void CasaLens::handle_get(http_request message) +{ + auto path = message.relative_uri().path(); + auto content_data = m_htmlcontentmap.find(path); + if (content_data == m_htmlcontentmap.end()) + { + message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1)); + return; + } + + auto file_name = std::get<0>(content_data->second); + auto content_type = std::get<1>(content_data->second); + concurrency::streams::fstream::open_istream(file_name, std::ios::in).then([=](concurrency::streams::istream is) + { + message.reply(status_codes::OK, is, content_type).then(std::bind(&handle_error, std::placeholders::_1)); + }).then([=](pplx::task& t) + { + try + { + t.get(); + } + catch(...) + { + // opening the file (open_istream) failed. + // Reply with an error. + message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1)); + } + }); +} + +// Respond to HTTP::POST messages +// Post data will contain the postal code or location string. +// Aggregate location data from different services and reply to the POST request. +void CasaLens::handle_post(http_request message) +{ + auto path = message.relative_uri().path(); + if (0 == path.compare(U("/"))) + { + message.extract_string().then([=](const utility::string_t& location) + { + get_data(message, location); + }).then(std::bind(&handle_error, std::placeholders::_1)); + } + else + { + message.reply(status_codes::NotFound, U("Path not found")).then(std::bind(&handle_error, std::placeholders::_1)); + } +} + +#ifdef _MS_WINDOWS +int wmain(int argc, wchar_t *args[]) +#else +int main(int argc, char *args[]) +#endif +{ + if(argc != 2) + { + wprintf(U("Usage: casalens.exe port\n")); + return -1; + } + + std::wstring address = U("http://localhost:"); + address.append(args[1]); + + CasaLens listener(address); + listener.open().wait(); + + std::wcout << utility::string_t(U("Listening for requests at: ")) << address << std::endl; + + std::string line; + std::wcout << U("Hit Enter to close the listener."); + std::getline(std::cin, line); + + listener.close().wait(); + + return 0; +} \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/casalens.h b/Release/collateral/Samples/CasaLens/casalens.h new file mode 100644 index 0000000000..41083b819c --- /dev/null +++ b/Release/collateral/Samples/CasaLens/casalens.h @@ -0,0 +1,125 @@ +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* casalens.h: Listener code: Given a location/postal code, the listener queries different services +* for weather, things to do: events, movie and pictures and returns it to the client. +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ +#pragma once + +#include "stdafx.h" +#include "cpprest\http_listener.h" +#include "cpprest/json.h" +#include "cpprest/filestream.h" +#include "cpprest/containerstream.h" +#include "cpprest/producerconsumerstream.h" +#include "cpprest/http_listener.h" +#include "cpprest/http_client.h" +#include +#include +#include + +// +// Credentials class to manage the service URLs, key name and api-keys. +// +class casalens_creds +{ +public: + static const utility::string_t events_url; + static const utility::string_t movies_url; + static const utility::string_t images_url; + static const utility::string_t weather_url; + static const utility::string_t bmaps_url; + static const utility::string_t gmaps_url; + + static const utility::string_t events_keyname; + static const utility::string_t events_key; + static const utility::string_t movies_keyname; + static const utility::string_t movies_key; + static const utility::string_t images_keyname; + static const utility::string_t images_key; + static const utility::string_t bmaps_keyname; + static const utility::string_t bmaps_key; +}; + +// +// This class implements the CasaLens server functionality. +// It maintains a http_listener, registers to listen for requests. +// Also implements the handlers to respond to requests and methods to fetch +// and aggregate data from different services. +// +class CasaLens +{ +public: + CasaLens() {} + CasaLens(utility::string_t url); + + pplx::task open(); + pplx::task close(); + + void handle_get(web::http::http_request message); + void handle_post(web::http::http_request message); + +private: + + // Error handlers + static void handle_error(pplx::task& t); + pplx::task handle_exception(pplx::task& t, const utility::string_t& field_name); + + // methods to fetch data from the services + pplx::task get_events(const utility::string_t& post_code); + pplx::task get_weather(const utility::string_t& post_code); + pplx::task get_pictures(const utility::string_t& location, const utility::string_t& count); + pplx::task get_movies(const utility::string_t& post_code); + + // Utility functions + bool is_number(const std::string& s); + std::wstring get_date(); + + void fetch_data(web::http::http_request message, const std::wstring& postal_code, const std::wstring& location); + void get_data(web::http::http_request message, const std::wstring& location); + + static const int num_events = 5; + static const int num_images = 5; + static const int num_movies = 5; + + static const utility::string_t events_json_key; + static const utility::string_t movies_json_key; + static const utility::string_t weather_json_key; + static const utility::string_t images_json_key; + static const utility::string_t error_json_key; + + // Lock to the in memory cache (m_data) + concurrency::reader_writer_lock m_rwlock; + + // key: City name or postal code + // Value: JSON response data to be sent to clients + // We are caching the data for multiple requests. + std::map m_data; + + // m_htmlcontentmap contains data about the html contents of the website, their mime types + // key: relative URI path of the HTML content being requested + // value: Tuple where: + // Element1: relative path on the disk of the file being requested + // Element2: Mime type/content type of the file + std::map> m_htmlcontentmap; + + // HTTP listener + web::http::experimental::listener::http_listener m_listener; +}; \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/css/default.css b/Release/collateral/Samples/CasaLens/css/default.css new file mode 100644 index 0000000000..65809e84fd --- /dev/null +++ b/Release/collateral/Samples/CasaLens/css/default.css @@ -0,0 +1,97 @@ +body +{ + width: 100%; + height: 100%; + font-family: Calibri; + background-image: linear-gradient(20deg, white, #DDE6DF 62.6%, #24507C); + background-repeat: no-repeat; + background-size: 100% 100%; +} + +h4 { + height:25px; + text-align: center; +} + +.Logo { + width: 105.59px; + height: 103.64px; +} + +.searchBox { +} + +.textclass +{ + width: 46%; + font-family: "segoe ui"; +} + +.tftextbtn +{ + color: #fff; + display: inline-block; + background-color: rgb(230, 100, 0); + font-family: "segoe ui"; +} + +.PictureGallery { +} + +.mainPic { +} + +.thumbnailPic { +} + +.CurrentTemperature { + vertical-align:middle; + text-align: center; + font-size: 75px; +} + +.WeatherData { +} + +.EventTitle { + font-size: large; +} + +.EventDescription { + font-family:Helvetica; + word-wrap:break-word; + font-size:small; +} + +a:link {text-decoration:none;} +td +{ + vertical-align:top; + valign:top; +} + +.verticalLine { + border-left: thick solid #ff0000; +} + +.wrap-words { + word-wrap:break-word; +} + +.eventful-badge, +.eventful-badge * { + margin: 0 !important; + padding: 0 !important; + border: 0 !important; + text-align: center !important; + color: #CCC !important; + font-family: Arial !important; + text-decoration: none !important; +} + +.eventful-medium { + position: relative !important; + width: 100px !important; + font-size: 12px !important; + line-height: 13px !important; +} \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/datafetcher.cpp b/Release/collateral/Samples/CasaLens/datafetcher.cpp new file mode 100644 index 0000000000..4c3b0a15e5 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/datafetcher.cpp @@ -0,0 +1,421 @@ +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* datafetcher.cpp: Listener code: Given a location/postal code, the listener queries different services +* for weather, things to do: events, movie and pictures and returns it to the client. +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "stdafx.h" +#include "casalens.h" + +using namespace utility; +using namespace concurrency; +using namespace concurrency::streams; + +using namespace web; +using namespace web::http; +using namespace web::http::client; +using namespace web::http::experimental; +using namespace web::http::experimental::listener; + +// In case of any failure to fetch data from a service, +// create a json object with "error" key and value containing the exception details. +pplx::task CasaLens::handle_exception(pplx::task& t, const utility::string_t& field_name) +{ + try + { + t.get(); + } + catch(const std::exception& ex) + { + json::value error_json = json::value::object(); + error_json[field_name] = json::value::object(); + error_json[field_name][error_json_key] = json::value::string(utility::conversions::to_string_t(ex.what())); + return pplx::task_from_result(error_json); + } + + return t; +} + +// Given postal code, query eventful service and obtain num_events upcoming events at that location. +// Returns a task of json::value of event data +// JSON result Format: +// {"events":["title":"event1","url":"http://event1","starttime":"ddmmyy",..]} +pplx::task CasaLens::get_events(const utility::string_t& postal_code) +{ + uri_builder ub(casalens_creds::events_url + postal_code); + + ub.append_query(casalens_creds::events_keyname, casalens_creds::events_key); + auto event_url = ub.to_string(); + + http_client ev_client(event_url); + return ev_client.request(methods::GET, event_url).then([](http_response resp) + { + return resp.extract_json(); + }).then([](json::value event_json) + { + json::value event_result_node = json::value::object(); + + if (!event_json[U("events")][U("event")].is_null()) + { + event_result_node[U("events")] = json::value::array(); + + int i = 0; + for(auto& iter:event_json[U("events")][U("event")]) + { + auto event = iter.second; + event_result_node[events_json_key][i][U("title")] = event[U("title")]; + event_result_node[events_json_key][i][U("url")] = event[U("url")]; + event_result_node[events_json_key][i][U("starttime")] = event[U("start_time")]; + event_result_node[events_json_key][i][U("description")] = event[U("description")]; + event_result_node[events_json_key][i][U("url")] = event[U("url")]; + event_result_node[events_json_key][i][U("venue_address")] = json::value::string(event[U("venue_address")].as_string() + U(" ") + event[U("city_name")].as_string()); + + if (i++ > num_events) + break; + } + } + else + { + // Event data is null, we hit an error. + event_result_node[events_json_key] = json::value::object(); + event_result_node[events_json_key][error_json_key] = event_json[U("events")][U("description")]; + } + + return event_result_node; + }).then([=](pplx::task t) + { + return handle_exception(t, events_json_key); + }); +} + +// Query openweathermap API and obtain weather information at the given location. +// Returns a task of json::value containing the weather data. +// Format: +// {"weather":{"temperature":"49","pressure":"xxx"..}} +pplx::task CasaLens::get_weather(const utility::string_t& postal_code) +{ + utility::string_t weather_url(casalens_creds::weather_url); + + uri_builder ub_weather(weather_url.append(postal_code)); + ub_weather.append_query(U("units"), U("imperial")); + + http_client weather_client(ub_weather.to_string()); + return weather_client.request(methods::GET).then([](http_response resp) + { + return resp.extract_string(); + }).then([](utility::string_t weather_str) + { + json::value weather_json = json::value::parse(weather_str); + + auto& j = weather_json[U("list")][0][U("main")]; + + json::value weather_result_node = json::value::object(); + weather_result_node[weather_json_key] = json::value::object(); + auto& w = weather_result_node[U("weather")]; + w[U("temperature")] = j[U("temp")]; + w[U("pressure")] = j[U("pressure")]; + w[U("temp_min")] = j[U("temp_min")]; + w[U("temp_max")] = j[U("temp_max")]; + w[U("image")] = json::value::string(U("http://openweathermap.org/img/w/") + weather_json[U("list")][0][U("weather")][0][U("icon")].as_string() + U(".png")); + w[U("description")] = weather_json[U("list")][0][U("weather")][0][U("description")]; + return weather_result_node; + }).then([=](pplx::task t) + { + return handle_exception(t, weather_json_key); + }); +} + +// Query bing images to fetch some image URLs of the given location +// Returns a task of json::Value +// JSON result format: +// {"images":["url1", "url2"]} +pplx::task CasaLens::get_pictures(const utility::string_t& location, const utility::string_t& count) +{ + http_client_config config; + credentials cred(casalens_creds::images_keyname, casalens_creds::images_key); + config.set_credentials(cred); + utility::string_t bing_url(casalens_creds::images_url); + uri_builder ub_bing(bing_url); + ub_bing.append_query(U("Query"), U("'") + location + U("'")); + ub_bing.append_query(U("$top"), count); + ub_bing.append_query(U("ImageFilters"), U("'Size:Medium'")); + + http_client bing_client(ub_bing.to_string(), config); + return bing_client.request(methods::GET).then([](http_response resp) + { + return resp.extract_json(); + }).then([](json::value image_json) + { + json::value image_result_node = json::value::object(); + image_result_node[images_json_key] = json::value::array(); + + int i = 0; + for(auto& iter:image_json[U("d")][U("results")]) + { + auto image = iter.second; + image_result_node[images_json_key][i] = image[U("MediaUrl")]; + if (i++ > num_images) + break; + } + return image_result_node; + }).then([=](pplx::task t) + { + return handle_exception(t, images_json_key); + }); +} + +// Get the current date +std::wstring CasaLens::get_date() +{ + time_t t = time(0); + struct tm now; + std::wostringstream date; + if (0 == localtime_s(&now, &t)) + { + date << (now.tm_year + 1900) << '-' + << (now.tm_mon + 1) << '-' + << now.tm_mday; + } + return date.str(); +} + +// Query tmsapi and fetch current movie showtimes at local theaters, for the given postal code +// Also quert bing images for movie posters +// Returns a task of JSON value +// JSON result format: +// "movies":[{"title":"abc","theatre":[{"name":"theater1","datetime":["dd-mm-yyThh:mm"]},{"name":"theater2","datetime":["ddmmyy"]}],"poster":"img-url"}}]}.. +pplx::task CasaLens::get_movies(const utility::string_t& postal_code) +{ + uri_builder ub_movie(casalens_creds::movies_url); + + ub_movie.append_query(U("startDate"), get_date()); + ub_movie.append_query(U("zip"), postal_code); + ub_movie.append_query(casalens_creds::movies_keyname, casalens_creds::movies_key); + ub_movie.append_query(U("imageSize"), U("Sm")); + + http_client tms_client(ub_movie.to_string()); + return tms_client.request(methods::GET).then([](http_response resp) + { + return resp.extract_json(); + }).then([](json::value movie_json) + { + // From the data obtained from tmsapi, construct movie JSON value to be sent to the client + // We will collect data for 5 movies, and 5 showtime info per movie. + json::value movie_result_node = json::value::object(); + + if (movie_json.size()) + { + auto temp = json::value::array(); + int i = 0; + for(auto iter = movie_json.cbegin(); iter != movie_json.cend() && i < num_movies; iter++, i++) + { + auto& showtimes = iter->second[U("showtimes")]; + + int j = 0; + int showtime_index = 0; + int theater_index = -1; + utility::string_t current_theater; + temp[i][U("title")] = iter->second[U("title")]; + + for (auto iter2 = showtimes.cbegin(); iter2 != showtimes.cend() && j < num_movies; iter2++,j++) + { + auto theater = iter2->second[U("theatre")][U("name")].as_string(); + if (0 != theater.compare(current_theater)) // new theater + { + temp[i][U("theatre")][++theater_index][U("name")] = json::value::string(theater); // Add theater entry + showtime_index = 0; + current_theater = theater; + } + temp[i][U("theatre")][theater_index][U("datetime")][showtime_index++] = iter2->second[U("dateTime")]; // Update the showtime for same theater + } + } + movie_result_node[movies_json_key] = std::move(temp); + } + else + { + movie_result_node[movies_json_key] = json::value::object(); + movie_result_node[movies_json_key][error_json_key] = json::value::string(U("Failed to fetch movie data")); + } + + return pplx::task_from_result(movie_result_node); + }).then([=](json::value movie_result) + { + try + { + // For every movie, obtain movie poster URL from bing + std::vector movie_list; + std::vector> poster_tasks; + auto date = get_date(); + std::wstring year = date.substr(0, date.find(U("-"))); + + for(auto& iter:movie_result[movies_json_key]) + { + auto title = iter.second[U("title")].as_string(); + auto searchStr = title + U(" ") + year + U(" new movie poster"); + poster_tasks.push_back(get_pictures(searchStr, U("1"))); + movie_list.push_back(title); + } + + pplx::when_all(poster_tasks.begin(), poster_tasks.end()).wait(); + json::value resp_data = json::value::object(); + + for(unsigned int i = 0; i < poster_tasks.size(); i++) + { + auto jval = poster_tasks[i].get(); + auto poster_url = jval.begin()->second[0]; + movie_result[movies_json_key][i][U("poster")] = poster_url; + } + } + catch(...) + { + // Ignore any failure in fetching movie posters. Just return + // the movie data to the client. + } + return pplx::task_from_result(movie_result); + }).then([=](pplx::task t) + { + return handle_exception(t, movies_json_key); + }); +} + +bool CasaLens::is_number(const std::string& s) +{ + return !s.empty() && std::find_if(s.begin(), + s.end(), [](char c) { return !std::isdigit(c, std::locale()); }) == s.end(); +} + +void CasaLens::fetch_data(http_request message, const std::wstring& postal_code, const std::wstring& location) +{ + json::value resp_data; + + try + { + m_rwlock.lock_read(); + resp_data = m_data[postal_code]; + m_rwlock.unlock(); + + if (resp_data.is_null()) + { + std::vector> tasks; + + tasks.push_back(get_events(postal_code)); + tasks.push_back(get_weather(postal_code)); + tasks.push_back(get_pictures(location, U("4"))); + tasks.push_back(get_movies(postal_code)); + + pplx::when_all(tasks.begin(), tasks.end()).wait(); + resp_data = json::value::object(); + + for(auto& iter:tasks) + { + auto jval = iter.get(); + auto key = jval.begin()->first.as_string(); + resp_data[key] = jval.begin()->second; + } + + m_rwlock.lock(); + m_data[postal_code] = resp_data; + m_rwlock.unlock(); + } + + // Reply with the aggregated JSON data + message.reply(status_codes::OK, resp_data).then(std::bind(&handle_error, std::placeholders::_1)); + } + catch(...) + { + message.reply(status_codes::InternalError).then(std::bind(&handle_error, std::placeholders::_1)); + } +} + +// Check if the input text is a number or string. +// If string => city name, use bing maps API to obtain the postal code for that city +// number => postal code, use google maps API to obtain city name (location data) for that postal code. +// then call fetch_data to query different services, aggregate movie, images, events, weather etc for that city and respond to the request. +void CasaLens::get_data(http_request message, const std::wstring& input_text) +{ + if (!is_number(utility::conversions::to_utf8string(input_text))) + { + std::wstring bing_maps_url(casalens_creds::bmaps_url); + uri_builder maps_builder; + maps_builder.append_query(U("locality"), input_text); + maps_builder.append_query(casalens_creds::bmaps_keyname, casalens_creds::bmaps_key); + auto s = maps_builder.to_string(); + http_client bing_client(bing_maps_url); + bing_client.request(methods::GET, s).then([=](http_response resp) + { + return resp.extract_json(); + }).then([=](json::value& maps_result) mutable + { + auto coordinates = maps_result[U("resourceSets")][0][U("resources")][0][U("point")]; + auto lattitude = coordinates[U("coordinates")][0].to_string(); + auto longitude = coordinates[U("coordinates")][1].to_string(); + uri_builder ub; + ub.append_path(lattitude + U(",") + longitude).append_query(casalens_creds::bmaps_keyname, casalens_creds::bmaps_key); + auto s = ub.to_string(); + return bing_client.request(methods::GET, s); + }).then([](http_response resp) + { + return resp.extract_json(); + }).then([=](json::value& maps_result) + { + auto postal_code = maps_result[U("resourceSets")][0][U("resources")][0][U("address")][U("postalCode")].as_string(); + fetch_data(message, postal_code, input_text); + }).then([=](pplx::task t) + { + try + { + t.get(); + } + catch(...) + { + message.reply(status_codes::InternalError, U("Failed to fetch the postal code")); + } + }); + } + else // get location from postal code + { + http_client client(casalens_creds::gmaps_url); + + uri_builder ub; + ub.append_query(U("address"), input_text); + ub.append_query(U("sensor"), U("false")); + + client.request(methods::GET, ub.to_string()).then([](http_response resp) + { + return resp.extract_json(); + }).then([=](json::value jval) + { + auto locationstr = jval[U("results")][0][U("address_components")][1][U("long_name")].as_string(); + fetch_data(message, input_text, locationstr); + }).then([=](pplx::task t) + { + try + { + t.get(); + } + catch(...) + { + message.reply(status_codes::InternalError, U("Failed to fetch the location from postal code")); + } + }); + } + return; +} diff --git a/Release/collateral/Samples/CasaLens/image/bing-logo.jpg b/Release/collateral/Samples/CasaLens/image/bing-logo.jpg new file mode 100644 index 0000000000..22a2dbe521 Binary files /dev/null and b/Release/collateral/Samples/CasaLens/image/bing-logo.jpg differ diff --git a/Release/collateral/Samples/CasaLens/image/logo.png b/Release/collateral/Samples/CasaLens/image/logo.png new file mode 100644 index 0000000000..1ba6835b10 Binary files /dev/null and b/Release/collateral/Samples/CasaLens/image/logo.png differ diff --git a/Release/collateral/Samples/CasaLens/image/wall.jpg b/Release/collateral/Samples/CasaLens/image/wall.jpg new file mode 100644 index 0000000000..ccd15ff191 Binary files /dev/null and b/Release/collateral/Samples/CasaLens/image/wall.jpg differ diff --git a/Release/collateral/Samples/CasaLens/js/default.js b/Release/collateral/Samples/CasaLens/js/default.js new file mode 100644 index 0000000000..b7e1ea2339 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/js/default.js @@ -0,0 +1,173 @@ +function formatAMPM(date) { + var hours = date.getHours(); + var minutes = date.getMinutes(); + var ampm = hours >= 12 ? 'pm' : 'am'; + hours = hours % 12; + hours = hours ? hours : 12; // the hour '0' should be '12' + minutes = minutes < 10 ? '0' + minutes : minutes; + var strTime = hours + ':' + minutes + ' ' + ampm; + return strTime; +} + +function formatEventTime(dateTimeStr) { + dateTimeStr = dateTimeStr.substr(0, dateTimeStr.lastIndexOf(":")).split(" ").join("T") + var dateObj = new Date(dateTimeStr); + if (!dateObj) { + return ""; + } + var dateStr = dateObj.toDateString(); + dateStr = dateStr.substring(0, dateStr.length - 5); + return dateStr + "" + formatAMPM(dateObj); +} + +function ClearText() { + location_ip.value = ""; +} + +function TrimText(text, maxLength) { + if (text.length < maxLength) { + return text; + } else { + var i = maxLength; + while (i < text.length) { + + if (text[i] == " " || text[i] == "," || text[i] == "." || text[i] == "\r" || text[i] == "\n") { + break; + } + i++; + } + return text.substr(0, i); + } +} + +function populateEvents(events) { + + var tempDiv = document.createElement("div"); + + var currentChildNodes = eventsTable.childNodes; + var defaultChildrenCount = 2; + for (var i = defaultChildrenCount; i < currentChildNodes.length; i++) { + currentChildNodes[i].parentNode.removeChild(currentChildNodes[i]); + } + for (var i = 0; i < events.length; i++) { + var dataObj = events[i]; + + tempDiv.innerHTML = dataObj.description; + var description = TrimText(tempDiv.innerText, 150); + var innerHtml = eventTemplate.innerHTML; + innerHtml = innerHtml.replace("%eventtitle%", TrimText(dataObj.title, 30)); + innerHtml = innerHtml.replace("%eventstarttime%", formatEventTime(dataObj.starttime)); + innerHtml = innerHtml.replace("%eventdescription%", description); + innerHtml = innerHtml.replace("%eventlink1%", dataObj.url); + innerHtml = innerHtml.replace("%eventlink2%", dataObj.url); + innerHtml = innerHtml.replace("%eventvenue%", dataObj.venue_address); + var obj = document.createElement("tr"); + obj.innerHTML = window.toStaticHTML(innerHtml); + + eventsTable.appendChild(obj); + } +} + +function populateWeather(weather) { + + var currentChildNodes = weatherData.childNodes; + var defaultChildrenCount = 5; + for (var i = defaultChildrenCount; i < currentChildNodes.length; i++) { + currentChildNodes[i].parentNode.removeChild(currentChildNodes[i]); + } + + var weatherElement = weatherTemplate.cloneNode(true); + weatherElement.style.display = "inherit"; + var innerHtml = weatherElement.innerHTML; + innerHtml = innerHtml.replace("%wt%", weather.temperature); + innerHtml = innerHtml.replace("%wp%", weather.pressure); + innerHtml = innerHtml.replace("%wtmin%", weather.temp_min); + innerHtml = innerHtml.replace("%wtmax%", weather.temp_max); + innerHtml = innerHtml.replace("%wdesc%", weather.description); + innerHtml = innerHtml.replace("%wimg%", weather.image); + weatherElement.innerHTML = window.toStaticHTML(innerHtml); + weatherData.appendChild(weatherElement); +} + +function populateMovies(movies) { + + var currentChildNodes = movieTemplateToHide.childNodes; + var defaultChildrenCount = 3; + for (var i = defaultChildrenCount; i < currentChildNodes.length; i++) { + currentChildNodes[i].parentNode.removeChild(currentChildNodes[i]); + } + + var showtimes = ""; + for (var i = 0; i < movies.length; i++) { + var innerHtml = movieTemplate.innerHTML; + var dataObj = movies[i]; + + var theatrename; + for (var j = 0; j < dataObj.theatre.length; j++) { + + showtimes += dataObj.theatre[j].name; + showtimes += ""; + var showtimelist = dataObj.theatre[j].datetime; + for (var k = 0; k < showtimelist.length; k++) { + var dateObj = new Date(showtimelist[k]); + if (dateObj) { + showtimes += formatAMPM(dateObj) + " | "; + } + } + showtimes = showtimes.substr(0, showtimes.length - 2); + showtimes += ""; + } + innerHtml = innerHtml.replace("%mtitle%", dataObj.title); + innerHtml = innerHtml.replace("%mtheater%", showtimes); + innerHtml = innerHtml.replace("%mposter%", dataObj.poster); + + var obj = document.createElement("div"); + obj.innerHTML = window.toStaticHTML(innerHtml); + movieTemplateToHide.appendChild(obj); + } +} + +function populateImages(images) { + if (images.length == 4) { + var mainimg = document.getElementById('mainPic1'); + mainimg.src = images[0]; + + var img1 = document.getElementById('thumbnailPic1'); + img1.src = images[1]; + + var img2 = document.getElementById('thumbnailPic2'); + img2.src = images[2]; + + var img3 = document.getElementById('thumbnailPic3'); + img3.src = images[3]; + } +} + +function FetchData() { + var xhr = new XMLHttpRequest(); + xhr.onreadystatechange = function (e) { + // The request finished and response is ready + if (xhr.readyState == 4) { + var searchbar = document.getElementById('searchBar'); + searchbar.style.display = 'none'; + + if (xhr.status == 200) { + var replydata = JSON.parse(xhr.responseText); + populateImages(replydata.images); + populateEvents(replydata.events); + populateMovies(replydata.movies); + populateWeather(replydata.weather); + + defaultData.style.display = "none"; + cityData.style.display = 'inherit'; + } + else { + defaultData.style.display = "none"; + errorData.style.display = 'inherit'; + } + } + } + xhr.open("POST", document.URL, true); + xhr.setRequestHeader("Content-type", 'text/html'); + xhr.send(location_ip.value); +} diff --git a/Release/collateral/Samples/CasaLens/stdafx.cpp b/Release/collateral/Samples/CasaLens/stdafx.cpp new file mode 100644 index 0000000000..5398581b84 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/stdafx.cpp @@ -0,0 +1,24 @@ +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* stdafx.cpp +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "stdafx.h" \ No newline at end of file diff --git a/Release/collateral/Samples/CasaLens/stdafx.h b/Release/collateral/Samples/CasaLens/stdafx.h new file mode 100644 index 0000000000..09ce8be448 --- /dev/null +++ b/Release/collateral/Samples/CasaLens/stdafx.h @@ -0,0 +1,35 @@ +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* stdafx.h : include file for standard system include files, +* or project specific include files that are used frequently, but +* are changed infrequently +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#pragma once + +#include +#include +#include +#include +#include +#include +#include "cpprest/basic_types.h" +#include "cpprest/http_client.h" diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml b/Release/collateral/Samples/FacebookDemo/App.xaml similarity index 98% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml rename to Release/collateral/Samples/FacebookDemo/App.xaml index 2ee521f9f2..8aba49f654 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml +++ b/Release/collateral/Samples/FacebookDemo/App.xaml @@ -1,4 +1,4 @@ - - - - - - - - - - - - - - - + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +--> + + + + + + + + + + + + + + diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.cpp b/Release/collateral/Samples/FacebookDemo/App.xaml.cpp similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.cpp rename to Release/collateral/Samples/FacebookDemo/App.xaml.cpp index 2ecb0f3a80..7ec7cba87a 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.cpp +++ b/Release/collateral/Samples/FacebookDemo/App.xaml.cpp @@ -1,124 +1,124 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* App.xaml.cpp - Implementation of the App class. -* -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ -#include "pch.h" -#include "MainPage.xaml.h" - -using namespace FacebookDemo; - -using namespace Platform; -using namespace Windows::ApplicationModel; -using namespace Windows::ApplicationModel::Activation; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Controls::Primitives; -using namespace Windows::UI::Xaml::Data; -using namespace Windows::UI::Xaml::Input; -using namespace Windows::UI::Xaml::Interop; -using namespace Windows::UI::Xaml::Media; -using namespace Windows::UI::Xaml::Navigation; - -// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 - -/// -/// Initializes the singleton application object. This is the first line of authored code -/// executed, and as such is the logical equivalent of main() or WinMain(). -/// -App::App() -{ - InitializeComponent(); - Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); -} - -/// -/// Invoked when the application is launched normally by the end user. Other entry points -/// will be used when the application is launched to open a specific file, to display -/// search results, and so forth. -/// -/// Details about the launch request and process. -void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) -{ - auto rootFrame = dynamic_cast(Window::Current->Content); - - // Do not repeat app initialization when the Window already has content, - // just ensure that the window is active - if (rootFrame == nullptr) - { - // Create a Frame to act as the navigation context and associate it with - // a SuspensionManager key - rootFrame = ref new Frame(); - - if (args->PreviousExecutionState == ApplicationExecutionState::Terminated) - { - // TODO: Restore the saved session state only when appropriate, scheduling the - // final launch steps after the restore is complete - - } - - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) - { - throw ref new FailureException("Failed to create initial page"); - } - } - // Place the frame in the current Window - Window::Current->Content = rootFrame; - // Ensure the current window is active - Window::Current->Activate(); - } - else - { - if (rootFrame->Content == nullptr) - { - // When the navigation stack isn't restored navigate to the first page, - // configuring the new page by passing required information as a navigation - // parameter - if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) - { - throw ref new FailureException("Failed to create initial page"); - } - } - // Ensure the current window is active - Window::Current->Activate(); - } -} - -/// -/// Invoked when application execution is being suspended. Application state is saved -/// without knowing whether the application will be terminated or resumed with the contents -/// of memory still intact. -/// -/// The source of the suspend request. -/// Details about the suspend request. -void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) -{ - (void) sender; // Unused parameter - (void) e; // Unused parameter - - //TODO: Save application state and stop any background activity -} +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* App.xaml.cpp - Implementation of the App class. +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ +#include "pch.h" +#include "MainPage.xaml.h" + +using namespace FacebookDemo; + +using namespace Platform; +using namespace Windows::ApplicationModel; +using namespace Windows::ApplicationModel::Activation; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Interop; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +// The Blank Application template is documented at http://go.microsoft.com/fwlink/?LinkId=234227 + +/// +/// Initializes the singleton application object. This is the first line of authored code +/// executed, and as such is the logical equivalent of main() or WinMain(). +/// +App::App() +{ + InitializeComponent(); + Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending); +} + +/// +/// Invoked when the application is launched normally by the end user. Other entry points +/// will be used when the application is launched to open a specific file, to display +/// search results, and so forth. +/// +/// Details about the launch request and process. +void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) +{ + auto rootFrame = dynamic_cast(Window::Current->Content); + + // Do not repeat app initialization when the Window already has content, + // just ensure that the window is active + if (rootFrame == nullptr) + { + // Create a Frame to act as the navigation context and associate it with + // a SuspensionManager key + rootFrame = ref new Frame(); + + if (args->PreviousExecutionState == ApplicationExecutionState::Terminated) + { + // TODO: Restore the saved session state only when appropriate, scheduling the + // final launch steps after the restore is complete + + } + + if (rootFrame->Content == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) + { + throw ref new FailureException("Failed to create initial page"); + } + } + // Place the frame in the current Window + Window::Current->Content = rootFrame; + // Ensure the current window is active + Window::Current->Activate(); + } + else + { + if (rootFrame->Content == nullptr) + { + // When the navigation stack isn't restored navigate to the first page, + // configuring the new page by passing required information as a navigation + // parameter + if (!rootFrame->Navigate(TypeName(MainPage::typeid), args->Arguments)) + { + throw ref new FailureException("Failed to create initial page"); + } + } + // Ensure the current window is active + Window::Current->Activate(); + } +} + +/// +/// Invoked when application execution is being suspended. Application state is saved +/// without knowing whether the application will be terminated or resumed with the contents +/// of memory still intact. +/// +/// The source of the suspend request. +/// Details about the suspend request. +void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e) +{ + (void) sender; // Unused parameter + (void) e; // Unused parameter + + //TODO: Save application state and stop any background activity +} diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.h b/Release/collateral/Samples/FacebookDemo/App.xaml.h similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.h rename to Release/collateral/Samples/FacebookDemo/App.xaml.h index 44d1387877..b6d6e63e04 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/App.xaml.h +++ b/Release/collateral/Samples/FacebookDemo/App.xaml.h @@ -1,41 +1,41 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* App.xaml.h - Declaration of the App class. -* -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ -#pragma once - -#include "App.g.h" - -namespace FacebookDemo -{ - /// - /// Provides application-specific behavior to supplement the default Application class. - /// - ref class App sealed - { - public: - App(); - virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) override; - - private: - void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); - }; -} +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* App.xaml.h - Declaration of the App class. +* +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ +#pragma once + +#include "App.g.h" + +namespace FacebookDemo +{ + /// + /// Provides application-specific behavior to supplement the default Application class. + /// + ref class App sealed + { + public: + App(); + virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ args) override; + + private: + void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e); + }; +} diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/Logo.png b/Release/collateral/Samples/FacebookDemo/Assets/Logo.png similarity index 100% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/Logo.png rename to Release/collateral/Samples/FacebookDemo/Assets/Logo.png diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/SmallLogo.png b/Release/collateral/Samples/FacebookDemo/Assets/SmallLogo.png similarity index 100% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/SmallLogo.png rename to Release/collateral/Samples/FacebookDemo/Assets/SmallLogo.png diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/SplashScreen.png b/Release/collateral/Samples/FacebookDemo/Assets/SplashScreen.png similarity index 100% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/SplashScreen.png rename to Release/collateral/Samples/FacebookDemo/Assets/SplashScreen.png diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/StoreLogo.png b/Release/collateral/Samples/FacebookDemo/Assets/StoreLogo.png similarity index 100% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Assets/StoreLogo.png rename to Release/collateral/Samples/FacebookDemo/Assets/StoreLogo.png diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Common/StandardStyles.xaml b/Release/collateral/Samples/FacebookDemo/Common/StandardStyles.xaml similarity index 98% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Common/StandardStyles.xaml rename to Release/collateral/Samples/FacebookDemo/Common/StandardStyles.xaml index 06bbe62f5d..4e5fd8c9d7 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Common/StandardStyles.xaml +++ b/Release/collateral/Samples/FacebookDemo/Common/StandardStyles.xaml @@ -1,4 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Mouse - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + This file contains XAML styles that simplify application development. + + These are not merely convenient, but are required by most Visual Studio project and item templates. + Removing, renaming, or otherwise modifying the content of these files may result in a project that + does not build, or that will not build once additional pages are added. If variations on these + styles are desired it is recommended that you copy the content under a new name and modify your + private copy. + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +--> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Mouse + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.cpp b/Release/collateral/Samples/FacebookDemo/Facebook.cpp similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.cpp rename to Release/collateral/Samples/FacebookDemo/Facebook.cpp index fbb8a7b8e8..5048e22b2a 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.cpp +++ b/Release/collateral/Samples/FacebookDemo/Facebook.cpp @@ -1,148 +1,148 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* Facebook.cpp - Implementation file for simple facebook client. -* Note: this implementation will not work until you replace the placeholder -* strings below with tokens obtained from facebook. -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ - -#include "pch.h" -#include "facebook.h" - -using namespace pplx; -using namespace web; -using namespace Platform; -using namespace Windows::Foundation; -using namespace Windows::Security::Authentication::Web; -using namespace Windows::Storage; - -// Placeholder strings for app tokens -// see blog post at http://aka.ms/FacebookCppRest -// for information on obtaining these values -const std::wstring application_id(L"insert your application ID"); -const std::wstring application_token(L"insert your application token"); - -facebook_client& facebook_client::instance() -{ - static facebook_client c; - return c; -} - -pplx::task facebook_client::login(std::wstring scopes) -{ - // Look in the Local Settings for previously-stored login credentials - auto ls = ApplicationData::Current->LocalSettings->CreateContainer("LoginDetailsCache", - ApplicationDataCreateDisposition::Always); - - if(ls->Values->HasKey("facebookToken")) { - token_ = dynamic_cast(ls->Values->Lookup("facebookToken"))->Data(); - } - - if(!token_.empty()) { - // Check if the token is still valid - using namespace http; - - uri_builder tokendbg_uri(L"/debug_token"); - tokendbg_uri.append_query(L"input_token", token_); - tokendbg_uri.append_query(L"access_token", application_token); - - http_request request(methods::GET); - request.set_request_uri(tokendbg_uri.to_string()); - request.headers().add(header_names::accept, L"application/json"); - - return raw_client.request(request) - .then([](http_response response){ - return response.extract_json(); - }).then([=](json::value v) -> task { - auto obj = v[L"data"]; - - if(obj[L"is_valid"].as_bool()) { - // Currently cached access token is valid - signed_in = true; - return create_task([](){}); // Return an empty task to match the function's return value - } - - // If the token was invalid, go through full login - return full_login(scopes); - }, task_continuation_context::use_current()); - } - - // If no token was found, go through full login - return full_login(scopes); -} - -pplx::task facebook_client::full_login(std::wstring scopes) -{ - // Create uri for OAuth login on Facebook - http::uri_builder login_uri(L"https://www.facebook.com/dialog/oauth"); - login_uri.append_query(L"client_id", application_id); // App id - login_uri.append_query(L"redirect_uri", L"https://www.facebook.com/connect/login_success.html"); - login_uri.append_query(L"scope", scopes); - login_uri.append_query(L"display", L"popup"); - login_uri.append_query(L"response_type", L"token"); - - return create_task(WebAuthenticationBroker::AuthenticateAsync( - WebAuthenticationOptions::None, ref new Uri(ref new String(login_uri.to_string().c_str())), - ref new Uri("https://www.facebook.com/connect/login_success.html"))) - .then([=](WebAuthenticationResult^ result) { - if(result->ResponseStatus == WebAuthenticationStatus::Success) - { - signed_in = true; - - std::wstring response(result->ResponseData->Data()); // Save authentication token - auto start = response.find(L"access_token="); - start += 13; - auto end = response.find('&'); - - token_ = response.substr(start, end-start); - - // Add token to Local Settings for future login attempts - auto ls = ApplicationData::Current->LocalSettings->CreateContainer("LoginDetailsCache", - ApplicationDataCreateDisposition::Always); - - ls->Values->Insert("facebookToken", ref new String(token_.c_str())); - } - }); -} - -task facebook_client::get(std::wstring path) -{ - using namespace http; - - http_request request(methods::GET); - - request.set_request_uri(base_uri().append_path(path).to_uri()); - request.headers().add(header_names::accept, L"application/json"); - - return raw_client.request(request) - .then([](http_response response) { - return response.extract_json(); - }); -} - -http::uri_builder facebook_client::base_uri(bool absolute) -{ - http::uri_builder ret; - - if(absolute) - ret.set_path(L"https://graph.facebook.com"); - - ret.append_query(L"access_token", token_); - return ret; +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* Facebook.cpp - Implementation file for simple facebook client. +* Note: this implementation will not work until you replace the placeholder +* strings below with tokens obtained from facebook. +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "pch.h" +#include "facebook.h" + +using namespace pplx; +using namespace web; +using namespace Platform; +using namespace Windows::Foundation; +using namespace Windows::Security::Authentication::Web; +using namespace Windows::Storage; + +// Placeholder strings for app tokens +// see blog post at http://aka.ms/FacebookCppRest +// for information on obtaining these values +const std::wstring application_id(L"insert your application ID"); +const std::wstring application_token(L"insert your application token"); + +facebook_client& facebook_client::instance() +{ + static facebook_client c; + return c; +} + +pplx::task facebook_client::login(std::wstring scopes) +{ + // Look in the Local Settings for previously-stored login credentials + auto ls = ApplicationData::Current->LocalSettings->CreateContainer("LoginDetailsCache", + ApplicationDataCreateDisposition::Always); + + if(ls->Values->HasKey("facebookToken")) { + token_ = dynamic_cast(ls->Values->Lookup("facebookToken"))->Data(); + } + + if(!token_.empty()) { + // Check if the token is still valid + using namespace http; + + uri_builder tokendbg_uri(L"/debug_token"); + tokendbg_uri.append_query(L"input_token", token_); + tokendbg_uri.append_query(L"access_token", application_token); + + http_request request(methods::GET); + request.set_request_uri(tokendbg_uri.to_string()); + request.headers().add(header_names::accept, L"application/json"); + + return raw_client.request(request) + .then([](http_response response){ + return response.extract_json(); + }).then([=](json::value v) -> task { + auto obj = v[L"data"]; + + if(obj[L"is_valid"].as_bool()) { + // Currently cached access token is valid + signed_in = true; + return create_task([](){}); // Return an empty task to match the function's return value + } + + // If the token was invalid, go through full login + return full_login(scopes); + }, task_continuation_context::use_current()); + } + + // If no token was found, go through full login + return full_login(scopes); +} + +pplx::task facebook_client::full_login(std::wstring scopes) +{ + // Create uri for OAuth login on Facebook + http::uri_builder login_uri(L"https://www.facebook.com/dialog/oauth"); + login_uri.append_query(L"client_id", application_id); // App id + login_uri.append_query(L"redirect_uri", L"https://www.facebook.com/connect/login_success.html"); + login_uri.append_query(L"scope", scopes); + login_uri.append_query(L"display", L"popup"); + login_uri.append_query(L"response_type", L"token"); + + return create_task(WebAuthenticationBroker::AuthenticateAsync( + WebAuthenticationOptions::None, ref new Uri(ref new String(login_uri.to_string().c_str())), + ref new Uri("https://www.facebook.com/connect/login_success.html"))) + .then([=](WebAuthenticationResult^ result) { + if(result->ResponseStatus == WebAuthenticationStatus::Success) + { + signed_in = true; + + std::wstring response(result->ResponseData->Data()); // Save authentication token + auto start = response.find(L"access_token="); + start += 13; + auto end = response.find('&'); + + token_ = response.substr(start, end-start); + + // Add token to Local Settings for future login attempts + auto ls = ApplicationData::Current->LocalSettings->CreateContainer("LoginDetailsCache", + ApplicationDataCreateDisposition::Always); + + ls->Values->Insert("facebookToken", ref new String(token_.c_str())); + } + }); +} + +task facebook_client::get(std::wstring path) +{ + using namespace http; + + http_request request(methods::GET); + + request.set_request_uri(base_uri().append_path(path).to_uri()); + request.headers().add(header_names::accept, L"application/json"); + + return raw_client.request(request) + .then([](http_response response) { + return response.extract_json(); + }); +} + +http::uri_builder facebook_client::base_uri(bool absolute) +{ + http::uri_builder ret; + + if(absolute) + ret.set_path(L"https://graph.facebook.com"); + + ret.append_query(L"access_token", token_); + return ret; } \ No newline at end of file diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.h b/Release/collateral/Samples/FacebookDemo/Facebook.h similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.h rename to Release/collateral/Samples/FacebookDemo/Facebook.h index e2f7522f10..8419b05923 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.h +++ b/Release/collateral/Samples/FacebookDemo/Facebook.h @@ -1,45 +1,45 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* Facebook.h - Simple client for connecting to facebook. See blog post -* at http://aka.ms/FacebookCppRest for a detailed walkthrough of this sample -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ - -#pragma once -#include -#include - -class facebook_client { -public: - static facebook_client& instance(); // Singleton - pplx::task login(std::wstring scopes); - pplx::task get(std::wstring path); - web::http::uri_builder base_uri(bool absolute = false); - -private: - facebook_client(): - raw_client(L"https://graph.facebook.com/"), - signed_in(false) {} - - pplx::task full_login(std::wstring scopes); - - std::wstring token_; - bool signed_in; - web::http::client::http_client raw_client; -}; +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* Facebook.h - Simple client for connecting to facebook. See blog post +* at http://aka.ms/FacebookCppRest for a detailed walkthrough of this sample +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#pragma once +#include +#include + +class facebook_client { +public: + static facebook_client& instance(); // Singleton + pplx::task login(std::wstring scopes); + pplx::task get(std::wstring path); + web::http::uri_builder base_uri(bool absolute = false); + +private: + facebook_client(): + raw_client(L"https://graph.facebook.com/"), + signed_in(false) {} + + pplx::task full_login(std::wstring scopes); + + std::wstring token_; + bool signed_in; + web::http::client::http_client raw_client; +}; diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo.sln b/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.sln similarity index 94% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo.sln rename to Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.sln index 237a228cab..643fb50f3e 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo.sln +++ b/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.sln @@ -1,38 +1,38 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Express 2012 for Windows 8 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FacebookDemo", "FacebookDemo110\FacebookDemo.vcxproj", "{5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|ARM = Debug|ARM - Debug|Win32 = Debug|Win32 - Debug|x64 = Debug|x64 - Release|ARM = Release|ARM - Release|Win32 = Release|Win32 - Release|x64 = Release|x64 - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.ActiveCfg = Debug|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Build.0 = Debug|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Deploy.0 = Debug|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.ActiveCfg = Debug|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Build.0 = Debug|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Deploy.0 = Debug|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.ActiveCfg = Debug|x64 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Build.0 = Debug|x64 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Deploy.0 = Debug|x64 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.ActiveCfg = Release|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Build.0 = Release|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Deploy.0 = Release|ARM - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.ActiveCfg = Release|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Build.0 = Release|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Deploy.0 = Release|Win32 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.ActiveCfg = Release|x64 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Build.0 = Release|x64 - {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Deploy.0 = Release|x64 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows 8 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FacebookDemo", "FacebookDemo.vcxproj", "{5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.ActiveCfg = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Build.0 = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Deploy.0 = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Build.0 = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Deploy.0 = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.ActiveCfg = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Build.0 = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Deploy.0 = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.ActiveCfg = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Build.0 = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Deploy.0 = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.ActiveCfg = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Build.0 = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Deploy.0 = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.ActiveCfg = Release|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Build.0 = Release|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.vcxproj b/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.vcxproj index 588c156941..80be10ae26 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.vcxproj +++ b/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo.vcxproj @@ -191,4 +191,26 @@ + + + + + + + + + + + + + + + + + + + + + + diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.sln b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.sln new file mode 100644 index 0000000000..643fb50f3e --- /dev/null +++ b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.sln @@ -0,0 +1,38 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Express 2012 for Windows 8 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FacebookDemo", "FacebookDemo.vcxproj", "{5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.ActiveCfg = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Build.0 = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|ARM.Deploy.0 = Debug|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.ActiveCfg = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Build.0 = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|Win32.Deploy.0 = Debug|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.ActiveCfg = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Build.0 = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Debug|x64.Deploy.0 = Debug|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.ActiveCfg = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Build.0 = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|ARM.Deploy.0 = Release|ARM + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.ActiveCfg = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Build.0 = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|Win32.Deploy.0 = Release|Win32 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.ActiveCfg = Release|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Build.0 = Release|x64 + {5BA97497-8CFE-4C98-B2FD-7BF262CEE4E0}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj new file mode 100644 index 0000000000..227f11c642 --- /dev/null +++ b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj @@ -0,0 +1,216 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {5ba97497-8cfe-4c98-b2fd-7bf262cee4e0} + FacebookDemo + en-US + 12.0 + true + + + + + Application + true + v120 + + + Application + true + v120 + + + Application + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + FacebookDemo_TemporaryKey.pfx + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm137 %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + /bigobj %(AdditionalOptions) + 4453 + + + + + + + App.xaml + + + MainPage.xaml + + + + + Designer + + + Designer + + + Designer + + + + + Designer + + + + + + + + + + + + App.xaml + + + + MainPage.xaml + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj.filters b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj.filters new file mode 100644 index 0000000000..22890e4798 --- /dev/null +++ b/Release/collateral/Samples/FacebookDemo/FacebookDemo120/FacebookDemo.vcxproj.filters @@ -0,0 +1,50 @@ + + + + + 5ba97497-8cfe-4c98-b2fd-7bf262cee4e0 + + + 06f342fa-0f04-4325-b6c6-a4628ef0ddda + + + Common + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo_TemporaryKey.pfx b/Release/collateral/Samples/FacebookDemo/FacebookDemo_TemporaryKey.pfx similarity index 100% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/FacebookDemo_TemporaryKey.pfx rename to Release/collateral/Samples/FacebookDemo/FacebookDemo_TemporaryKey.pfx diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml b/Release/collateral/Samples/FacebookDemo/MainPage.xaml similarity index 98% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml rename to Release/collateral/Samples/FacebookDemo/MainPage.xaml index 02927f26d9..7c4bd57e34 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml +++ b/Release/collateral/Samples/FacebookDemo/MainPage.xaml @@ -1,4 +1,4 @@ - - - - - - - - - - - - - - - - - - - - - - - - - Login - Fetch Albums - - - + =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +--> + + + + + + + + + + + + + + + + + + + + + + + + Login + Fetch Albums + + + diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.cpp b/Release/collateral/Samples/FacebookDemo/MainPage.xaml.cpp similarity index 96% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.cpp rename to Release/collateral/Samples/FacebookDemo/MainPage.xaml.cpp index 5d73997874..f5923d0b00 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.cpp +++ b/Release/collateral/Samples/FacebookDemo/MainPage.xaml.cpp @@ -1,117 +1,117 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* MainPage.xaml.cpp - Implementation of the MainPage and -* FacebookAlbum classes. -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ - -#include "pch.h" -#include -#include "MainPage.xaml.h" -#include "Facebook.h" - -using namespace FacebookDemo; - -using namespace Platform; -using namespace Platform::Collections; -using namespace Windows::Foundation; -using namespace Windows::Foundation::Collections; -using namespace Windows::UI::Xaml; -using namespace Windows::UI::Xaml::Controls; -using namespace Windows::UI::Xaml::Controls::Primitives; -using namespace Windows::UI::Xaml::Data; -using namespace Windows::UI::Xaml::Input; -using namespace Windows::UI::Xaml::Media; -using namespace Windows::UI::Xaml::Navigation; - -MainPage::MainPage() -{ - InitializeComponent(); -} - -/// -/// Invoked when this page is about to be displayed in a Frame. -/// -/// Event data that describes how this page was reached. The Parameter -/// property is typically used to configure the page. -void MainPage::OnNavigatedTo(NavigationEventArgs^ e) -{ - (void) e; // Unused parameter -} - -void MainPage::LoginButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - LoginButton->IsEnabled = false; // Disable button to prevent double-login - - facebook_client::instance().login(L"user_photos") - .then([=](){ - AlbumButton->IsEnabled = true; - }, pplx::task_continuation_context::use_current()); -} - - -void MainPage::AlbumButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) -{ - using namespace pplx; - AlbumButton->IsEnabled = false; - - facebook_client::instance().get(L"/me/albums") - .then([](web::json::value v){ - std::vector albums; - - for(const auto& it : v[L"data"]){ - auto& elem = it.second; - - albums.push_back(ref new FacebookAlbum( - elem[L"name"].as_string(), - elem[L"count"].as_integer(), - elem[L"id"].as_string(), - elem[L"cover_photo"].as_string() - )); - } - - return task_from_result(std::move(albums)); - }).then([=](std::vector albums){ - AlbumGrid->ItemsSource = ref new Vector(std::move(albums)); - }, task_continuation_context::use_current()); -} - -String^ FacebookAlbum::Title::get() -{ - return ref new String(title_.c_str()); -} - -int FacebookAlbum::Count::get() -{ - return count_; -} - -ImageSource^ FacebookAlbum::Preview::get() -{ - if(preview_ == nullptr) { - auto preview_uri = facebook_client::instance().base_uri(true); - - preview_uri.append_path(photo_id_); - preview_uri.append_path(L"/picture"); - - preview_ = ref new Imaging::BitmapImage(ref new Uri(StringReference(preview_uri.to_string().c_str()))); - } - - return preview_; -} +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* MainPage.xaml.cpp - Implementation of the MainPage and +* FacebookAlbum classes. +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "pch.h" +#include +#include "MainPage.xaml.h" +#include "Facebook.h" + +using namespace FacebookDemo; + +using namespace Platform; +using namespace Platform::Collections; +using namespace Windows::Foundation; +using namespace Windows::Foundation::Collections; +using namespace Windows::UI::Xaml; +using namespace Windows::UI::Xaml::Controls; +using namespace Windows::UI::Xaml::Controls::Primitives; +using namespace Windows::UI::Xaml::Data; +using namespace Windows::UI::Xaml::Input; +using namespace Windows::UI::Xaml::Media; +using namespace Windows::UI::Xaml::Navigation; + +MainPage::MainPage() +{ + InitializeComponent(); +} + +/// +/// Invoked when this page is about to be displayed in a Frame. +/// +/// Event data that describes how this page was reached. The Parameter +/// property is typically used to configure the page. +void MainPage::OnNavigatedTo(NavigationEventArgs^ e) +{ + (void) e; // Unused parameter +} + +void MainPage::LoginButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + LoginButton->IsEnabled = false; // Disable button to prevent double-login + + facebook_client::instance().login(L"user_photos") + .then([=](){ + AlbumButton->IsEnabled = true; + }, pplx::task_continuation_context::use_current()); +} + + +void MainPage::AlbumButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e) +{ + using namespace pplx; + AlbumButton->IsEnabled = false; + + facebook_client::instance().get(L"/me/albums") + .then([](web::json::value v){ + std::vector albums; + + for(const auto& it : v[L"data"]){ + auto& elem = it.second; + + albums.push_back(ref new FacebookAlbum( + elem[L"name"].as_string(), + elem[L"count"].as_integer(), + elem[L"id"].as_string(), + elem[L"cover_photo"].as_string() + )); + } + + return task_from_result(std::move(albums)); + }).then([=](std::vector albums){ + AlbumGrid->ItemsSource = ref new Vector(std::move(albums)); + }, task_continuation_context::use_current()); +} + +String^ FacebookAlbum::Title::get() +{ + return ref new String(title_.c_str()); +} + +int FacebookAlbum::Count::get() +{ + return count_; +} + +ImageSource^ FacebookAlbum::Preview::get() +{ + if(preview_ == nullptr) { + auto preview_uri = facebook_client::instance().base_uri(true); + + preview_uri.append_path(photo_id_); + preview_uri.append_path(L"/picture"); + + preview_ = ref new Imaging::BitmapImage(ref new Uri(StringReference(preview_uri.to_string().c_str()))); + } + + return preview_; +} diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.h b/Release/collateral/Samples/FacebookDemo/MainPage.xaml.h similarity index 96% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.h rename to Release/collateral/Samples/FacebookDemo/MainPage.xaml.h index b9bfb6232c..a80a7e8aa7 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/MainPage.xaml.h +++ b/Release/collateral/Samples/FacebookDemo/MainPage.xaml.h @@ -1,73 +1,73 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* MainPage.xaml.h - Declaration of the MainPage class. Also includes -* the declaration for the FacebookAlbum class that the GridView databinds to. -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ -#pragma once - -#include "MainPage.g.h" - -namespace FacebookDemo -{ - /// - /// An empty page that can be used on its own or navigated to within a Frame. - /// - public ref class MainPage sealed - { - public: - MainPage(); - - protected: - virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override; - - private: - void LoginButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); - void AlbumButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); - }; - - [Windows::UI::Xaml::Data::Bindable] - [Windows::Foundation::Metadata::WebHostHidden] - public ref class FacebookAlbum sealed - { - internal: - FacebookAlbum(std::wstring title, int count, std::wstring id, std::wstring photo_id): - title_(title), count_(count), id_(id), photo_id_(photo_id) {} - - public: - property Platform::String^ Title { - Platform::String^ get(); - } - - property int Count { - int get(); - } - - property Windows::UI::Xaml::Media::ImageSource^ Preview { - Windows::UI::Xaml::Media::ImageSource^ get(); - } - - private: - std::wstring id_; - std::wstring title_; - std::wstring photo_id_; - int count_; - Windows::UI::Xaml::Media::ImageSource^ preview_; - }; -} +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* MainPage.xaml.h - Declaration of the MainPage class. Also includes +* the declaration for the FacebookAlbum class that the GridView databinds to. +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ +#pragma once + +#include "MainPage.g.h" + +namespace FacebookDemo +{ + /// + /// An empty page that can be used on its own or navigated to within a Frame. + /// + public ref class MainPage sealed + { + public: + MainPage(); + + protected: + virtual void OnNavigatedTo(Windows::UI::Xaml::Navigation::NavigationEventArgs^ e) override; + + private: + void LoginButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); + void AlbumButton_Click_1(Platform::Object^ sender, Windows::UI::Xaml::RoutedEventArgs^ e); + }; + + [Windows::UI::Xaml::Data::Bindable] + [Windows::Foundation::Metadata::WebHostHidden] + public ref class FacebookAlbum sealed + { + internal: + FacebookAlbum(std::wstring title, int count, std::wstring id, std::wstring photo_id): + title_(title), count_(count), id_(id), photo_id_(photo_id) {} + + public: + property Platform::String^ Title { + Platform::String^ get(); + } + + property int Count { + int get(); + } + + property Windows::UI::Xaml::Media::ImageSource^ Preview { + Windows::UI::Xaml::Media::ImageSource^ get(); + } + + private: + std::wstring id_; + std::wstring title_; + std::wstring photo_id_; + int count_; + Windows::UI::Xaml::Media::ImageSource^ preview_; + }; +} diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Package.appxmanifest b/Release/collateral/Samples/FacebookDemo/Package.appxmanifest similarity index 96% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/Package.appxmanifest rename to Release/collateral/Samples/FacebookDemo/Package.appxmanifest index a6b3db3aa4..92b3781c45 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/Package.appxmanifest +++ b/Release/collateral/Samples/FacebookDemo/Package.appxmanifest @@ -1,42 +1,42 @@ - - - - - - - FacebookDemo - Andy - Assets\StoreLogo.png - - - - 6.2.1 - 6.2.1 - - - - - - - - - - - - - - - - - + + + + + + + FacebookDemo + Andy + Assets\StoreLogo.png + + + + 6.2.1 + 6.2.1 + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.cpp b/Release/collateral/Samples/FacebookDemo/pch.cpp similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.cpp rename to Release/collateral/Samples/FacebookDemo/pch.cpp index f59dc7e74f..db0f841de3 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.cpp +++ b/Release/collateral/Samples/FacebookDemo/pch.cpp @@ -1,23 +1,23 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* pch.cpp - Source file to generate pre-compiled header. -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ - -#include "pch.h" +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* pch.cpp - Source file to generate pre-compiled header. +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#include "pch.h" diff --git a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.h b/Release/collateral/Samples/FacebookDemo/pch.h similarity index 97% rename from Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.h rename to Release/collateral/Samples/FacebookDemo/pch.h index 40f409e56e..7227242334 100644 --- a/Release/collateral/Samples/FacebookDemo/FacebookDemo110/pch.h +++ b/Release/collateral/Samples/FacebookDemo/pch.h @@ -1,26 +1,26 @@ -/*** -* ==++== -* -* Copyright (c) Microsoft Corporation. All rights reserved. -* Licensed under the Apache License, Version 2.0 (the "License"); -* you may not use this file except in compliance with the License. -* You may obtain a copy of the License at -* http://www.apache.org/licenses/LICENSE-2.0 -* -* Unless required by applicable law or agreed to in writing, software -* distributed under the License is distributed on an "AS IS" BASIS, -* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -* See the License for the specific language governing permissions and -* limitations under the License. -* -* ==--== -* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ -* -* pch.h - Pre-compiled header standard include file -* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- -****/ - -#pragma once - -#include -#include "App.xaml.h" +/*** +* ==++== +* +* Copyright (c) Microsoft Corporation. All rights reserved. +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +* ==--== +* =+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+=+ +* +* pch.h - Pre-compiled header standard include file +* =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- +****/ + +#pragma once + +#include +#include "App.xaml.h" diff --git a/Release/collateral/Samples/SearchFile/VC11/SearchFile.vcxproj b/Release/collateral/Samples/SearchFile/VC11/SearchFile.vcxproj index bec0a2a5f9..4324e972d9 100644 --- a/Release/collateral/Samples/SearchFile/VC11/SearchFile.vcxproj +++ b/Release/collateral/Samples/SearchFile/VC11/SearchFile.vcxproj @@ -146,5 +146,5 @@ - + diff --git a/Release/collateral/Samples/SearchFile/VC12/SearchFile.sln b/Release/collateral/Samples/SearchFile/VC12/SearchFile.sln new file mode 100644 index 0000000000..09568f0c85 --- /dev/null +++ b/Release/collateral/Samples/SearchFile/VC12/SearchFile.sln @@ -0,0 +1,26 @@ + +Microsoft Visual Studio Solution File, Format Version 11.00 +# Visual Studio 2010 +Project("{F0BBD44F-3344-46E7-A87F-3816339F1384}") = "SearchFile", "SearchFile.vcxproj", "{99F16455-0590-430A-9CAD-DA29AB519348}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|x64 = Debug|x64 + Debug|Win32 = Debug|Win32 + Release|x64 = Release|x64 + Release|Win32 = Release|Win32 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {99F16455-0590-430A-9CAD-DA29AB519348}.Debug|x64.ActiveCfg = Debug|x64 + {99F16455-0590-430A-9CAD-DA29AB519348}.Debug|x64.Build.0 = Debug|x64 + {99F16455-0590-430A-9CAD-DA29AB519348}.Release|x64.ActiveCfg = Release|x64 + {99F16455-0590-430A-9CAD-DA29AB519348}.Release|x64.Build.0 = Release|x64 + {99F16455-0590-430A-9CAD-DA29AB519348}.Debug|Win32.ActiveCfg = Debug|Win32 + {99F16455-0590-430A-9CAD-DA29AB519348}.Debug|Win32.Build.0 = Debug|Win32 + {99F16455-0590-430A-9CAD-DA29AB519348}.Release|Win32.ActiveCfg = Release|Win32 + {99F16455-0590-430A-9CAD-DA29AB519348}.Release|Win32.Build.0 = Release|Win32 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj b/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj new file mode 100644 index 0000000000..b360ae4f6c --- /dev/null +++ b/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj @@ -0,0 +1,150 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {99F16455-0590-430A-9CAD-DA29AB519348} + Win32Proj + $(VCTargetsPath12) + + + + Application + true + NotSet + v120 + + + Application + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + $(ProjectDir)\$(Platform)\$(Configuration)\ + $(ProjectDir)\$(Configuration)\ + AllRules.ruleset + + + + + + /bigobj %(AdditionalOptions) + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + + + Console + true + + + + + /bigobj %(AdditionalOptions) + NotUsing + Disabled + WIN32;DEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + + + + + /bigobj %(AdditionalOptions) + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + + + Console + true + true + true + + + + + /bigobj %(AdditionalOptions) + NotUsing + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE + Async + -Zm130 %(AdditionalOptions) + + + Console + true + true + true + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj.filters b/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj.filters new file mode 100644 index 0000000000..913e863e9e --- /dev/null +++ b/Release/collateral/Samples/SearchFile/VC12/SearchFile.vcxproj.filters @@ -0,0 +1,22 @@ + + + + + {5CA157CA-4151-4AF8-9750-D0260D41DF4C} + cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx + + + {E2392BF1-7CB4-4CAC-9E0D-4C6EA7549729} + h;hpp;hxx;hm;inl;inc;xsd + + + {3584B882-6699-4F89-A52F-689BB54204CE} + rc;ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe;resx;tiff;tif;png;wav;mfcribbon-ms + + + + + Source Files + + + \ No newline at end of file diff --git a/Release/collateral/Samples/WindowsLiveAuth/WindowsLiveAuth.vcxproj b/Release/collateral/Samples/WindowsLiveAuth/VC11/WindowsLiveAuth.vcxproj similarity index 86% rename from Release/collateral/Samples/WindowsLiveAuth/WindowsLiveAuth.vcxproj rename to Release/collateral/Samples/WindowsLiveAuth/VC11/WindowsLiveAuth.vcxproj index fdaa18f668..5ed0fec897 100644 --- a/Release/collateral/Samples/WindowsLiveAuth/WindowsLiveAuth.vcxproj +++ b/Release/collateral/Samples/WindowsLiveAuth/VC11/WindowsLiveAuth.vcxproj @@ -190,4 +190,25 @@ + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/WindowsLiveAuth/WindowsLiveAuth.vcxproj.filters b/Release/collateral/Samples/WindowsLiveAuth/VC11/WindowsLiveAuth.vcxproj.filters similarity index 100% rename from Release/collateral/Samples/WindowsLiveAuth/WindowsLiveAuth.vcxproj.filters rename to Release/collateral/Samples/WindowsLiveAuth/VC11/WindowsLiveAuth.vcxproj.filters diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/Logo.png b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/Logo.png new file mode 100644 index 0000000000..e26771cb33 Binary files /dev/null and b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/Logo.png differ diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SmallLogo.png b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SmallLogo.png new file mode 100644 index 0000000000..1eb0d9d528 Binary files /dev/null and b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SmallLogo.png differ diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SplashScreen.png b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SplashScreen.png new file mode 100644 index 0000000000..c951e031bd Binary files /dev/null and b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/SplashScreen.png differ diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/StoreLogo.png b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/StoreLogo.png new file mode 100644 index 0000000000..dcb672712c Binary files /dev/null and b/Release/collateral/Samples/WindowsLiveAuth/VC12/Assets/StoreLogo.png differ diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.sln b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.sln new file mode 100644 index 0000000000..780f519637 --- /dev/null +++ b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.sln @@ -0,0 +1,40 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 2013 +VisualStudioVersion = 12.0.21005.1 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WindowsLiveAuth", "WindowsLiveAuth.vcxproj", "{1C20F771-3131-46E8-805F-AA1FE44165C0}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|ARM = Debug|ARM + Debug|Win32 = Debug|Win32 + Debug|x64 = Debug|x64 + Release|ARM = Release|ARM + Release|Win32 = Release|Win32 + Release|x64 = Release|x64 + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|ARM.ActiveCfg = Debug|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|ARM.Build.0 = Debug|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|ARM.Deploy.0 = Debug|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|Win32.ActiveCfg = Debug|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|Win32.Build.0 = Debug|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|Win32.Deploy.0 = Debug|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|x64.ActiveCfg = Debug|x64 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|x64.Build.0 = Debug|x64 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Debug|x64.Deploy.0 = Debug|x64 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|ARM.ActiveCfg = Release|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|ARM.Build.0 = Release|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|ARM.Deploy.0 = Release|ARM + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|Win32.ActiveCfg = Release|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|Win32.Build.0 = Release|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|Win32.Deploy.0 = Release|Win32 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|x64.ActiveCfg = Release|x64 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|x64.Build.0 = Release|x64 + {1C20F771-3131-46E8-805F-AA1FE44165C0}.Release|x64.Deploy.0 = Release|x64 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection +EndGlobal diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj new file mode 100644 index 0000000000..0db1c78933 --- /dev/null +++ b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj @@ -0,0 +1,214 @@ + + + + + Debug + ARM + + + Debug + Win32 + + + Debug + x64 + + + Release + ARM + + + Release + Win32 + + + Release + x64 + + + + {1c20f771-3131-46e8-805f-aa1fe44165c0} + WindowsLiveAuth + en-US + 12.0 + true + + + + + Application + true + v120 + + + Application + true + v120 + + + Application + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + Application + false + true + v120 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + WindowsLiveAuth_TemporaryKey.pfx + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + /bigobj /Zm200 %(AdditionalOptions) + 4453 + + + + + + + App.xaml + + + MainPage.xaml + + + + + Designer + + + Designer + + + Designer + + + + + Designer + + + + + + + + + + + + App.xaml + + + MainPage.xaml + + + Create + Create + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj.filters b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj.filters new file mode 100644 index 0000000000..6fec621b9f --- /dev/null +++ b/Release/collateral/Samples/WindowsLiveAuth/VC12/WindowsLiveAuth.vcxproj.filters @@ -0,0 +1,49 @@ + + + + + 1c20f771-3131-46e8-805f-aa1fe44165c0 + + + 2e86a4d3-7266-4209-8887-57f1ded55a34 + + + Common + + + Assets + + + Assets + + + Assets + + + Assets + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/collateral/Samples/WindowsLiveAuth/live_connect.h b/Release/collateral/Samples/WindowsLiveAuth/live_connect.h index b577a0d35f..c888941b6e 100644 --- a/Release/collateral/Samples/WindowsLiveAuth/live_connect.h +++ b/Release/collateral/Samples/WindowsLiveAuth/live_connect.h @@ -27,7 +27,6 @@ #pragma once #include -#include "pplx/pplxtasks.h" #include "cpprest/basic_types.h" #include "cpprest/http_client.h" #include "cpprest/streams.h" diff --git a/Release/collateral/Samples/WindowsLiveAuth/pch.h b/Release/collateral/Samples/WindowsLiveAuth/pch.h index c07532f0dc..590f452f91 100644 --- a/Release/collateral/Samples/WindowsLiveAuth/pch.h +++ b/Release/collateral/Samples/WindowsLiveAuth/pch.h @@ -20,6 +20,5 @@ #include #include "App.xaml.h" #include "MainPage.xaml.h" -#include #include #include "live_connect.h" \ No newline at end of file diff --git a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.filters b/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.filters deleted file mode 100644 index c1c81c2931..0000000000 --- a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.filters +++ /dev/null @@ -1,13 +0,0 @@ - - - - - {483682d6-bd75-471d-a9b5-e03a6d9fc7bc} - - - - - Source Files - - - \ No newline at end of file diff --git a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.vspscc b/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/samples/BingRequest/dirs.proj b/Release/samples/BingRequest/dirs.proj index 7f3029118a..97ec5d147b 100644 --- a/Release/samples/BingRequest/dirs.proj +++ b/Release/samples/BingRequest/dirs.proj @@ -6,7 +6,7 @@ - + diff --git a/Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient.vcxproj b/Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient.vcxproj index 03bf248b42..10b9b0a586 100644 --- a/Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient.vcxproj +++ b/Release/samples/BlackJack/BlackJack_UIClient/BlackJack_UIClient.vcxproj @@ -107,7 +107,7 @@ - $(CollateralsDir)\Samples\BlackJack_UIClient\VC11 + $(CollateralsDir)\Samples\BlackJack_UIClient $(OutDir)\$(MSBuildProjectName)\ 5C945ED108BF1723994A90F9BAA4B7D93FBE0E47 diff --git a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj b/Release/samples/CasaLens/CasaLens110/CasaLens110.vcxproj similarity index 56% rename from Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj rename to Release/samples/CasaLens/CasaLens110/CasaLens110.vcxproj index 3f37af9d3f..e825086d9c 100644 --- a/Release/samples/BingRequest/BingRequest100/BingRequest100.vcxproj +++ b/Release/samples/CasaLens/CasaLens110/CasaLens110.vcxproj @@ -19,57 +19,48 @@ - {9A262ECE-3190-4CAE-99B8-D1BC24B72DBB} + {FFBFD6C1-B525-4D35-AB64-A2FE9460B147} SAK SAK SAK SAK Win32Proj + $(VCTargetsPath11) Application true NotSet + v110 Application true NotSet + v110 Application false true NotSet + v110 Application false true NotSet + v110 - /bigobj %(AdditionalOptions) - NotUsing - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CasablancaIncludeDir) - Async - - - Console - true - - - - - /bigobj %(AdditionalOptions) - NotUsing + /bigobj -Zm140 %(AdditionalOptions) + Use Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(CasablancaIncludeDir) @@ -82,8 +73,8 @@ - /bigobj %(AdditionalOptions) - NotUsing + /bigobj -Zm140 %(AdditionalOptions) + Use Disabled WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) $(CasablancaIncludeDir) @@ -96,8 +87,8 @@ - /bigobj %(AdditionalOptions) - NotUsing + /bigobj -Zm140 %(AdditionalOptions) + Use MaxSpeed true true @@ -112,28 +103,10 @@ true - - - /bigobj %(AdditionalOptions) - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - $(CasablancaIncludeDir); - Async - - - Console - true - true - true - - - /bigobj %(AdditionalOptions) - NotUsing + /bigobj -Zm140 %(AdditionalOptions) + Use MaxSpeed true true @@ -149,12 +122,47 @@ - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} + + {90D85FF4-F0AE-4816-923F-0EF2758F30AB} - + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/samples/CasaLens/CasaLens120/CasaLens120.vcxproj b/Release/samples/CasaLens/CasaLens120/CasaLens120.vcxproj new file mode 100644 index 0000000000..cd08af0b8f --- /dev/null +++ b/Release/samples/CasaLens/CasaLens120/CasaLens120.vcxproj @@ -0,0 +1,168 @@ + + + + + Debug + Win32 + + + Debug + x64 + + + Release + Win32 + + + Release + x64 + + + + {FFBFD6C1-B525-4D35-AB64-A2FE9460B147} + SAK + SAK + SAK + SAK + Win32Proj + $(VCTargetsPath12) + + + + Application + true + NotSet + v120 + + + Application + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + Application + false + true + NotSet + v120 + + + + + + + /bigobj -Zm140 %(AdditionalOptions) + Use + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(CasablancaIncludeDir) + Async + + + Console + true + + + + + /bigobj -Zm140 %(AdditionalOptions) + Use + Disabled + WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(CasablancaIncludeDir) + Async + + + Console + true + + + + + /bigobj -Zm140 %(AdditionalOptions) + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(CasablancaIncludeDir) + Async + + + Console + true + true + true + + + + + /bigobj -Zm140 %(AdditionalOptions) + Use + MaxSpeed + true + true + WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) + $(CasablancaIncludeDir) + Async + + + Console + true + true + true + + + + + {90D85FF4-F0AE-4816-923F-0EF2758F30AB} + + + + + + + + + + + + Create + Create + Create + Create + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Release/samples/CasaLens/dirs.proj b/Release/samples/CasaLens/dirs.proj new file mode 100644 index 0000000000..2a2818659f --- /dev/null +++ b/Release/samples/CasaLens/dirs.proj @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/Release/samples/FacebookDemo/VS11/FacebookDemo.vcxproj b/Release/samples/FacebookDemo/VS11/FacebookDemo.vcxproj index 8c825f7adc..158475d436 100644 --- a/Release/samples/FacebookDemo/VS11/FacebookDemo.vcxproj +++ b/Release/samples/FacebookDemo/VS11/FacebookDemo.vcxproj @@ -79,7 +79,7 @@ $(OutDir)\$(MSBuildProjectName)\ - $(CollateralsDir)\Samples\FacebookDemo\FacebookDemo110 + $(CollateralsDir)\Samples\FacebookDemo diff --git a/Release/samples/dirs.proj b/Release/samples/dirs.proj index b112505f0d..21b3691446 100644 --- a/Release/samples/dirs.proj +++ b/Release/samples/dirs.proj @@ -21,6 +21,10 @@ + + + + diff --git a/Release/setup/CasablancaSetup.wixproj b/Release/setup/CasablancaSetup.wixproj index 8ef109f514..c4a645dccb 100644 --- a/Release/setup/CasablancaSetup.wixproj +++ b/Release/setup/CasablancaSetup.wixproj @@ -6,8 +6,8 @@ + Text="Error: you must set the VSTargetVersion property. Either build with '/p:VSTargetVersion=XX' command line option (where XX is either 11, or 12) or use other project files" + Condition="(('$(VSTargetVersion)' != '11') AND ('$(VSTargetVersion)' != '12'))" /> diff --git a/Release/setup/CasablancaSetup.wxs b/Release/setup/CasablancaSetup.wxs index cd393539f0..597dac6cfd 100644 --- a/Release/setup/CasablancaSetup.wxs +++ b/Release/setup/CasablancaSetup.wxs @@ -1,11 +1,6 @@ - - - - - - + @@ -111,12 +106,10 @@ - - - - - - + + + + - - - - - - - - VS_ROOT - - - + + + + + + + VS_ROOT + + - + - @@ -388,7 +378,6 @@ - @@ -406,7 +395,7 @@ - + @@ -415,9 +404,6 @@ - - - @@ -464,21 +450,16 @@ - - - - - + + - - - - + + @@ -488,20 +469,16 @@ - - - - + + - - - - + + @@ -512,29 +489,20 @@ - - - - - - - + + + - - - - - - - + + + - @@ -543,34 +511,24 @@ - - - - - - + + - - - - - - + + - - - + @@ -578,12 +536,11 @@ - + - @@ -603,11 +560,8 @@ - - - - - + + @@ -617,37 +571,35 @@ - - - + + - - - - - - - - + + + + + + + + - - - - - - - - + + + + + + + + - - + diff --git a/Release/setup/VS10/MakeSetup.proj b/Release/setup/VS10/MakeSetup.proj deleted file mode 100644 index 208466bcab..0000000000 --- a/Release/setup/VS10/MakeSetup.proj +++ /dev/null @@ -1,8 +0,0 @@ - - - - 10 - Casablanca_setup100_$(CppRestSDKVersionFileSuffix) - - - diff --git a/Release/setup/VS10/guiddefs.wxi b/Release/setup/VS10/guiddefs.wxi deleted file mode 100644 index 7d1aa802c9..0000000000 --- a/Release/setup/VS10/guiddefs.wxi +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/Release/setup/VSProject/CppRest.props b/Release/setup/VSProject/CppRest110.props similarity index 100% rename from Release/setup/VSProject/CppRest.props rename to Release/setup/VSProject/CppRest110.props diff --git a/Release/setup/VSProject/CppRestVC10.props b/Release/setup/VSProject/CppRest120.props similarity index 93% rename from Release/setup/VSProject/CppRestVC10.props rename to Release/setup/VSProject/CppRest120.props index 9562174ef2..4497252594 100644 --- a/Release/setup/VSProject/CppRestVC10.props +++ b/Release/setup/VSProject/CppRest120.props @@ -18,8 +18,8 @@ - $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\100\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) - $(CppRestBaseFileName)100$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix) + $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\120\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) + $(CppRestBaseFileName)120$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix) diff --git a/Release/setup/WindowsPhoneSDK/110/arm/CppRESTWindowsSDK.props b/Release/setup/WindowsPhoneSDK/110/arm/CppRESTWindowsSDK.props index cc266d7a1c..bf43426913 100644 --- a/Release/setup/WindowsPhoneSDK/110/arm/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsPhoneSDK/110/arm/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\110\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsPhoneSDK/110/x86/CppRESTWindowsSDK.props b/Release/setup/WindowsPhoneSDK/110/x86/CppRESTWindowsSDK.props index bedca047b7..82b36b443a 100644 --- a/Release/setup/WindowsPhoneSDK/110/x86/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsPhoneSDK/110/x86/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\110\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/110/arm/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/110/arm/CppRESTWindowsSDK.props index 8f030214f0..05453617e4 100644 --- a/Release/setup/WindowsSDK/110/arm/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/110/arm/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\110\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props index 093497754c..d5685e68d9 100644 --- a/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\110\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/110/x86/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/110/x86/CppRESTWindowsSDK.props index cf396a6d7e..26c46300b3 100644 --- a/Release/setup/WindowsSDK/110/x86/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/110/x86/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\110\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props index 6215a5c579..8a931f1873 100644 --- a/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\120\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props index 68e9e49923..3e9c9aef1b 100644 --- a/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\120\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props index afa9c1ec5f..1fd3f52769 100644 --- a/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props +++ b/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props @@ -2,7 +2,7 @@ - <_PropertySheetDisplayName>C++ REST SDK, $(CppRestSDKVersionString) + <_PropertySheetDisplayName>C++ REST SDK $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\120\v$(CppRestSDKVersionString)\SDK`, `InstallDir`)) diff --git a/Release/setup/dirs.proj b/Release/setup/dirs.proj index afb2229271..3eba0291ca 100644 --- a/Release/setup/dirs.proj +++ b/Release/setup/dirs.proj @@ -8,10 +8,6 @@ - - - - diff --git a/Release/src/build/casablanca100.vcxproj b/Release/src/build/casablanca100.vcxproj deleted file mode 100644 index 0093d1a2f5..0000000000 --- a/Release/src/build/casablanca100.vcxproj +++ /dev/null @@ -1,68 +0,0 @@ - - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - Win32Proj - casablanca100 - SAK - SAK - SAK - SAK - v100 - false - DynamicLibrary - - - - - - - - - - - d - - - $(CppRestBaseFileName)100$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix) - - - - - _ASYNCRT_EXPORT;AZURESTORAGESERVICES_EXPORTS;_PPLX_EXPORT;WIN32;_MBCS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories) - Use - stdafx.h - -Zm140 %(AdditionalOptions) - - - Winhttp.lib;httpapi.lib;crypt32.lib;%(AdditionalDependencies) - - - - - - - - \ No newline at end of file diff --git a/Release/src/build/casablanca100.vcxproj.filters b/Release/src/build/casablanca100.vcxproj.filters deleted file mode 100644 index a20a5f15ff..0000000000 --- a/Release/src/build/casablanca100.vcxproj.filters +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/Release/src/build/casablanca100.vcxproj.vspscc b/Release/src/build/casablanca100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/src/build/casablanca100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/src/build/casablanca100.vssscc b/Release/src/build/casablanca100.vssscc deleted file mode 100644 index 6cb031bcf5..0000000000 --- a/Release/src/build/casablanca100.vssscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROJECT" -} diff --git a/Release/src/build/sources.proj b/Release/src/build/sources.proj index ff9980edd4..b8eb2d4b51 100644 --- a/Release/src/build/sources.proj +++ b/Release/src/build/sources.proj @@ -174,7 +174,7 @@ - + Source Files diff --git a/Release/src/dirs.proj b/Release/src/dirs.proj index 7e2b84dcd6..5c7683f751 100644 --- a/Release/src/dirs.proj +++ b/Release/src/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj b/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj deleted file mode 100644 index d1183ff451..0000000000 --- a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj +++ /dev/null @@ -1,176 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {04CF7FC3-DFDD-4DE9-B239-C1668DA6021C} - Win32Proj - TestRunner - SAK - SAK - SAK - SAK - - - - Application - true - Unicode - - - Application - true - Unicode - - - Application - false - true - Unicode - - - Application - false - true - Unicode - - - - - - - - - - - - - - - - - - - - true - TestRunner - - - true - TestRunner - - - false - TestRunner - - - false - TestRunner - - - - - $(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories) - - - - - - NotUsing - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - Console - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(OutDir) - - - - - NotUsing - Disabled - WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - Console - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(OutDir) - - - - - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - Console - true - true - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(OutDir) - - - - - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions) - - - - - Console - true - true - true - kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;%(AdditionalDependencies) - $(OutDir) - - - - - - - - - - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.filters b/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.filters deleted file mode 100644 index 8a66b41b2a..0000000000 --- a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.filters +++ /dev/null @@ -1,24 +0,0 @@ - - - - - Source Files - - - Source Files - - - - - {1abc2a67-fc5e-4496-b54c-0e08dab08055} - - - {521947e7-0005-4492-8e61-05c1a84610d5} - - - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.vspscc b/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Common/TestRunner/VS10/TestRunner100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Common/TestRunner/dirs.proj b/Release/tests/Common/TestRunner/dirs.proj index a1365d6f6a..968239bdcb 100644 --- a/Release/tests/Common/TestRunner/dirs.proj +++ b/Release/tests/Common/TestRunner/dirs.proj @@ -1,10 +1,6 @@ - - - - diff --git a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj b/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj deleted file mode 100644 index 36beac3638..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj +++ /dev/null @@ -1,153 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B51C0C25-8B61-4CA0-BAB7-B6B486FA44AB} - Win32Proj - TestUnitTest - SAK - SAK - SAK - SAK - TestUnitTestpp100 - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - $(CasablancaIncludeDir);%(AdditionalIncludeDirectories); - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - 6204; - - - Windows - true - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - 6204; - - - Windows - true - - - - - MaxSpeed - Use - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - 6204; - - - Windows - true - true - true - - - - - MaxSpeed - Use - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - 6204; - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - {B149500C-FFFF-463A-8C29-B4FF9B3FD6F9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.filters b/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.filters deleted file mode 100644 index 44e0743ad6..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.filters +++ /dev/null @@ -1,72 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - - - {420b7d9f-7900-40f3-8aa7-3c800278bc98} - - - {7ddca59d-156c-46f2-af93-4a03f915bbcb} - - - \ No newline at end of file diff --git a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.vspscc b/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/TestUnitTestpp100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj b/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj deleted file mode 100644 index dbc7914392..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {B149500C-FFFF-463A-8C29-B4FF9B3FD6F9} - Win32Proj - UnitTest - SAK - SAK - SAK - SAK - UnitTestpp100 - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - $(CasablancaIncludeDir);$(CommonTestIncludeDir);%(AdditionalIncludeDirectories) - - - - - - Use - Disabled - UNITTEST_DLL_EXPORT;WIN32;_DEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - - - Windows - true - - - - - Use - Disabled - UNITTEST_DLL_EXPORT;WIN32;_DEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - - - Windows - true - - - - - MaxSpeed - Use - true - true - UNITTEST_DLL_EXPORT;WIN32;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - MaxSpeed - Use - true - true - UNITTEST_DLL_EXPORT;WIN32;NDEBUG;_USRDLL;_CRT_SECURE_NO_DEPRECATE;%(PreprocessorDefinitions) - - - Windows - true - true - true - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.filters b/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.filters deleted file mode 100644 index f3392cad67..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.filters +++ /dev/null @@ -1,159 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Header Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {c096cee6-16b7-415f-8534-04e4a0bc95a6} - - - {38accbcc-e52e-45dc-9e72-4f38b347e0da} - - - \ No newline at end of file diff --git a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.vspscc b/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Common/UnitTestpp/VS10/UnitTestpp100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Common/UnitTestpp/dirs.proj b/Release/tests/Common/UnitTestpp/dirs.proj index cfe5739b04..61aef1698b 100644 --- a/Release/tests/Common/UnitTestpp/dirs.proj +++ b/Release/tests/Common/UnitTestpp/dirs.proj @@ -2,11 +2,6 @@ - - - - - diff --git a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj b/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj deleted file mode 100644 index d076de8b0c..0000000000 --- a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {AD40B45B-6F96-44FB-8C09-C83D994B5AA8} - Win32Proj - CommonUtilities100 - SAK - SAK - SAK - SAK - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONUTILITIES_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONUTILITIES_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONUTILITIES_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONUTILITIES_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - Create - Create - Create - Create - - - - - - - - - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - {04CF7FC3-DFDD-4DE9-B239-C1668DA6021C} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - - - - diff --git a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.filters b/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.filters deleted file mode 100644 index 3d83c78b47..0000000000 --- a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Source Files - - - Source Files - - - - - HeaderFiles - - - HeaderFiles - - - HeaderFiles - - - HeaderFiles - - - - - {0431c284-71fd-4e96-82aa-06993824a766} - - - {95b3126c-4cee-4c79-89c3-f691f31740cf} - - - \ No newline at end of file diff --git a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.vspscc b/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Common/utilities/VS10/CommonUtilities100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Common/utilities/dirs.proj b/Release/tests/Common/utilities/dirs.proj index d2fc2b21d3..799a14e4ed 100644 --- a/Release/tests/Common/utilities/dirs.proj +++ b/Release/tests/Common/utilities/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj b/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj deleted file mode 100644 index 74b6d951fc..0000000000 --- a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj +++ /dev/null @@ -1,166 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FFDD992C-253B-4BBC-AA9B-3392F387055E} - HttpTests - SAK - SAK - SAK - SAK - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\..\utilities\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {FD37C336-02F4-43A5-9D3A-261EC7C5E289} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.filters b/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.filters deleted file mode 100644 index 419fde4487..0000000000 --- a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.filters +++ /dev/null @@ -1,81 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - {7afbebfa-79cc-4bdd-9de5-32bf604ce514} - - - {8ec2c654-8159-4569-ab7a-9135e7113ab4} - - - \ No newline at end of file diff --git a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.vspscc b/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/http/client/VS10/HttpClient100_test.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/http/client/dirs.proj b/Release/tests/Functional/http/client/dirs.proj index d05851463c..b27224c65a 100644 --- a/Release/tests/Functional/http/client/dirs.proj +++ b/Release/tests/Functional/http/client/dirs.proj @@ -6,10 +6,6 @@ - - - - diff --git a/Release/tests/Functional/http/client/request_stream_tests.cpp b/Release/tests/Functional/http/client/request_stream_tests.cpp index 67ee15bcee..825b494acb 100644 --- a/Release/tests/Functional/http/client/request_stream_tests.cpp +++ b/Release/tests/Functional/http/client/request_stream_tests.cpp @@ -404,6 +404,7 @@ TEST_FIXTURE(uri_address, stream_close_early_with_exception_and_contentlength, } TEST_FIXTURE(uri_address, stream_close_early_with_contentlength, + "Ignore", "825361", "Ignore:Linux", "TBD", "Ignore:Apple", "The test server has trouble closing.") { diff --git a/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj b/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj deleted file mode 100644 index fd6b3fc0aa..0000000000 --- a/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj +++ /dev/null @@ -1,175 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {86F079E4-F73C-4C5F-9AE6-FBCA9784DA69} - HttpTests - SAK - SAK - SAK - SAK - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - - - - - - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);$(TestRoot)\Functional\http\utilities\include;$(TestListenerPath)\include - /bigobj %(AdditionalOptions) - -Zm140 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);$(TestRoot)\Functional\http\utilities\include;$(TestListenerPath)\include - /bigobj %(AdditionalOptions) - -Zm140 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);$(TestRoot)\Functional\http\utilities\include;$(TestListenerPath)\include - /bigobj %(AdditionalOptions) - -Zm140 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);$(TestRoot)\Functional\http\utilities\include;$(TestListenerPath)\include - /bigobj %(AdditionalOptions) - -Zm140 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {FD37C336-02F4-43A5-9D3A-261EC7C5E289} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - - - diff --git a/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj.filters b/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj.filters deleted file mode 100644 index 8275b21007..0000000000 --- a/Release/tests/Functional/http/listener/VS10/HttpListener100_test.vcxproj.filters +++ /dev/null @@ -1,66 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - - - {3de7d3df-7d70-4ea1-a460-bc378ed266c2} - - - {4ac74123-f940-4347-9a8e-d9e35ba7c7ac} - - - \ No newline at end of file diff --git a/Release/tests/Functional/http/listener/dirs.proj b/Release/tests/Functional/http/listener/dirs.proj index c722dfaacb..ee12daf459 100644 --- a/Release/tests/Functional/http/listener/dirs.proj +++ b/Release/tests/Functional/http/listener/dirs.proj @@ -1,10 +1,6 @@ - - - - diff --git a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj b/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj deleted file mode 100644 index bf58389f7d..0000000000 --- a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj +++ /dev/null @@ -1,157 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {FD37C336-02F4-43A5-9D3A-261EC7C5E289} - SAK - SAK - SAK - SAK - Win32Proj - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTUTILITY_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - Winhttp.lib;Httpapi.lib;%(AdditionalDependencies) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTUTILITY_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - Winhttp.lib;Httpapi.lib;%(AdditionalDependencies) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTUTILITY_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - Winhttp.lib;Httpapi.lib;%(AdditionalDependencies) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTUTILITY_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir);..\include;$(TestListenerPath)\include - -Zm200 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - Winhttp.lib;Httpapi.lib;%(AdditionalDependencies) - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - - - - Create - Create - Create - Create - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.filters b/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.filters deleted file mode 100644 index 1e583ce8ed..0000000000 --- a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.filters +++ /dev/null @@ -1,51 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - Header Files - - - - - {d0052d1d-10e0-42da-9df6-72be473a8ebe} - - - {a4317631-da2e-4508-982f-e689f8d4a039} - - - \ No newline at end of file diff --git a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.vspscc b/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/http/utilities/VS10/HttpTestUtilities100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/http/utilities/dirs.proj b/Release/tests/Functional/http/utilities/dirs.proj index b57bc14bf2..beab547c9c 100644 --- a/Release/tests/Functional/http/utilities/dirs.proj +++ b/Release/tests/Functional/http/utilities/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.filters b/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.filters deleted file mode 100644 index 5be8c06070..0000000000 --- a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.filters +++ /dev/null @@ -1,41 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.vspscc b/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/json/VS10/JSON100_test.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/json/dirs.proj b/Release/tests/Functional/json/dirs.proj index c71c1206be..9776170385 100644 --- a/Release/tests/Functional/json/dirs.proj +++ b/Release/tests/Functional/json/dirs.proj @@ -1,10 +1,6 @@ - - - - diff --git a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj b/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj deleted file mode 100644 index 88667066e5..0000000000 --- a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj +++ /dev/null @@ -1,173 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {55FFAC9F-D4E8-4F49-8E23-1732837F04E9} - Win32Proj - header_test100 - SAK - SAK - SAK - SAK - atl_header100 - - - - DynamicLibrary - true - Unicode - Dynamic - Dynamic - - - DynamicLibrary - true - Unicode - Dynamic - Dynamic - - - DynamicLibrary - false - true - Unicode - Dynamic - - - DynamicLibrary - false - true - Unicode - Dynamic - - - - - - - - - - - - - - - - - - - - true - - - true - - - false - - - false - - - - NotUsing - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HEADER_TEST_EXPORTS;%(PreprocessorDefinitions);_AFXDLL - $(CommonTestIncludeDir);$(CasablancaIncludeDir);%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Windows - true - - - - - NotUsing - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HEADER_TEST_EXPORTS;%(PreprocessorDefinitions);_AFXDLL - $(CommonTestIncludeDir);$(CasablancaIncludeDir);%(AdditionalIncludeDirectories) - MultiThreadedDebugDLL - - - Windows - true - - - - - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HEADER_TEST_EXPORTS;%(PreprocessorDefinitions);_AFXDLL - $(CommonTestIncludeDir);$(CasablancaIncludeDir);%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Windows - true - true - true - - - - - NotUsing - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HEADER_TEST_EXPORTS;%(PreprocessorDefinitions);_AFXDLL - $(CommonTestIncludeDir);$(CasablancaIncludeDir);%(AdditionalIncludeDirectories) - MultiThreadedDLL - - - Windows - true - true - true - - - - - - - - - - - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.filters b/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.filters deleted file mode 100644 index c298a22570..0000000000 --- a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.filters +++ /dev/null @@ -1,32 +0,0 @@ - - - - - Source Files - - - Source Files - - - - - {bd424154-ff19-464a-9c4b-23e58763f8c5} - - - {1acaa097-a36a-454a-b73a-04c94afb17e3} - - - {b11fc5dc-442e-466e-b0a0-8d02149f832a} - - - - - Resource Files - - - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.vspscc b/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/misc/atl_headers/VS10/header_test100.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/misc/atl_headers/dirs.proj b/Release/tests/Functional/misc/atl_headers/dirs.proj index f813364940..ec419ab195 100644 --- a/Release/tests/Functional/misc/atl_headers/dirs.proj +++ b/Release/tests/Functional/misc/atl_headers/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj b/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj deleted file mode 100644 index 11e5a4f824..0000000000 --- a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj +++ /dev/null @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {2760086d-c70a-45d8-8a8a-e3324bc9cedd} - Win32Proj - pplxtests - SAK - SAK - SAK - SAK - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - - - - - - - Create - Create - Create - Create - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.filters b/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.filters deleted file mode 100644 index f7a1e02952..0000000000 --- a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.filters +++ /dev/null @@ -1,33 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - {8db07103-c190-40ec-866c-448b320efed1} - - - {31fda3d6-9c5f-46a9-a98b-97918294c274} - - - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.vspscc b/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/pplx/pplx_test/VS10/pplx100_test.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/pplx/pplx_test/dirs.proj b/Release/tests/Functional/pplx/pplx_test/dirs.proj index 846ac69565..ec562ca784 100644 --- a/Release/tests/Functional/pplx/pplx_test/dirs.proj +++ b/Release/tests/Functional/pplx/pplx_test/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj b/Release/tests/Functional/streams/VS10/streams100_test.vcxproj deleted file mode 100644 index 8057037e15..0000000000 --- a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj +++ /dev/null @@ -1,148 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {C7F8B433-B522-453B-9494-A76BD3DDA396} - Win32Proj - HttpTests - SAK - SAK - SAK - SAK - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj /Zm140 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj /Zm140 %(AdditionalOptions) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj /Zm140 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;HTTPTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - /bigobj /Zm140 %(AdditionalOptions) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - - - - - - Create - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.filters b/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.filters deleted file mode 100644 index c8d4cfa1b1..0000000000 --- a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.filters +++ /dev/null @@ -1,39 +0,0 @@ - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - {1de3a9ce-57af-48bd-8125-3af4f406be26} - - - {3c2936bc-8d1e-4a33-96c9-5cfb3d83b30d} - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.vspscc b/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/streams/VS10/streams100_test.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/streams/dirs.proj b/Release/tests/Functional/streams/dirs.proj index 66bacafa87..11a43500c1 100644 --- a/Release/tests/Functional/streams/dirs.proj +++ b/Release/tests/Functional/streams/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj b/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj deleted file mode 100644 index ab7401952b..0000000000 --- a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj +++ /dev/null @@ -1,150 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {7400759E-DA5D-482E-90AA-49A3004CFEDD} - SAK - SAK - SAK - SAK - Win32Proj - actors::tests::functional::messaging::common - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;COMMONTESTS_EXPORTS;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - - - - - - - - - - - - - Create - Create - Create - Create - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.filters b/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.filters deleted file mode 100644 index 9b30bbed21..0000000000 --- a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.filters +++ /dev/null @@ -1,56 +0,0 @@ - - - - - {4FC737F1-C7A5-4376-A066-2A32D752A2FF} - cpp;c;cc;cxx;def;odl;idl;hpj;bat;asm;asmx - - - {93995380-89BD-4b04-88EB-625FBE52EBFB} - h;hpp;hxx;hm;inl;inc;xsd - - - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - Source Files - - - - - Header Files - - - Header Files - - - \ No newline at end of file diff --git a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.vspscc b/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.vspscc deleted file mode 100644 index b6d32892fd..0000000000 --- a/Release/tests/Functional/uri/VS10/Uri100_test.vcxproj.vspscc +++ /dev/null @@ -1,10 +0,0 @@ -"" -{ -"FILE_VERSION" = "9237" -"ENLISTMENT_CHOICE" = "NEVER" -"PROJECT_FILE_RELATIVE_PATH" = "" -"NUMBER_OF_EXCLUDED_FILES" = "0" -"ORIGINAL_PROJECT_FILE_PATH" = "" -"NUMBER_OF_NESTED_PROJECTS" = "0" -"SOURCE_CONTROL_SETTINGS_PROVIDER" = "PROVIDER" -} diff --git a/Release/tests/Functional/uri/dirs.proj b/Release/tests/Functional/uri/dirs.proj index 2094b4526e..33bc1dc2d9 100644 --- a/Release/tests/Functional/uri/dirs.proj +++ b/Release/tests/Functional/uri/dirs.proj @@ -2,10 +2,6 @@ - - - - diff --git a/Release/tests/Functional/utils/VS10/utils100_test.vcxproj b/Release/tests/Functional/utils/VS10/utils100_test.vcxproj deleted file mode 100644 index fb7bf4b46a..0000000000 --- a/Release/tests/Functional/utils/VS10/utils100_test.vcxproj +++ /dev/null @@ -1,144 +0,0 @@ - - - - - Debug - Win32 - - - Debug - x64 - - - Release - Win32 - - - Release - x64 - - - - {ee3d7c93-73f6-4fc4-b8b1-ba7eb8f833ef} - SAK - SAK - SAK - SAK - Win32Proj - actors::tests::functional::messaging::common - - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - DynamicLibrary - false - true - Unicode - - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - Disabled - WIN32;_DEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - Use - MaxSpeed - true - true - WIN32;NDEBUG;_WINDOWS;_USRDLL;%(PreprocessorDefinitions) - $(CasablancaIncludeDir);$(CommonTestIncludeDir) - - - Windows - true - true - true - $(OutDir);%(AdditionalLibraryDirectories) - - - - - - - - - - - - Create - Create - Create - Create - - - - - {ad40b45b-6f96-44fb-8c09-c83d994b5aa8} - - - {4A8DDC8B-BF1C-4F5F-B3A4-DD93199F117B} - - - {b149500c-ffff-463a-8c29-b4ff9b3fd6f9} - - - - - - \ No newline at end of file diff --git a/Release/tests/Functional/utils/dirs.proj b/Release/tests/Functional/utils/dirs.proj index 59c7698fc4..6ff28efe64 100644 --- a/Release/tests/Functional/utils/dirs.proj +++ b/Release/tests/Functional/utils/dirs.proj @@ -2,10 +2,6 @@ - - - -
Failed to fetch the data! Please try again later.
+ Image results by + +
%wdesc%
Weather by OpenWeatherMap
Postal code to location conversion by Google Maps API
Events by Eventful
%mtheater%
Movie data by OnConnect TMS API services
+ Movie poster results by + +