Sync with TFS

Author: ras0219-msft

Build/Common.Build.settings

@@ -40,8 +40,9 @@
     <CasablancaResourceDir>$(BuildRoot)\Release\Resource</CasablancaResourceDir>
     <CasablancaIncludeDir>$(BuildRoot)\Release\include</CasablancaIncludeDir>
     <CollateralsDir>$(BuildRoot)\Release\Collateral</CollateralsDir>
+    <PocoRoot Condition="'$(PocoRoot)'=='' AND Exists('$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)')">$(BuildRoot)\..\Tools\poco\poco$(DevToolsVersion)</PocoRoot>
   </PropertyGroup>
-  
+
   <!-- try locating configuration file -->
   <Import Condition="Exists('$(BuildRoot)\..\Build\environment.casablanca.settings')" Project="$(BuildRoot)\..\Build\environment.casablanca.settings"/>
 

Release/nuget/readme.txt

@@ -7,5 +7,4 @@ Here are the steps to follow to generate Casablanca's NuGet package:
 
         PS C:\NativeCloud\Main\Tools\NuGet> Write-NuGetPackage .\cpprestsdk.autopkg -SplitThreshold 1000
 
-4. Test generated NuGet package ***Important*** on ALL flavors, architectures, platforms(XP, store, phone, desktop), configurations, VS versions
-5. Add this new package to TFS and delete old one.
+4. Test generated NuGet package ***Important*** on ALL flavors, architectures, platforms(XP, store, phone, desktop), configurations, VS versions

Release/samples/BlackJack/dirs.proj

@@ -7,8 +7,12 @@
       <ProjectFile Include="BlackJack_Server\dirs.proj"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110'">
-      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient.vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
+      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient110.vcxproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
+      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient120.vcxproj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

Release/samples/FacebookDemo/FacebookDemo_TemporaryKey.pfx

@@ -2,8 +2,12 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
-      <ProjectFile Include="vs11\FacebookDemo.vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
+      <ProjectFile Include="FacebookDemo110.vcxproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
+      <ProjectFile Include="FacebookDemo120.vcxproj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

Release/samples/FacebookDemo/dirs.proj

@@ -110,7 +110,7 @@ void MainPage::Button_Click_2(Platform::Object^ sender, Windows::UI::Xaml::Route
         {
             try
             {
-                auto str = value.get().to_string();
+                auto str = value.get().serialize();
                 this->Block1->Text = ref new Platform::String(str.c_str());
             }
             catch(std::exception& exc)
@@ -156,7 +156,7 @@ void MainPage::UploadButton_Click(Platform::Object^ sender, Windows::UI::Xaml::R
         {
             try
             {
-                auto message = response.get().to_string();
+                auto message = response.get().serialize();
                 this->Block1->Text = ref new Platform::String(message.c_str());
             }
             catch(std::exception& exc)

Release/samples/WindowsLiveAuth/MainPage.xaml.cpp

@@ -3,7 +3,11 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
-      <ProjectFile Include="VS11\WindowsLiveAuth.vcxproj"/>
+      <ProjectFile Include="WindowsLiveAuth110.vcxproj"/>
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
+      <ProjectFile Include="WindowsLiveAuth120.vcxproj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />

Release/samples/WindowsLiveAuth/dirs.proj

@@ -1,13 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\version.props" />
   <PropertyGroup Label="Globals">
     <ProjectGuid>{9AD285A2-301E-47A0-A299-14AD5D4F2758}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>casablanca</RootNamespace>
     <DefaultLanguage>en-US</DefaultLanguage>
-    <MinimumVisualStudioVersion>11.0</MinimumVisualStudioVersion>
+    <MinimumVisualStudioVersion>12.0</MinimumVisualStudioVersion>
     <SccProjectName>SAK</SccProjectName>
     <SccAuxPath>SAK</SccAuxPath>
     <SccLocalPath>SAK</SccLocalPath>
@@ -17,27 +16,25 @@
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <PlatformToolset>v120</PlatformToolset>
     <WinRTProject>true</WinRTProject>
-	<TargetXP>false</TargetXP>
+    <TargetXP>false</TargetXP>
     <!-- This is only necessary for dev12 toolset, due to an msbuild change introduced in dev12 -->
     <OutDir>$(OutDir)\$(MsBuildProjectName)</OutDir>
+    <ApplicationType>Windows Store</ApplicationType>
+    <ApplicationTypeRevision>8.1</ApplicationTypeRevision>
   </PropertyGroup>
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Config.Definitions.props" />
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Release.Product.Settings" />
-
   <ImportGroup Label="PropertySheets">
     <Import Project="$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props" Condition="exists('$(UserRootDir)\Microsoft.Cpp.$(Platform).user.props')" Label="LocalAppDataPlatform" />
   </ImportGroup>
-
   <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
     <DebugFileSuffix>d</DebugFileSuffix>
   </PropertyGroup>
   <PropertyGroup>
     <TargetName>$(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix)</TargetName>
   </PropertyGroup>
-
   <ItemDefinitionGroup>
     <ClCompile>
       <PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);AZURESTORAGESERVICES_EXPORTS</PreprocessorDefinitions>
@@ -53,11 +50,8 @@
       <GenerateWindowsMetadata>false</GenerateWindowsMetadata>
     </Link>
   </ItemDefinitionGroup>
-
   <Import Project="sources.proj" />
-
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-
   <!-- This is a workaround until we get the Casablanca120.winrt.dll output directly in binaries folder -->
   <ItemDefinitionGroup>
     <PostBuildEvent>
@@ -67,5 +61,4 @@
       <Message>Copying $(TargetName).winrt binaries to OutDir and removing appcontainer flag</Message>
     </PostBuildEvent>
   </ItemDefinitionGroup>
-
 </Project>