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

Author: stgates

Release/tests/functional/http/client/dirs.proj

@@ -8,20 +8,14 @@
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
       <ProjectFile Include="VS11\HttpClient110_test.vcxproj" />
+      <ProjectFile Include="VS11.winrt\HttpClient110_test.winrt.vcxproj" Condition="'$(OsVersion)'=='6.2' or '$(OsVersion)'=='6.3'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">
-      <ProjectFile Include="VS11.winrt\HttpClient110_test.winrt.vcxproj" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
       <ProjectFile Include="VS12\HttpClient120_test.vcxproj" />
+      <ProjectFile Include="VS12.winrt\HttpClient120_test.winrt.vcxproj" Condition="'$(OsVersion)'=='6.3'" />
   </ItemGroup>
 
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
-      <ProjectFile Include="VS12.winrt\HttpClient120_test.winrt.vcxproj" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
       <ProjectFile Include="VS14\HttpClient140_test.vcxproj" />
   </ItemGroup>

Release/tests/functional/http/client/vs11.xp/HttpClient110_test.xp.vcxproj

@@ -5,9 +5,6 @@
   <ItemGroup>
       <ProjectFile Include="utilities\dirs.proj"/>
       <ProjectFile Include="client\dirs.proj"/>
-  </ItemGroup>
-
-  <ItemGroup>
       <ProjectFile Include="listener\dirs.proj"/>
   </ItemGroup>
 

Release/tests/functional/http/dirs.proj

@@ -4,7 +4,6 @@
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
       <ProjectFile Include="VS11\HttpTestUtilities110.vcxproj" />
-      <ProjectFile Include="VS11.xp\HttpTestUtilities110.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">
@@ -13,7 +12,6 @@
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
       <ProjectFile Include="VS12\HttpTestUtilities120.vcxproj" />
-      <ProjectFile Include="VS12.xp\HttpTestUtilities120.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">