Fix for Build Issue #785302:

tools were still not getting built for projectK build....fixed that. Verified on local machine using below command
msbuild /t:rebuild /p:ProductGroupsToBuild=PK dirs.proj

[tfs-changeset: 1565223]

diff --git a/src/ToolBox/SOS/dirs.proj b/src/ToolBox/SOS/dirs.proj
index 028d4c27cbbf48cdbfbf84b389e1208e04d39055..85bea0d39a7847a27f17df6dc45a8a615b4b30ad 100644 (file)
--- a/src/ToolBox/SOS/dirs.proj
+++ b/src/ToolBox/SOS/dirs.proj
@@ -9,6 +9,12 @@
     <BuildSysBinaries>true</BuildSysBinaries>
   </PropertyGroup>
 
+  <ItemDefinitionGroup>
+    <ProjectFile>
+      <ProductGroups>FX</ProductGroups>
+    </ProjectFile>
+  </ItemDefinitionGroup>
+
   <ItemGroup Condition="'$(BuildExePhase)' == '1'">
     <ProjectFile Include="strike\dirs.proj" />
   </ItemGroup>

diff --git a/src/ToolBox/dirs.proj b/src/ToolBox/dirs.proj
index bd47b7287515e01bbe526b35b3aca5c2a88d28af..f506b3fc0373d7a245d4a66e865f1f2966ee168a 100644 (file)
--- a/src/ToolBox/dirs.proj
+++ b/src/ToolBox/dirs.proj
@@ -64,7 +64,9 @@
     <ProjectFile Include="resview\resview.csproj" />
     <ProjectFile Include="runsxs\runsxs.nativeproj" />
     <ProjectFile Include="soapsuds\dirs.proj" />
-    <ProjectFile Include="sos\dirs.proj" />
+    <ProjectFile Include="sos\dirs.proj" >
+        <ProductGroups>FX;PK</ProductGroups>
+    </ProjectFile>
     <ProjectFile Include="storeadm\storeadm.csproj" />
     <ProjectFile Include="tlbexp\tlbexp_msbuild.csproj" />
     <ProjectFile Include="tlbguid\tlbguid.csproj" />

diff --git a/src/dirs.proj b/src/dirs.proj
index 6eab0285c75f0dc9dff39dfefc8080c0324d3a78..84b1e58128ee1f165817ed84ec4bc4f7551d47d3 100644 (file)
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -46,7 +46,9 @@
         <ProjectFile Include="jit32\dirs.proj" Condition="'$(BuildArchitecture)' != 'amd64' and '$(BuildArchitecture)' != 'arm64'" />
         <ProjectFile Include="jit64\dirs.proj" Condition="'$(BuildProjectName)' != 'CoreSys'" />
 
-        <ProjectFile Include="tools\dirs.proj" />
+        <ProjectFile Include="tools\dirs.proj" >
+            <ProductGroups>FX;PK</ProductGroups>
+        </ProjectFile>
         <ProjectFile Include="toolbox\dirs.proj" >
             <ProductGroups>FX;PK</ProductGroups>
         </ProjectFile>

diff --git a/src/tools/dirs.proj b/src/tools/dirs.proj
index 21f28331ca61f225a44cf7ea134de1e29f081206..7cfd87c248d8d96f98916a7adbcf75a1a7ab8caa 100644 (file)
--- a/src/tools/dirs.proj
+++ b/src/tools/dirs.proj
@@ -9,6 +9,12 @@
     <BuildSysBinaries>true</BuildSysBinaries>
   </PropertyGroup>
 
+  <ItemDefinitionGroup>
+    <ProjectFile>
+      <ProductGroups>FX</ProductGroups>
+    </ProjectFile>
+  </ItemDefinitionGroup>
+
   <!--The following projects will build during PHASE 1-->
   <ItemGroup Condition="'$(BuildExePhase)' == '1' and '$(FeatureCoreClr)' != 'true'">
     <ProjectFile Include="allocationsprofiler\allocationsprofiler.nativeproj" />