merge linux change with codeplex

Author: hohong

.gitignore

@@ -32,10 +32,9 @@
 *.exe
 *.manifest
 *.rc
+*~
 ipch/
 obj/
 *.resfiles
 [Bb]in
 Binaries/
-VS11.winrt/
-!*.vcxproj.*

Release/collateral/Samples/BingRequest/bingrequest.cpp

@@ -22,8 +22,8 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 
-#include <http_client.h>
-#include <filestream.h>
+#include <cpprest/http_client.h>
+#include <cpprest/filestream.h>
 
 using namespace utility;
 using namespace web::http;

Release/collateral/Samples/SearchFile/searchfile.cpp

@@ -22,9 +22,9 @@
 * =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 ****/
 
-#include <filestream.h>
-#include <containerstream.h>
-#include <producerconsumerstream.h>
+#include "cpprest/filestream.h"
+#include "cpprest/containerstream.h"
+#include "cpprest/producerconsumerstream.h"
 
 using namespace utility;
 using namespace concurrency::streams;
@@ -34,30 +34,30 @@ using namespace concurrency::streams;
 /// </summary>
 pplx::task<bool> _do_while_iteration(std::function<pplx::task<bool>(void)> func)
 {
-	pplx::task_completion_event<bool> ev;
-	func().then([=](bool guard)
-	{
-		ev.set(guard);
-	});
-	return pplx::create_task(ev);
+    pplx::task_completion_event<bool> ev;
+    func().then([=](bool guard)
+    {
+        ev.set(guard);
+    });
+    return pplx::create_task(ev);
 }
 pplx::task<bool> _do_while_impl(std::function<pplx::task<bool>(void)> func)
 {
-	return _do_while_iteration(func).then([=](bool guard) -> pplx::task<bool>
-	{
-		if(guard)
-		{
-			return ::_do_while_impl(func);
-		}
-		else
-		{
-			return pplx::task_from_result(false);
-		}
-	});
+    return _do_while_iteration(func).then([=](bool guard) -> pplx::task<bool>
+    {
+        if(guard)
+        {
+            return ::_do_while_impl(func);
+        }
+        else
+        {
+            return pplx::task_from_result(false);
+        }
+    });
 }
 pplx::task<void> do_while(std::function<pplx::task<bool>(void)> func)
 {
-	return _do_while_impl(func).then([](bool){});
+    return _do_while_impl(func).then([](bool){});
 }
 
 /// <summary>
@@ -77,21 +77,21 @@ class type_parser<CharType, matched_lines>
         basic_istream<CharType> in(buffer);
         auto lines = std::make_shared<matched_lines>();
         return do_while([=]()
-		{
-			container_buffer<std::string> line;
-			return in.read_line(line).then([=](const size_t bytesRead)
-			{
-				if(bytesRead == 0 && in.is_eof())
-				{
-					return false;
-				}
-				else
-				{
-					lines->push_back(std::move(line.collection()));
-					return true;
-				}
-			});
-		}).then([=]()
+        {
+            container_buffer<std::string> line;
+            return in.read_line(line).then([=](const size_t bytesRead)
+            {
+                if(bytesRead == 0 && in.is_eof())
+                {
+                    return false;
+                }
+                else
+                {
+                    lines->push_back(std::move(line.collection()));
+                    return true;
+                }
+            });
+        }).then([=]()
         {
             return matched_lines(std::move(*lines));
         });
