Merge pull request #103 from JasonYang-MSFT/master

Azure Storage Client Library for C++ v2.5.0

BreakingChanges.txt

@@ -1,6 +1,9 @@
 Azure Storage Client Library for C++
 History of Breaking Changes
 
+Breaking Changes in v2.5:
+- Upgraded Casablanca dependency to 2.9.1
+
 Breaking Changes in v2.3:
 - Upgraded Casablanca dependency to 2.8.0
 

Changelog.txt

@@ -1,6 +1,16 @@
 Azure Storage Client Library for C++
 History of Changes
 
+Changes in v2.5:
+- Upgraded Casablanca dependency to 2.9.1
+- Default Rest API version is 2015-12-11
+- Supported server-side encryption for blobs
+- Fixed the bug that enumeration iterator couldn't use non-const methods, such as create/delete.
+- Fixed the bug that request id used but wasn't logged correctly in unit tests.
+- Changed predefinition for Windows platform from WIN32 to _WIN32.
+- Fixed the bug that queue message operations throws exception "Error: The Uri for the target storage location is not specified. Please consider changing the request's location mode." on VS 2013 and Linux platform.
+- Fixed the bug that xml constructor throws exception "The namespace () has not been declared." on Linux platform.
+
 Changes in v2.4:
 - Added support for file service: file client, file share, file directory and file.
 - Performance improvements with URI cache, string concat, uri builder parameters.
@@ -9,9 +19,9 @@ Changes in v2.4:
 - Fixed the bug that copying blob from other accounts doesn't use source credentials.
 - Fixed the bug that network took too long time to close while network error happened.
 - Fixed the bug that blob name with reserved characters didn't split with right order.
-- Fixed the but that blob properties didn't clear after delettion.
+- Fixed the but that blob properties didn't clear after deletion.
 - Fixed the coding style for static string to prevent ODR issue.
-- Fixed the build issue on OS X, but not offically suporting OS X.
+- Fixed the build issue on OS X, but not officially supporting OS X.
 
 Changes in v2.3:
 - Added the following interfaces to support programmatically configurable HTTP/HTTPS proxy

Doxyfile

@@ -38,7 +38,7 @@ PROJECT_NAME = "Microsoft Azure Storage Client Library for C++"
 # could be handy for archiving the generated documentation or if some version
 # control system is used.
 
-PROJECT_NUMBER = 2.4.0
+PROJECT_NUMBER = 2.5.0
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description
 # for a project that appears at the top of each page and should give viewer a

Microsoft.WindowsAzure.Storage/CMakeLists.txt

@@ -115,7 +115,7 @@ set(AZURESTORAGE_LIBRARIES ${AZURESTORAGE_LIBRARY} ${CASABLANCA_LIBRARIES} ${Boo
 
 # Set version numbers centralized
 set (AZURESTORAGE_VERSION_MAJOR 2)
-set (AZURESTORAGE_VERSION_MINOR 4)
+set (AZURESTORAGE_VERSION_MINOR 5)
 set (AZURESTORAGE_VERSION_REVISION 0)
 
 # Add sources per configuration

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v120.vcxproj

@@ -257,12 +257,12 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
- <Import Project="..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
+ <Import Project="..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  <PropertyGroup>
  <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
- <Error Condition="!Exists('..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
+ <Error Condition="!Exists('..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v120.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
  </Target>
 </Project>

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v120.vcxproj.filters

@@ -269,6 +269,9 @@
  <ClCompile Include="src\file_response_parsers.cpp">
  <Filter>Source Files</Filter>
  </ClCompile>
+ <ClCompile Include="src\streams.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
  </ItemGroup>
  <ItemGroup>
  <ResourceCompile Include="version.rc">
@@ -281,4 +284,4 @@
  <Filter>Header Files</Filter>
  </None>
  </ItemGroup>
-</Project>
+</Project>

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v140.vcxproj

@@ -257,12 +257,12 @@
  </ItemGroup>
  <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
  <ImportGroup Label="ExtensionTargets">
- <Import Project="..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
+ <Import Project="..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets" Condition="Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" />
  </ImportGroup>
  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
  <PropertyGroup>
  <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
  </PropertyGroup>
- <Error Condition="!Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.8.0\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
+ <Error Condition="!Exists('..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.2.9.1\build\native\cpprestsdk.v140.windesktop.msvcstl.dyn.rt-dyn.targets'))" />
  </Target>
 </Project>

Microsoft.WindowsAzure.Storage/includes/targetver.h

@@ -22,6 +22,6 @@
 // If you wish to build your application for a previous Windows platform, include WinSDKVer.h and
 // set the _WIN32_WINNT macro to the platform you wish to support before including SDKDDKVer.h.
 
-#ifdef WIN32
+#ifdef _WIN32
 #include <SDKDDKVer.h>
 #endif