Skip to content

Commit e25c3de

Browse files
hohonghohong
committed
merge nativecloud to codeplex
1 parent 80e5c58 commit e25c3de

File tree

145 files changed

+5809
-1850
lines changed

Some content is hidden

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

145 files changed

+5809
-1850
lines changed

‎Build/Common.Build.settings‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848

4949
<!-- try locating configuration file -->
5050
<Import Condition="Exists('$(BuildRoot)\..\Build\environment.casablanca.settings')" Project="$(BuildRoot)\..\Build\environment.casablanca.settings"/>
51-
51+
5252
<!-- paths will not be overridden -->
5353
<PropertyGroup>
5454
<OutDir Condition="'$(OutDir)' != '' and !HasTrailingSlash('$(OutDir)')">$(OutDir)\</OutDir>
@@ -63,6 +63,10 @@
6363
<DevEnvDir>$(VS110COMNTOOLS)..\IDE</DevEnvDir>
6464
</PropertyGroup>
6565

66+
<PropertyGroup Condition="'$(DevToolsVersion)' == '120'">
67+
<DevEnvDir>$(VS120COMNTOOLS)..\IDE</DevEnvDir>
68+
</PropertyGroup>
69+
6670
<PropertyGroup>
6771
<BinaryDependencies>$(TargetsPath)\BinaryDependencies</BinaryDependencies>
6872
<ErrorReport>prompt</ErrorReport>

‎Build/version.props‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,12 @@
33
<PropertyGroup>
44
<CppRestBaseFileName>cpprest</CppRestBaseFileName>
55
<CppRestSDKVersionMajor>1</CppRestSDKVersionMajor>
6-
<CppRestSDKVersionMinor>1</CppRestSDKVersionMinor>
6+
<CppRestSDKVersionMinor>2</CppRestSDKVersionMinor>
77
<CppRestSDKVersionRevision>0</CppRestSDKVersionRevision>
88
<CppRestSDKVersionFileSuffix>$(CppRestSDKVersionMajor)_$(CppRestSDKVersionMinor)</CppRestSDKVersionFileSuffix>
99
<CppRestSDKVersionString>$(CppRestSDKVersionMajor).$(CppRestSDKVersionMinor)</CppRestSDKVersionString>
1010
</PropertyGroup>
11+
<!--
12+
Note: remember to regenerate guiddefs.wxi files using gen_guids_for_msi.ps1 whenever major or minor version file changes
13+
-->
1114
</Project>

‎Release/collateral/MakeZip/MakeZip.proj‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,7 @@
77
<PropertyGroup>
88
<RootFolder>..</RootFolder>
99
<SamplesFolder>..\Samples</SamplesFolder>
10+
<VSProjFolder>..\..\setup\VSProject</VSProjFolder>
1011
<ZipFileName>Casablanca_Samples.zip</ZipFileName>
1112
</PropertyGroup>
1213

@@ -16,10 +17,15 @@
1617
</Target>
1718
<Target Name="Build">
1819
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
20+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC10" OverwriteReadOnlyFiles="true"/>
1921
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
22+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\BingRequest\VC11" OverwriteReadOnlyFiles="true"/>
2023
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
24+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\SearchFile\VC11" OverwriteReadOnlyFiles="true"/>
2125
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
26+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\FacebookDemo\FacebookDemo110" OverwriteReadOnlyFiles="true"/>
2227
<Copy SourceFiles="$(BuildRoot)\Build\version.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
28+
<Copy SourceFiles="$(VSProjFolder)\CppRest.props" DestinationFolder="$(SamplesFolder)\WindowsLiveAuth" OverwriteReadOnlyFiles="true"/>
2329
<ItemGroup>
2430
<DefaultExclude Include="$(SamplesFolder)\**\bin\**" />
2531
<DefaultExclude Include="$(SamplesFolder)\**\ipch\**" />
@@ -61,4 +67,8 @@
6167

6268
</Target>
6369

70+
<Target Name="Rebuild">
71+
<CallTarget Targets="Clean;Build"/>
72+
</Target>
73+
6474
</Project>

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

