From b3cf5504174b7b17682820dd65168c62eb01e178 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 12:26:56 +0100
Subject: [PATCH 01/44] Enable restore for projects in libraries

Enabling project restore for ref and src projects
(any by that any others as well).
---
 eng/Analyzers.props                           |  2 +
 eng/Tools.props                               | 30 -----------
 eng/codeAnalysis.targets                      | 51 -------------------
 eng/restore/repoRestore.props                 | 31 -----------
 eng/restore/repoRestore.targets               | 34 -------------
 .../System.Private.CoreLib.csproj             |  2 +-
 src/libraries/Directory.Build.props           | 19 ++++---
 src/libraries/Directory.Build.targets         |  2 -
 .../restore/analyzers/analyzers.depproj       | 27 ----------
 src/libraries/restore/dirs.proj               |  3 --
 .../harvestPackages/harvestPackages.depproj   | 15 ++++--
 11 files changed, 25 insertions(+), 191 deletions(-)
 delete mode 100644 eng/codeAnalysis.targets
 delete mode 100644 eng/restore/repoRestore.props
 delete mode 100644 eng/restore/repoRestore.targets
 delete mode 100644 src/libraries/restore/analyzers/analyzers.depproj

diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index 534d38a5546ca3..fe07ec37c61b4a 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -1,6 +1,8 @@
 <Project>
   <PropertyGroup>
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset>
+    <!-- Disable using analyzers in sourcebuild -->
+    <EnableAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</EnableAnalyzers>
   </PropertyGroup>
   <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
diff --git a/eng/Tools.props b/eng/Tools.props
index 4c399288ad250f..a631b23be10f60 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,45 +1,15 @@
 <Project>
-  <PropertyGroup>
-    <MSBuildTreatWarningsAsErrors>false</MSBuildTreatWarningsAsErrors>
-    <EnableAnalyzers>true</EnableAnalyzers>
-  </PropertyGroup>
-
-  <!-- We need to import this props file which contains PackageReferences to analyzers so that
-       analyzer build assets are imported via the Tools generated props and targets -->
-  <Import Project="$(RepositoryEngineeringDir)Analyzers.props" Condition="Exists('$(RepositoryEngineeringDir)Analyzers.props') and '$(DotNetBuildFromSource)' != 'true'" />
-
-  <!-- source-built packages -->
   <ItemGroup>
-    <!-- arcade -->
-    <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
 
-    <!-- coreclr -->
     <!-- Download the package in the initial arcade restore step to work around race conditions when restoring an msbuild SDK. -->
     <PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
-
-    <!-- roslyn -->
-    <PackageReference Include="Microsoft.Net.Compilers.Toolset" Version="$(MicrosoftNetCompilersToolsetVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-
-    <!-- mono -->
-    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
-  </ItemGroup>
-
-  <!-- excluded from offline portion of source build -->
-  <ItemGroup Condition="'$(DotNetBuildOffline)' != 'true'">
-    <!-- arcade -->
-    <PackageReference Include="Microsoft.DotNet.GenAPI" Version="$(MicrosoftDotNetGenApiVersion)" />
   </ItemGroup>
 
   <!-- excluded from source build -->
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <PackageReference Include="Microsoft.DotNet.ApiCompat" Version="$(MicrosoftDotNetApiCompatVersion)" />
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
-
-    <!-- SourceLink -->
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)restore\docs.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
diff --git a/eng/codeAnalysis.targets b/eng/codeAnalysis.targets
deleted file mode 100644
index de4eb79cd35db1..00000000000000
--- a/eng/codeAnalysis.targets
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project>
-  <Import Condition="Exists($(AnalyzerPropsFile)) and '$(EnableAnalyzers)' == 'true'" Project="$(AnalyzerPropsFile)" />
-
-  <!-- This target is executed when building a project and EnableAnalyzers property is set to true. 
-  It will populate the Analyzer item that is passed to the compiler with the analyzers restored
-  as package references in Tools.props. Those analyzers will be saved in a props file -> artifacts\toolset\Common\Tools.Analyzers.props.
-  So in order to add a new analyzer just need to add a package reference in Tools.props to the package containing it.
-  *
-  This target also provides filtering for specific type of projects through to Items.
-  - <AnalyzersToInclude> will include only the specified analyzers and will ignore the others that where restored.
-  - <AnalyzersToExclude> will exclude the specified analyzers from the restored analyzers, but will preserve the others.
-  **The values in these Items are the name of the analyzers' dll.
-  **These to Items are mutually exclusive, so only 1 should be set at a time.
-  Example of usage:
-  <AnalyzersToInclude Condition="$(IsTestProject)" Include="Xunit.Analyzers" /> will only include Xunit analyzers.
-  <AnalyzersToExclude Condition="$(IsSourceProject)" Include="Xunit.Analyzers" /> will include all analyzers but Xunit analyzer. -->
-
-  <Target Name="CalculateAnalyzersForBuildTime">
-    <ItemGroup>
-      <Analyzer Include="@(ResolvedAnalyzer)" />
-    </ItemGroup>
-
-    <Warning Text="AnalyzersToExclude and AnalyzersToInclude shouldn't be set together, they are mutually exclusive." Condition="'@(AnalyzersToExclude)' != '' and '@(AnalyzersToInclude)' != ''" />
-
-    <ItemGroup Condition="'@(AnalyzersToExclude)' != '' or '@(AnalyzersToInclude)' != ''">
-      <_AnalyzersToFileName Include="@(Analyzer -> '%(FileName)')">
-        <OriginalIdentity>%(Identity)</OriginalIdentity>
-      </_AnalyzersToFileName>
-    </ItemGroup>
-
-    <ItemGroup Condition="'@(AnalyzersToExclude)' != ''">
-      <_AnalyzersToRemove Include="@(_AnalyzersToFileName)" Condition="'@(AnalyzersToExclude)' == '@(_AnalyzersToFileName)' and '%(Identity)' != ''" />
-      <Analyzer Remove="@(_AnalyzersToRemove -> '%(OriginalIdentity)')" />
-    </ItemGroup>
-
-    <ItemGroup Condition="'@(AnalyzersToInclude)' != ''">
-      <_AnalyzersToRemove Include="@(_AnalyzersToFileName)" Exclude="@(AnalyzersToInclude)" />
-      <_missingAnalyzersToInclude Include="@(AnalyzersToInclude)" Exclude="@(_AnalyzersToFileName)" />
-      <Analyzer Remove="@(_AnalyzersToRemove -> '%(OriginalIdentity)')" />
-    </ItemGroup>
-
-    <Error Text="Couldn't find analyzer to include with values: @(_missingAnalyzersToInclude)" Condition="'@(_missingAnalyzersToInclude)' != '' and '@(_missingAnalyzersToInclude)' != 'None'" />
-  </Target>
-
-  <PropertyGroup Condition="'$(EnableAnalyzers)' == 'true'">
-  	<ResolveReferencesDependsOn>
-  	  $(ResolveReferencesDependsOn);
-  	  CalculateAnalyzersForBuildTime;
-  	</ResolveReferencesDependsOn>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props
deleted file mode 100644
index 204c23d1de0b95..00000000000000
--- a/eng/restore/repoRestore.props
+++ /dev/null
@@ -1,31 +0,0 @@
-<Project TreatAsLocalProperty="ExcludeRestorePackageImports">
-
-  <PropertyGroup>
-    <!-- Need to set ProjectAssetsFile to something so it doesn't get set to the Tools.proj assets file when we import the generated props -->
-    <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == ''">unused</ProjectAssetsFile>
-    <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
-         non-determinism where first restore changes a subsequent restore,
-         but we need these since they define properties (like TargetFramework) needed by restore.
-         In this case we guarantee this is ok since these specific props are not restored by this project's restore. -->
-    <_excludeRestorePackageImports>$(ExcludeRestorePackageImports)</_excludeRestorePackageImports>
-    <ExcludeRestorePackageImports>false</ExcludeRestorePackageImports>
-  </PropertyGroup>
-  <Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.props" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.props')" />
-  <PropertyGroup>
-    <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == 'unused'" />
-    <ExcludeRestorePackageImports>$(_excludeRestorePackageImports)</ExcludeRestorePackageImports>
-  </PropertyGroup>
-
-  <!-- Enable the repo-restored analyzers -->
-  <PropertyGroup>
-    <AnalyzerPropsFile>$(ToolSetCommonDirectory)Tools.Analyzers.props</AnalyzerPropsFile>
-    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true'">true</EnableAnalyzers>
-  </PropertyGroup>
-  
-  <PropertyGroup>
-    <!-- Disable code paths that require project.assets.json files to be present or to be computed. -->
-    <GenerateDependencyFile>false</GenerateDependencyFile>
-    <ComputeNETCoreBuildOutputFiles>false</ComputeNETCoreBuildOutputFiles>
-    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets
deleted file mode 100644
index d99f198e1a5fbd..00000000000000
--- a/eng/restore/repoRestore.targets
+++ /dev/null
@@ -1,34 +0,0 @@
-<Project InitialTargets="_ClearResolvePackageAssets" TreatAsLocalProperty="ExcludeRestorePackageImports">
-  <PropertyGroup>
-    <!-- Disable restoring of package references in our projects -->
-    <RestoreProjectStyle Condition="'$(MSBuildProjectExtension)' != '.depproj'">Unknown</RestoreProjectStyle>
-  </PropertyGroup>
-
-  <Import Project="$(RepositoryEngineeringDir)codeAnalysis.targets" />
-
-  <PropertyGroup>
-    <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
-         non-determinism where first restore changes a subsequent restore,
-         but we need these since they define properties (like TargetFramework) needed by restore.
-         In this case we guarantee this is ok since these specific props are not restored by this project's restore. -->
-    <_excludeRestorePackageImports>$(ExcludeRestorePackageImports)</_excludeRestorePackageImports>
-    <ExcludeRestorePackageImports>false</ExcludeRestorePackageImports>
-  </PropertyGroup>
-  <Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets')" />
-  <PropertyGroup>
-    <ExcludeRestorePackageImports>$(_excludeRestorePackageImports)</ExcludeRestorePackageImports>
-  </PropertyGroup>
-  
-  <!--
-  Hack workaround for not restoring each project. Instead, we turn off all the targets
-  that require a `project.assets.json`, since ours will be empty anyway.
-  -->
-  <Target Name="_ClearResolvePackageAssets"
-          Condition="'$(MSBuildProjectExtension)' != '.depproj'">
-
-    <PropertyGroup>
-      <ResolvePackageDependenciesForBuildDependsOn></ResolvePackageDependenciesForBuildDependsOn>
-    </PropertyGroup>
-
-  </Target>
-</Project>
diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index 7e215d1ad72a8a..f0aed17c4ec839 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -60,7 +60,7 @@
     <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
     <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes>
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
-    <EnableAnalyzers>true</EnableAnalyzers>
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == ''">true</EnableAnalyzers>
   </PropertyGroup>
 
   <!-- Platform specific properties -->
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 4ff8a6be977978..4dd204b7ab23c3 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -119,12 +119,6 @@
     <IsShipping Condition="'$(IsTestProject)' == 'true'">false</IsShipping>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <EnableProjectRestore Condition="'$(IsTestProject)' == 'true'">true</EnableProjectRestore>
-  </PropertyGroup>
-
-  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
-
   <!-- Common repo directories -->
   <PropertyGroup>
     <!-- Need to try and keep the same logic as the native builds as we need this for packaging -->
