diff --git a/Release/collateral/MakeZip/MakeZip.proj b/Release/collateral/MakeZip/MakeZip.proj
index 3d085d9ede..c74dd84735 100644
--- a/Release/collateral/MakeZip/MakeZip.proj
+++ b/Release/collateral/MakeZip/MakeZip.proj
@@ -16,16 +16,16 @@
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
diff --git a/Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj b/Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj
index f94aa9b926..3b0e5b2dc5 100644
--- a/Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj
+++ b/Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj
@@ -5,18 +5,10 @@
Debug
Win32
-
- Debug
- ARM
-
Debug
x64
-
- Release
- ARM
-
Release
Win32
@@ -42,12 +34,6 @@
NotSet
v110_xp
-
- Application
- true
- NotSet
- v110
-
Application
true
@@ -61,13 +47,6 @@
NotSet
v110_xp
-
- Application
- false
- true
- NotSet
- v110
-
Application
false
@@ -92,20 +71,6 @@
true
-
-
- /bigobj %(AdditionalOptions)
- NotUsing
- Disabled
- WIN32;_DEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(CasablancaIncludeDir)
- Async
-
-
- Console
- true
-
-
/bigobj %(AdditionalOptions)
@@ -138,24 +103,6 @@
true
-
-
- /bigobj %(AdditionalOptions)
- NotUsing
- MaxSpeed
- true
- true
- WIN32;NDEBUG;_CONSOLE;%(PreprocessorDefinitions)
- $(CasablancaIncludeDir);
- Async
-
-
- Console
- true
- true
- true
-
-
/bigobj %(AdditionalOptions)
@@ -178,7 +125,9 @@
-
+
+ {4D9ED383-673B-4E48-A6AF-6BD9F108150E}
+
\ No newline at end of file
diff --git a/Release/samples/BingRequest/dirs.proj b/Release/samples/BingRequest/dirs.proj
index 59e0c2f95e..68952ee01f 100644
--- a/Release/samples/BingRequest/dirs.proj
+++ b/Release/samples/BingRequest/dirs.proj
@@ -6,6 +6,9 @@
+
+
+
diff --git a/Release/setup/VSProject/CppRestVC10.props b/Release/setup/VSProject/CppRestVC10.props
new file mode 100644
index 0000000000..9562174ef2
--- /dev/null
+++ b/Release/setup/VSProject/CppRestVC10.props
@@ -0,0 +1,41 @@
+
+
+
+
+
+
+ d
+
+
+
+ x86
+
+
+ x64
+
+
+ arm
+
+
+
+ $([MSBuild]::GetRegistryValue(`HKEY_LOCAL_MACHINE\Software\Microsoft\CppRestSDK\OpenSourceRelease\100\v$(CppRestSDKVersionString)\SDK`, `InstallDir`))
+ $(CppRestBaseFileName)100$(DebugFileSuffix)_$(CppRestSDKVersionFileSuffix)
+
+
+
+
+ $(CppRestSDKPath)\include;%(AdditionalIncludeDirectories)
+
+
+ $(CppRestRuntimeBaseFileName).lib;%(AdditionalDependencies)
+ $(CppRestSDKPath)\lib\$(PlatformLibPath)\$(Configuration);%(AdditionalLibraryDirectories)
+
+
+ Copying C++ REST Runtime
+
+ copy /y "$(CppRestSDKPath)\bin\$(PlatformLibPath)\$(Configuration)\$(CppRestRuntimeBaseFileName).dll" "$(TargetDir)"
+ copy /y "$(CppRestSDKPath)\bin\$(PlatformLibPath)\$(Configuration)\$(CppRestRuntimeBaseFileName).pdb" "$(TargetDir)"
+
+
+
+
\ No newline at end of file
diff --git a/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props
index 4bbd7346ec..093497754c 100644
--- a/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props
+++ b/Release/setup/WindowsSDK/110/x64/CppRESTWindowsSDK.props
@@ -14,7 +14,7 @@
$(CppRestSDKPath)\LIB\x64\$(Configuration);%(AdditionalLibraryDirectories)
- $(CppRestBaseFileName)110$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
+ $(CppRestBaseFileName)110$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
\ No newline at end of file
diff --git a/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props
index 640b00346a..6215a5c579 100644
--- a/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props
+++ b/Release/setup/WindowsSDK/120/arm/CppRESTWindowsSDK.props
@@ -14,7 +14,7 @@
$(CppRestSDKPath)\LIB\arm\$(Configuration);%(AdditionalLibraryDirectories)
- $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
+ $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
\ No newline at end of file
diff --git a/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props
index d095f8b05f..68e9e49923 100644
--- a/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props
+++ b/Release/setup/WindowsSDK/120/x64/CppRESTWindowsSDK.props
@@ -14,7 +14,7 @@
$(CppRestSDKPath)\LIB\x64\$(Configuration);%(AdditionalLibraryDirectories)
- $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
+ $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
\ No newline at end of file
diff --git a/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props b/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props
index 8ec7eddc78..afa9c1ec5f 100644
--- a/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props
+++ b/Release/setup/WindowsSDK/120/x86/CppRESTWindowsSDK.props
@@ -14,7 +14,7 @@
$(CppRestSDKPath)\LIB\x86\$(Configuration);%(AdditionalLibraryDirectories)
- $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
+ $(CppRestBaseFileName)120$(DebugFileSuffix)_app_$(CppRestSDKVersionFileSuffix).lib;%(AdditionalDependencies)
\ No newline at end of file
diff --git a/Release/tests/Common/utilities/VS11.xp/CommonUtilities110.xp.vcxproj b/Release/tests/Common/utilities/VS11.xp/CommonUtilities110.xp.vcxproj
index 26cce7763c..2901d009c5 100644
--- a/Release/tests/Common/utilities/VS11.xp/CommonUtilities110.xp.vcxproj
+++ b/Release/tests/Common/utilities/VS11.xp/CommonUtilities110.xp.vcxproj
@@ -27,7 +27,7 @@
- {0c9d50d9-94fb-4732-a4ad-58e068315bb2}
+ {E3C7A314-A6B5-4169-A323-8655035E4EA8}
Win32Proj
CommonUtilities110
SAK
@@ -195,7 +195,7 @@
{6490C580-DD4A-4F2D-A345-732C5148349F}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
diff --git a/Release/tests/Common/utilities/dirs.proj b/Release/tests/Common/utilities/dirs.proj
index 282b65c945..00f9d55dbf 100644
--- a/Release/tests/Common/utilities/dirs.proj
+++ b/Release/tests/Common/utilities/dirs.proj
@@ -8,6 +8,7 @@
+
diff --git a/Release/tests/Functional/http/client/outside_tests.cpp b/Release/tests/Functional/http/client/outside_tests.cpp
index 77362a9cf6..c4d4d41e38 100644
--- a/Release/tests/Functional/http/client/outside_tests.cpp
+++ b/Release/tests/Functional/http/client/outside_tests.cpp
@@ -94,8 +94,9 @@ TEST_FIXTURE(uri_address, reading_google_stream,
memset(chars, 0, sizeof(chars));
streams::rawptr_buffer temp(chars, sizeof(chars));
+
VERIFY_ARE_EQUAL(response.body().read(temp, 80).get(), 80);
- VERIFY_ARE_EQUAL(strcmp((const char *)chars, ""), 0);
+ VERIFY_ARE_EQUAL(strcmp((const char *)chars, "
- {6F026328-4D10-4EF1-BD6C-8FD3CBE0F530}
+ {1CD44176-1F99-4D59-82C5-D07940114533}
SAK
SAK
SAK
@@ -191,7 +191,7 @@
{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
{0c9d50d9-94fb-4732-a4ad-58e068315bb2}
diff --git a/Release/tests/Functional/json/dirs.proj b/Release/tests/Functional/json/dirs.proj
index aa0b104597..f0670bbe7f 100644
--- a/Release/tests/Functional/json/dirs.proj
+++ b/Release/tests/Functional/json/dirs.proj
@@ -8,6 +8,7 @@
+
diff --git a/Release/tests/Functional/pplx/pplx_test/VS11.xp/pplx110_test.xp.vcxproj b/Release/tests/Functional/pplx/pplx_test/VS11.xp/pplx110_test.xp.vcxproj
index 9d3ebb42f7..f5a2cb90ed 100644
--- a/Release/tests/Functional/pplx/pplx_test/VS11.xp/pplx110_test.xp.vcxproj
+++ b/Release/tests/Functional/pplx/pplx_test/VS11.xp/pplx110_test.xp.vcxproj
@@ -27,7 +27,7 @@
- {5115840E-A5A8-4044-B595-CDA05C2D65D0}
+ {5F853B89-AACA-4A7B-93A8-8F9A74DD73EA}
Win32Proj
HttpTests
SAK
@@ -198,7 +198,7 @@
{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
{0c9d50d9-94fb-4732-a4ad-58e068315bb2}
diff --git a/Release/tests/Functional/pplx/pplx_test/dirs.proj b/Release/tests/Functional/pplx/pplx_test/dirs.proj
index f8bdb81d81..ed9339fe7f 100644
--- a/Release/tests/Functional/pplx/pplx_test/dirs.proj
+++ b/Release/tests/Functional/pplx/pplx_test/dirs.proj
@@ -8,6 +8,7 @@
+
diff --git a/Release/tests/Functional/streams/VS11.xp/streams110_test.xp.vcxproj b/Release/tests/Functional/streams/VS11.xp/streams110_test.xp.vcxproj
index 597aa0c9bf..5ad85c3245 100644
--- a/Release/tests/Functional/streams/VS11.xp/streams110_test.xp.vcxproj
+++ b/Release/tests/Functional/streams/VS11.xp/streams110_test.xp.vcxproj
@@ -27,7 +27,7 @@
- {181CCB80-9AE8-4ED7-8B7D-4C0CBC80EEDD}
+ {77683C34-494E-4CB1-96C7-DA035D2E9ED8}
Win32Proj
HttpTests
SAK
@@ -178,13 +178,15 @@
-
-
-
-
+
+
+
+
+
+
Create
Create
Create
@@ -202,7 +204,7 @@
{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
diff --git a/Release/tests/Functional/streams/dirs.proj b/Release/tests/Functional/streams/dirs.proj
index ba1a806df0..7948c8622a 100644
--- a/Release/tests/Functional/streams/dirs.proj
+++ b/Release/tests/Functional/streams/dirs.proj
@@ -8,6 +8,7 @@
+
diff --git a/Release/tests/Functional/uri/VS11.xp/Uri110_test.xp.vcxproj b/Release/tests/Functional/uri/VS11.xp/Uri110_test.xp.vcxproj
index b276d6a4df..862b5f6bee 100644
--- a/Release/tests/Functional/uri/VS11.xp/Uri110_test.xp.vcxproj
+++ b/Release/tests/Functional/uri/VS11.xp/Uri110_test.xp.vcxproj
@@ -27,7 +27,7 @@
- {3D9C3F25-1736-4D39-A31F-6B2DE34E20CF}
+ {248328B2-88DA-4495-A9B0-567561463502}
SAK
SAK
SAK
@@ -195,7 +195,7 @@
{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
{0c9d50d9-94fb-4732-a4ad-58e068315bb2}
diff --git a/Release/tests/Functional/uri/dirs.proj b/Release/tests/Functional/uri/dirs.proj
index af6051e1d7..4692cdaf82 100644
--- a/Release/tests/Functional/uri/dirs.proj
+++ b/Release/tests/Functional/uri/dirs.proj
@@ -8,6 +8,7 @@
+
diff --git a/Release/tests/Functional/utils/VS11.xp/utils110_test.xp.vcxproj b/Release/tests/Functional/utils/VS11.xp/utils110_test.xp.vcxproj
index 2e827ac3ef..4415ce003f 100644
--- a/Release/tests/Functional/utils/VS11.xp/utils110_test.xp.vcxproj
+++ b/Release/tests/Functional/utils/VS11.xp/utils110_test.xp.vcxproj
@@ -27,7 +27,7 @@
- {77BD8C21-0E78-46AD-8420-09F36FC192AA}
+ {0A9F1C3A-A8F4-417B-AD25-DF0E2CE9B299}
SAK
SAK
SAK
@@ -189,7 +189,7 @@
{3EB86C0D-432C-4FFC-BAD4-8DF4EFC7D0FF}
- {90d85ff4-f0ae-4816-923f-0ef2758f30ab}
+ {4d9ed383-673b-4e48-a6af-6bd9f108150e}
{0c9d50d9-94fb-4732-a4ad-58e068315bb2}
diff --git a/Release/tests/Functional/utils/dirs.proj b/Release/tests/Functional/utils/dirs.proj
index 6050373814..06adb23b42 100644
--- a/Release/tests/Functional/utils/dirs.proj
+++ b/Release/tests/Functional/utils/dirs.proj
@@ -8,6 +8,7 @@
+