@@ -103,79 +103,79 @@ class type_parser<CharType, matched_lines>
 /// </summary>
 static pplx::task<void> find_matches_in_file(const string_t &fileName, const std::string &searchString, basic_ostream<char> results)
 {
-	return file_stream<char>::open_istream(fileName).then([=](basic_istream<char> inFile)
-	{			
-		auto lineNumber = std::make_shared<int>(1);
-		return ::do_while([=]()
-		{
-			container_buffer<std::string> inLine;
-			return inFile.read_line(inLine).then([=](size_t bytesRead)
-			{
-				if(bytesRead == 0 && inFile.is_eof())
-				{
-					return pplx::task_from_result(false);
-				}
+    return file_stream<char>::open_istream(fileName).then([=](basic_istream<char> inFile)
+    {
+        auto lineNumber = std::make_shared<int>(1);
+        return ::do_while([=]()
+        {
+            container_buffer<std::string> inLine;
+            return inFile.read_line(inLine).then([=](size_t bytesRead)
+            {
+                if(bytesRead == 0 && inFile.is_eof())
+                {
+                    return pplx::task_from_result(false);
+                }
 
-				else if(inLine.collection().find(searchString) != std::string::npos)
-				{
-					results.print("line ");
-					results.print((*lineNumber)++);
-					return results.print(":").then([=](size_t)
-					{
-						container_buffer<std::string> outLine(std::move(inLine.collection()));
-						return results.write(outLine, outLine.collection().size());
-					}).then([=](size_t)
-					{
-						return results.print("\r\n");
-					}).then([=](size_t)
-					{
-						return true;
-					});
-				}
+                else if(inLine.collection().find(searchString) != std::string::npos)
+                {
+                    results.print("line ");
+                    results.print((*lineNumber)++);
+                    return results.print(":").then([=](size_t)
+                    {
+                        container_buffer<std::string> outLine(std::move(inLine.collection()));
+                        return results.write(outLine, outLine.collection().size());
+                    }).then([=](size_t)
+                    {
+                        return results.print("\r\n");
+                    }).then([=](size_t)
+                    {
+                        return true;
+                    });
+                }
 
-				else
-				{
-					++(*lineNumber);
-					return pplx::task_from_result(true);
-				}
-			});
-		}).then([=]()
-		{
-			// Close the file and results stream.
-			return inFile.close() && results.close();
-		});
-	});
+                else
+                {
+                    ++(*lineNumber);
+                    return pplx::task_from_result(true);
+                }
+            });
+        }).then([=]()
+        {
+            // Close the file and results stream.
+            return inFile.close() && results.close();
+        });
+    });
 }
 
 /// <summary>
 /// Function to write out results from matched_lines type to file
 /// </summary>
 static pplx::task<void> write_matches_to_file(const string_t &fileName, matched_lines results)
 {
-	// Create a shared pointer to the matched_lines structure to copying repeatedly.
-	auto sharedResults = std::make_shared<matched_lines>(std::move(results));
+    // Create a shared pointer to the matched_lines structure to copying repeatedly.
+    auto sharedResults = std::make_shared<matched_lines>(std::move(results));
 
     return file_stream<char>::open_ostream(fileName, std::ios::trunc).then([=](basic_ostream<char> outFile)
-	{
-		auto currentIndex = std::make_shared<size_t>(0);
-		return ::do_while([=]()
-		{
-			if(*currentIndex >= sharedResults->size())
-			{
-				return pplx::task_from_result(false);
-			}
+    {
+        auto currentIndex = std::make_shared<size_t>(0);
+        return ::do_while([=]()
+        {
+            if(*currentIndex >= sharedResults->size())
+            {
+                return pplx::task_from_result(false);
+            }
 
-			container_buffer<std::string> lineData((*sharedResults)[(*currentIndex)++]);
-			outFile.write(lineData, lineData.collection().size());
-			return outFile.print("\r\n").then([](size_t)
-			{
-				return true;
-			});
-		}).then([=]()
-		{
-			return outFile.close();
-		});
-	});
+            container_buffer<std::string> lineData((*sharedResults)[(*currentIndex)++]);
+            outFile.write(lineData, lineData.collection().size());
+            return outFile.print("\r\n").then([](size_t)
+            {
+                return true;
+            });
+        }).then([=]()
+        {
+            return outFile.close();
+        });
+    });
 }
 
 #ifdef _MS_WINDOWS
@@ -193,26 +193,26 @@ int main(int argc, char *args[])
     const std::string searchString = utility::conversions::to_utf8string(args[2]);
     const string_t outFileName = args[3];
     producer_consumer_buffer<char> lineResultsBuffer;
-	
-	// Find all matches in file.
-	basic_ostream<char> outLineResults(lineResultsBuffer);
+    
+    // Find all matches in file.
+    basic_ostream<char> outLineResults(lineResultsBuffer);
     find_matches_in_file(inFileName, searchString, outLineResults)
 
-	// Write matches into custom data structure.
-	.then([&]()
-	{
-		basic_istream<char> inLineResults(lineResultsBuffer);
-		return inLineResults.extract<matched_lines>();
-	})
+    // Write matches into custom data structure.
+    .then([&]()
+    {
+        basic_istream<char> inLineResults(lineResultsBuffer);
+        return inLineResults.extract<matched_lines>();
+    })
 
-	// Write out stored match data to a new file.
-	.then([&](matched_lines lines)
-	{
-		return write_matches_to_file(outFileName, std::move(lines));
-	})
+    // Write out stored match data to a new file.
+    .then([&](matched_lines lines)
+    {
+        return write_matches_to_file(outFileName, std::move(lines));
+    })
 
-	// Wait for everything to complete.
-	.wait();
+    // Wait for everything to complete.
+    .wait();
 
     return 0;
 }

Release/collateral/Samples/WindowsLiveAuth/MainPage.xaml.cpp

@@ -17,7 +17,7 @@
 
 #include "pch.h"
 #include "MainPage.xaml.h"
-#include <filestream.h>
+#include "cpprest/filestream.h"
 
 using namespace WindowsLiveAuth;
 

Release/collateral/Samples/WindowsLiveAuth/live_connect.h

@@ -27,11 +27,11 @@
 #pragma once
 
 #include <collection.h>
-#include <pplxtasks.h>
-#include <basic_types.h>
-#include <http_client.h>
-#include <streams.h>
-#include <filestream.h>
+#include "pplx/pplxtasks.h"
+#include "cpprest/basic_types.h"
+#include "cpprest/http_client.h"
+#include "cpprest/streams.h"
+#include "cpprest/filestream.h"
 
 namespace web { namespace live {
 

Release/collateral/Samples/WindowsLiveAuth/pch.h

@@ -20,6 +20,6 @@
 #include <collection.h>
 #include "App.xaml.h"
 #include "MainPage.xaml.h"
-#include <pplxtasks.h>
-#include <basic_types.h>
+#include <pplx/pplxtasks.h>
+#include <cpprest/basic_types.h>
 #include "live_connect.h"