@@ -146,6 +140,13 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.DotNet.GenAPI" Condition="'$(DotNetBuildOffline)' != 'true'" Version="$(MicrosoftDotNetGenApiVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <_runtimeOSVersionIndex>$(RuntimeOS.IndexOfAny(".-0123456789"))</_runtimeOSVersionIndex>
     <_runtimeOSFamily Condition="'$(_runtimeOSVersionIndex)' != '-1'">$(RuntimeOS.SubString(0, $(_runtimeOSVersionIndex)))</_runtimeOSFamily>
@@ -271,7 +272,7 @@
     <!-- We decided to keep this disabled by default to see some history of way have a look at https://github.com/dotnet/corefx/issues/3140 -->
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <GenFacadesIgnoreBuildAndRevisionMismatch>true</GenFacadesIgnoreBuildAndRevisionMismatch>
-    <EnableAnalyzers Condition="'$(EnableProjectRestore)' == 'true' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
   </PropertyGroup>
 
   <!-- Set up some common paths -->
@@ -349,6 +350,10 @@
     <ILLinkClearInitLocals Condition="'$(IsSourceProject)' == 'true' and '$(Language)' != 'VB'">true</ILLinkClearInitLocals>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
+  </ItemGroup>
+
   <PropertyGroup>
     <MonoRspFileName>mono.issues.rsp</MonoRspFileName>
   </PropertyGroup>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 659009ab0dbe2f..8ec6d2776118db 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -112,8 +112,6 @@
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
-  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
-
   <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
   <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
diff --git a/src/libraries/restore/analyzers/analyzers.depproj b/src/libraries/restore/analyzers/analyzers.depproj
deleted file mode 100644
index 27fad4d37cff1d..00000000000000
--- a/src/libraries/restore/analyzers/analyzers.depproj
+++ /dev/null
@@ -1,27 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <EnableAnalyzers>true</EnableAnalyzers>
-    <Language>C#</Language>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- 
-      Microsoft.CodeAnalysis.Common shouldn't be referenced directly but is needed by the analyzer depproj restore.
-      TODO: Remove when project restore is enabled for non test projects: https://github.com/dotnet/corefx/issues/41512.
-    -->
-    <PackageReference Include="Microsoft.CodeAnalysis.Common" Version="3.4.0-beta2-final" PrivateAssets="all" />
-  </ItemGroup>
-
-  <UsingTask TaskName="Microsoft.DotNet.Arcade.Sdk.SaveItems" AssemblyFile="$(ArcadeSdkBuildTasksAssembly)" />
-
-  <Target Name="GenerateAnalyzersPropsFile"
-          AfterTargets="ResolveLockFileAnalyzers">
-
-    <SaveItems Condition="'@(Analyzer)' != ''"
-               ItemName="ResolvedAnalyzer"
-               Items="@(Analyzer)"
-               File="$(AnalyzerPropsFile)" />
-  </Target>
-</Project>
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index d54794d38db3ee..fa95fe66739b98 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -2,9 +2,6 @@
   <Import Project="Directory.Build.props" />
 
   <ItemGroup>
-    <Project Condition="'$(DotNetBuildFromSource)' != 'true'" Include="analyzers/analyzers.depproj" />
-
-    <!-- Build for all configurations -->
     <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
     <Project Include="netstandard/netstandard.depproj" />
     <Project Include="netfx/netfx.depproj" />
diff --git a/src/libraries/restore/harvestPackages/harvestPackages.depproj b/src/libraries/restore/harvestPackages/harvestPackages.depproj
index 2ae20ecda6e67c..bead8306f5801f 100644
--- a/src/libraries/restore/harvestPackages/harvestPackages.depproj
+++ b/src/libraries/restore/harvestPackages/harvestPackages.depproj
@@ -1,6 +1,11 @@
 <Project InitialTargets="AddPackageDownload" Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <PackagingTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\</PackagingTaskAssembly>
+    <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(PackagingTaskAssembly)netcoreapp2.1\</PackagingTaskAssembly>
+    <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'core'">$(PackagingTaskAssembly)net472\</PackagingTaskAssembly>
+    <PackagingTaskAssembly>$(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll</PackagingTaskAssembly>
   </PropertyGroup>
 
   <Import Project="$(PkgDir)baseline/baseline.props" />
@@ -10,6 +15,7 @@
        for harvesting binaries & support. -->
   <Target Name="Build" DependsOnTargets="RestorePackages" />
 
+  <UsingTask TaskName="GetLastStablePackage" AssemblyFile="$(PackagingTaskAssembly)"/>
   <Target Name="AddPackageDownload">
     <ItemGroup>
       <_AllPkgProjs Include="$(LibrariesProjectRoot)*\pkg\**\*.pkgproj" />
@@ -20,10 +26,10 @@
     </ItemGroup>
 
     <GetLastStablePackage
-        LatestPackages="@(_AllPkgProjsToPackageIdentity)"
-        PackageIndexes="$(PackageIndexFile)"
-        DoNotAllowVersionsFromSameRelease="true">
-        <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" />
+      LatestPackages="@(_AllPkgProjsToPackageIdentity)"
+      PackageIndexes="$(PackageIndexFile)"
+      DoNotAllowVersionsFromSameRelease="true">
+      <Output TaskParameter="LastStablePackages" ItemName="_PackageDownload" />
     </GetLastStablePackage>
 
     <!-- Allow to override package download and versions in case there is already a PackageDownload set -->
@@ -40,5 +46,4 @@
       </PackageDownload>
     </ItemGroup>
   </Target>
-
 </Project>
\ No newline at end of file

From 0ce2d867bbfaab39c5492822c8e3e159c6631e3f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 12:33:58 +0100
Subject: [PATCH 02/44] Remove winrt.depproj

---
 .../ref/System.Runtime.WindowsRuntime.csproj  |  8 +++---
 .../src/System.Runtime.WindowsRuntime.csproj  | 27 ++++++++++---------
 src/libraries/restore/winrt/winrt.depproj     | 16 -----------
 3 files changed, 17 insertions(+), 34 deletions(-)
 delete mode 100644 src/libraries/restore/winrt/winrt.depproj

diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index 08655bbddfe08f..ba5269213c9de3 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -18,13 +18,11 @@
     <Compile Include="System.Runtime.WindowsRuntime.Manual.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
-    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
+  </ItemGroup>  
+  <ItemGroup>
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 60f7f32e4794b7..7fe3719388843a 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -15,18 +15,6 @@
     <GeneratePlatformNotSupportedAssemblyMessage>SR.PlatformNotSupported_WindowsRuntime</GeneratePlatformNotSupportedAssemblyMessage>
     <GeneratePlatformNotSupportedAssemblyWithGlobalPrefix>true</GeneratePlatformNotSupportedAssemblyWithGlobalPrefix>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
-    <ReferenceFromRuntime Include="System.Private.CoreLib" />
-    <Reference Include="mscorlib" />
-    <Reference Include="Windows" />
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
-  </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
-    <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
-    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
-    <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj" />
-    <ProjectReference Include="..\..\System.ObjectModel\src\System.ObjectModel.csproj" />
-  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
     <Compile Include="System\IO\StreamOperationAsyncResult.cs" />
     <Compile Include="System\Runtime\InteropServices\WindowsRuntime\MarshalingHelpers.cs" />
@@ -94,12 +82,25 @@
       <Link>Common\System\HexConverter.cs</Link>
     </Compile>
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <ReferenceFromRuntime Include="System.Private.CoreLib" />
+    <Reference Include="mscorlib" />
+    <Reference Include="Windows" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
+    <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
+    <ProjectReference Include="..\..\System.Runtime.Extensions\src\System.Runtime.Extensions.csproj" />
+    <ProjectReference Include="..\..\System.Runtime.InteropServices.WindowsRuntime\src\System.Runtime.InteropServices.WindowsRuntime.csproj" />
+    <ProjectReference Include="..\..\System.ObjectModel\src\System.ObjectModel.csproj" />
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <Reference Include="System.Runtime" />
     <Reference Include="System.IO" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Resources.ResourceManager" />
-    <ProjectReference Include="$(LibrariesProjectRoot)restore\winrt\winrt.depproj" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+  </ItemGroup>
 </Project>
diff --git a/src/libraries/restore/winrt/winrt.depproj b/src/libraries/restore/winrt/winrt.depproj
deleted file mode 100644
index fb99977c302e51..00000000000000
--- a/src/libraries/restore/winrt/winrt.depproj
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <AssemblyName>Windows</AssemblyName>
-    <TargetExt>.winmd</TargetExt>
-    <!-- don't binplace for netstandard since the netstandard ref path is used for API compat and assumed to be 
-         implemented by all frameworks that support it.  Instead require projectreference to this project -->
-    <BinPlaceRef Condition="'$(TargetsNetStandard)' != 'true'">true</BinPlaceRef>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <TargetFrameworks>netcoreapp3.0;$(netcoreappCurrent);netstandard1.0</TargetFrameworks>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT">
-      <Version>1.0.5</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From f16320d426424cd16092d5f2cae5bf4188653eab Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 12:43:43 +0100
Subject: [PATCH 03/44] Remove tools.depproj

---
 src/libraries/Directory.Build.props       |  1 -
 src/libraries/restore/dirs.proj           |  1 -
 src/libraries/restore/tools/tools.depproj | 18 ------------------
 3 files changed, 20 deletions(-)
 delete mode 100644 src/libraries/restore/tools/tools.depproj

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 4dd204b7ab23c3..40d5131b753df6 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -297,7 +297,6 @@
     <NetStandard20RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.0'))</NetStandard20RefPath>
     <NetStandard21RefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', 'netstandard2.1'))</NetStandard21RefPath>
     <NetFxRefPath>$([MSBuild]::NormalizeDirectory('$(RefRootPath)', '$(NetFrameworkCurrent)'))</NetFxRefPath>
-    <ILAsmToolPath>$([MSBuild]::NormalizeDirectory('$(ArtifactsToolsetDir)', 'ilasm'))</ILAsmToolPath>
 
     <!-- Helix properties -->
     <OSPlatformConfig>$(TargetOS).$(Platform).$(Configuration)</OSPlatformConfig>
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index fa95fe66739b98..5319074f8ac0e8 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -5,7 +5,6 @@
     <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
     <Project Include="netstandard/netstandard.depproj" />
     <Project Include="netfx/netfx.depproj" />
-    <Project Include="tools/tools.depproj" />
     <Project Include="harvestPackages/harvestPackages.depproj" />
     <Project Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
diff --git a/src/libraries/restore/tools/tools.depproj b/src/libraries/restore/tools/tools.depproj
deleted file mode 100644
index f2e32a3773b8b6..00000000000000
--- a/src/libraries/restore/tools/tools.depproj
+++ /dev/null
@@ -1,18 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputPath>$(ILAsmToolPath)</OutputPath>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <RuntimeIdentifier>$(ToolRuntimeRID)</RuntimeIdentifier>
-    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>$(MicrosoftNETCoreILAsmVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.ILDAsm">
-      <Version>$(MicrosoftNETCoreILAsmVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file

From 760517e0b079366b3795fb44eddda204893231e7 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 17:27:45 +0100
Subject: [PATCH 04/44] Enable upfront restore

---
 docs/coding-guidelines/project-guidelines.md  |  4 +--
 .../ref/System.Runtime.WindowsRuntime.csproj  |  6 ++--
 .../src/System.Runtime.WindowsRuntime.csproj  |  5 ++-
 src/libraries/build.proj                      |  5 +++
 src/libraries/dirs.proj                       |  8 ++---
 src/libraries/ref.builds                      | 14 --------
 src/libraries/ref.proj                        | 36 +++++++++++++++++++
 .../harvestPackages/harvestPackages.depproj   |  1 -
 src/libraries/{src.builds => src.proj}        | 28 +++++++++++++--
 src/libraries/tests.proj                      |  2 +-
 10 files changed, 79 insertions(+), 30 deletions(-)
 delete mode 100644 src/libraries/ref.builds
 create mode 100644 src/libraries/ref.proj
 rename src/libraries/{src.builds => src.proj} (50%)

diff --git a/docs/coding-guidelines/project-guidelines.md b/docs/coding-guidelines/project-guidelines.md
index e1ede65ea60b97..5ab9a76c1573fd 100644
--- a/docs/coding-guidelines/project-guidelines.md
+++ b/docs/coding-guidelines/project-guidelines.md
@@ -10,9 +10,9 @@ once before you can iterate and work on a given library project.
  - Netstandard Library - Copy to `bin\ref\netstandard2.0`
  - NetFx targeting pack - Copy to `bin\ref\net472`
 - Build targeting pack
- - Build src\ref.builds which builds all references assembly projects. For reference assembly project information see [ref](#ref)
+ - Build src\libraries\ref.proj which builds all references assembly projects. For reference assembly project information see [ref](#ref)
 - Build product
- - Build src\src.builds which builds all the source library projects. For source library project information see [src](#src).
+ - Build src\libraries\src.proj which builds all the source library projects. For source library project information see [src](#src).
 - Sign product
  - Build src\sign.proj
 
diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index ba5269213c9de3..bf76bc8b7162a1 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -18,11 +18,13 @@
     <Compile Include="System.Runtime.WindowsRuntime.Manual.cs" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetCoreApp)' == 'true'">
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
+    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
   </ItemGroup>  
-  <ItemGroup>
-    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
+  <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 7fe3719388843a..3bb4e5f644b6c0 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -86,6 +86,7 @@
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <Reference Include="mscorlib" />
     <Reference Include="Windows" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
@@ -98,9 +99,7 @@
     <Reference Include="System.IO" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Resources.ResourceManager" />
-    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
-  </ItemGroup>
-  <ItemGroup>
     <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+    <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 8da5cf9b63eb6e..31c687188cfd4d 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -19,6 +19,11 @@
     <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
       <_RestoreProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" Build="true" />
     </ItemGroup>
+
+    <ItemGroup>
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)ref.proj" Build="false" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)src.proj" Build="false" />
+    </ItemGroup>
     
     <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
       <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Build="false" />
diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index 2b9534d5965a81..e20c6bf49b70e7 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -7,18 +7,18 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <Project Include="ref.builds" />
+    <Project Include="ref.proj" />
     <Project Include="shims\generated\*.csproj" />
     <Project Include="Native\native-binplace.proj" />
-    <Project Include="src.builds" />
+    <Project Include="src.proj" />
     <Project Include="shims\manual\*.csproj" />
     <Project Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
     <Project Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
-    <Project Include="ref.builds" />
-    <Project Include="src.builds" />
+    <Project Include="ref.proj" />
+    <Project Include="src.proj" />
   </ItemGroup>
 
   <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
diff --git a/src/libraries/ref.builds b/src/libraries/ref.builds
deleted file mode 100644
index 9bef0a6e4edbab..00000000000000
--- a/src/libraries/ref.builds
+++ /dev/null
@@ -1,14 +0,0 @@
-<Project DefaultTargets="Build" >
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
-
-  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
-    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\ref\System.Utf8String.Experimental.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Project Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
-    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
-  </ItemGroup>
-
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
-</Project>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
new file mode 100644
index 00000000000000..f4f43e9bab1e2f
--- /dev/null
+++ b/src/libraries/ref.proj
@@ -0,0 +1,36 @@
+<Project InitialTargets="IncludeProjectReferences">
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
+  </PropertyGroup>
+
+  <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
+    <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\ref\System.Utf8String.Experimental.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <Project Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
+    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
+  </ItemGroup>
+
+  <Target Name="IncludeProjectReferences">
+    <ItemGroup>
+      <ProjectReference Include="@(Project)" />
+    </ItemGroup>
+  </Target>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(Project)"
+             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+
+    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
+    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
+  </Target>
+</Project>
diff --git a/src/libraries/restore/harvestPackages/harvestPackages.depproj b/src/libraries/restore/harvestPackages/harvestPackages.depproj
index bead8306f5801f..5e17770fec9d43 100644
--- a/src/libraries/restore/harvestPackages/harvestPackages.depproj
+++ b/src/libraries/restore/harvestPackages/harvestPackages.depproj
@@ -1,5 +1,4 @@
 <Project InitialTargets="AddPackageDownload" Sdk="Microsoft.NET.Sdk">
-
   <PropertyGroup>
     <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackagingTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\</PackagingTaskAssembly>
diff --git a/src/libraries/src.builds b/src/libraries/src.proj
similarity index 50%
rename from src/libraries/src.builds
rename to src/libraries/src.proj
index 5903b7fd7a10af..89d8739fccb7d4 100644
--- a/src/libraries/src.builds
+++ b/src/libraries/src.proj
@@ -1,5 +1,9 @@
-<Project DefaultTargets="Build" TreatAsLocalProperty="AdditionalBuildTargetFrameworks">
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
+<Project InitialTargets="IncludeProjectReferences">
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
+  </PropertyGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\src\System.Utf8String.Experimental.csproj" />
@@ -17,5 +21,23 @@
     <Project Include="$(DirectoryToBuild)\src\*.*proj" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
+  <Target Name="IncludeProjectReferences">
+    <ItemGroup>
+      <ProjectReference Include="@(Project)" />
+    </ItemGroup>
+  </Target>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(Project)"
+             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+
+    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
+    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
+  </Target>
 </Project>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index d47a26ac972b8b..687ceb49dfd338 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -3,7 +3,7 @@
   <Import Project="$(RepositoryEngineeringDir)coverage.props" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <PropertyGroup>
-    <TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
+    <TargetFramework>netcoreapp5.0</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(EnableCoverageSupport)' == 'true'">

From bf91cc2f4c9d54792341fa2a8a2e83c53ec11831 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 17:52:47 +0100
Subject: [PATCH 05/44] Stop flowing of package dependencies

---
 .../ref/System.Runtime.WindowsRuntime.csproj                  | 2 +-
 .../src/System.Runtime.WindowsRuntime.csproj                  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index bf76bc8b7162a1..e7f0ac3edc8056 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -24,7 +24,7 @@
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
   </ItemGroup>  
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>
diff --git a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
index 3bb4e5f644b6c0..147afba607288f 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/src/System.Runtime.WindowsRuntime.csproj
@@ -86,7 +86,7 @@
     <ReferenceFromRuntime Include="System.Private.CoreLib" />
     <Reference Include="mscorlib" />
     <Reference Include="Windows" />
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup Condition="'$(TargetFramework)' == '$(NetCoreAppCurrent)'">
     <ProjectReference Include="..\..\System.Runtime\src\System.Runtime.csproj" />
@@ -99,7 +99,7 @@
     <Reference Include="System.IO" />
     <Reference Include="System.Threading.Tasks" />
     <Reference Include="System.Resources.ResourceManager" />
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
   </ItemGroup>
 </Project>

From 2e0cb60fa6dc577c8ee7f9c07c5d174d70d8a86e Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 18:49:03 +0100
Subject: [PATCH 06/44] Merge illink.tasks packageref with others

---
 src/libraries/Directory.Build.props | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 40d5131b753df6..bc5e2dd3c46323 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -145,6 +145,7 @@
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.GenAPI" Condition="'$(DotNetBuildOffline)' != 'true'" Version="$(MicrosoftDotNetGenApiVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
   </ItemGroup>
 
   <PropertyGroup>
@@ -349,10 +350,6 @@
     <ILLinkClearInitLocals Condition="'$(IsSourceProject)' == 'true' and '$(Language)' != 'VB'">true</ILLinkClearInitLocals>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="illink.tasks" Version="$(ILLinkTasksVersion)" PrivateAssets="all" IsImplicitlyDefined="true" ExcludeAssets="build" GeneratePathProperty="true" />
-  </ItemGroup>
-
   <PropertyGroup>
     <MonoRspFileName>mono.issues.rsp</MonoRspFileName>
   </PropertyGroup>

From 6f9d3051beb2fafd92592e6593944a2bdd9f2880 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 18:51:56 +0100
Subject: [PATCH 07/44] Update TargetFramework.Sdk

---
 eng/Version.Details.xml | 4 ++--
 global.json             | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index e2b20bc565a85c..96ff375758d9e7 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -42,9 +42,9 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20153.1">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Version="5.0.0-beta.20155.2">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
+      <Sha>bc4fa8e7149769db4efd466f160417a32b11f0bf</Sha>
     </Dependency>
     <Dependency Name="Microsoft.DotNet.RemoteExecutor" Version="5.0.0-beta.20153.1">
       <Uri>https://github.com/dotnet/arcade</Uri>
diff --git a/global.json b/global.json
index 5960e0e52784cf..0a18bc20c02fc6 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20153.1",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20155.2",
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20153.1",

From b80e055121b0de14098d74d93e3e7cd9997c7e85 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 19:23:24 +0100
Subject: [PATCH 08/44] Error task cleanup in composits

---
 src/libraries/ref.proj   | 3 ---
 src/libraries/src.proj   | 3 ---
 src/libraries/tests.proj | 3 ---
 3 files changed, 9 deletions(-)

diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index f4f43e9bab1e2f..27cbe4255da134 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -29,8 +29,5 @@
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
 </Project>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 89d8739fccb7d4..4406b4d56c54bf 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -36,8 +36,5 @@
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
 </Project>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 687ceb49dfd338..036d05940884fc 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -48,9 +48,6 @@
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
 
   <Target Name="Test" DependsOnTargets="TestAllProjects" />

From 6db735c753a684877333a9107419ac1ae39d3b01 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 19:25:50 +0100
Subject: [PATCH 09/44] Add comments for Target ordering

---
 src/libraries/ref.proj   | 1 +
 src/libraries/src.proj   | 1 +
 src/libraries/tests.proj | 1 +
 3 files changed, 3 insertions(+)

diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 27cbe4255da134..234d127e3613fc 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -22,6 +22,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 4406b4d56c54bf..44ddaa8922dd97 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -29,6 +29,7 @@
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 036d05940884fc..16bab33f5c03b7 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -41,6 +41,7 @@
   <Import Project="$(RepositoryEngineeringDir)coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
+  <!-- Ordering matters! Overwriting the Build and Test target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"

From 0202258cc8d6dffedf642a014003b9e4ee661d10 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 19:36:33 +0100
Subject: [PATCH 10/44] Set composit tfms to BuildTargetFramework

---
 src/libraries/ref.proj   | 2 +-
 src/libraries/src.proj   | 2 +-
 src/libraries/tests.proj | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 234d127e3613fc..e06322483cc7a7 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -2,7 +2,7 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 44ddaa8922dd97..288710e0e0f26c 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -2,7 +2,7 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(RuntimeFlavor)' == 'Mono'"> 
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 16bab33f5c03b7..afbaacf6c5c570 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -3,7 +3,7 @@
   <Import Project="$(RepositoryEngineeringDir)coverage.props" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp5.0</TargetFramework>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(EnableCoverageSupport)' == 'true'">

From 7b063a12c974a18af2148d6dde97b8558b85e678 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Thu, 5 Mar 2020 23:27:19 +0100
Subject: [PATCH 11/44] Disable project restore for others

---
 eng/restore/repoRestore.props                 | 31 ++++++++++++++++++
 eng/restore/repoRestore.targets               | 32 +++++++++++++++++++
 src/libraries/Directory.Build.props           |  6 ++++
 src/libraries/Directory.Build.targets         |  1 +
 .../ref/System.Runtime.WindowsRuntime.csproj  |  2 +-
 5 files changed, 71 insertions(+), 1 deletion(-)
 create mode 100644 eng/restore/repoRestore.props
 create mode 100644 eng/restore/repoRestore.targets

diff --git a/eng/restore/repoRestore.props b/eng/restore/repoRestore.props
new file mode 100644
index 00000000000000..3d6a393519d7f1
--- /dev/null
+++ b/eng/restore/repoRestore.props
@@ -0,0 +1,31 @@
+<Project TreatAsLocalProperty="ExcludeRestorePackageImports">
+
+  <PropertyGroup>
+    <!-- Need to set ProjectAssetsFile to something so it doesn't get set to the Tools.proj assets file when we import the generated props -->
+    <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == ''">unused</ProjectAssetsFile>
+    <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
+         non-determinism where first restore changes a subsequent restore,
+         but we need these since they define properties (like TargetFramework) needed by restore.
+         In this case we guarantee this is ok since these specific props are not restored by this project's restore. -->
+    <_excludeRestorePackageImports>$(ExcludeRestorePackageImports)</_excludeRestorePackageImports>
+    <ExcludeRestorePackageImports>false</ExcludeRestorePackageImports>
+  </PropertyGroup>
+  <Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.props" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.props')" />
+  <PropertyGroup>
+    <ProjectAssetsFile Condition="'$(ProjectAssetsFile)' == 'unused'" />
+    <ExcludeRestorePackageImports>$(_excludeRestorePackageImports)</ExcludeRestorePackageImports>
+  </PropertyGroup>
+
+  <!-- Enable the repo-restored analyzers -->
+  <PropertyGroup>
+    <AnalyzerPropsFile>$(ToolSetCommonDirectory)Tools.Analyzers.props</AnalyzerPropsFile>
+    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true'">true</EnableAnalyzers>
+  </PropertyGroup>
+  
+  <PropertyGroup>
+    <!-- Disable code paths that require project.assets.json files to be present or to be computed. -->
+    <GenerateDependencyFile>false</GenerateDependencyFile>
+    <ComputeNETCoreBuildOutputFiles>false</ComputeNETCoreBuildOutputFiles>
+    <GenerateRuntimeConfigurationFiles>false</GenerateRuntimeConfigurationFiles>
+  </PropertyGroup>
+</Project>
diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets
new file mode 100644
index 00000000000000..a430b67fee1fff
--- /dev/null
+++ b/eng/restore/repoRestore.targets
@@ -0,0 +1,32 @@
+<Project InitialTargets="_ClearResolvePackageAssets" TreatAsLocalProperty="ExcludeRestorePackageImports">
+  <PropertyGroup>
+    <!-- Disable restoring of package references in our projects -->
+    <RestoreProjectStyle Condition="'$(MSBuildProjectExtension)' != '.depproj'">Unknown</RestoreProjectStyle>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
+         non-determinism where first restore changes a subsequent restore,
+         but we need these since they define properties (like TargetFramework) needed by restore.
+         In this case we guarantee this is ok since these specific props are not restored by this project's restore. -->
+    <_excludeRestorePackageImports>$(ExcludeRestorePackageImports)</_excludeRestorePackageImports>
+    <ExcludeRestorePackageImports>false</ExcludeRestorePackageImports>
+  </PropertyGroup>
+  <Import Project="$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets" Condition="Exists('$(ToolSetCommonDirectory)Tools.proj.nuget.g.targets')" />
+  <PropertyGroup>
+    <ExcludeRestorePackageImports>$(_excludeRestorePackageImports)</ExcludeRestorePackageImports>
+  </PropertyGroup>
+  
+  <!--
+  Hack workaround for not restoring each project. Instead, we turn off all the targets
+  that require a `project.assets.json`, since ours will be empty anyway.
+  -->
+  <Target Name="_ClearResolvePackageAssets"
+          Condition="'$(MSBuildProjectExtension)' != '.depproj'">
+
+    <PropertyGroup>
+      <ResolvePackageDependenciesForBuildDependsOn></ResolvePackageDependenciesForBuildDependsOn>
+    </PropertyGroup>
+
+  </Target>
+</Project>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index bc5e2dd3c46323..51fd7617cb79a1 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -336,6 +336,12 @@
   <!-- Import it at the end of the props file to override the OutputPath for reference assemblies and use common directory props -->
   <Import Project="$(RepositoryEngineeringDir)referenceAssemblies.props" />
 
+  <PropertyGroup>
+    <EnableProjectRestore Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsTestProject)' == 'true'">true</EnableProjectRestore>
+  </PropertyGroup>
+
+  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
+
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
     <EmbedUntrackedSources>true</EmbedUntrackedSources>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 8ec6d2776118db..f019b5bd21a6af 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -112,6 +112,7 @@
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
+  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
   <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
   <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
diff --git a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
index e7f0ac3edc8056..ee65f5e9eff934 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/ref/System.Runtime.WindowsRuntime.csproj
@@ -22,7 +22,7 @@
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />
     <ProjectReference Include="..\..\System.Runtime\ref\System.Runtime.csproj" />
     <ProjectReference Include="..\..\System.Runtime.Extensions\ref\System.Runtime.Extensions.csproj" />
-  </ItemGroup>  
+  </ItemGroup>
   <ItemGroup Condition="'$(TargetsNetStandard)' == 'true'">
     <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
     <ProjectReference Include="..\..\mscorlib.WinRT-Facade\ref\mscorlib.WinRT-Facade.csproj" />

From c095003c56c5105944752e8d98c8d68bf5337963 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 14:38:21 +0100
Subject: [PATCH 12/44] Fix analyzers and build references in P2P

---
 eng/Analyzers.props                           |  5 ++-
 src/libraries/Directory.Build.props           |  2 +-
 .../src/Microsoft.VisualBasic.Core.vbproj     |  2 +
 src/libraries/build.proj                      |  7 +---
 src/libraries/dirs.proj                       | 39 ++++++++++++-------
 src/libraries/pretest.proj                    |  6 +--
 src/libraries/ref.proj                        | 14 ++-----
 src/libraries/shims/Directory.Build.props     |  4 ++
 src/libraries/src.proj                        | 20 ++++------
 src/libraries/tests.proj                      | 24 +++++-------
 10 files changed, 58 insertions(+), 65 deletions(-)

diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index fe07ec37c61b4a..5057056e74fd99 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -1,11 +1,12 @@
 <Project>
   <PropertyGroup>
     <CodeAnalysisRuleset>$(MSBuildThisFileDirectory)CodeAnalysis.ruleset</CodeAnalysisRuleset>
-    <!-- Disable using analyzers in sourcebuild -->
+    <!-- Disable analyzers in sourcebuild -->
     <EnableAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</EnableAnalyzers>
   </PropertyGroup>
   <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
-    <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <!-- Analyzer wasn't running and errors need to be fixed: https://github.com/dotnet/runtime/issues/33286. -->
+    <!-- <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> -->
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113" PrivateAssets="all" />
   </ItemGroup>
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 51fd7617cb79a1..01957c1fe69ac0 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -270,7 +270,7 @@
     <Features>strict;nullablePublicOnly</Features>
     <WarningLevel>4</WarningLevel>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-    <!-- We decided to keep this disabled by default to see some history of way have a look at https://github.com/dotnet/corefx/issues/3140 -->
+    <!-- We decided to keep this disabled by default: https://github.com/dotnet/runtime/issues/15152 -->
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
     <GenFacadesIgnoreBuildAndRevisionMismatch>true</GenFacadesIgnoreBuildAndRevisionMismatch>
     <EnableAnalyzers Condition="'$(EnableAnalyzers)' == '' and '$(IsSourceProject)' == 'true' and '$(MSBuildProjectExtension)' != '.ilproj'">true</EnableAnalyzers>
diff --git a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
index 436ecca9fbe2d5..e8774341649cad 100644
--- a/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
+++ b/src/libraries/Microsoft.VisualBasic.Core/src/Microsoft.VisualBasic.Core.vbproj
@@ -18,6 +18,8 @@
     <RootNamespace />
     <!-- Disable this as it seems to break windows builds for now. -->
     <DocumentationFile />
+    <!-- No plans to fix the analyzer issues. -->
+    <EnableAnalyzers>false</EnableAnalyzers>
     <TargetFrameworks>$(NetCoreAppCurrent);$(NetCoreAppCurrent)-Windows_NT</TargetFrameworks>
   </PropertyGroup>
   <ItemGroup Condition="'$(TargetsWindows)' == 'true'">
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 31c687188cfd4d..1a0a2d9de34d5b 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -21,13 +21,10 @@
     </ItemGroup>
 
     <ItemGroup>
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)ref.proj" Build="false" />
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)src.proj" Build="false" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" Build="false" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" Build="false" />
     </ItemGroup>
     
-    <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Build="false" />
-    </ItemGroup>
 
     <MSBuild Projects="@(_RestoreProjects)" Targets="Restore" Properties="$(ProjectProperties)" />
     <MSBuild Projects="@(_RestoreProjects)" Condition="'%(Build)' != 'false'" Properties="$(ProjectProperties)" />
diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index e20c6bf49b70e7..d818329488a4d7 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -1,26 +1,37 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <!-- required to build the projects in their specified order -->
   <PropertyGroup>
-    <SerializeProjects>true</SerializeProjects>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <Project Include="ref.proj" />
-    <Project Include="shims\generated\*.csproj" />
-    <Project Include="Native\native-binplace.proj" />
-    <Project Include="src.proj" />
-    <Project Include="shims\manual\*.csproj" />
-    <Project Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
-    <Project Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
+    <ProjectReference Include="ref.proj" />
+    <ProjectReference Include="shims\generated\*.csproj" />
+    <ProjectReference Include="Native\native-binplace.proj" />
+    <ProjectReference Include="src.proj" />
+    <ProjectReference Include="shims\manual\*.csproj" />
+    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
+    <ProjectReference Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
-    <Project Include="ref.proj" />
-    <Project Include="src.proj" />
+    <ProjectReference Include="ref.proj" />
+    <ProjectReference Include="src.proj" />
   </ItemGroup>
 
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
-</Project>
\ No newline at end of file
+  <!--
+    Ordering matters! Overwriting the Build target after the Sdk.targets import.
+    BuildInParallel false is required to build the projects in their specified order.
+  -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             BuildInParallel="false"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
+</Project>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index 317bf140a39af2..f7ce15204237b4 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -58,6 +58,7 @@
       <_TestProjectRootDir>$(LibrariesProjectRoot)</_TestProjectRootDir>
       <_TestProjectRootDir Condition="'$(DirectoryToBuild)'!=''">$(DirectoryToBuild)</_TestProjectRootDir>
     </PropertyGroup>
+
     <ItemGroup>
       <!-- Keep in sync with pattern for test projects in tests.proj -->
       <TestProjects Include="$(_TestProjectRootDir)*\tests\**\*.Tests.csproj" />
@@ -73,15 +74,10 @@
   <Target Name="Build"
           Condition="'$(SkipPrepareTest)' != 'true'"
           DependsOnTargets="GenerateLaunchSettingsFiles;GenerateTestSharedFrameworkDepsFile;GenerateFileVersionProps">
-
     <MSBuild Targets="Build"
              Projects="@(Project)"
              Properties="TargetFramework=$(BuildTargetFramework);%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
-
   </Target>
 </Project>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index e06322483cc7a7..48c6046377fbd2 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -1,4 +1,4 @@
-<Project InitialTargets="IncludeProjectReferences">
+<Project>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
@@ -10,23 +10,17 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Project Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
-    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
+    <ProjectReference Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
   </ItemGroup>
 
-  <Target Name="IncludeProjectReferences">
-    <ItemGroup>
-      <ProjectReference Include="@(Project)" />
-    </ItemGroup>
-  </Target>
-
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
   <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 790b6126ca80de..943614ecbf2a98 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <EnableProjectRestore>true</EnableProjectRestore>
+  </PropertyGroup>
+
   <Import Project="..\Directory.Build.props" />
 
   <Import Project="netfxreference.props" />
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 288710e0e0f26c..5b773f6123cc4a 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -1,4 +1,4 @@
-<Project InitialTargets="IncludeProjectReferences">
+<Project>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
@@ -10,30 +10,24 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.csproj" Exclude="@(ProjectExclusions)" />
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.ilproj" Exclude="@(ProjectExclusions)" />
-    <Project Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.csproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.ilproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\src\*.vbproj" Exclude="@(ProjectExclusions)" />
     <!-- Explicitly include the runtime.depproj project here to correctly set up the test host. -->
-    <Project Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)restore\runtime\runtime.depproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
-    <Project Include="$(DirectoryToBuild)\src\*.*proj" />
+    <ProjectReference Include="$(DirectoryToBuild)\src\*.*proj" />
   </ItemGroup>
 
-  <Target Name="IncludeProjectReferences">
-    <ItemGroup>
-      <ProjectReference Include="@(Project)" />
-    </ItemGroup>
-  </Target>
-
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   
   <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index afbaacf6c5c570..bc11df70284540 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -1,4 +1,4 @@
-<Project InitialTargets="IncludeProjectReferences">
+<Project>
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
   <Import Project="$(RepositoryEngineeringDir)coverage.props" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
@@ -14,22 +14,16 @@
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' != 'true'">
     <!-- We currently only test with C# projects. -->
-    <Project Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\**\*.Tests.csproj" />
-    <Project Condition="'$(SkipTestRestore)' != 'true' and '$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" Exclude="@(ProjectExclusions)" />
-    <Project Condition="'$(SkipTestRestore)' == 'true' and '$(DirectoryToBuild)' == ''" Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
-    <Project Remove="$(CommonTestPath)System\Net\Prerequisites\**\*.csproj" />
+    <ProjectReference Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\**\*.Tests.csproj" />
+    <ProjectReference Condition="'$(SkipTestRestore)' != 'true' and '$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\tests\**\*.Tests.csproj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Condition="'$(SkipTestRestore)' == 'true' and '$(DirectoryToBuild)' == ''" Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
+    <ProjectReference Remove="$(CommonTestPath)System\Net\Prerequisites\**\*.csproj" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(BuildAllConfigurations)' == 'true'">
-    <Project Include="$(MSBuildThisFileDirectory)pkg\test\testPackages.proj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)pkg\test\testPackages.proj" />
   </ItemGroup>
 
-  <Target Name="IncludeProjectReferences">
-    <ItemGroup>
-      <ProjectReference Include="@(Project)" />
-    </ItemGroup>
-  </Target>
-
   <Target Name="GenerateCoverageReport"
           Condition="'$(EnableCoverageSupport)' == 'true' and '$(SkipCoverageReport)' != 'true'"
           AfterTargets="TestAllProjects"
@@ -45,7 +39,7 @@
   <Target Name="Build" DependsOnTargets="BuildAllProjects" />
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
@@ -56,13 +50,13 @@
     <!-- To Serialize we use msbuild's batching functionality '%' to force it to batch all similar projects with the same identity
          however since the project names are unique it will essentially force each to run in its own batch -->
     <MSBuild Targets="Test"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' == 'true' and '%(Identity)' != ''"
              Properties="TestAllProjects=true"
              ContinueOnError="ErrorAndContinue" />
 
     <MSBuild Targets="Test"
-             Projects="@(Project)"
+             Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' != 'true'"
              Properties="TestAllProjects=true"
              BuildInParallel="true"

From 7eb863eaf1ad3be643db030ae93f9525e0c7c46d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 16:35:45 +0100
Subject: [PATCH 13/44] Reenable codeanalysis package

---
 eng/Analyzers.props | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/eng/Analyzers.props b/eng/Analyzers.props
index 5057056e74fd99..034bb1b8e49c6c 100644
--- a/eng/Analyzers.props
+++ b/eng/Analyzers.props
@@ -5,8 +5,7 @@
     <EnableAnalyzers Condition="'$(DotNetBuildFromSource)' == 'true'">false</EnableAnalyzers>
   </PropertyGroup>
   <ItemGroup Condition="'$(EnableAnalyzers)' == 'true'">
-    <!-- Analyzer wasn't running and errors need to be fixed: https://github.com/dotnet/runtime/issues/33286. -->
-    <!-- <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" /> -->
+    <PackageReference Include="Microsoft.DotNet.CodeAnalysis" Version="$(MicrosoftDotNetCodeAnalysisVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8" PrivateAssets="all" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.113" PrivateAssets="all" />
   </ItemGroup>

From 964fb2fcd05cb76885d0ba6cb171ce155e8d7033 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 18:32:14 +0100
Subject: [PATCH 14/44] Fix casing of PInvokeAnalyzerException file

---
 ...ist.analyzerdata => PinvokeAnalyzerExceptionList.analyzerdata} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/libraries/System.Net.Http/src/{PInvokeAnalyzerExceptionList.analyzerdata => PinvokeAnalyzerExceptionList.analyzerdata} (100%)

diff --git a/src/libraries/System.Net.Http/src/PInvokeAnalyzerExceptionList.analyzerdata b/src/libraries/System.Net.Http/src/PinvokeAnalyzerExceptionList.analyzerdata
similarity index 100%
rename from src/libraries/System.Net.Http/src/PInvokeAnalyzerExceptionList.analyzerdata
rename to src/libraries/System.Net.Http/src/PinvokeAnalyzerExceptionList.analyzerdata

From 317a4360593798a0c1793c157208b02d9a50b737 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 21:07:09 +0100
Subject: [PATCH 15/44] Update global.json

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 0a18bc20c02fc6..50da51a14c9d18 100644
--- a/global.json
+++ b/global.json
@@ -12,7 +12,7 @@
     "python": "2.7.15"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20155.2",
+    "Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk": "5.0.0-beta.20156.4",
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Build.Tasks.SharedFramework.Sdk": "5.0.0-beta.20153.1",
     "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20153.1",

From 99074d85140fbf41be86189280e0d9b0d004c14c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 21:08:22 +0100
Subject: [PATCH 16/44] Update Versions.props

---
 eng/Versions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Versions.props b/eng/Versions.props
index e7bd40414e24d9..1a3c54201de72b 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -60,7 +60,7 @@
     <!-- Arcade dependencies -->
     <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20153.1</MicrosoftDotNetApiCompatVersion>
     <MicrosoftDotNetBuildTasksFeedVersion>5.0.0-beta.20153.1</MicrosoftDotNetBuildTasksFeedVersion>
-    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20153.1</MicrosoftDotNetCodeAnalysisVersion>
+    <MicrosoftDotNetCodeAnalysisVersion>5.0.0-beta.20156.4</MicrosoftDotNetCodeAnalysisVersion>
     <MicrosoftDotNetGenAPIVersion>5.0.0-beta.20153.1</MicrosoftDotNetGenAPIVersion>
     <MicrosoftDotNetGenFacadesVersion>5.0.0-beta.20153.1</MicrosoftDotNetGenFacadesVersion>
     <MicrosoftDotNetXUnitExtensionsVersion>5.0.0-beta.20153.1</MicrosoftDotNetXUnitExtensionsVersion>

From 9522d8436da6431c6b486ab8edd215544a4dd925 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Fri, 6 Mar 2020 21:10:20 +0100
Subject: [PATCH 17/44] Update Version.Details.xml

---
 eng/Version.Details.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 96ff375758d9e7..6174024211e1dd 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -38,7 +38,7 @@
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20153.1">
+    <Dependency Name="Microsoft.DotNet.CodeAnalysis" Version="5.0.0-beta.20156.4">
       <Uri>https://github.com/dotnet/arcade</Uri>
       <Sha>421b20fb860907c45673de791177e3fd61402197</Sha>
     </Dependency>

From 3dd120b675be8733ccd454a0090c4e469e7417c3 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 00:36:52 +0100
Subject: [PATCH 18/44] Enable static graph evaluation for restore

---
 Directory.Build.props | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 0b999b18d37dbe..5978de0fecf99d 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -88,6 +88,9 @@
 
     <!-- Resource naming bug: https://github.com/microsoft/msbuild/issues/4740 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
+
+    <!-- Enable NuGet static graph evaluation to optimize incremental restore. -->
+    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
   </PropertyGroup>
 
   <PropertyGroup>

From 0cfae531f83cd2073e0b32b97ff032ae5844ca8c Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 09:39:35 +0100
Subject: [PATCH 19/44] Make ApiCmpat.proj restorable

---
 src/libraries/shims/ApiCompat.proj | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/libraries/shims/ApiCompat.proj b/src/libraries/shims/ApiCompat.proj
index a340a3d1a5aecd..db4c9fe1d756ef 100644
--- a/src/libraries/shims/ApiCompat.proj
+++ b/src/libraries/shims/ApiCompat.proj
@@ -1,9 +1,12 @@
-<Project DefaultTargets="Build">
+<Project>
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
-  <Import Project="Directory.Build.props" />
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
 
   <PropertyGroup>
-    <ApiCompatTarget>$(BuildTargetFramework)</ApiCompatTarget>
+    <ApiCompatTarget>$(TargetFramework)</ApiCompatTarget>
     <ApiCompatTarget Condition="$(BuildTargetFramework.Contains('netcoreapp'))">netcoreapp</ApiCompatTarget>
     <ApiCompatResponseFile>$(IntermediateOutputPath)/apicompat.rsp</ApiCompatResponseFile>
     <ApiCompatBaselineFile>$(MSBuildThisFileDirectory)ApiCompatBaseline.$(ApiCompatTarget).netfx461.txt</ApiCompatBaselineFile>
@@ -98,11 +101,12 @@
 
   </Target>
 
-  <Target Name="Build" DependsOnTargets="RunApiCompat" />
-  <Target Name="Clean">
+  <Target Name="CleanAdditionalFiles" AfterTargets="Clean">
     <RemoveDir Directories="$(BaseIntermediateOutputPath)" />
   </Target>
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
 
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="RunApiCompat" />
 </Project>

From ae5432a52fa35fe27fad7165842d32e8649ec38b Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 13:25:17 +0100
Subject: [PATCH 20/44] Optimize restore and disable RestoreTaskEx meanwhile

---
 Directory.Build.props    |  4 ++--
 src/libraries/build.proj | 12 ++++++------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 5978de0fecf99d..1be78d8e4ea4df 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -89,8 +89,8 @@
     <!-- Resource naming bug: https://github.com/microsoft/msbuild/issues/4740 -->
     <EmbeddedResourceUseDependentUponConvention>false</EmbeddedResourceUseDependentUponConvention>
 
-    <!-- Enable NuGet static graph evaluation to optimize incremental restore. -->
-    <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation>
+    <!-- Enable NuGet static graph evaluation to optimize incremental restore: https://github.com/dotnet/sdk/pull/10794 -->
+    <!-- <RestoreUseStaticGraphEvaluation>true</RestoreUseStaticGraphEvaluation> -->
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 1a0a2d9de34d5b..eb57a31f548a1e 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -17,17 +17,17 @@
 
   <Target Name="Restore" DependsOnTargets="GenerateRuntimeOSPropsFile">
     <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" Build="true" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" MSBuildTarget="Build" />
     </ItemGroup>
 
     <ItemGroup>
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" Build="false" />
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" Build="false" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" MSBuildTarget="Restore" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" MSBuildTarget="Restore" />
     </ItemGroup>
-    
 
-    <MSBuild Projects="@(_RestoreProjects)" Targets="Restore" Properties="$(ProjectProperties)" />
-    <MSBuild Projects="@(_RestoreProjects)" Condition="'%(Build)' != 'false'" Properties="$(ProjectProperties)" />
+    <MSBuild Projects="@(_RestoreProjects)"
+             Targets="%(_RestoreProjects.MSBuildTarget)"
+             BuildInParallel="true" />
   </Target>
 
   <Target Name="BuildNative">

From 7d44c9c99d7853e58ab55aa43456d9b56cd0dd29 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 13:25:44 +0100
Subject: [PATCH 21/44] Remove dir.traversal.tarets from depproj container

---
 src/libraries/restore/dirs.proj | 25 +++++++++++++++++++------
 1 file changed, 19 insertions(+), 6 deletions(-)

diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 5319074f8ac0e8..b7676c5a08d590 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,13 +1,26 @@
 <Project>
   <Import Project="Directory.Build.props" />
 
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
   <ItemGroup>
-    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
-    <Project Include="netstandard/netstandard.depproj" />
-    <Project Include="netfx/netfx.depproj" />
-    <Project Include="harvestPackages/harvestPackages.depproj" />
-    <Project Include="binplacePackages/binplacePackages.depproj" />
+    <ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
+    <ProjectReference Include="netstandard/netstandard.depproj" />
+    <ProjectReference Include="netfx/netfx.depproj" />
+    <ProjectReference Include="harvestPackages/harvestPackages.depproj" />
+    <ProjectReference Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
-  <Import Project="..\dir.traversal.targets" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="%(Project.AdditionalProperties)"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
 </Project>

From 3184f2a1c17306cf7444f6b1c262be65da73914f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 14:06:45 +0100
Subject: [PATCH 22/44] Remove harvestPackages.depproj and refactoring

Removing havestPackages.depproj in favor of a target that is hooked
into Arcade's repo restore phase in Tools.props.

Additionally moving common properties that are used both in Arcade and
the repo inside Configurations.props. Before they were scattered around
multiple places (Versions.props, Subsets.props).
---
 eng/Build.props                               |  1 +
 eng/Configurations.props                      | 20 +++++++++++++++++++
 eng/Subsets.props                             |  9 ---------
 eng/Tools.props                               |  7 ++++---
 eng/Versions.props                            |  4 ----
 .../restore/harvestPackages.targets           | 10 ++--------
 src/libraries/restore/dirs.proj               |  3 +--
 .../installer.tasks/installer.tasks.csproj    |  8 ++++++++
 8 files changed, 36 insertions(+), 26 deletions(-)
 rename src/libraries/restore/harvestPackages/harvestPackages.depproj => eng/restore/harvestPackages.targets (81%)

diff --git a/eng/Build.props b/eng/Build.props
index 95f52b37593d49..f10a9243d8c232 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -15,6 +15,7 @@
       https://github.com/dotnet/arcade/issues/388
   -->
 
+  <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. -->
   <Import Project="$(MSBuildThisFileDirectory)Configurations.props" />
   <Import Project="$(MSBuildThisFileDirectory)Subsets.props" />
 
diff --git a/eng/Configurations.props b/eng/Configurations.props
index 12fe0471490d0d..2a6f427b15b852 100644
--- a/eng/Configurations.props
+++ b/eng/Configurations.props
@@ -1,4 +1,24 @@
 <Project>
+  <!--
+    This file contains properties and items which are used in both the Arcade
+    steps and in the repository.
+  -->
+
+  <PropertyGroup>
+    <LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))</LibrariesProjectRoot>
+    <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))</CoreClrProjectRoot>
+    <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))</MonoProjectRoot>
+    <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
+    <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))</RepoToolsLocalDir>
+    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks'))</RepoTasksDir>
+    <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
+    <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
+  </PropertyGroup>
+
+  <PropertyGroup>
+    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
+  </PropertyGroup>
+
   <!-- Honor the generic RuntimeConfiguration property. -->
   <PropertyGroup>
     <RuntimeConfiguration Condition="'$(RuntimeConfiguration)' == ''">$(Configuration)</RuntimeConfiguration>
