Added dev14 to dirs.proj's

ras0219-msft · ras0219-msft · commit 3e37f3457030 · 2014-09-25T17:37:58.000-07:00
diff --git a/Release/samples/BingRequest/dirs.proj b/Release/samples/BingRequest/dirs.proj
@@ -2,12 +2,12 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
       <ProjectFile Include="BingRequest$(DevToolsVersion)\BingRequest$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(Platform)' != 'ARM' and '$(RunCodeAnalysis)'!='true'">
-    <ProjectFile Include="BingRequest$(DevToolsVersion).xp\BingRequest$(DevToolsVersion).xp.vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120'">
+      <ProjectFile Include="BingRequest$(DevToolsVersion).xp\BingRequest$(DevToolsVersion).xp.vcxproj" Condition="'$(Platform)' != 'ARM' and '$(RunCodeAnalysis)'!='true'" />
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/BlackJack/BlackJack_Client/dirs.proj b/Release/samples/BlackJack/BlackJack_Client/dirs.proj
@@ -2,7 +2,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
       <ProjectFile Include="BlackJack_Client$(DevToolsVersion)\BlackJack_Client$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
diff --git a/Release/samples/BlackJack/BlackJack_Server/dirs.proj b/Release/samples/BlackJack/BlackJack_Server/dirs.proj
@@ -2,7 +2,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
       <ProjectFile Include="BlackJack_Server$(DevToolsVersion)\BlackJack_Server$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
diff --git a/Release/samples/BlackJack/dirs.proj b/Release/samples/BlackJack/dirs.proj
@@ -7,12 +7,8 @@
       <ProjectFile Include="BlackJack_Server\dirs.proj"/>
   </ItemGroup>
 
-  <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
-      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient110.vcxproj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
-      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient120.vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' Or '$(DevToolsVersion)'=='120'">
+      <ProjectFile Include="BlackJack_UIClient\BlackJack_UIClient$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/CasaLens/dirs.proj b/Release/samples/CasaLens/dirs.proj
@@ -2,8 +2,8 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
-      <ProjectFile Include="CasaLens$(DevToolsVersion)\CasaLens$(DevToolsVersion).vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="CasaLens$(DevToolsVersion)\CasaLens$(DevToolsVersion).vcxproj" Condition="'$(Platform)' != 'ARM'" />
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/FacebookDemo/dirs.proj b/Release/samples/FacebookDemo/dirs.proj
@@ -2,12 +2,8 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
-      <ProjectFile Include="FacebookDemo110.vcxproj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
-      <ProjectFile Include="FacebookDemo120.vcxproj"/>
+  <ItemGroup Condition="'$(OsVersion)'=='6.2' and ('$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120')">
+      <ProjectFile Include="FacebookDemo$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/OAuth2Live/dirs.proj b/Release/samples/OAuth2Live/dirs.proj
@@ -2,7 +2,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup>
+  <ItemGroup Condition="'$(OsVersion)'=='6.2' and ('$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120')">
       <ProjectFile Include="OAuth2Live$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
diff --git a/Release/samples/Oauth1Client/dirs.proj b/Release/samples/Oauth1Client/dirs.proj
@@ -2,8 +2,8 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup  Condition="'$(Platform)' != 'ARM'">
-      <ProjectFile Include="Oauth1Client$(DevToolsVersion)\Oauth1Client$(DevToolsVersion).vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="Oauth1Client$(DevToolsVersion)\Oauth1Client$(DevToolsVersion).vcxproj" Condition="'$(Platform)' != 'ARM'" />
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/Oauth2Client/dirs.proj b/Release/samples/Oauth2Client/dirs.proj
@@ -2,8 +2,8 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup Condition="'$(Platform)' != 'ARM'">
-      <ProjectFile Include="Oauth2Client$(DevToolsVersion)\Oauth2Client$(DevToolsVersion).vcxproj"/>
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120' or '$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="Oauth2Client$(DevToolsVersion)\Oauth2Client$(DevToolsVersion).vcxproj" Condition="'$(Platform)' != 'ARM'" />
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/samples/SearchFile/dirs.proj b/Release/samples/SearchFile/dirs.proj
@@ -2,11 +2,7 @@
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
-  <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
-      <ProjectFile Include="SearchFile$(DevToolsVersion)\SearchFile$(DevToolsVersion).vcxproj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
+  <ItemGroup Condition="'$(DevToolsVersion)'=='110' Or '$(DevToolsVersion)'=='120' Or '$(DevToolsVersion)'=='140'">
       <ProjectFile Include="SearchFile$(DevToolsVersion)\SearchFile$(DevToolsVersion).vcxproj"/>
   </ItemGroup>
 
