merge from tfs for 1.4 release

microsoft · Dec 6, 2013 · 5606cc6 · 5606cc6
1 parent b4da994
commit 5606cc6
Show file tree

Hide file tree

Showing 175 changed files with 6,231 additions and 5,919 deletions.
diff --git 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
@@ -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
@@ -16,22 +16,38 @@
     <Delete Files="$(BuildRoot)\Release\Collateral\MakeZip\$(ZipFileName)" />
   </Target>
   <Target Name="Build">
-    <Copy SourceFiles="$(VSProjFolder)\CppRestVC10.props" DestinationFiles="$(SamplesFolder)\BingRequest\VC10\CppRest.props" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>    
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
     <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
-    <Copy SourceFiles="$(VSProjFolder)\CppRest.props"     DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\CasaLens\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest110.props"     DestinationFolder="$(SamplesFolder)\CasaLens\VC11" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BingRequest\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\BingRequest\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\SearchFile\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\SearchFile\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo120" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo120" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(BuildRoot)\Build\version.props"  DestinationFolder="$(SamplesFolder)\CasaLens\VC12" OverwriteReadOnlyFiles="true"/>
+    <Copy SourceFiles="$(VSProjFolder)\CppRest120.props"     DestinationFolder="$(SamplesFolder)\CasaLens\VC12" OverwriteReadOnlyFiles="true"/>
     <ItemGroup>
       <DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
       <DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />

diff --git a/Release/collateral/Samples/BingRequest/VC10/BingRequest.sln b/Release/collateral/Samples/BingRequest/VC10/BingRequest.sln
diff --git a/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj b/Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj
@@ -142,5 +142,5 @@
     <ClCompile Include="..\bingrequest.cpp" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
-  <Import Project="CppRest.props" />
+  <Import Project="CppRest110.props" />
 </Project>