diff --git a/eng/Subsets.props b/eng/Subsets.props
index 6939ee71af00b9..90346437faa14a 100644
--- a/eng/Subsets.props
+++ b/eng/Subsets.props
@@ -47,15 +47,6 @@
       artifacts to the test layout, then running the test subset.
   -->
 
-  <PropertyGroup>
-    <LibrariesProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'libraries'))</LibrariesProjectRoot>
-    <CoreClrProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'coreclr'))</CoreClrProjectRoot>
-    <MonoProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'mono'))</MonoProjectRoot>
-    <InstallerProjectRoot>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'installer'))</InstallerProjectRoot>
-    <RepoToolsLocalDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'tools-local'))</RepoToolsLocalDir>
-    <RepoTasksDir>$([MSBuild]::NormalizeDirectory('$(RepoToolsLocalDir)', 'tasks'))</RepoTasksDir>
-  </PropertyGroup>
-
   <PropertyGroup>
     <DefaultSubsetCategories>libraries-installer-coreclr-mono</DefaultSubsetCategories>
     <DefaultInstallerSubsets>corehost-managed-depproj-pkgproj-bundle-installers-test</DefaultInstallerSubsets>
diff --git a/eng/Tools.props b/eng/Tools.props
index a631b23be10f60..de79f5ca3086a6 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -1,9 +1,9 @@
 <Project>