diff --git a/Release/samples/dirs.proj b/Release/samples/dirs.proj
@@ -7,10 +7,10 @@
     <ProjectFile Include="BlackJack\dirs.proj"/>
     <ProjectFile Include="Oauth1Client\dirs.proj"/>
     <ProjectFile Include="Oauth2Client\dirs.proj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120'">
     <ProjectFile Include="SearchFile\dirs.proj"/>
+    <ProjectFile Include="CasaLens\dirs.proj"/>
+    <ProjectFile Include="FacebookDemo\dirs.proj"/>
+    <ProjectFile Include="OAuth2Live\dirs.proj"/>
   </ItemGroup>
 
 <!-- Disabled for now, because this project doesn't support rebuild and clean targets.
@@ -19,18 +19,6 @@
   </ItemGroup>
 -->
 
-  <ItemGroup Condition="'$(OsVersion)'=='6.2' and ('$(DevToolsVersion)'=='110' or '$(DevToolsVersion)'=='120')">
-    <ProjectFile Include="OAuth2Live\dirs.proj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110'">
-    <ProjectFile Include="FacebookDemo\dirs.proj"/>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(Platform)' != 'ARM'">
-    <ProjectFile Include="CasaLens\dirs.proj"/>
-  </ItemGroup>
-  
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/src/dirs.proj b/Release/src/dirs.proj
@@ -3,29 +3,33 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), build.root))\Build\Common.Build.settings" />
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='110'">
-      <ProjectFile Include="build\casablanca110.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
-      <ProjectFile Include="build\casablanca110.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'" />
+      <ProjectFile Include="build\vs11\casablanca110.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
+      <ProjectFile Include="build\vs11.xp\casablanca110.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">
-      <ProjectFile Include="build\casablanca110.winrt.vcxproj" />
+      <ProjectFile Include="build\vs11.winrt\casablanca110.winrt.vcxproj" />
   </ItemGroup>
 
   <ItemGroup Condition="('$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110') and '$(Platform)'!='x64'">
-      <ProjectFile Include="build\casablanca110.wp8.vcxproj" />
+      <ProjectFile Include="build\vs11.wp8\casablanca110.wp8.vcxproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DevToolsVersion)'=='120'">
-      <ProjectFile Include="build\casablanca120.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
-      <ProjectFile Include="build\casablanca120.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'" />
+      <ProjectFile Include="build\vs12\casablanca120.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
+      <ProjectFile Include="build\vs12.xp\casablanca120.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|120' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
-      <ProjectFile Include="build\casablanca120.winrt.vcxproj" />
+      <ProjectFile Include="build\vs12.winrt\casablanca120.winrt.vcxproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120' and '$(Platform)'!='x64'">
-      <ProjectFile Include="build\casablanca120.wp81.vcxproj" />
+      <ProjectFile Include="build\vs12.wp81\casablanca120.wp81.vcxproj" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+    <ProjectFile Include="build\vs14\casablanca140.vcxproj" Condition="'$(Platform)'!='ARM' or '$(WindowsSDKDesktopARMSupport)' == 'true'" />
   </ItemGroup>
 
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
diff --git a/Release/tests/common/TestRunner/dirs.proj b/Release/tests/common/TestRunner/dirs.proj
@@ -10,6 +10,10 @@
       <ProjectFile Include="VS12\TestRunner120.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+    <ProjectFile Include="VS14\TestRunner140.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/common/UnitTestpp/dirs.proj b/Release/tests/common/UnitTestpp/dirs.proj
@@ -16,6 +16,11 @@
     <ProjectFile Include="VS12.winrt\UnitTestpp120.winrt.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+    <ProjectFile Include="VS14\UnitTestpp140.vcxproj"/>