Lines changed: 2 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,7 @@
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" />
25+
2726
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2827
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
2928
<ConfigurationType>Application</ConfigurationType>
@@ -82,37 +81,25 @@
8281
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8382
<Optimization>Disabled</Optimization>
8483
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
85-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
8684
<ExceptionHandling>Async</ExceptionHandling>
8785
</ClCompile>
8886
<Link>
8987
<SubSystem>Console</SubSystem>
9088
<GenerateDebugInformation>true</GenerateDebugInformation>
91-
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
92-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9389
</Link>
94-
<PostBuildEvent>
95-
<Command>"$(ProjectDir)\copydlls.bat" x86\Debug "$(TargetDir)"</Command>
96-
</PostBuildEvent>
9790
</ItemDefinitionGroup>
9891
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
9992
<ClCompile>
10093
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10194
<Optimization>Disabled</Optimization>
10295
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
103-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
10496
<ExceptionHandling>Async</ExceptionHandling>
10597
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
10698
</ClCompile>
10799
<Link>
108100
<SubSystem>Console</SubSystem>
109101
<GenerateDebugInformation>true</GenerateDebugInformation>
110-
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
111-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
112102
</Link>
113-
<PostBuildEvent>
114-
<Command>"$(ProjectDir)\copydlls.bat" x64\Debug "$(TargetDir)"</Command>
115-
</PostBuildEvent>
116103
</ItemDefinitionGroup>
117104
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
118105
<ClCompile>
@@ -121,20 +108,14 @@
121108
<FunctionLevelLinking>true</FunctionLevelLinking>
122109
<IntrinsicFunctions>true</IntrinsicFunctions>
123110
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
124-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
125111
<ExceptionHandling>Async</ExceptionHandling>
126112
</ClCompile>
127113
<Link>
128114
<SubSystem>Console</SubSystem>
129115
<GenerateDebugInformation>true</GenerateDebugInformation>
130116
<EnableCOMDATFolding>true</EnableCOMDATFolding>
131117
<OptimizeReferences>true</OptimizeReferences>
132-
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
133-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
134118
</Link>
135-
<PostBuildEvent>
136-
<Command>"$(ProjectDir)\copydlls.bat" x86\Release "$(TargetDir)"</Command>
137-
</PostBuildEvent>
138119
</ItemDefinitionGroup>
139120
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
140121
<ClCompile>
@@ -143,7 +124,6 @@
143124
<FunctionLevelLinking>true</FunctionLevelLinking>
144125
<IntrinsicFunctions>true</IntrinsicFunctions>
145126
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
146-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
147127
<ExceptionHandling>Async</ExceptionHandling>
148128
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
149129
</ClCompile>
@@ -152,18 +132,11 @@
152132
<GenerateDebugInformation>true</GenerateDebugInformation>
153133
<EnableCOMDATFolding>true</EnableCOMDATFolding>
154134
<OptimizeReferences>true</OptimizeReferences>
155-
<AdditionalDependencies>$(CppRestBaseFileName)100_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
156-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\100\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
157135
</Link>
158-
<PostBuildEvent>
159-
<Command>"$(ProjectDir)\copydlls.bat" x64\Release "$(TargetDir)"</Command>
160-
</PostBuildEvent>
161136
</ItemDefinitionGroup>
162137
<ItemGroup>
163138
<ClCompile Include="..\bingrequest.cpp" />
164139
</ItemGroup>
165-
<ItemGroup>
166-
<None Include="copydlls.bat" />
167-
</ItemGroup>
168140
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
141+
<Import Project="CppRest.props" />
169142
</Project>

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

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

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