+  <!-- Import to have access to properties/items used both during the Arcade phase and in the repo. -->
+  <Import Project="$(MSBuildThisFileDirectory)Configurations.props" />
+
   <ItemGroup>
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" />
-
-    <!-- Download the package in the initial arcade restore step to work around race conditions when restoring an msbuild SDK. -->
-    <PackageDownload Include="Microsoft.NET.Sdk.IL" Version="[$(MicrosoftNETSdkILVersion)]" />
   </ItemGroup>
 
   <!-- excluded from source build -->
@@ -12,6 +12,7 @@
     <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
   </ItemGroup>
 
+  <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" Condition="'$(BuildAllConfigurations)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)restore\docs.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
   <Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(EnableNgenOptimization)' == 'true'" />
 </Project>
diff --git a/eng/Versions.props b/eng/Versions.props
index 1a3c54201de72b..eadba345483640 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -19,10 +19,6 @@
     <UsingToolMicrosoftNetCompilers>true</UsingToolMicrosoftNetCompilers>
     <UsingToolIbcOptimization>true</UsingToolIbcOptimization>
     <UsingToolXliff>false</UsingToolXliff>
-    <!-- Paths used during restore -->
-    <EnableNgenOptimization Condition="'$(EnableNgenOptimization)' == '' and '$(Configuration)' == 'Release'">true</EnableNgenOptimization>
-    <IbcOptimizationDataDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'ibc'))</IbcOptimizationDataDir>
-    <XmlDocDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'docs'))</XmlDocDir>
     <!-- Blob storage container that has the "Latest" channel to publish to. -->
     <ContainerName>dotnet</ContainerName>
     <ChecksumContainerName>$(ContainerName)</ChecksumContainerName>