+    <ProjectFile Include="VS14\TestUnitTestpp140.vcxproj"/>
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/common/utilities/dirs.proj b/Release/tests/common/utilities/dirs.proj
@@ -16,6 +16,10 @@
       <ProjectFile Include="VS12.winrt\CommonUtilities120.winrt.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+    <ProjectFile Include="VS14\CommonUtilities140.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/http/client/dirs.proj b/Release/tests/functional/http/client/dirs.proj
@@ -21,6 +21,10 @@
   <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>
   
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
diff --git a/Release/tests/functional/http/listener/dirs.proj b/Release/tests/functional/http/listener/dirs.proj
@@ -10,6 +10,10 @@
       <ProjectFile Include="VS12\HttpListener120_test.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\HttpListener140_test.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/http/utilities/dirs.proj b/Release/tests/functional/http/utilities/dirs.proj
@@ -13,12 +13,17 @@
 
   <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'">
       <ProjectFile Include="VS12.winrt\HttpTestUtilities120.winrt.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+    <ProjectFile Include="VS14\HttpTestUtilities140.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/json/dirs.proj b/Release/tests/functional/json/dirs.proj
@@ -20,6 +20,10 @@
       <ProjectFile Include="VS12.winrt\JSON120_test.winrt.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\JSON140_test.vcxproj" />
+  </ItemGroup>
+  
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/misc/atl_headers/dirs.proj b/Release/tests/functional/misc/atl_headers/dirs.proj
@@ -10,6 +10,10 @@
       <ProjectFile Include="VS12\header_test120.vcxproj" />
   </ItemGroup>
   
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\header_test140.vcxproj" />
+  </ItemGroup>
+  
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/pplx/pplx_test/dirs.proj b/Release/tests/functional/pplx/pplx_test/dirs.proj
@@ -12,6 +12,10 @@
       <ProjectFile Include="VS12.xp\pplx120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\pplx140_test.vcxproj" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.2|110' or '$(OsVersion)|$(DevToolsVersion)'=='6.3|110'">
       <ProjectFile Include="VS11.winrt\pplx110_test.winrt.vcxproj" />
   </ItemGroup>
diff --git a/Release/tests/functional/streams/dirs.proj b/Release/tests/functional/streams/dirs.proj
@@ -20,6 +20,10 @@
       <ProjectFile Include="VS12.winrt\streams120_test.winrt.vcxproj" />
   </ItemGroup>
   
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\streams140_test.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/uri/dirs.proj b/Release/tests/functional/uri/dirs.proj
@@ -20,6 +20,10 @@
       <ProjectFile Include="VS12.winrt\URI120_test.winrt.vcxproj" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\Uri140_test.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/utils/dirs.proj b/Release/tests/functional/utils/dirs.proj
@@ -16,6 +16,10 @@
       <ProjectFile Include="VS12.xp\Utils120_test.xp.vcxproj" Condition="'$(Platform)'!='ARM' and '$(RunCodeAnalysis)'!='true'"/>
   </ItemGroup>
   
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\Utils140_test.vcxproj" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(OsVersion)|$(DevToolsVersion)'=='6.3|120'">
       <ProjectFile Include="VS12.winrt\Utils120_test.winrt.vcxproj" />
   </ItemGroup>
diff --git a/Release/tests/functional/websockets/client/dirs.proj b/Release/tests/functional/websockets/client/dirs.proj
@@ -22,6 +22,9 @@
   </ItemGroup>
 -->
   
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="vs14\websocketsclient140_test.vcxproj" />
+  </ItemGroup>
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
diff --git a/Release/tests/functional/websockets/utilities/dirs.proj b/Release/tests/functional/websockets/utilities/dirs.proj
@@ -25,6 +25,10 @@
   </ItemGroup>
 -->
 
+  <ItemGroup Condition="'$(DevToolsVersion)'=='140'">
+      <ProjectFile Include="VS14\websockets_test_utilities140.vcxproj" />
+  </ItemGroup>
+
   <Import Project="$(TargetsPath)\Common.Build.Traversal.targets" />
 
 </Project>