Lines changed: 1 addition & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@
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" />
2826
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
2927
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
3028
<ConfigurationType>Application</ConfigurationType>
@@ -87,37 +85,25 @@
8785
<PrecompiledHeader>NotUsing</PrecompiledHeader>
8886
<Optimization>Disabled</Optimization>
8987
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
90-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
9188
<ExceptionHandling>Async</ExceptionHandling>
9289
</ClCompile>
9390
<Link>
9491
<SubSystem>Console</SubSystem>
9592
<GenerateDebugInformation>true</GenerateDebugInformation>
96-
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
97-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
9893
</Link>
99-
<PostBuildEvent>
100-
<Command>"$(ProjectDir)\copydlls.bat" x86\Debug "$(TargetDir)"</Command>
101-
</PostBuildEvent>
10294
</ItemDefinitionGroup>
10395
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'">
10496
<ClCompile>
10597
<PrecompiledHeader>NotUsing</PrecompiledHeader>
10698
<Optimization>Disabled</Optimization>
10799
<PreprocessorDefinitions>WIN32;DEBUG;_CONSOLE</PreprocessorDefinitions>
108-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
109100
<ExceptionHandling>Async</ExceptionHandling>
110101
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
111102
</ClCompile>
112103
<Link>
113104
<SubSystem>Console</SubSystem>
114105
<GenerateDebugInformation>true</GenerateDebugInformation>
115-
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
116-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Debug\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
117106
</Link>
118-
<PostBuildEvent>
119-
<Command>"$(ProjectDir)\copydlls.bat" x64\Debug "$(TargetDir)"</Command>
120-
</PostBuildEvent>
121107
</ItemDefinitionGroup>
122108
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'">
123109
<ClCompile>
@@ -126,20 +112,14 @@
126112
<FunctionLevelLinking>true</FunctionLevelLinking>
127113
<IntrinsicFunctions>true</IntrinsicFunctions>
128114
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
129-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
130115
<ExceptionHandling>Async</ExceptionHandling>
131116
</ClCompile>
132117
<Link>
133118
<SubSystem>Console</SubSystem>
134119
<GenerateDebugInformation>true</GenerateDebugInformation>
135120
<EnableCOMDATFolding>true</EnableCOMDATFolding>
136121
<OptimizeReferences>true</OptimizeReferences>
137-
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
138-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x86\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
139122
</Link>
140-
<PostBuildEvent>
141-
<Command>"$(ProjectDir)\copydlls.bat" x86\Release "$(TargetDir)"</Command>
142-
</PostBuildEvent>
143123
</ItemDefinitionGroup>
144124
<ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'">
145125
<ClCompile>
@@ -148,7 +128,6 @@
148128
<FunctionLevelLinking>true</FunctionLevelLinking>
149129
<IntrinsicFunctions>true</IntrinsicFunctions>
150130
<PreprocessorDefinitions>WIN32;NDEBUG;_CONSOLE</PreprocessorDefinitions>
151-
<AdditionalIncludeDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\include;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>
152131
<ExceptionHandling>Async</ExceptionHandling>
153132
<AdditionalOptions>-Zm130 %(AdditionalOptions)</AdditionalOptions>
154133
</ClCompile>
@@ -157,18 +136,11 @@
157136
<GenerateDebugInformation>true</GenerateDebugInformation>
158137
<EnableCOMDATFolding>true</EnableCOMDATFolding>
159138
<OptimizeReferences>true</OptimizeReferences>
160-
<AdditionalDependencies>$(CppRestBaseFileName)110_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)</AdditionalDependencies>
161-
<AdditionalLibraryDirectories>$([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\Casablanca\OpenSourceRelease\110\SDK`, `InstallDir`))\lib\x64\Release\;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
162139
</Link>
163-
<PostBuildEvent>
164-
<Command>"$(ProjectDir)\copydlls.bat" x64\Release "$(TargetDir)"</Command>
165-
</PostBuildEvent>
166140
</ItemDefinitionGroup>
167141
<ItemGroup>
168142
<ClCompile Include="..\bingrequest.cpp" />
169143
</ItemGroup>
170-
<ItemGroup>
171-
<None Include="copydlls.bat" />
172-
</ItemGroup>
173144
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
145+
<Import Project="CppRest.props" />
174146
</Project>

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

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

0 commit comments

Comments
 (0)