diff --git a/src/libraries/restore/harvestPackages/harvestPackages.depproj b/eng/restore/harvestPackages.targets
similarity index 81%
rename from src/libraries/restore/harvestPackages/harvestPackages.depproj
rename to eng/restore/harvestPackages.targets
index 5e17770fec9d43..d6f6f98019f1cc 100644
--- a/src/libraries/restore/harvestPackages/harvestPackages.depproj
+++ b/eng/restore/harvestPackages.targets
@@ -1,18 +1,12 @@
-<Project InitialTargets="AddPackageDownload" Sdk="Microsoft.NET.Sdk">
+<Project InitialTargets="AddPackageDownload">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
     <PackagingTaskAssembly>$(NuGetPackageRoot)microsoft.dotnet.build.tasks.packaging\$(MicrosoftDotNetBuildTasksPackagingVersion)\tools\</PackagingTaskAssembly>
     <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' == 'core'">$(PackagingTaskAssembly)netcoreapp2.1\</PackagingTaskAssembly>
     <PackagingTaskAssembly Condition="'$(MSBuildRuntimeType)' != 'core'">$(PackagingTaskAssembly)net472\</PackagingTaskAssembly>
     <PackagingTaskAssembly>$(PackagingTaskAssembly)Microsoft.DotNet.Build.Tasks.Packaging.dll</PackagingTaskAssembly>
   </PropertyGroup>
 
-  <Import Project="$(PkgDir)baseline/baseline.props" />
-
-  <!-- only restore this project during the build, don't copy any of it's packages
-       The sole purpose of this project is to download packages that can be examined
-       for harvesting binaries & support. -->
-  <Target Name="Build" DependsOnTargets="RestorePackages" />
+  <Import Project="$(LibrariesProjectRoot)pkg\baseline\baseline.props" />
 
   <UsingTask TaskName="GetLastStablePackage" AssemblyFile="$(PackagingTaskAssembly)"/>
   <Target Name="AddPackageDownload">
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index b7676c5a08d590..e923fd086c23f3 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,5 +1,5 @@
 <Project>
-  <Import Project="Directory.Build.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
     <TargetFramework>$(BuildTargetFramework)</TargetFramework>
@@ -9,7 +9,6 @@
     <ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
     <ProjectReference Include="netstandard/netstandard.depproj" />
     <ProjectReference Include="netfx/netfx.depproj" />
-    <ProjectReference Include="harvestPackages/harvestPackages.depproj" />
     <ProjectReference Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj
index 2ed742bb359556..5152f7909cccb2 100644
--- a/tools-local/tasks/installer.tasks/installer.tasks.csproj
+++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj
@@ -20,6 +20,14 @@
     <PackageReference Include="System.Reflection.Metadata" Version="1.7.0" />
   </ItemGroup>
 
+  <!--
+    Restore the packaging package here to use it during the repo restore phase in 
+    harvestPackages.targets which is hooked into Tools.props.
+  -->
+  <ItemGroup>
+    <PackageDownload Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="[$(MicrosoftDotNetBuildTasksPackagingVersion)]" />
+  </ItemGroup>
+
   <Choose>
     <When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
       <ItemGroup>

From af638ca88e4cf9d2148cc9a4e5acd5757c38b7eb Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sat, 7 Mar 2020 15:13:37 +0100
Subject: [PATCH 23/44] Fix WindowsRuntime test

---
 .../tests/System.Runtime.WindowsRuntime.Tests.csproj            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
index dab72ed0560b0e..8633fffda010c5 100644
--- a/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
+++ b/src/libraries/System.Runtime.WindowsRuntime/tests/System.Runtime.WindowsRuntime.Tests.csproj
@@ -18,6 +18,6 @@
     <Compile Include="Windows\UI\ColorTests.cs" />
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Windows" />
+    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT" Version="$(MicrosoftTargetingPackPrivateWinRTVersion)" PrivateAssets="all" />
   </ItemGroup>
 </Project>
\ No newline at end of file

From 4c17df5ee4dff341c21e7857fd3e0d597b3b3bdb Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sun, 8 Mar 2020 16:36:46 +0100
Subject: [PATCH 24/44] Revert dirs.proj depproj change

---
 src/libraries/build.proj        | 12 ++++++++----
 src/libraries/restore/dirs.proj | 25 ++++++-------------------
 2 files changed, 14 insertions(+), 23 deletions(-)

diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index eb57a31f548a1e..a02bb1e173e818 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -17,17 +17,21 @@
 
   <Target Name="Restore" DependsOnTargets="GenerateRuntimeOSPropsFile">
     <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" MSBuildTarget="Build" />
+      <_RestoreBuildProjects Include="$(MSBuildThisFileDirectory)restore\dirs.proj" />
+      <_RestoreProjects Include="@(_RestoreBuildProjects)" />
     </ItemGroup>
 
     <ItemGroup>
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" MSBuildTarget="Restore" />
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" MSBuildTarget="Restore" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" />
     </ItemGroup>
 
     <MSBuild Projects="@(_RestoreProjects)"
-             Targets="%(_RestoreProjects.MSBuildTarget)"
+             Targets="Restore"
              BuildInParallel="true" />
+
+    <MSBuild Projects="@(_RestoreBuildProjects)"
+             Targets="Build" />
   </Target>
 
   <Target Name="BuildNative">
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index e923fd086c23f3..1aff6590f2429c 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,25 +1,12 @@
 <Project>
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
-
-  <PropertyGroup>
-    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
-  </PropertyGroup>
+  <Import Project="Directory.Build.props" />
 
   <ItemGroup>
-    <ProjectReference Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
-    <ProjectReference Include="netstandard/netstandard.depproj" />
-    <ProjectReference Include="netfx/netfx.depproj" />
-    <ProjectReference Include="binplacePackages/binplacePackages.depproj" />
+    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
+    <Project Include="netstandard/netstandard.depproj" />
+    <Project Include="netfx/netfx.depproj" />
+    <Project Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-  
-  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
-  <Target Name="Build">
-    <MSBuild Targets="Build"
-             Projects="@(ProjectReference)"
-             Properties="%(Project.AdditionalProperties)"
-             BuildInParallel="true"
-             ContinueOnError="ErrorAndStop" />
-  </Target>
+  <Import Project="..\dir.traversal.targets" />
 </Project>

From 7da6e40c198812ba7a9070b3c2cc84c8af3f09ee Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sun, 8 Mar 2020 17:28:15 +0100
Subject: [PATCH 25/44] Add sourcelink back to Tools.props

---
 eng/Tools.props | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/eng/Tools.props b/eng/Tools.props
index de79f5ca3086a6..fd0da6846183b5 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -10,6 +10,10 @@
   <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Feed" Version="$(MicrosoftDotNetBuildTasksFeedVersion)" />
     <PackageReference Include="Microsoft.DotNet.VersionTools.Tasks" Version="$(MicrosoftDotNetVersionToolsTasksVersion)" />
+
+    <!-- SourceLink -->
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+    <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 
   <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" Condition="'$(BuildAllConfigurations)' == 'true'" />

From 2705614ae90b3df9f743a272b28f0ac084dc6f1f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Sun, 8 Mar 2020 19:58:17 +0100
Subject: [PATCH 26/44] Set ilasm/ildasm RID for restore

---
 src/libraries/Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 01957c1fe69ac0..37c82ea5a46e87 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -172,6 +172,7 @@
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' == 'Windows_NT'">win-x64</ToolRuntimeRID>
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' != 'Windows_NT' and $(_buildingInOSX)">osx-x64</ToolRuntimeRID>
     <ToolRuntimeRID Condition="'$(RuntimeOS)' == 'webassembly' and '$(TargetOS)' != 'Windows_NT' and !$(_buildingInOSX)">linux-x64</ToolRuntimeRID>
+    <MicrosoftNetCoreIlasmPackageRuntimeId>$(ToolRuntimeRID)</MicrosoftNetCoreIlasmPackageRuntimeId>
 
     <!-- support cross-targeting by choosing a RID to restore when running on a different machine that what we're build for -->
     <_portableOS Condition="'$(TargetOS)' == 'Unix' and '$(_runtimeOSFamily)' != 'osx' and '$(_runtimeOSFamily)' != 'FreeBSD' and '$(_runtimeOS)' != 'linux-musl'">linux</_portableOS>

From b579b3d478e6ed91f365fcfba3d19948c130f78f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 16:03:53 +0100
Subject: [PATCH 27/44] Sequence restore into steps out of upfront restore

---
 eng/Build.props          |  8 ++++++--
 src/libraries/build.proj | 24 ++++++++++++++++++++----
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/eng/Build.props b/eng/Build.props
index f10a9243d8c232..8827b98cd3642c 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -77,8 +77,12 @@
     </ItemGroup>
 
     <MSBuild Projects="@(RepoTaskProjects)"
-             Properties="Configuration=Debug;Platform=AnyCPU"
-             Targets="Restore;Build"/>
+             Properties="Configuration=Debug;Platform=AnyCPU;__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(RepoTaskProjects)"
+             Properties="Configuration=Debug;Platform=AnyCPU;__BuildPhase=Build"
+             Targets="Build" />
 
     <WriteLinesToFile File="$(RepoTasksOutputFile)"
                       Lines="$(RepoTasksOutputFile)"
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index a02bb1e173e818..1904e2af5350fe 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -11,6 +11,8 @@
     <BuildDependsOn Condition="'$(BuildManaged)' == 'true' and '$(BuildTests)' != 'only'">$(BuildDependsOn);BuildManaged</BuildDependsOn>
     <BuildDependsOn Condition="'$(BuildPackages)' == 'true' and '$(BuildTests)' != 'only'">$(BuildDependsOn);Pack</BuildDependsOn>
     <BuildDependsOn Condition="'$(BuildTests)' != ''">$(BuildDependsOn);BuildTests</BuildDependsOn>
