Skip to content

Commit 5606cc6

Browse files
hohonghohong
committed
merge from tfs for 1.4 release
1 parent b4da994 commit 5606cc6

File tree

175 files changed

+6231
-5919
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+6231
-5919
lines changed

‎Release/casablanca110.sln

Lines changed: 1 addition & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,13 +29,9 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca110.winrt", "src\
2929
EndProject
3030
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HttpListener110_test", "tests\Functional\http\listener\VS11\HttpListener110_test.vcxproj", "{2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}"
3131
EndProject
32-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils110_test.xp", "tests\Functional\utils\VS11.xp\utils110_test.xp.vcxproj", "{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}"
33-
EndProject
34-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utils110_test", "tests\Functional\utils\VS11\utils110_test.vcxproj", "{77BD8C21-0E78-46AD-8420-09F36FC192AA}"
35-
EndProject
3632
Global
3733
GlobalSection(TeamFoundationVersionControl) = preSolution
38-
SccNumberOfProjects = 16
34+
SccNumberOfProjects = 14
3935
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
4036
SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2
4137
SccProjectUniqueName0 = src\\build\\casablanca110.vcxproj
@@ -108,16 +104,6 @@ Global
108104
SccAuxPath13 = http://tkbgitvstfat01:8080/devdiv2
109105
SccLocalPath13 = tests\\Functional\\http\\listener\\VS11
110106
SccProvider13 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
111-
SccProjectUniqueName14 = tests\\Functional\\utils\\VS11.xp\\utils110_test.xp.vcxproj
112-
SccProjectName14 = tests/Functional/utils/VS11.xp
113-
SccAuxPath14 = http://tkbgitvstfat01:8080/devdiv2
114-
SccLocalPath14 = tests\\Functional\\utils\\VS11.xp
115-
SccProvider14 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
116-
SccProjectUniqueName15 = tests\\Functional\\utils\\VS11\\utils110_test.vcxproj
117-
SccProjectName15 = tests/Functional/utils/VS11
118-
SccAuxPath15 = http://tkbgitvstfat01:8080/devdiv2
119-
SccLocalPath15 = tests\\Functional\\utils\\VS11
120-
SccProvider15 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
121107
EndGlobalSection
122108
GlobalSection(SolutionConfigurationPlatforms) = preSolution
123109
Debug|ARM = Debug|ARM
@@ -294,30 +280,6 @@ Global
294280
{2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|Win32.Build.0 = Release|Win32
295281
{2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|x64.ActiveCfg = Release|x64
296282
{2853EC0B-1B8E-4D9D-8436-4EF6DDED5378}.Release|x64.Build.0 = Release|x64
297-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|ARM.ActiveCfg = Debug|ARM
298-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|ARM.Build.0 = Debug|ARM
299-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|Win32.ActiveCfg = Debug|Win32
300-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|Win32.Build.0 = Debug|Win32
301-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|x64.ActiveCfg = Debug|x64
302-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Debug|x64.Build.0 = Debug|x64
303-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|ARM.ActiveCfg = Release|ARM
304-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|ARM.Build.0 = Release|ARM
305-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|Win32.ActiveCfg = Release|Win32
306-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|Win32.Build.0 = Release|Win32
307-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|x64.ActiveCfg = Release|x64
308-
{0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}.Release|x64.Build.0 = Release|x64
309-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|ARM.ActiveCfg = Debug|ARM
310-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|ARM.Build.0 = Debug|ARM
311-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|Win32.ActiveCfg = Debug|Win32
312-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|Win32.Build.0 = Debug|Win32
313-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|x64.ActiveCfg = Debug|x64
314-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Debug|x64.Build.0 = Debug|x64
315-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|ARM.ActiveCfg = Release|ARM
316-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|ARM.Build.0 = Release|ARM
317-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|Win32.ActiveCfg = Release|Win32
318-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|Win32.Build.0 = Release|Win32
319-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|x64.ActiveCfg = Release|x64
320-
{77BD8C21-0E78-46AD-8420-09F36FC192AA}.Release|x64.Build.0 = Release|x64
321283
EndGlobalSection
322284
GlobalSection(SolutionProperties) = preSolution
323285
HideSolutionNode = FALSE

‎Release/casablanca120.sln

Lines changed: 76 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio 2013
4-
VisualStudioVersion = 12.0.20930.1
4+
VisualStudioVersion = 12.0.20625.1 MAIN
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca120", "src\build\casablanca120.vcxproj", "{1014C621-BC2D-4813-B8C1-6D83AD6F9249}"
77
EndProject
@@ -29,11 +29,82 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Uri120_test", "tests\Functi
2929
EndProject
3030
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Utils120_test", "tests\Functional\utils\VS12\Utils120_test.vcxproj", "{50386698-0180-4EBC-8827-F2C36561F6B4}"
3131
EndProject
32-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "casablanca120.winrt", "src\build\casablanca120.winrt.vcxproj", "{9AD285A2-301E-47A0-A299-14AD5D4F2758}"
33-
EndProject
34-
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "streams120_test.winrt", "tests\Functional\streams\vs12.winrt\streams120_test.winrt.vcxproj", "{337E0660-2300-4DC6-883E-283D5A7281B5}"
35-
EndProject
3632
Global
33+
GlobalSection(TeamFoundationVersionControl) = preSolution
34+
SccNumberOfProjects = 14
35+
SccEnterpriseProvider = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
36+
SccTeamFoundationServer = http://tkbgitvstfat01:8080/devdiv2
37+
SccProjectUniqueName0 = src\\build\\casablanca120.vcxproj
38+
SccProjectName0 = src/build
39+
SccAuxPath0 = http://tkbgitvstfat01:8080/devdiv2
40+
SccLocalPath0 = src\\build
41+
SccProvider0 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
42+
SccProjectUniqueName1 = tests\\Common\\TestRunner\\VS11\\TestRunner120.vcxproj
43+
SccProjectName1 = tests/Common/TestRunner/VS11
44+
SccAuxPath1 = http://tkbgitvstfat01:8080/devdiv2
45+
SccLocalPath1 = tests\\Common\\TestRunner\\VS11
46+
SccProvider1 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
47+
SccProjectUniqueName2 = tests\\Common\\UnitTestpp\\VS11\\TestUnitTestpp120.vcxproj
48+
SccProjectName2 = tests/Common/UnitTestpp/VS11
49+
SccAuxPath2 = http://tkbgitvstfat01:8080/devdiv2
50+
SccLocalPath2 = tests\\Common\\UnitTestpp\\VS11
51+
SccProvider2 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
52+
SccProjectUniqueName3 = tests\\Common\\UnitTestpp\\VS11\\UnitTestpp120.vcxproj
53+
SccProjectName3 = tests/Common/UnitTestpp/VS11
54+
SccAuxPath3 = http://tkbgitvstfat01:8080/devdiv2
55+
SccLocalPath3 = tests\\Common\\UnitTestpp\\VS11
56+
SccProvider3 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
57+
SccProjectUniqueName4 = tests\\Common\\utilities\\VS11\\CommonUtilities120.vcxproj
58+
SccProjectName4 = tests/Common/utilities/VS11
59+
SccAuxPath4 = http://tkbgitvstfat01:8080/devdiv2
60+
SccLocalPath4 = tests\\Common\\utilities\\VS11
61+
SccProvider4 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
62+
SccProjectUniqueName5 = tests\\Functional\\http\\client\\VS11\\HttpClient110_test.vcxproj
63+
SccProjectName5 = tests/Functional/http/client/VS11
64+
SccAuxPath5 = http://tkbgitvstfat01:8080/devdiv2
65+
SccLocalPath5 = tests\\Functional\\http\\client\\VS11
66+
SccProvider5 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
67+
SccProjectUniqueName6 = tests\\Functional\\http\\utilities\\VS11\\HttpTestUtilities120.vcxproj
68+
SccProjectName6 = tests/Functional/http/utilities/VS11
69+
SccAuxPath6 = http://tkbgitvstfat01:8080/devdiv2
70+
SccLocalPath6 = tests\\Functional\\http\\utilities\\VS11
71+
SccProvider6 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
72+
SccProjectUniqueName7 = tests\\Functional\\json\\VS11\\JSON110_test.vcxproj
73+
SccProjectName7 = tests/Functional/json/VS11
74+
SccAuxPath7 = http://tkbgitvstfat01:8080/devdiv2
75+
SccLocalPath7 = tests\\Functional\\json\\VS11
76+
SccProvider7 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
77+
SccProjectUniqueName8 = tests\\Functional\\misc\\atl_headers\\VS11\\header_test120.vcxproj
78+
SccProjectName8 = tests/Functional/misc/atl_headers/VS11
79+
SccAuxPath8 = http://tkbgitvstfat01:8080/devdiv2
80+
SccLocalPath8 = tests\\Functional\\misc\\atl_headers\\VS11
81+
SccProvider8 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
82+
SccProjectUniqueName9 = tests\\Functional\\pplx\\pplx_test\\VS11\\pplx110_test.vcxproj
83+
SccProjectName9 = tests/Functional/pplx/pplx_test/VS11
84+
SccAuxPath9 = http://tkbgitvstfat01:8080/devdiv2
85+
SccLocalPath9 = tests\\Functional\\pplx\\pplx_test\\VS11
86+
SccProvider9 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
87+
SccProjectUniqueName10 = tests\\Functional\\streams\\VS11\\streams110_test.vcxproj
88+
SccProjectName10 = tests/Functional/streams/VS11
89+
SccAuxPath10 = http://tkbgitvstfat01:8080/devdiv2
90+
SccLocalPath10 = tests\\Functional\\streams\\VS11
91+
SccProvider10 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
92+
SccProjectUniqueName11 = tests\\Functional\\uri\\VS11\\Uri110_test.vcxproj
93+
SccProjectName11 = tests/Functional/uri/VS11
94+
SccAuxPath11 = http://tkbgitvstfat01:8080/devdiv2
95+
SccLocalPath11 = tests\\Functional\\uri\\VS11
96+
SccProvider11 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
97+
SccProjectUniqueName12 = src\\build\\casablanca110.winrt.vcxproj
98+
SccProjectName12 = src/build
99+
SccAuxPath12 = http://tkbgitvstfat01:8080/devdiv2
100+
SccLocalPath12 = src\\build
101+
SccProvider12 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
102+
SccProjectUniqueName13 = tests\\Functional\\http\\listener\\VS11\\HttpListener110_test.vcxproj
103+
SccProjectName13 = tests/Functional/http/listener/VS11
104+
SccAuxPath13 = http://tkbgitvstfat01:8080/devdiv2
105+
SccLocalPath13 = tests\\Functional\\http\\listener\\VS11
106+
SccProvider13 = {4CA58AB2-18FA-4F8D-95D4-32DDF27D184C}
107+
EndGlobalSection
37108
GlobalSection(SolutionConfigurationPlatforms) = preSolution
38109
Debug|ARM = Debug|ARM
39110
Debug|Win32 = Debug|Win32
@@ -197,30 +268,6 @@ Global
197268
{50386698-0180-4EBC-8827-F2C36561F6B4}.Release|Win32.Build.0 = Release|Win32
198269
{50386698-0180-4EBC-8827-F2C36561F6B4}.Release|x64.ActiveCfg = Release|x64
199270
{50386698-0180-4EBC-8827-F2C36561F6B4}.Release|x64.Build.0 = Release|x64
200-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|ARM.ActiveCfg = Debug|ARM
201-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|ARM.Build.0 = Debug|ARM
202-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|Win32.ActiveCfg = Debug|Win32
203-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|Win32.Build.0 = Debug|Win32
204-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|x64.ActiveCfg = Debug|x64
205-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Debug|x64.Build.0 = Debug|x64
206-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|ARM.ActiveCfg = Release|ARM
207-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|ARM.Build.0 = Release|ARM
208-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|Win32.ActiveCfg = Release|Win32
209-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|Win32.Build.0 = Release|Win32
210-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|x64.ActiveCfg = Release|x64
211-
{9AD285A2-301E-47A0-A299-14AD5D4F2758}.Release|x64.Build.0 = Release|x64
212-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|ARM.ActiveCfg = Debug|ARM
213-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|ARM.Build.0 = Debug|ARM
214-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|Win32.ActiveCfg = Debug|Win32
215-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|Win32.Build.0 = Debug|Win32
216-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|x64.ActiveCfg = Debug|x64
217-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Debug|x64.Build.0 = Debug|x64
218-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|ARM.ActiveCfg = Release|ARM
219-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|ARM.Build.0 = Release|ARM
220-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|Win32.ActiveCfg = Release|Win32
221-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|Win32.Build.0 = Release|Win32
222-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|x64.ActiveCfg = Release|x64
223-
{337E0660-2300-4DC6-883E-283D5A7281B5}.Release|x64.Build.0 = Release|x64
224271
EndGlobalSection
225272
GlobalSection(SolutionProperties) = preSolution
226273
HideSolutionNode = FALSE

‎Release/collateral/MakeZip/MakeZip.proj

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -16,22 +16,38 @@
1616
<Delete Files="$(BuildRoot)\Release\Collateral\MakeZip\$(ZipFileName)" />
1717
</Target>
1818
<Target Name="Build">
19-
<Copy SourceFiles="$(VSProjFolder)\CppRestVC10.props" DestinationFiles="$(SamplesFolder)\BingRequest\VC10\CppRest.props" OverwriteReadOnlyFiles="true"/>
20-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
2119
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
22-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
20+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
2321
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
24-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
22+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
2523
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
26-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
24+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC11\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
2725
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
28-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
26+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC11" OverwriteReadOnlyFiles="true"/>
2927
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
30-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
28+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
3129
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
32-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
33-
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
34-
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
30+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
31+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC11" OverwriteReadOnlyFiles="true"/>
32+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC11" OverwriteReadOnlyFiles="true"/>
33+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\CasaLens\VC11" OverwriteReadOnlyFiles="true"/>
34+
<Copy SourceFiles="$(VSProjFolder)\CppRest110.props" DestinationFolder="$(SamplesFolder)\CasaLens\VC11" OverwriteReadOnlyFiles="true"/>
35+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC12" OverwriteReadOnlyFiles="true"/>
36+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC12" OverwriteReadOnlyFiles="true"/>
37+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
38+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Client" OverwriteReadOnlyFiles="true"/>
39+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
40+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\BlackJack\VC12\BlackJack_Server" OverwriteReadOnlyFiles="true"/>
41+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC12" OverwriteReadOnlyFiles="true"/>
42+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\BlackJack_UIClient\VC12" OverwriteReadOnlyFiles="true"/>
43+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC12" OverwriteReadOnlyFiles="true"/>
44+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC12" OverwriteReadOnlyFiles="true"/>
45+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo120" OverwriteReadOnlyFiles="true"/>
46+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo120" OverwriteReadOnlyFiles="true"/>
47+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC12" OverwriteReadOnlyFiles="true"/>
48+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth\VC12" OverwriteReadOnlyFiles="true"/>
49+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\CasaLens\VC12" OverwriteReadOnlyFiles="true"/>
50+
<Copy SourceFiles="$(VSProjFolder)\CppRest120.props" DestinationFolder="$(SamplesFolder)\CasaLens\VC12" OverwriteReadOnlyFiles="true"/>
3551
<ItemGroup>
3652
<DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
3753
<DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />

‎Release/collateral/Samples/BingRequest/VC10/BingRequest.sln

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎Release/collateral/Samples/BingRequest/VC11/BingRequest.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -142,5 +142,5 @@
142142
<ClCompile Include="..\bingrequest.cpp" />
143143
</ItemGroup>
144144
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
145-
<Import Project="CppRest.props" />
145+
<Import Project="CppRest110.props" />
146146
</Project>

0 commit comments

Comments
 (0)