rollback 1565534 and also fix build break

[tfs-changeset: 1565674]

diff --git a/src/ToolBox/SOS/dirs.proj b/src/ToolBox/SOS/dirs.proj
index 028d4c2..85bea0d 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 bd47b72..f506b3f 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 6eab028..9442381 100644 (file)
--- a/src/dirs.proj
+++ b/src/dirs.proj
@@ -23,7 +23,9 @@
     
     <!--The following projects will build during PHASE 1-->
     <ItemGroup Condition="'$(BuildExePhase)' == '1'">
-        <ProjectFile Include="inc\corguids.nativeproj" />
+        <ProjectFile Include="inc\corguids.nativeproj" >
+            <ProductGroups>FX;PK</ProductGroups>
+        </ProjectFile>
         <ProjectFile Include="format\format.nativeproj" />
         <ProjectFile Include="shimload\shimload.nativeproj" Condition="'$(BuildProjectName)' != 'CoreSys'"/>
         <ProjectFile Include="utilcode\dirs.proj" />
@@ -46,7 +48,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 21f2833..7cfd87c 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" />