Move Generation filtering to build.proj

Add KeepProjectReference for Runtime.Loader projects.

Author: karajas

build.proj

@@ -169,10 +169,15 @@
           DependsOnTargets="FilterProjects;UpdateVersionsOnTestProjectJson"
           BeforeTargets="RestorePackages">
       <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's..." />
+      
+      <ItemGroup>
+        <GenerateForProject Include="src\tests.builds">
+          <UndefineProperties>%(Project.UndefineProperties);OSGroup</UndefineProperties>
+        </GenerateForProject>
+      </ItemGroup>
       <MSBuild Targets="GenerateAllTestProjectJsons"
-               Projects="src\tests.builds"
-               Properties="GenerateIndependentOfOSGroup=true"
-               />
+               Projects="@(GenerateForProject)"
+               /> 
       <Message Importance="High" Text="[$([System.DateTime]::Now.ToString('HH:mm:ss.ff'))] Generating Test project.json's...done" />
   </Target>
 

src/System.Runtime.Loader/tests/DefaultContext/System.Runtime.Loader.DefaultContext.Tests.csproj

@@ -19,6 +19,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <KeepProjectReference>true</KeepProjectReference>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

src/System.Runtime.Loader/tests/RefEmitLoadContext/System.Runtime.Loader.RefEmitLoadContext.Tests.csproj

@@ -15,6 +15,7 @@
       <ReferenceOutputAssembly>false</ReferenceOutputAssembly>
       <OutputItemType>content</OutputItemType>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <KeepProjectReference>true</KeepProjectReference>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.targets))\dir.targets" />

src/tests.builds

@@ -6,19 +6,12 @@
   </PropertyGroup>
 
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.props))\dir.props" />
-  <ItemGroup Condition="'$(GenerateIndependentOfOSGroup)' != 'true'">
+  <ItemGroup>
     <Project Include="*\tests\**\*.builds">
       <BuildAllOSGroups Condition="'$(OSGroup)' != '' OR '$(FilterToOSGroup)' != '' ">false</BuildAllOSGroups>
       <FilterToOSGroup Condition="'$(_OriginalOSGroup)' == '' AND '$(DontFilterOsGroup)' != 'true'">$(OSEnvironment)</FilterToOSGroup>
     </Project>
   </ItemGroup>
-  
-  <ItemGroup Condition="'$(GenerateIndependentOfOSGroup)' == 'true'">
-    <Project Include="*\tests\**\*.builds">
-      <BuildAllOSGroups>true</BuildAllOSGroups>
-      <UndefineProperties>OSGroup;FilterToOSGroup;</UndefineProperties>
-    </Project>
-  </ItemGroup>
 
   <Import Project="$(ToolsDir)versioning.targets" Condition="Exists('$(ToolsDir)versioning.targets')" />
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), dir.traversal.targets))\dir.traversal.targets" />