Skip to content

Commit a2d5d7e

Browse files
stgatesstgates
committed
Merge branch 'development' of https://git01.codeplex.com/casablanca into development
2 parents 63920c0 + 2606284 commit a2d5d7e

23 files changed

+52
-99
lines changed

‎Release/src/build/vs11.winrt/casablanca110.winrt.vcxproj

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

4343
<ItemDefinitionGroup>
4444
<ClCompile>
45-
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);AZURESTORAGESERVICES_EXPORTS</PreprocessorDefinitions>
45+
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);</PreprocessorDefinitions>
4646
<AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
4747
<CompileAsWinRT>true</CompileAsWinRT>
4848
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎Release/src/build/vs11.winrt/packages.config

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
6-
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
8-
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
10-
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
12-
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
14-
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
153
</packages>

‎Release/src/build/vs11.wp8/packages.config

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
6-
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
8-
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
10-
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
12-
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
14-
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
153
</packages>

‎Release/src/build/vs11.xp/casablanca110.xp.vcxproj

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,11 @@
2727
<Import Project="$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_regex-vc110.1.55.0.16\build\native\boost_regex-vc110.targets')" />
2828
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
2929
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
31+
<Import Project="$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets" Condition="Exists('$(PackagesRoot)\zlib.redist.1.2.8.7\build\native\zlib.redist.targets')" />
32+
<Import Project="$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets" Condition="Exists('$(PackagesRoot)\zlib.1.2.8.7\build\native\zlib.targets')" />
33+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
34+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
3035
</ImportGroup>
3136
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3237
<DebugFileSuffix>d</DebugFileSuffix>

‎Release/src/build/vs11.xp/packages.config

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,13 @@
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
44
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
65
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
86
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
107
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
128
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
149
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
10+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
11+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
12+
<package id="zlib" version="1.2.8.7" targetFramework="Native" />
13+
<package id="zlib.redist" version="1.2.8.7" targetFramework="Native" />
1514
</packages>

‎Release/src/build/vs11/casablanca110.vcxproj

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,9 @@
2727
<Import Project="$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_thread-vc110.1.55.0.16\build\native\boost_thread-vc110.targets')" />
2828
<Import Project="$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_chrono-vc110.1.55.0.16\build\native\boost_chrono-vc110.targets')" />
2929
<Import Project="$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets" Condition="Exists('$(PackagesRoot)\boost_random-vc110.1.55.0.16\build\native\boost_random-vc110.targets')" />
30+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.props')" />
31+
<Import Project="$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets" Condition="Exists('$(PackagesRoot)\openssl.redist.1.0.1.25\build\native\openssl.redist.targets')" />
32+
<Import Project="$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets" Condition="Exists('$(PackagesRoot)\openssl.1.0.1.25\build\native\openssl.targets')" />
3033
</ImportGroup>
3134
<PropertyGroup Condition="'$(Configuration)' == 'Debug'">
3235
<DebugFileSuffix>d</DebugFileSuffix>

‎Release/src/build/vs11/packages.config

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,14 +2,11 @@
22
<packages>
33
<package id="boost" version="1.55.0.16" targetFramework="Native" />
44
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
65
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
86
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
107
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
128
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
149
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
10+
<package id="openssl" version="1.0.1.25" targetFramework="Native" />
11+
<package id="openssl.redist" version="1.0.1.25" targetFramework="Native" />
1512
</packages>

‎Release/src/build/vs12.winrt/casablanca120.winrt.vcxproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
</PropertyGroup>
3838
<ItemDefinitionGroup>
3939
<ClCompile>
40-
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);AZURESTORAGESERVICES_EXPORTS</PreprocessorDefinitions>
40+
<PreprocessorDefinitions>WINAPI_FAMILY=WINAPI_PARTITION_APP;_ASYNCRT_EXPORT;_PPLX_EXPORT;_USRDLL;%(PreprocessorDefinitions);</PreprocessorDefinitions>
4141
<AdditionalUsingDirectories>$(WindowsSdkDir)\References\CommonConfiguration\Neutral;$(VSInstallDir)\vc\vcpackages;$(AdditionalUsingDirectories)</AdditionalUsingDirectories>
4242
<CompileAsWinRT>true</CompileAsWinRT>
4343
<AdditionalIncludeDirectories>$(CasablancaIncludeDir);$(CasablancaSrcDir)\pch;%(AdditionalIncludeDirectories)</AdditionalIncludeDirectories>

‎Release/src/build/vs12.winrt/packages.config

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
6-
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
8-
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
10-
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
12-
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
14-
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
153
</packages>

‎Release/src/build/vs12.wp81/packages.config

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="boost" version="1.55.0.16" targetFramework="Native" />
4-
<package id="boost_chrono-vc110" version="1.55.0.16" targetFramework="Native" />
5-
<package id="boost_chrono-vc120" version="1.55.0.16" targetFramework="Native" />
6-
<package id="boost_date_time-vc110" version="1.55.0.16" targetFramework="Native" />
7-
<package id="boost_date_time-vc120" version="1.55.0.16" targetFramework="Native" />
8-
<package id="boost_regex-vc110" version="1.55.0.16" targetFramework="Native" />
9-
<package id="boost_regex-vc120" version="1.55.0.16" targetFramework="Native" />
10-
<package id="boost_system-vc110" version="1.55.0.16" targetFramework="Native" />
11-
<package id="boost_system-vc120" version="1.55.0.16" targetFramework="Native" />
12-
<package id="boost_thread-vc110" version="1.55.0.16" targetFramework="Native" />
13-
<package id="boost_thread-vc120" version="1.55.0.16" targetFramework="Native" />
14-
<package id="boost_random-vc110" version="1.55.0.16" targetFramework="Native" />
153
</packages>

0 commit comments

Comments
 (0)