Reorganise .sln .vcxproj file, refactor samples

Author: Jinming-Hu

.gitmodules

@@ -171,6 +171,7 @@ if(BUILD_TESTS)
 endif()
 
 if(BUILD_SAMPLES)
+  set(AZUREAZURAGE_LIBRARY_SAMPLE azurestoragesample)
   add_subdirectory(samples)
 endif()
 

Microsoft.WindowsAzure.Storage/CMakeLists.txt

@@ -272,13 +272,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="includes\wascore\constants.dat" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-    </PropertyGroup>
-  </Target>
 </Project>

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

@@ -108,6 +108,12 @@
     <ClInclude Include="includes\wascore\filestream.h">
       <Filter>Header Files</Filter>
     </ClInclude>
+    <ClInclude Include="includes\wascore\timer_handler.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
+    <ClInclude Include="includes\wascore\xml_wrapper.h">
+      <Filter>Header Files</Filter>
+    </ClInclude>
     <ClInclude Include="includes\was\crc64.h">
       <Filter>Header Files</Filter>
     </ClInclude>
@@ -275,6 +281,15 @@
     <ClCompile Include="src\streams.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
+    <ClCompile Include="src\executor.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\timer_handler.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
+    <ClCompile Include="src\xml_wrapper.cpp">
+      <Filter>Source Files</Filter>
+    </ClCompile>
     <ClCompile Include="src\crc64.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -285,7 +300,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="includes\wascore\constants.dat">
       <Filter>Header Files</Filter>
     </None>

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

@@ -272,13 +272,8 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="includes\wascore\constants.dat" />
-    <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <ImportGroup Label="ExtensionTargets">
   </ImportGroup>
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-    </PropertyGroup>
-  </Target>
 </Project>

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v141.vcxproj

@@ -300,7 +300,6 @@
     </ResourceCompile>
   </ItemGroup>
   <ItemGroup>
-    <None Include="packages.config" />
     <None Include="includes\wascore\constants.dat">
       <Filter>Header Files</Filter>
     </None>

Microsoft.WindowsAzure.Storage/Microsoft.WindowsAzure.Storage.v141.vcxproj.filters

@@ -1,5 +1,5 @@
 // -----------------------------------------------------------------------------------------
-// <copyright file="Application.cpp" company="Microsoft">
+// <copyright file="BlobsGettingStarted.cpp" company="Microsoft">
 //    Copyright 2013 Microsoft Corporation
 //
 //    Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,21 +15,17 @@
 // </copyright>
 // -----------------------------------------------------------------------------------------
 
-#include "stdafx.h"
 #include "samples_common.h"
 
 #include <was/storage_account.h>
 #include <was/blob.h>
 #include <cpprest/filestream.h>
 #include <cpprest/containerstream.h>
 
-namespace azure { namespace storage { namespace samples {
 
-    utility::string_t to_string(const std::vector<uint8_t>& data)
-    {
-        return utility::string_t(data.cbegin(), data.cend());
-    }
+namespace azure { namespace storage { namespace samples {
 
+    SAMPLE(BlobsGettingStarted, blobs_getting_started_sample)
     void blobs_getting_started_sample()
     {
         try
@@ -86,7 +82,7 @@ namespace azure { namespace storage { namespace samples {
             concurrency::streams::ostream output_stream(buffer);
             azure::storage::cloud_block_blob binary_blob = container.get_block_blob_reference(_XPLATSTR("my-blob-1"));
             binary_blob.download_to_stream(output_stream);
-            ucout << _XPLATSTR("Stream: ") << to_string(buffer.collection()) << std::endl;
+            ucout << _XPLATSTR("Stream: ") << utility::string_t(buffer.collection().begin(), buffer.collection().end()) << std::endl;
 
             // Download a blob as text
             azure::storage::cloud_block_blob text_blob = container.get_block_blob_reference(_XPLATSTR("my-blob-2"));
@@ -167,11 +163,4 @@ namespace azure { namespace storage { namespace samples {
         }
     }
 
-}}} // namespace azure::storage::samples
-
-int main(int argc, const char *argv[])
-{
-    azure::storage::samples::blobs_getting_started_sample();
-    return 0;
-}
-
+}}}  // namespace azure::storage::samples