test

Author: ViktorHofer

eng/Build.props

@@ -1,5 +1,6 @@
 <Project>
 
+  <Import Project="$(MSBuildThisFileDirectory)Common.props" />
   <Import Project="$(MSBuildThisFileDirectory)Build\Directory.Build.props" />
 
   <Choose>

eng/Build/Directory.Build.props

@@ -1,11 +1,6 @@
 <Project>
 
-  <!-- Don't import repo infrastructure -->
-  <PropertyGroup>
-    <ImportDirectoryPackagesProps>false</ImportDirectoryPackagesProps>
-  </PropertyGroup>
-
-  <Import Project="..\Common.props" />
+  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.props, $(MSBuildThisFileDirectory)..))" />
 
   <!--
     @(RequiresDelayedBuild) projects can be extended many ways but this isn't fully automated because the new
@@ -15,7 +10,6 @@
     the format is correct) and undo any temporary changes. When complete, only BuildAfterTargetingPack.csproj and
     other @(RequiresDelayedBuild) projects should mention projects listed in RequiresDelayedBuildProjects.props.
   -->
-  <Import Project="..\RequiresDelayedBuildProjects.props" />
 
   <!-- These projects are always excluded, even when -projects is specified on command line. -->
   <ItemGroup>

eng/Build/Directory.Build.targets

@@ -103,4 +103,12 @@
                     Condition=" '$(BuildMainlyReferenceProviders)' == 'true' " />
   </ItemGroup>
 
+  <Target Name="GetReferencesProvided" Returns="@(ProvidesReferenceOrRequiresDelay)">
+    <MSBuild Projects="@(ProjectReference);@(ExplicitRequiresDelay)"
+             Targets="GetReferencesProvided"
+             BuildInParallel="true">
+      <Output TaskParameter="TargetOutputs" ItemName="ProvidesReferenceOrRequiresDelay" />
+    </MSBuild>
+  </Target>
+
 </Project>

eng/Build/Managed.Traversal.proj

@@ -1,25 +1,17 @@
-<Project>
-  <PropertyGroup>
-    <BuildManaged>true</BuildManaged>
-    <RepoRoot
-        Condition=" '$(RepoRoot)' == '' OR !HasTrailingSlash('$(RepoRoot)') ">$([MSBuild]::NormalizeDirectory('$(MSBuildThisFileDirectory)', '..'))</RepoRoot>
-  </PropertyGroup>
-
-  <Import Project="Build.props" />
+<Project Sdk="Microsoft.Build.NoTargets">
 
   <ItemGroup>
+    <GetReferencesProvidedProject Include="$(RepoRoot)eng\Build\Managed.Traversal.proj" />
     <ExplicitRequiresDelay Include="$(RepoRoot)eng\Npm.Workspace.FunctionalTests.nodeproj" />
   </ItemGroup>
 
   <Target Name="GenerateProjectList">
     <Message Importance="High" Text="Analyzing projects..." />
 
-    <MSBuild Projects="@(ProjectToBuild);@(ExplicitRequiresDelay)"
+    <MSBuild Projects="@(GetReferencesProvidedProject);@(ExplicitRequiresDelay)"
              Targets="GetReferencesProvided"
              BuildInParallel="true"
-             SkipNonexistentTargets="true"
-             SkipNonexistentProjects="true"
-             Properties="BuildMainlyReferenceProviders=true;RepoRoot=$(RepoRoot)">
+             Properties="BuildMainlyReferenceProviders=true">
       <Output TaskParameter="TargetOutputs" ItemName="_ProvidesReferenceOrRequiresDelay" />
     </MSBuild>
 

eng/CodeGen.proj

@@ -1,8 +1,5 @@
 <Project>
   <PropertyGroup>
-      <!-- The DotNetBuild property is set to true if in any kind of .NET product build (orchestrator, repo, or inner repo). -->
-    <DotNetBuild Condition="'$(DotNetBuild)' == '' and ('$(DotNetBuildInnerRepo)' == 'true' or '$(DotNetBuildRepo)' == 'true' or '$(DotNetBuildOrchestrator)' == 'true')">true</DotNetBuild>
-
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Windows'))">win</TargetOsName>
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('OSX'))">osx</TargetOsName>
     <TargetOsName Condition=" '$(TargetOsName)' == '' AND $([MSBuild]::IsOSPlatform('Linux'))">linux</TargetOsName>

eng/Common.props

@@ -29,6 +29,7 @@
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24564.1",
     "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24564.1",
+    "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
 }