+
+    <RestoreAll Condition="'$(RestoreAll)' == '' and ('$(ContinuousIntegrationBuild)' == 'true' or '$(OfficialBuildId)' != '')">true</RestoreAll>
   </PropertyGroup>
 
   <Import Project="Directory.Build.targets" />
@@ -22,8 +24,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" />
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" Condition="'$(RestoreAll)' == 'true'" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(RestoreAll)' == 'true' and '$(DotNetBuildFromSource)' != 'true'" />
     </ItemGroup>
 
     <MSBuild Projects="@(_RestoreProjects)"
@@ -47,7 +49,15 @@
       <_BuildMangedProjects Include="$(MSBuildThisFileDirectory)dirs.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_BuildMangedProjects)" Properties="$(ProjectProperties)" />
+    <!-- Only restore if there was no upfront restore. -->
+    <MSBuild Projects="@(_BuildMangedProjects)"
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(_BuildMangedProjects)"
+             Properties="$(ProjectProperties);__BuildPhase=Build"
+             Targets="Build" />
   </Target>
 
   <Target Name="BuildTests">
@@ -55,9 +65,15 @@
       <_TestProjects Include="$(MSBuildThisFileDirectory)tests.proj" />
     </ItemGroup>
 
+    <!-- Only restore if there was no upfront restore. -->
+    <MSBuild Projects="@(_TestProjects)"
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Targets="Restore" />
+
     <MSBuild Projects="@(_TestProjects)"
              Targets="Build"
-             Properties="$(ProjectProperties)" />
+             Properties="$(ProjectProperties);__BuildPhase=Build" />
   </Target>
 
   <Target Name="Test">

From 0c1d442880e7d9ecd35b66aea915f5d131dd5dc0 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 17:11:44 +0100
Subject: [PATCH 28/44] Fix docker entrypoints by using build

---
 eng/docker/build-docker-sdk.ps1              | 3 +--
 eng/docker/libraries-sdk.linux.Dockerfile    | 3 +--
 eng/pipelines/libraries/enterprise/linux.yml | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/eng/docker/build-docker-sdk.ps1 b/eng/docker/build-docker-sdk.ps1
index 76c1ce7b414070..af1943a0d49dce 100755
--- a/eng/docker/build-docker-sdk.ps1
+++ b/eng/docker/build-docker-sdk.ps1
@@ -18,8 +18,7 @@ if ($buildWindowsContainers)
   # Due to size concerns, we don't currently do docker builds on windows.
   # Build on the host machine, then simply copy artifacts to the target docker image.
   # This should result in significantly lower build times, for now.
