Merge branch 'development' of https://git01.codeplex.com/casablanca into development

Author: stgates

Build/Common.Build.settings

@@ -89,6 +89,9 @@
       <CompileAsManaged Condition="'$(CompileAsManagedDefault)' != ''">true</CompileAsManaged>
       <AdditionalOptions Condition="'$(DevToolsVersion)'=='140' And '$(ApplicationType)'!='Android'"> /d2notypeopt %(AdditionalOptions)</AdditionalOptions>
     </ClCompile>
+    <ResourceCompile>
+	  <AdditionalOptions>/DTARGET_NAME="$(TARGETNAME)" %(AdditionalOptions)</AdditionalOptions>
+    </ResourceCompile>
   </ItemDefinitionGroup>
 
   <ItemDefinitionGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'">
@@ -189,7 +192,7 @@
 
   <!--end paths configuration -->
   <Target Name="CopyToOutputDirectoryAlwaysError"
-          Condition="'@(Content)'!='' or '@(None)'!=''">
+         Condition="'@(Content)'!='' or '@(None)'!=''">
     <Error Condition="'%(Content.CopyToOutputDirectory)'=='Always'" Text="CopyToOutputDirectory is not allowed to be 'Always'.  Use 'PreserveNewest' instead." File="$(MSBuildProjectFile)" />
     <Error Condition="'%(None.CopyToOutputDirectory)'=='Always'" Text="CopyToOutputDirectory is not allowed to be 'Always'.  Use 'PreserveNewest' instead." File="$(MSBuildProjectFile)" />
   </Target>
@@ -222,7 +225,7 @@
   <!-- Remove all items from _ResolvedProjectReferencePaths that have non-default value for CopyToOutputDirectory   -->
   <Target Name="Cleanup_ResolvedProjectReferencePaths"
      BeforeTargets="ResolveAssemblyReferences"
-     Condition="'@(_ResolvedProjectReferencePaths)' != ''">
+    Condition="'@(_ResolvedProjectReferencePaths)' != ''">
     <Message Text="Before Cleanup_ResolvedProjectReferencePaths (CopyToOutputDirectory = %(CopyToOutputDirectory)): @(_ResolvedProjectReferencePaths)"
              Importance="Low" />
     <ItemGroup>

CONTRIBUTORS.txt

@@ -19,6 +19,7 @@ simonlep
 jracle
 gandziej 
 adish
+LeonidCSIT
 
 AutoDesk Inc.
 Cyrille Fauvel (cyrillef)

Release/include/cpprest/details/resource.h

@@ -0,0 +1,14 @@
+//{{NO_DEPENDENCIES}}
+// Microsoft Visual C++ generated include file.
+// Used by Resource.rc
+
+// Next default values for new objects
+// 
+#ifdef APSTUDIO_INVOKED
+#ifndef APSTUDIO_READONLY_SYMBOLS
+#define _APS_NEXT_RESOURCE_VALUE        101
+#define _APS_NEXT_COMMAND_VALUE         40001
+#define _APS_NEXT_CONTROL_VALUE         1001
+#define _APS_NEXT_SYMED_VALUE           101
+#endif
+#endif

Release/include/pplx/pplxtasks.h

@@ -1997,9 +1997,16 @@ namespace details
             }
             catch(...)
             {
-                // This exception could only have come from within the chore body. It should've been caught
-                // and the task should be canceled with exception. Swallow the exception here.
-                _ASSERTE(_HasUserException());
+                // The exception could have come from two places:
+                //   1. From the chore body, so it already should have been caught and canceled.
+                //      In this case swallow the exception.
+                //   2. From trying to actually schedule the task on the scheduler.
+                //      In this case cancel the task with the current exception, otherwise the
+                //      task will never be signaled leading to deadlock when waiting on the task.
+                if (!_HasUserException())
+                {
+                    _CancelWithException(std::current_exception());
+                }
             }
         }
 

Release/samples/BingRequest/BingRequest110.xp/BingRequest110.xp.vcxproj

@@ -2,11 +2,11 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup Condition="'$(Platform)' != 'ARM' and ('$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140')">
+  <ItemGroup Condition="'$(Platform)' != 'ARM' and ('$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140')">
       <ProjectFile Include="BingRequest$(DevToolsVersion)\BingRequest$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120'">
+  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
       <ProjectFile Include="BingRequest$(DevToolsVersion).xp\BingRequest$(DevToolsVersion).xp.vcxproj" Condition="'$(Platform)' != 'ARM' and '$(RunCodeAnalysis)'!='true'" />
   </ItemGroup>