Skip to content

Commit 77e25bd

Browse files
hohonghohong
committed
port changes from tfs to codeplex
1 parent f831983 commit 77e25bd

File tree

56 files changed

+329
-506
lines changed

Some content is hidden

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

56 files changed

+329
-506
lines changed

‎Build/version.props

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
5+
<CppRestSDKVersionMajor>1</CppRestSDKVersionMajor>
6+
<CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
7+
<CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
8+
<CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
9+
<CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
10+
</PropertyGroup>
11+
</Project>

‎Release/collateral/MakeZip/MakeZip.proj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,11 @@
1515
<Delete Files="$(BuildRoot)\Release\Collateral\MakeZip\$(ZipFileName)" />
1616
</Target>
1717
<Target Name="Build">
18+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
19+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
20+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
21+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
22+
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
1823
<ItemGroup>
1924
<DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
2025
<DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@
2222
<ProjectGuid>{BC7664BD-F33B-433C-AB8D-3530A914F5EC}</ProjectGuid>
2323
<Keyword>Win32Proj</Keyword>
2424
</PropertyGroup>
25+
<!-- this file must exist in the same directory as the project file: -->
26+
<Import Project="version.props" />
2527
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2628
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2729
<ConfigurationType>Application</ConfigurationType>
@@ -86,7 +88,7 @@
8688
<Link>
8789
<SubSystem>Console</SubSystem>
8890
<GenerateDebugInformation>true</GenerateDebugInformation>
89-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
91+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
9092
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9193
</Link>
9294
<PostBuildEvent>
@@ -105,7 +107,7 @@
105107
<Link>
106108
<SubSystem>Console</SubSystem>
107109
<GenerateDebugInformation>true</GenerateDebugInformation>
108-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
110+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
109111
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
110112
</Link>
111113
<PostBuildEvent>
@@ -127,7 +129,7 @@
127129
<GenerateDebugInformation>true</GenerateDebugInformation>
128130
<EnableCOMDATFolding>true</EnableCOMDATFolding>
129131
<OptimizeReferences>true</OptimizeReferences>
130-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
132+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
131133
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
132134
</Link>
133135
<PostBuildEvent>
@@ -150,7 +152,7 @@
150152
<GenerateDebugInformation>true</GenerateDebugInformation>
151153
<EnableCOMDATFolding>true</EnableCOMDATFolding>
152154
<OptimizeReferences>true</OptimizeReferences>
153-
<AdditionalDependencies>casablanca100.lib;%(AdditionalDependencies)</AdditionalDependencies>
155+
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
154156
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
155157
</Link>
156158
<PostBuildEvent>

‎Release/collateral/Samples/BingRequest/VC10/copydlls.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
)
77
)
88

9-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca100.pdb" %2
9+
@copy "%CASABLANCA_SDK%\bin\%1\*.dll" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\*.pdb" %2

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,8 @@
2323
<Keyword>Win32Proj</Keyword>
2424
<VCTargetsPath Condition="'$(VCTargetsPath11)' != '' and '$(VSVersion)' == '' and $(VisualStudioVersion) == ''">$(VCTargetsPath11)</VCTargetsPath>
2525
</PropertyGroup>
26+
<!-- this file must exist in the same directory as the project file: -->
27+
<Import Project="version.props" />
2628
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2729
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2830
<ConfigurationType>Application</ConfigurationType>
@@ -91,7 +93,7 @@
9193
<Link>
9294
<SubSystem>Console</SubSystem>
9395
<GenerateDebugInformation>true</GenerateDebugInformation>
94-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
96+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
9597
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9698
</Link>
9799
<PostBuildEvent>
@@ -110,7 +112,7 @@
110112
<Link>
111113
<SubSystem>Console</SubSystem>
112114
<GenerateDebugInformation>true</GenerateDebugInformation>
113-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
115+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
114116
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
115117
</Link>
116118
<PostBuildEvent>
@@ -132,7 +134,7 @@
132134
<GenerateDebugInformation>true</GenerateDebugInformation>
133135
<EnableCOMDATFolding>true</EnableCOMDATFolding>
134136
<OptimizeReferences>true</OptimizeReferences>
135-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
137+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
136138
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
137139
</Link>
138140
<PostBuildEvent>
@@ -155,7 +157,7 @@
155157
<GenerateDebugInformation>true</GenerateDebugInformation>
156158
<EnableCOMDATFolding>true</EnableCOMDATFolding>
157159
<OptimizeReferences>true</OptimizeReferences>
158-
<AdditionalDependencies>casablanca110.lib;%(AdditionalDependencies)</AdditionalDependencies>
160+
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
159161
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
160162
</Link>
161163
<PostBuildEvent>

‎Release/collateral/Samples/BingRequest/VC11/copydlls.bat

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,5 +6,5 @@
66
)
77
)
88

9-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.dll" %2
10-
@copy "%CASABLANCA_SDK%\bin\%1\casablanca110.pdb" %2
9+
@copy "%CASABLANCA_SDK%\bin\%1\*.dll" %2
10+
@copy "%CASABLANCA_SDK%\bin\%1\*.pdb" %2

‎Release/collateral/Samples/FacebookDemo/FacebookDemo/FacebookDemo.vcxproj

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

‎Release/collateral/Samples/FacebookDemo/FacebookDemo110/Facebook.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323

2424
#pragma once
2525
#include <string>
26-
#include <http_client.h>
26+
#include <cpprest/http_client.h>
2727

2828
class facebook_client {
2929
public:

0 commit comments

Comments
 (0)