-  & "$REPO_ROOT_DIR/coreclr.cmd" -c Release
-  & "$REPO_ROOT_DIR/libraries.cmd" -ci -c $configuration -runtimeConfiguration release
+  & "$REPO_ROOT_DIR/build.cmd" -ci -subsetcategory coreclr-libraries -runtimeconfiguration release -c $configuration
   
   # Dockerize the build artifacts
   docker build --tag $imageName `
diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile
index efba4fb7c309d4..fce6381e71028a 100644
--- a/eng/docker/libraries-sdk.linux.Dockerfile
+++ b/eng/docker/libraries-sdk.linux.Dockerfile
@@ -8,8 +8,7 @@ WORKDIR /repo
 COPY . .
 
 ARG CONFIGURATION=Release
-RUN ./src/coreclr/build.sh -release -skiptests -clang9 && \
-    ./libraries.sh -c $CONFIGURATION -runtimeconfiguration release
+RUN ./build.sh -ci -subsetcategory coreclr-libraries -runtimeconfiguration release -c $CONFIGURATION
 
 FROM $SDK_BASE_IMAGE as target
 
diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
index 4cf1c7ded3827c..4bedd2d2bb6d5e 100644
--- a/eng/pipelines/libraries/enterprise/linux.yml
+++ b/eng/pipelines/libraries/enterprise/linux.yml
@@ -50,7 +50,7 @@ steps:
   displayName: Test linuxclient connection to web server
 
 - bash: |
-    docker exec linuxclient bash -c '/repo/src/coreclr/build.sh -release -skipnuget -clang9 && /repo/libraries.sh /p:CoreCLRConfiguration=Release'
+    docker exec linuxclient bash -c '/repo/build.sh -subsetcategory coreclr-libraries -runtimeconfiguration release -ci'
   displayName: Build product sources
 
 - bash: |

From a492cf6e1202ce99e2267a3efed727cb746a1af1 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 17:21:35 +0100
Subject: [PATCH 29/44] Move build of generate shims into ref.proj

---
 src/libraries/dirs.proj | 1 -
 src/libraries/ref.proj  | 9 ++++++---
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index d818329488a4d7..a78ec529fb6dcb 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -7,7 +7,6 @@
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
     <ProjectReference Include="ref.proj" />
-    <ProjectReference Include="shims\generated\*.csproj" />
     <ProjectReference Include="Native\native-binplace.proj" />
     <ProjectReference Include="src.proj" />
     <ProjectReference Include="shims\manual\*.csproj" />
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 48c6046377fbd2..c6c23b34b3c8e5 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -9,9 +9,12 @@
     <ProjectExclusions Include="$(MSBuildThisFileDirectory)\System.Utf8String.Experimental\ref\System.Utf8String.Experimental.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Condition="'$(DirectoryToBuild)' == ''" Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
-    <ProjectReference Condition="'$(DirectoryToBuild)' != ''" Include="$(DirectoryToBuild)\ref\*.*proj" />
+  <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
+    <ProjectReference Include="shims\generated\*.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
+  </ItemGroup>
+  <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
+    <ProjectReference Include="$(DirectoryToBuild)\ref\*.*proj" />
   </ItemGroup>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />

From 17a15ccb9d0515374c1800511cd135ee12885f63 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 18:08:25 +0100
Subject: [PATCH 30/44] PR feedback

---
 eng/Tools.props                               |  1 -
 src/libraries/build.proj                      | 14 ++++++++--
 src/libraries/dir.traversal.targets           |  3 +-
 .../{packages.builds => packages.proj}        |  9 ++++--
 src/libraries/pkg/dir.traversal.targets       |  2 ++
 src/libraries/restore/dirs.proj               | 28 +++++++++++++++----
 .../installer.tasks/installer.tasks.csproj    |  8 ------
 7 files changed, 43 insertions(+), 22 deletions(-)
 rename src/libraries/{packages.builds => packages.proj} (92%)

diff --git a/eng/Tools.props b/eng/Tools.props
index fd0da6846183b5..999758d5f8f94a 100644
--- a/eng/Tools.props
+++ b/eng/Tools.props
@@ -16,7 +16,6 @@
     <PackageReference Include="Microsoft.SourceLink.AzureRepos.Git" Version="$(MicrosoftSourceLinkVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" Condition="'$(BuildAllConfigurations)' == 'true'" />
   <Import Project="$(RepositoryEngineeringDir)restore\docs.targets" Condition="'$(DotNetBuildFromSource)' != 'true'" />
   <Import Project="$(RepositoryEngineeringDir)restore\optimizationData.targets" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(EnableNgenOptimization)' == 'true'" />
 </Project>
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 1904e2af5350fe..d8bcc6d97835dc 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -12,7 +12,7 @@
     <BuildDependsOn Condition="'$(BuildPackages)' == 'true' and '$(BuildTests)' != 'only'">$(BuildDependsOn);Pack</BuildDependsOn>
     <BuildDependsOn Condition="'$(BuildTests)' != ''">$(BuildDependsOn);BuildTests</BuildDependsOn>
 
-    <RestoreAll Condition="'$(RestoreAll)' == '' and ('$(ContinuousIntegrationBuild)' == 'true' or '$(OfficialBuildId)' != '')">true</RestoreAll>
+    <RestoreAll Condition="'$(RestoreAll)' == '' and '$(ContinuousIntegrationBuild)' == 'true'">true</RestoreAll>
   </PropertyGroup>
 
   <Import Project="Directory.Build.targets" />
@@ -88,10 +88,18 @@
 
   <Target Name="Pack">
     <ItemGroup>
-      <_PackProjects Include="$(MSBuildThisFileDirectory)packages.builds" />
+      <_PackProjects Include="$(MSBuildThisFileDirectory)packages.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_PackProjects)" Properties="$(ProjectProperties)" />
+    <!-- Only restore if there was no upfront restore. -->
+    <MSBuild Projects="@(_PackProjects)"
+             Condition="'$(RestoreAll)' != 'true'"
+             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Targets="Restore" />
+
+    <MSBuild Projects="@(_PackProjects)"
+             Targets="Build"
+             Properties="$(ProjectProperties);__BuildPhase=Build" />
   </Target>
 
   <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
diff --git a/src/libraries/dir.traversal.targets b/src/libraries/dir.traversal.targets
index 3596af30d25338..6617271378f745 100644
--- a/src/libraries/dir.traversal.targets
+++ b/src/libraries/dir.traversal.targets
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build">
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.targets" />
+  <Import Condition="'$(ImportDirectoryBuildTargets)' != 'false'" Project="$(MSBuildThisFileDirectory)Directory.Build.targets" />
 
   <Target Name="BuildAllProjects">
     <PropertyGroup>
@@ -48,6 +48,5 @@
   <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
   <Target Name="Clean" DependsOnTargets="$(TraversalCleanDependsOn)" />
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="Restore" />
 
 </Project>
diff --git a/src/libraries/packages.builds b/src/libraries/packages.proj
similarity index 92%
rename from src/libraries/packages.builds
rename to src/libraries/packages.proj
index ab33fce628208e..a6e1ba78ebdc4a 100644
--- a/src/libraries/packages.builds
+++ b/src/libraries/packages.proj
@@ -1,5 +1,9 @@
 <Project>
-  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
 
   <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
     <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
@@ -15,7 +19,7 @@
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->
-  <Import Project="$(PkgDir)baseline\baseline.props" />
+  <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" />
 
   <UsingTask TaskName="UpdatePackageIndex" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
 
@@ -69,6 +73,7 @@
       Overwrite="true" />
   </Target>
 
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
   <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
 
   <Target Name="SetAzureDevOpsVariableForBuiltPackages"
diff --git a/src/libraries/pkg/dir.traversal.targets b/src/libraries/pkg/dir.traversal.targets
index 2e66296d7f6a37..67ba4c2404b7c2 100644
--- a/src/libraries/pkg/dir.traversal.targets
+++ b/src/libraries/pkg/dir.traversal.targets
@@ -1,5 +1,7 @@
 <Project>
   <Import Project="..\dir.traversal.targets" />
+  <!-- Disable restore of pkgprojs. -->
+  <Target Name="Restore" />
 
   <PropertyGroup Condition="'$(BuildingAnOfficialBuildLeg)' == 'true'">
     <!-- During an official build, only build identity packages in the AllConfigurations build -->
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 1aff6590f2429c..26801dc7ed3772 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,12 +1,28 @@
 <Project>
-  <Import Project="Directory.Build.props" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+  
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
 
   <ItemGroup>
-    <Project Condition="'$(BuildAllConfigurations)' == 'true'" Include="netcoreapp/netcoreapp.depproj" />
-    <Project Include="netstandard/netstandard.depproj" />
-    <Project Include="netfx/netfx.depproj" />
-    <Project Include="binplacePackages/binplacePackages.depproj" />
+    <ProjectReference Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
+    <ProjectReference Include="netstandard/netstandard.depproj" />
+    <ProjectReference Include="netfx/netfx.depproj" />
+    <ProjectReference Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
-  <Import Project="..\dir.traversal.targets" />
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+  
+  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
+  <Target Name="Build">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="%(Project.AdditionalProperties)"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
+
+  <!-- Disabling restore of the depprojs. -->
+  <Target Name="Restore" />
 </Project>
diff --git a/tools-local/tasks/installer.tasks/installer.tasks.csproj b/tools-local/tasks/installer.tasks/installer.tasks.csproj
index 5152f7909cccb2..2ed742bb359556 100644
--- a/tools-local/tasks/installer.tasks/installer.tasks.csproj
+++ b/tools-local/tasks/installer.tasks/installer.tasks.csproj
@@ -20,14 +20,6 @@
     <PackageReference Include="System.Reflection.Metadata" Version="1.7.0" />
   </ItemGroup>
 
-  <!--
-    Restore the packaging package here to use it during the repo restore phase in 
-    harvestPackages.targets which is hooked into Tools.props.
-  -->
-  <ItemGroup>
-    <PackageDownload Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="[$(MicrosoftDotNetBuildTasksPackagingVersion)]" />
-  </ItemGroup>
-
   <Choose>
     <When Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
       <ItemGroup>

From 273f9fd11187e803a766b1aa76afab34e150e196 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 18:22:32 +0100
Subject: [PATCH 31/44] Fixing enterprise pipeline

---
 eng/pipelines/libraries/enterprise/linux.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eng/pipelines/libraries/enterprise/linux.yml b/eng/pipelines/libraries/enterprise/linux.yml
index 4bedd2d2bb6d5e..017ca39dbb0cce 100644
--- a/eng/pipelines/libraries/enterprise/linux.yml
+++ b/eng/pipelines/libraries/enterprise/linux.yml
@@ -26,7 +26,7 @@ variables:
   - name: enterpriseTestsSetup
     value: $(sourcesRoot)/Common/tests/System/Net/EnterpriseTests/setup
   - name: containerRunTestsCommand
-    value: /repo/.dotnet/dotnet build /t:test --no-restore
+    value: /repo/.dotnet/dotnet build /t:test
   - name: containerLibrariesRoot
     value: /repo/src/libraries
 

From 5f78ca0fad4e52943c5c10f481d8d52667269291 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 19:34:45 +0100
Subject: [PATCH 32/44] Revert dirs.proj depproj refactoring

---
 src/libraries/restore/dirs.proj | 22 ++++++----------------
 1 file changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 26801dc7ed3772..447dbb674068ed 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,28 +1,18 @@
 <Project>
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
+  <Import Project="Directory.Build.props" />
   
   <PropertyGroup>
     <TargetFramework>$(BuildTargetFramework)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
-    <ProjectReference Include="netstandard/netstandard.depproj" />
-    <ProjectReference Include="netfx/netfx.depproj" />
-    <ProjectReference Include="binplacePackages/binplacePackages.depproj" />
+    <Project Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
+    <Project Include="netstandard/netstandard.depproj" />
+    <Project Include="netfx/netfx.depproj" />
+    <Project Include="binplacePackages/binplacePackages.depproj" />
   </ItemGroup>
 
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-  
-  <!-- Ordering matters! Overwriting the Build target after the Sdk.targets import. -->
-  <Target Name="Build">
-    <MSBuild Targets="Build"
-             Projects="@(ProjectReference)"
-             Properties="%(Project.AdditionalProperties)"
-             BuildInParallel="true"
-             ContinueOnError="ErrorAndStop" />
-  </Target>
-
+  <Import Project="..\dir.traversal.targets" />
   <!-- Disabling restore of the depprojs. -->
   <Target Name="Restore" />
 </Project>

From 72c7458a19b235a0c79325b1eb992f32747c0811 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 20:35:45 +0100
Subject: [PATCH 33/44] Enable restore in dirs.proj libraries

---
 src/libraries/restore/dirs.proj | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 447dbb674068ed..15364492211f24 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -13,6 +13,4 @@
   </ItemGroup>
 
   <Import Project="..\dir.traversal.targets" />
-  <!-- Disabling restore of the depprojs. -->
-  <Target Name="Restore" />
 </Project>

From 8638a583eed74c9502f5eec8f533d0e13e914517 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 21:44:26 +0100
Subject: [PATCH 34/44] It must work!!

---
 src/libraries/Directory.Build.props       |  6 ++---
 src/libraries/Directory.Build.targets     |  2 +-
 src/libraries/dir.traversal.targets       |  1 +
 src/libraries/packages.proj               | 27 +++++++++++++++++------
 src/libraries/pkg/dir.traversal.targets   |  2 --
 src/libraries/restore/dirs.proj           |  4 ----
 src/libraries/shims/Directory.Build.props |  4 ----
 7 files changed, 25 insertions(+), 21 deletions(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 37c82ea5a46e87..24274a84c240ba 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -140,7 +140,7 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+  <ItemGroup Condition="'$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true'">
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
@@ -338,10 +338,10 @@
   <Import Project="$(RepositoryEngineeringDir)referenceAssemblies.props" />
 
   <PropertyGroup>
-    <EnableProjectRestore Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsTestProject)' == 'true'">true</EnableProjectRestore>
+    <DisableProjectRestore Condition="'$(MSBuildProjectExtension)' == '.depproj' or '$(MSBuildProjectExtension)' == '.pkgproj'">true</DisableProjectRestore>
   </PropertyGroup>
 
-  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
+  <Import Condition="'$(DisableProjectRestore)' == 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
 
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index f019b5bd21a6af..13dd406ef9c2c2 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -112,7 +112,7 @@
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
-  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
+  <Import Condition="'$(DisableProjectRestore)' == 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
   <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
   <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
diff --git a/src/libraries/dir.traversal.targets b/src/libraries/dir.traversal.targets
index 6617271378f745..124ceaaea94e4d 100644
--- a/src/libraries/dir.traversal.targets
+++ b/src/libraries/dir.traversal.targets
@@ -48,5 +48,6 @@
   <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
   <Target Name="Clean" DependsOnTargets="$(TraversalCleanDependsOn)" />
   <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
+  <Target Name="Restore" />
 
 </Project>
diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index a6e1ba78ebdc4a..f1648c29bf6506 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -9,13 +9,17 @@
     <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
   </PropertyGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'">
-    <Project Include="$(PkgDir)*\*.builds" >
+    <ProjectReference Include="$(PkgDir)*\*.builds" >
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
-    <Project Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' OR '$(DotNetBuildFromSource)' == 'true'">
+    </ProjectReference>
+    <ProjectReference Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' OR '$(DotNetBuildFromSource)' == 'true'">
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </Project>
+    </ProjectReference>
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->
@@ -73,9 +77,6 @@
       Overwrite="true" />
   </Target>
 
-  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
-  <Import Project="$(MSBuildThisFileDirectory)dir.traversal.targets" />
-
   <Target Name="SetAzureDevOpsVariableForBuiltPackages"
           Condition="'$(ContinuousIntegrationBuild)' == 'true'"
           AfterTargets="BuildAllProjects">
@@ -85,4 +86,16 @@
 
     <Message Condition="'@(_PackageReports)' != ''" Importance="High" Text="##vso[task.setvariable variable=_librariesBuildProducedPackages]true" />
   </Target>
+
+  <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
+
+  <!-- Ordering matters! Overwriting the Build and Test target after the Sdk.targets import. -->
+  <Target Name="Build" DependsOnTargets="BuildAllProjects" />
+  <Target Name="BuildAllProjects">
+    <MSBuild Targets="Build"
+             Projects="@(ProjectReference)"
+             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             BuildInParallel="true"
+             ContinueOnError="ErrorAndStop" />
+  </Target>
 </Project>
diff --git a/src/libraries/pkg/dir.traversal.targets b/src/libraries/pkg/dir.traversal.targets
index 67ba4c2404b7c2..2e66296d7f6a37 100644
--- a/src/libraries/pkg/dir.traversal.targets
+++ b/src/libraries/pkg/dir.traversal.targets
@@ -1,7 +1,5 @@
 <Project>
   <Import Project="..\dir.traversal.targets" />
-  <!-- Disable restore of pkgprojs. -->
-  <Target Name="Restore" />
 
   <PropertyGroup Condition="'$(BuildingAnOfficialBuildLeg)' == 'true'">
     <!-- During an official build, only build identity packages in the AllConfigurations build -->
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 15364492211f24..42adbead392f80 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,9 +1,5 @@
 <Project>
   <Import Project="Directory.Build.props" />
-  
-  <PropertyGroup>
-    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
-  </PropertyGroup>
 
   <ItemGroup>
     <Project Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 943614ecbf2a98..790b6126ca80de 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -1,8 +1,4 @@
 <Project>
-  <PropertyGroup>
-    <EnableProjectRestore>true</EnableProjectRestore>
-  </PropertyGroup>
-
   <Import Project="..\Directory.Build.props" />
 
   <Import Project="netfxreference.props" />

From 60d0600d709aa25bcc0c91ae94a5735d72075232 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 22:26:53 +0100
Subject: [PATCH 35/44] Please work

---
 src/libraries/Directory.Build.props       | 6 +++---
 src/libraries/Directory.Build.targets     | 2 +-
 src/libraries/build.proj                  | 2 ++
 src/libraries/dir.traversal.targets       | 2 +-
 src/libraries/packages.proj               | 8 ++++----
 src/libraries/restore/dirs.proj           | 4 ++++
 src/libraries/shims/Directory.Build.props | 3 +++
 7 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 24274a84c240ba..37c82ea5a46e87 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -140,7 +140,7 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(IsReferenceAssembly)' == 'true' or '$(IsSourceProject)' == 'true'">
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
@@ -338,10 +338,10 @@
   <Import Project="$(RepositoryEngineeringDir)referenceAssemblies.props" />
 
   <PropertyGroup>
-    <DisableProjectRestore Condition="'$(MSBuildProjectExtension)' == '.depproj' or '$(MSBuildProjectExtension)' == '.pkgproj'">true</DisableProjectRestore>
+    <EnableProjectRestore Condition="'$(IsSourceProject)' == 'true' or '$(IsReferenceAssembly)' == 'true' or '$(IsTestProject)' == 'true'">true</EnableProjectRestore>
   </PropertyGroup>
 
-  <Import Condition="'$(DisableProjectRestore)' == 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
+  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.props" />
 
   <PropertyGroup>
     <EnableDefaultItems>false</EnableDefaultItems>
diff --git a/src/libraries/Directory.Build.targets b/src/libraries/Directory.Build.targets
index 13dd406ef9c2c2..f019b5bd21a6af 100644
--- a/src/libraries/Directory.Build.targets
+++ b/src/libraries/Directory.Build.targets
@@ -112,7 +112,7 @@
   <Import Project="$(RepositoryEngineeringDir)testing\coverage.targets" Condition="'$(EnableCoverageSupport)' == 'true'" />
 
   <Import Sdk="Microsoft.DotNet.Build.Tasks.TargetFramework.Sdk" Project="Sdk.targets" />
-  <Import Condition="'$(DisableProjectRestore)' == 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
+  <Import Condition="'$(EnableProjectRestore)' != 'true'" Project="$(RepositoryEngineeringDir)restore\repoRestore.targets" />
   <Import Project="$(RepositoryEngineeringDir)referenceFromRuntime.targets" />
   <Import Project="$(RepositoryEngineeringDir)illink.targets" />
   <Import Project="$(RepositoryEngineeringDir)notSupported.SourceBuild.targets" Condition="'$(DotNetBuildFromSource)' == 'true'" />
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index d8bcc6d97835dc..32716185caa4df 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -30,9 +30,11 @@
 
     <MSBuild Projects="@(_RestoreProjects)"
              Targets="Restore"
+             Properties="$(ProjectProperties);__BuildPhase=Restore"
              BuildInParallel="true" />
 
     <MSBuild Projects="@(_RestoreBuildProjects)"
+             Properties="$(ProjectProperties);__BuildPhase=Build"
              Targets="Build" />
   </Target>
 
diff --git a/src/libraries/dir.traversal.targets b/src/libraries/dir.traversal.targets
index 124ceaaea94e4d..3596af30d25338 100644
--- a/src/libraries/dir.traversal.targets
+++ b/src/libraries/dir.traversal.targets
@@ -1,5 +1,5 @@
 <Project DefaultTargets="Build">
-  <Import Condition="'$(ImportDirectoryBuildTargets)' != 'false'" Project="$(MSBuildThisFileDirectory)Directory.Build.targets" />
+  <Import Project="$(MSBuildThisFileDirectory)Directory.Build.targets" />
 
   <Target Name="BuildAllProjects">
     <PropertyGroup>
diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index f1648c29bf6506..dbb0696562ade5 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -1,4 +1,8 @@
 <Project>
+  <PropertyGroup>
+    <EnableProjectRestore>true</EnableProjectRestore>
+  </PropertyGroup>
+
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
@@ -9,10 +13,6 @@
     <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
   </PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-  </ItemGroup>
-
   <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'">
     <ProjectReference Include="$(PkgDir)*\*.builds" >
       <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
diff --git a/src/libraries/restore/dirs.proj b/src/libraries/restore/dirs.proj
index 42adbead392f80..ee2162758d1e64 100644
--- a/src/libraries/restore/dirs.proj
+++ b/src/libraries/restore/dirs.proj
@@ -1,6 +1,10 @@
 <Project>
   <Import Project="Directory.Build.props" />
 
+  <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
+  </PropertyGroup>
+
   <ItemGroup>
     <Project Include="netcoreapp/netcoreapp.depproj" Condition="'$(BuildAllConfigurations)' == 'true'" />
     <Project Include="netstandard/netstandard.depproj" />
diff --git a/src/libraries/shims/Directory.Build.props b/src/libraries/shims/Directory.Build.props
index 790b6126ca80de..768825eb3e775b 100644
--- a/src/libraries/shims/Directory.Build.props
+++ b/src/libraries/shims/Directory.Build.props
@@ -1,4 +1,7 @@
 <Project>
+  <PropertyGroup>
+    <EnableProjectRestore>true</EnableProjectRestore>
+  </PropertyGroup>
   <Import Project="..\Directory.Build.props" />
 
   <Import Project="netfxreference.props" />

From ef3e4774154ed75cd88175292adb39233c581121 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Mon, 9 Mar 2020 23:27:25 +0100
Subject: [PATCH 36/44] Fix one error at a time

---
 src/libraries/packages.proj | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index dbb0696562ade5..bee1d7226b1e37 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -22,6 +22,10 @@
     </ProjectReference>
   </ItemGroup>
 
+  <ItemGroup>
+    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
+  </ItemGroup>
+
   <!-- Need the PackageIndexFile file property from baseline.props -->
   <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" />
 

From a6f403862c9ad00c06931577415cd9e402515d16 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 08:52:21 +0100
Subject: [PATCH 37/44] Add packages.proj to upfront restore

---
 src/libraries/build.proj | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 32716185caa4df..72e3c4697ee4b5 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -23,9 +23,10 @@
       <_RestoreProjects Include="@(_RestoreBuildProjects)" />
     </ItemGroup>
 
-    <ItemGroup>
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj" Condition="'$(RestoreAll)' == 'true'" />
-      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(RestoreAll)' == 'true' and '$(DotNetBuildFromSource)' != 'true'" />
+    <ItemGroup Condition="'$(RestoreAll)' == 'true'">
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)dirs.proj"  />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)tests.proj" Condition="'$(DotNetBuildFromSource)' != 'true'" />
+      <_RestoreProjects Include="$(MSBuildThisFileDirectory)packages.proj" />
     </ItemGroup>
 
     <MSBuild Projects="@(_RestoreProjects)"

From aacea8c47792b3873988c51d844c9bab87aecd87 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 08:58:39 +0100
Subject: [PATCH 38/44] Fix sequencing

---
 src/libraries/ref.proj | 2 +-
 src/libraries/src.proj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index c6c23b34b3c8e5..92c0cd509425ae 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -25,7 +25,7 @@
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
-             BuildInParallel="true"
+             BuildInParallel="false"
              ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 5b773f6123cc4a..084ddc934c2bdb 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -29,7 +29,7 @@
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
              Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
-             BuildInParallel="true"
+             BuildInParallel="false"
              ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>

From 2f824eff0132cef66692b8c3dc62d63ef79283bf Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 09:34:49 +0100
Subject: [PATCH 39/44] Remove unnecessary packageref

---
 src/libraries/packages.proj | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index bee1d7226b1e37..dbb0696562ade5 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -22,10 +22,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
-  </ItemGroup>
-
   <!-- Need the PackageIndexFile file property from baseline.props -->
   <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" />
 

From 6856d290a039bbec9e0ed241f3408675673833f8 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 10:04:51 +0100
Subject: [PATCH 40/44] More fixes in ProjectRef composition

---
 src/libraries/dirs.proj     |  6 +++---
 src/libraries/packages.proj |  2 +-
 src/libraries/pretest.proj  | 11 +++++------
 src/libraries/ref.proj      |  2 +-
 src/libraries/src.proj      |  2 +-
 src/libraries/tests.proj    |  6 +++---
 6 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index a78ec529fb6dcb..b5c20bc679092c 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <ProjectReference Include="ref.proj" />
+    <!-- <ProjectReference Include="ref.proj" />
     <ProjectReference Include="Native\native-binplace.proj" />
     <ProjectReference Include="src.proj" />
     <ProjectReference Include="shims\manual\*.csproj" />
-    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
+    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" /> -->
     <ProjectReference Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
   </ItemGroup>
 
@@ -29,7 +29,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="false"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index dbb0696562ade5..e6b44b58b960fb 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -94,7 +94,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index f7ce15204237b4..f5adabec8daff2 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -2,16 +2,15 @@
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
 
   <PropertyGroup>
+    <TargetFramework>$(BuildTargetFramework)</TargetFramework>
     <BuildDependsOnTargets>GenerateLaunchSettingsFiles</BuildDependsOnTargets>
     <BuildDependsOnTargets Condition="'$(BinplaceTestSharedFramework)' == 'true'">$(BuildDependsOnTargets);GenerateTestSharedFrameworkDepsFile</BuildDependsOnTargets>
     <BuildDependsOnTargets Condition="'$(PlatformManifestFile)' != ''">$(BuildDependsOnTargets);GenerateFileVersionProps</BuildDependsOnTargets>
-    <TargetFrameworkIdentifier>netcoreapp</TargetFrameworkIdentifier>
-    <TargetFrameworkVersion>5.0</TargetFrameworkVersion>
   </PropertyGroup>
 
   <ItemGroup>
     <!-- This is necessary as inside VS project references that aren't part of the sln aren't built. -->
-    <Project Include="$(CommonTestPath)\CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
+    <ProjectReference Include="$(CommonTestPath)CoreFx.Private.TestUtilities\CoreFx.Private.TestUtilities.csproj" />
   </ItemGroup>
 
   <!-- Microsoft.XmlSerializer.Generator should not be marked as a platform item and be copy-local instead. -->
@@ -66,7 +65,7 @@
 
     <MSBuild Projects="@(TestProjects)"
              Targets="GenerateLaunchSettingsFile"
-             ContinueOnError="ErrorAndContinue" />
+             ContinueOnError="ErrorAndStop" />
   </Target>
 
   <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.targets" />
@@ -75,8 +74,8 @@
           Condition="'$(SkipPrepareTest)' != 'true'"
           DependsOnTargets="GenerateLaunchSettingsFiles;GenerateTestSharedFrameworkDepsFile;GenerateFileVersionProps">
     <MSBuild Targets="Build"
-             Projects="@(Project)"
-             Properties="TargetFramework=$(BuildTargetFramework);%(Project.AdditionalProperties)"
+             Projects="@(ProjectReference)"
+             Properties="%(ProjectReference.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 92c0cd509425ae..6d691766d05ac8 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -24,7 +24,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="false"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index 084ddc934c2bdb..f6f89905756cae 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -28,7 +28,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="false"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index bc11df70284540..33cd7d463cd0c2 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -40,7 +40,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(Project.AdditionalProperties)"
+             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
@@ -52,13 +52,13 @@
     <MSBuild Targets="Test"
              Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' == 'true' and '%(Identity)' != ''"
-             Properties="TestAllProjects=true"
+             Properties="TestAllProjects=true;%(ProjectReference.AdditionalProperties)"
              ContinueOnError="ErrorAndContinue" />
 
     <MSBuild Targets="Test"
              Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' != 'true'"
-             Properties="TestAllProjects=true"
+             Properties="TestAllProjects=true;%(ProjectReference.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndContinue" />
 

From 7144258e9ae480f6bb52289915280e58cc9dd39f Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 10:21:04 +0100
Subject: [PATCH 41/44] Undo commented out lines in dirs.proj

---
 src/libraries/dirs.proj | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index b5c20bc679092c..9769c777d3ca68 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -6,11 +6,11 @@
   </PropertyGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <!-- <ProjectReference Include="ref.proj" />
+    <ProjectReference Include="ref.proj" />
     <ProjectReference Include="Native\native-binplace.proj" />
     <ProjectReference Include="src.proj" />
     <ProjectReference Include="shims\manual\*.csproj" />
-    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" /> -->
+    <ProjectReference Include="shims\ApiCompat.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildTargetFramework)' == '$(NetCoreAppCurrent)'" />
     <ProjectReference Include="pretest.proj" Condition="'$(DotNetBuildFromSource)' != 'true' and '$(BuildAllConfigurations)' != 'true'" />
   </ItemGroup>
 

From 4f336ab1d25a174c384c759cceddaf7df2721dae Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 11:22:43 +0100
Subject: [PATCH 42/44] Sequence refs correctly and cleanup

---
 .../System.Private.CoreLib.csproj             |  2 +-
 src/libraries/Directory.Build.props           |  2 +-
 src/libraries/build.proj                      | 25 +++++++++----------
 src/libraries/packages.proj                   |  2 --
 src/libraries/ref.proj                        |  2 +-
 5 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
index f0aed17c4ec839..7e215d1ad72a8a 100644
--- a/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
+++ b/src/coreclr/src/System.Private.CoreLib/System.Private.CoreLib.csproj
@@ -60,7 +60,7 @@
     <_FullFrameworkReferenceAssemblyPaths>$(MSBuildThisFileDirectory)/Documentation</_FullFrameworkReferenceAssemblyPaths>
     <SkipCommonResourcesIncludes>true</SkipCommonResourcesIncludes>
     <DocumentationFile>$(OutputPath)$(MSBuildProjectName).xml</DocumentationFile>
-    <EnableAnalyzers Condition="'$(EnableAnalyzers)' == ''">true</EnableAnalyzers>
+    <EnableAnalyzers>true</EnableAnalyzers>
   </PropertyGroup>
 
   <!-- Platform specific properties -->
diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 37c82ea5a46e87..5e46e312388a5c 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -140,7 +140,7 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
-  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
+  <ItemGroup Condition="'(EnableProjectRestore)' == 'true' and '$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
diff --git a/src/libraries/build.proj b/src/libraries/build.proj
index 72e3c4697ee4b5..0e00e66aea4501 100644
--- a/src/libraries/build.proj
+++ b/src/libraries/build.proj
@@ -31,11 +31,11 @@
 
     <MSBuild Projects="@(_RestoreProjects)"
              Targets="Restore"
-             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Properties="__BuildPhase=Restore"
              BuildInParallel="true" />
 
     <MSBuild Projects="@(_RestoreBuildProjects)"
-             Properties="$(ProjectProperties);__BuildPhase=Build"
+             Properties="__BuildPhase=Build"
              Targets="Build" />
   </Target>
 
@@ -44,7 +44,7 @@
       <_BuildNativeProjects Include="$(MSBuildThisFileDirectory)Native\build-native.proj" />
     </ItemGroup>
 
-    <MSBuild Projects="@(_BuildNativeProjects)" Properties="$(ProjectProperties)" />
+    <MSBuild Projects="@(_BuildNativeProjects)" />
   </Target>
 
   <Target Name="BuildManaged">
@@ -55,11 +55,11 @@
     <!-- Only restore if there was no upfront restore. -->
     <MSBuild Projects="@(_BuildMangedProjects)"
              Condition="'$(RestoreAll)' != 'true'"
-             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Properties="__BuildPhase=Restore"
              Targets="Restore" />
 
     <MSBuild Projects="@(_BuildMangedProjects)"
-             Properties="$(ProjectProperties);__BuildPhase=Build"
+             Properties="__BuildPhase=Build"
              Targets="Build" />
   </Target>
 
@@ -71,12 +71,12 @@
     <!-- Only restore if there was no upfront restore. -->
     <MSBuild Projects="@(_TestProjects)"
              Condition="'$(RestoreAll)' != 'true'"
-             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Properties="__BuildPhase=Restore"
              Targets="Restore" />
 
-    <MSBuild Projects="@(_TestProjects)"
-             Targets="Build"
-             Properties="$(ProjectProperties);__BuildPhase=Build" />
+    <MSBuild Projects="@(_TestProjects)"             
+             Properties="__BuildPhase=Build"
+             Targets="Build" />
   </Target>
 
   <Target Name="Test">
@@ -85,8 +85,7 @@
     </ItemGroup>
 
     <MSBuild Projects="@(_TestProjects)"
-             Targets="Test"
-             Properties="$(ProjectProperties)" />
+             Targets="Test" />
   </Target>
 
   <Target Name="Pack">
@@ -97,12 +96,12 @@
     <!-- Only restore if there was no upfront restore. -->
     <MSBuild Projects="@(_PackProjects)"
              Condition="'$(RestoreAll)' != 'true'"
-             Properties="$(ProjectProperties);__BuildPhase=Restore"
+             Properties="__BuildPhase=Restore"
              Targets="Restore" />
 
     <MSBuild Projects="@(_PackProjects)"
              Targets="Build"
-             Properties="$(ProjectProperties);__BuildPhase=Build" />
+             Properties="__BuildPhase=Build" />
   </Target>
 
   <Target Name="Build" DependsOnTargets="$(BuildDependsOn)" />
diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index e6b44b58b960fb..a793a64f48626d 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -25,8 +25,6 @@
   <!-- Need the PackageIndexFile file property from baseline.props -->
   <Import Project="$(RepositoryEngineeringDir)restore\harvestPackages.targets" />
 
-  <UsingTask TaskName="UpdatePackageIndex" AssemblyFile="$(PackagingTaskDir)Microsoft.DotNet.Build.Tasks.Packaging.dll"/>
-
   <!--
     Updates the package index to mark all packages we are building that can go stable as stable.
     this will allow for a kicked off build to control package stability at queue time. This does edit
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 6d691766d05ac8..68cc8d4235b0c2 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -10,8 +10,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DirectoryToBuild)' == ''">
-    <ProjectReference Include="shims\generated\*.csproj" />
     <ProjectReference Include="$(MSBuildThisFileDirectory)*\ref\*.*proj" Exclude="@(ProjectExclusions)" />
+    <ProjectReference Include="shims\generated\*.csproj" />
   </ItemGroup>
   <ItemGroup Condition="'$(DirectoryToBuild)' != ''">
     <ProjectReference Include="$(DirectoryToBuild)\ref\*.*proj" />

From 90fc025743807fbeafb8000aaf0ff1f7d9bb142d Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 11:28:43 +0100
Subject: [PATCH 43/44] Cleanup proj containers

---
 src/libraries/dirs.proj     |  3 +--
 src/libraries/packages.proj | 15 ++++-----------
 src/libraries/pretest.proj  |  1 -
 src/libraries/ref.proj      |  3 +--
 src/libraries/src.proj      |  3 +--
 src/libraries/tests.proj    |  7 +++----
 6 files changed, 10 insertions(+), 22 deletions(-)

diff --git a/src/libraries/dirs.proj b/src/libraries/dirs.proj
index 9769c777d3ca68..d03d5892fe7920 100644
--- a/src/libraries/dirs.proj
+++ b/src/libraries/dirs.proj
@@ -29,8 +29,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
-             BuildInParallel="false"
+             Properties="BuildAllProjects=true"
              ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>
diff --git a/src/libraries/packages.proj b/src/libraries/packages.proj
index a793a64f48626d..9e62eb26d72bff 100644
--- a/src/libraries/packages.proj
+++ b/src/libraries/packages.proj
@@ -7,19 +7,12 @@
 
   <PropertyGroup>
     <TargetFramework>$(BuildTargetFramework)</TargetFramework>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(DotNetBuildFromSource)' == 'true'">
-    <AdditionalBuildTargetFrameworks>$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
+    <AdditionalBuildTargetFrameworks Condition="'$(DotNetBuildFromSource)' == 'true'">$(AdditionalBuildTargetFrameworks);package-$(Configuration)</AdditionalBuildTargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup Condition="'$(SkipManagedPackageBuild)' != 'true'">
-    <ProjectReference Include="$(PkgDir)*\*.builds" >
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </ProjectReference>
-    <ProjectReference Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' OR '$(DotNetBuildFromSource)' == 'true'">
-      <AdditionalProperties>$(AdditionalProperties)</AdditionalProperties>
-    </ProjectReference>
+    <ProjectReference Include="$(PkgDir)*\*.builds" />
+    <ProjectReference Include="*\pkg\**\*.pkgproj" Condition="'$(BuildAllConfigurations)' == 'true' or '$(DotNetBuildFromSource)' == 'true'" />
   </ItemGroup>
 
   <!-- Need the PackageIndexFile file property from baseline.props -->
@@ -92,7 +85,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
+             Properties="BuildAllProjects=true"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/pretest.proj b/src/libraries/pretest.proj
index f5adabec8daff2..5b5cb13dd2490c 100644
--- a/src/libraries/pretest.proj
+++ b/src/libraries/pretest.proj
@@ -75,7 +75,6 @@
           DependsOnTargets="GenerateLaunchSettingsFiles;GenerateTestSharedFrameworkDepsFile;GenerateFileVersionProps">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="%(ProjectReference.AdditionalProperties)"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
diff --git a/src/libraries/ref.proj b/src/libraries/ref.proj
index 68cc8d4235b0c2..99037969eaadb3 100644
--- a/src/libraries/ref.proj
+++ b/src/libraries/ref.proj
@@ -24,8 +24,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
-             BuildInParallel="false"
+             Properties="BuildAllProjects=true"
              ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>
diff --git a/src/libraries/src.proj b/src/libraries/src.proj
index f6f89905756cae..d2d0ec88d23df0 100644
--- a/src/libraries/src.proj
+++ b/src/libraries/src.proj
@@ -28,8 +28,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
-             BuildInParallel="false"
+             Properties="BuildAllProjects=true"
              ContinueOnError="ErrorAndStop" />
   </Target>
 </Project>
diff --git a/src/libraries/tests.proj b/src/libraries/tests.proj
index 33cd7d463cd0c2..1a32a6b477c382 100644
--- a/src/libraries/tests.proj
+++ b/src/libraries/tests.proj
@@ -40,7 +40,7 @@
   <Target Name="BuildAllProjects">
     <MSBuild Targets="Build"
              Projects="@(ProjectReference)"
-             Properties="BuildAllProjects=true;%(ProjectReference.AdditionalProperties)"
+             Properties="BuildAllProjects=true"
              BuildInParallel="true"
              ContinueOnError="ErrorAndStop" />
   </Target>
@@ -52,18 +52,17 @@
     <MSBuild Targets="Test"
              Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' == 'true' and '%(Identity)' != ''"
-             Properties="TestAllProjects=true;%(ProjectReference.AdditionalProperties)"
+             Properties="TestAllProjects=true"
              ContinueOnError="ErrorAndContinue" />
 
     <MSBuild Targets="Test"
              Projects="@(ProjectReference)"
              Condition="'$(SerializeProjects)' != 'true'"
-             Properties="TestAllProjects=true;%(ProjectReference.AdditionalProperties)"
+             Properties="TestAllProjects=true"
              BuildInParallel="true"
              ContinueOnError="ErrorAndContinue" />
 
     <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
     <Error Condition="'$(MSBuildLastTaskResult)' == 'false'" />
   </Target>
-
 </Project>

From 34e403cf6246d2e2734d1a7581a8b64c24780015 Mon Sep 17 00:00:00 2001
From: Viktor Hofer <viktor.hofer@microsoft.com>
Date: Tue, 10 Mar 2020 11:57:55 +0100
Subject: [PATCH 44/44] Remove wrong condition

---
 src/libraries/Directory.Build.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/libraries/Directory.Build.props b/src/libraries/Directory.Build.props
index 5e46e312388a5c..37c82ea5a46e87 100644
--- a/src/libraries/Directory.Build.props
+++ b/src/libraries/Directory.Build.props
@@ -140,7 +140,7 @@
     <ApiCompatExcludeAttributeList>$(RepositoryEngineeringDir)DefaultGenApiDocIds.txt</ApiCompatExcludeAttributeList>
   </PropertyGroup>
 
-  <ItemGroup Condition="'(EnableProjectRestore)' == 'true' and '$(IsTestProject)' != 'true'">
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'">
     <PackageReference Include="Microsoft.DotNet.Build.Tasks.Packaging" Version="$(MicrosoftDotNetBuildTasksPackagingVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.GenFacades" Version="$(MicrosoftDotNetGenFacadesVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />
     <PackageReference Include="Microsoft.DotNet.ApiCompat" Condition="'$(DotNetBuildFromSource)' != 'true'" Version="$(MicrosoftDotNetApiCompatVersion)" PrivateAssets="all" IsImplicitlyDefined="true" />