Prepare corefx for repo consolidation (dotnet/corefx#42175)

* Prepare corefx for repo consolidation into runtime


Commit migrated from https://github.com/dotnet/corefx/commit/e160dd972d958fbe9594dc1001da4d1b94bba949

37 files changed, 12 insertions, 908 deletions

diff --git a/eng/Analyzers.props b/eng/analyzers.props
index f49d7a9aaa4..f49d7a9aaa4 100644
--- a/eng/Analyzers.props
+++ b/eng/analyzers.props
diff --git a/eng/CodeAnalysis.targets b/eng/codeAnalysis.targets
index 74f6163d458..74f6163d458 100644
--- a/eng/CodeAnalysis.targets
+++ b/eng/codeAnalysis.targets
diff --git a/eng/dir.traversal.targets b/eng/dir.traversal.targets
deleted file mode 100644
index f0e86873831..00000000000
--- a/eng/dir.traversal.targets
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project DefaultTargets="Build">
-  <Import Project="$([MSBuild]::GetPathOfFileAbove(Directory.Build.targets))" />
-
-  <Target Name="BuildAllProjects" DependsOnTargets="FilterProjects">
-    <PropertyGroup>
-      <DefaultBuildAllTarget Condition="'$(DefaultBuildAllTarget)'==''">$(MSBuildProjectDefaultTargets)</DefaultBuildAllTarget>
-    </PropertyGroup>
-
-    <!-- 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="$(DefaultBuildAllTarget)"
-             Projects="@(Project)"
-             Condition="'$(SerializeProjects)'=='true' AND '%(Identity)' != ''"
-             Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration)"
-             ContinueOnError="ErrorAndStop" />
-
-    <MSBuild Targets="$(DefaultBuildAllTarget)"
-             Projects="@(Project)"
-             Condition="'$(SerializeProjects)'!='true'"
-             Properties="DefaultBuildAllTarget=$(DefaultBuildAllTarget);BuildAllProjects=true;BuildConfiguration=$(BuildConfiguration);%(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="GetFilesToPackage"
-          DependsOnTargets="FilterProjects"
-          Returns="@(FilesToPackage)">
-    <MSBuild Targets="GetFilesToPackage"
-             Projects="@(Project)"
-             BuildInParallel="true"
-             Properties="$(ProjectProperties)"
-             ContinueOnError="ErrorAndContinue" >
-      <Output TaskParameter="TargetOutputs"
-              ItemName="FilesToPackage" />
-    </MSBuild>
-
-    <!-- Given we ErrorAndContinue we need to propagate the error if the overall task failed -->
-    <Error Condition="'$(MSBuildLastTaskResult)'=='false'" />
-  </Target>
-
-  <PropertyGroup>
-    <TraversalBuildDependsOn>BuildAllProjects;$(TraversalBuildDependsOn);</TraversalBuildDependsOn>
-  </PropertyGroup>
-
-  <Target Name="Build" DependsOnTargets="$(TraversalBuildDependsOn)" />
-  <Target Name="BuildAndTest" DependsOnTargets="Build;Test" />
-  <Target Name="Clean" DependsOnTargets="$(TraversalCleanDependsOn)" />
-  <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
-  <Target Name="RebuildAndTest" DependsOnTargets="Rebuild;Test" />
-  <Target Name="Restore" />
-  <Target Name="Test" />
-
-</Project>
diff --git a/eng/Packaging.props b/eng/packaging.props
index 25987e9894d..422b8808e01 100644
--- a/eng/Packaging.props
+++ b/eng/packaging.props
@@ -1,16 +1,15 @@
 <Project>
   <PropertyGroup>
-    <PackageDescriptionFile>$(RepoRoot)pkg/descriptions.json</PackageDescriptionFile>
+    <PackageDescriptionFile>$(PkgDir)descriptions.json</PackageDescriptionFile>
     <PackageLicenseFile>$(RepoRoot)LICENSE.TXT</PackageLicenseFile>
     <PackageThirdPartyNoticesFile>$(RepoRoot)THIRD-PARTY-NOTICES.TXT</PackageThirdPartyNoticesFile>
-    <RuntimeIdGraphDefinitionFile>$(RepoRoot)pkg/Microsoft.NETCore.Platforms/runtime.json</RuntimeIdGraphDefinitionFile>
+    <RuntimeIdGraphDefinitionFile>$(PkgDir)Microsoft.NETCore.Platforms/runtime.json</RuntimeIdGraphDefinitionFile>
     <ReleaseNotes>https://go.microsoft.com/fwlink/?LinkID=799421</ReleaseNotes>
-    <ProjectUrl>https://github.com/dotnet/corefx</ProjectUrl>
-    <LicenseUrl>https://github.com/dotnet/corefx/blob/master/LICENSE.TXT</LicenseUrl>
+    <ProjectUrl Condition="'$(ProjectUrl)' == ''">https://github.com/dotnet/corefx</ProjectUrl>
+    <LicenseUrl Condition="'$(LicenseUrl)' == ''">https://github.com/dotnet/corefx/blob/master/LICENSE.TXT</LicenseUrl>
     <!-- defined in buildtools packaging.targets, but we need this before targets are imported -->
     <PackagePlatform Condition="'$(PackagePlatform)' == ''">$(Platform)</PackagePlatform>
     <PackagePlatform Condition="'$(PackagePlatform)' == 'amd64'">x64</PackagePlatform>
-    <NativePackagePath>$(MSBuildThisFileDirectory)src/Native/pkg</NativePackagePath>
 
     <!-- Used by PackageLibs.targets -->
     <XmlDocFileRoot>$(NuGetPackageRoot)$(MicrosoftPrivateIntellisensePackageId)/$(MicrosoftPrivateIntellisensePackageVersion)/xmldocs/netcoreapp</XmlDocFileRoot>
@@ -45,7 +44,7 @@
     <PackageConfigurations>$(BuildConfigurations)</PackageConfigurations>
   </PropertyGroup>
 
-  <Import Condition="Exists('../pkg/baseline/baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="../pkg/baseline/baseline.props" />
+  <Import Condition="Exists('$(PkgDir)baseline\baseline.props') AND '$(MSBuildProjectExtension)' == '.pkgproj'" Project="$(PkgDir)baseline\baseline.props" />
 
   <PropertyGroup Condition="'$(OsEnvironment)'=='Unix'">
     <!--
@@ -75,7 +74,7 @@
 
     <!-- Add a marker to help the designer optimize & share .NET Core packages -->
     <File Condition="'$(IncludeDesignerMarker)' != 'false'"
-          Include="$(RepoRoot)pkg/useSharedDesignerContext.txt">
+          Include="$(PkgDir)useSharedDesignerContext.txt">
         <SkipPackageFileCheck>true</SkipPackageFileCheck>
     </File>
   </ItemGroup>
diff --git a/eng/Packaging.targets b/eng/packaging.targets
index 6bc626451ca..6bc626451ca 100644
--- a/eng/Packaging.targets
+++ b/eng/packaging.targets
diff --git a/eng/pipelines/libraries/corefx-base.yml b/eng/pipelines/libraries/corefx-base.yml
index 65364ae4ac7..3080cb58d55 100644
--- a/eng/pipelines/libraries/corefx-base.yml
+++ b/eng/pipelines/libraries/corefx-base.yml
@@ -159,7 +159,7 @@ jobs:
 
           - ${{ if eq(job.submitToHelix, 'true') }}:
             - ${{ if eq(parameters.isOfficialBuild, 'true') }}:
-              - script: $(_msbuildCommand) eng/publishTestAssets.proj
+              - script: $(_msbuildCommand) src/publishTestAssets.proj
                       /p:FilesToPublishPattern=$(Build.SourcesDirectory)/artifacts/helix/**/*.zip
                       /p:AccountKey=$(dotnetfeed-storage-access-key-1)
                       /p:ExpectedFeedUrl=$(_dotnetFeedUrl)
diff --git a/eng/pipelines/libraries/helix.yml b/eng/pipelines/libraries/helix.yml
index 9ca0c08dac6..419df576489 100644
--- a/eng/pipelines/libraries/helix.yml
+++ b/eng/pipelines/libraries/helix.yml
@@ -13,7 +13,7 @@ parameters:
 
 steps:
   - script: ${{ parameters.msbuildScript }}
-            eng/sendtohelix.proj
+            src/sendtohelix.proj
             /t:test
             /p:ArchGroup=${{ parameters.archGroup }}
             /p:ConfigurationGroup=${{ parameters.configuration }}
diff --git a/eng/pipelines/libraries/pre-publish.yml b/eng/pipelines/libraries/pre-publish.yml
index d2140910a66..9d0460bd01e 100644
--- a/eng/pipelines/libraries/pre-publish.yml
+++ b/eng/pipelines/libraries/pre-publish.yml
@@ -77,7 +77,7 @@ stages:
                       /bl:$(Build.SourcesDirectory)/artifacts/log/$(_BuildConfig)/PublishToArtifacts.binlog
               displayName: Publish to artifacts and produce manifest
 
-            - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 build.proj
+            - script: powershell -ExecutionPolicy ByPass -NoProfile eng\common\msbuild.ps1 src\build.proj
                       -warnaserror:0 -ci
                       /t:UpdatePublishedVersions
                       /p:GitHubAuthToken=$(AccessToken-dotnet-build-bot-public-repo)
diff --git a/eng/publishTestAssets.proj b/eng/publishTestAssets.proj
deleted file mode 100644
index 3d50cfafdb0..00000000000
--- a/eng/publishTestAssets.proj
+++ /dev/null
@@ -1,66 +0,0 @@
-<Project DefaultTargets="PublishTestAssets">
-  <Import Project="..\Directory.Build.props" />
-
-  <!-- We need to import Directory.Build.targets at the beginning because there is where we import the restored tools targets, in 
-  this case we need Microsoft.DotNet.Build.Tasks.Feed targets to be imported. -->
-  <Import Project="..\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <AssetManifestDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsDir)', 'TestAssetsManifests'))</AssetManifestDir>
-    <AssetManifestFilePath>$(AssetManifestDir)$(AssetManifestFileName)</AssetManifestFilePath>
-  </PropertyGroup>
-
-  <Target Name="PublishTestAssets">
-    <Error Text="The ExpectedFeedUrl property wasn't supplied." Condition="'$(ExpectedFeedUrl)' == ''" />
-    <Error Text="The AccountKey property wasn't supplied." Condition="'$(AccountKey)' == ''" />
-    <Error Text="FilesToPublishPattern property wasn't supplied." Condition="'$(FilesToPublishPattern)' == ''" />
-
-    <PropertyGroup>
-      <_TestAssetVersion>$(PackageVersion)-$(VersionSuffix)</_TestAssetVersion>
-      <_FileRelativePathBase>corefx-tests/$(_TestAssetVersion)/$(OSGroup).$(ArchGroup)/$(TargetGroup)/</_FileRelativePathBase>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <_ItemsToPush Remove="@(_ItemsToPush)" />
-      <_ItemsToPush Include="$(FilesToPublishPattern)" />
-      <_ItemsToPush>
-        <RelativeBlobPath>$(_FileRelativePathBase)$([System.String]::Copy('%(RecursiveDir)%(Filename)%(Extension)').Replace('\' ,'/'))</RelativeBlobPath>
-      </_ItemsToPush>
-    </ItemGroup>
-
-    <Error Condition="'@(_ItemsToPush)' == ''" Text="No files to push." />
-
-    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(_ItemsToPush)"
-                    PublishFlatContainer="true"
-                    ManifestBuildId="$(ManifestBuildId)"
-                    ManifestBranch="$(ManifestBranch)"
-                    ManifestCommit="$(ManifestCommit)"
-                    ManifestBuildData="$(ManifestBuildData)"
-                    ManifestRepoUri="$(ManifestRepoUri)"
-                    AssetManifestPath="$(AssetManifestFilePath)"
-                    Overwrite="true" />
-
-    <ItemGroup>
-      <_ManifestToPush Remove="@(_ManifestToPush)" />
-      <_ManifestToPush Include="$(AssetManifestFilePath)">
-        <RelativeBlobPath>$(_FileRelativePathBase)$(AssetManifestFileName)</RelativeBlobPath>
-      </_ManifestToPush>
-    </ItemGroup>
-
-    <Message Importance="High" Text="PublishTestAssets: $(_FileRelativePathBase)$(AssetManifestFileName)" />
-
-    <PushToBlobFeed ExpectedFeedUrl="$(ExpectedFeedUrl)"
-                    AccountKey="$(AccountKey)"
-                    ItemsToPush="@(_ManifestToPush)"
-                    PublishFlatContainer="true"
-                    ManifestBuildId="$(ManifestBuildId)"
-                    ManifestBranch="$(ManifestBranch)"
-                    ManifestCommit="$(ManifestCommit)"
-                    ManifestBuildData="$(ManifestBuildData)"
-                    ManifestRepoUri="$(ManifestRepoUri)"
-                    AssetManifestPath="$(AssetManifestDir)ManifestUpload.xml"
-                    Overwrite="true" />
-  </Target>
-</Project>
diff --git a/eng/ReferenceAssemblies.props b/eng/referenceAssemblies.props
index ba1e667fb4e..ba1e667fb4e 100644
--- a/eng/ReferenceAssemblies.props
+++ b/eng/referenceAssemblies.props
diff --git a/eng/resolveContract.targets b/eng/resolveContract.targets
index c4a95eae082..9598aec36c4 100644
--- a/eng/resolveContract.targets
+++ b/eng/resolveContract.targets
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup Condition="'$(IsSourceProject)' == 'true'">
-    <ContractProject Condition="'$(ContractProject)' == ''">$(SourceDir)/$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject>
+    <ContractProject Condition="'$(ContractProject)' == ''">$(LibrariesProjectRoot)$(MSBuildProjectName)/ref/$(MSBuildProjectName).csproj</ContractProject>
     <HasMatchingContract Condition="'$(HasMatchingContract)' == '' and Exists('$(ContractProject)')">true</HasMatchingContract>
     <ContractAssemblyPath Condition="'$(ContractAssemblyPath)' == ''">$(RefPath)/$(MSBuildProjectName).dll</ContractAssemblyPath>
 
diff --git a/eng/Resources.targets b/eng/resources.targets
index 5df76a12cd6..5df76a12cd6 100644
--- a/eng/Resources.targets
+++ b/eng/resources.targets
diff --git a/eng/restore/Directory.Build.props b/eng/restore/Directory.Build.props
deleted file mode 100644
index 65eeecb86fe..00000000000
--- a/eng/restore/Directory.Build.props
+++ /dev/null
@@ -1,21 +0,0 @@
-<Project>
-  <Import Project="..\..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <!-- We need configuration-specific assets files. -->
-    <RestoreOutputPath>$(IntermediateOutputPath)</RestoreOutputPath>
-    <ProjectAssetsFile>$(RestoreOutputPath)/project.assets.json</ProjectAssetsFile>
-    <MSBuildProjectExtensionsPath>$(IntermediateOutputPath)</MSBuildProjectExtensionsPath>
-    <SkipDeriveTargetFrameworks>true</SkipDeriveTargetFrameworks>
-    <!-- let us control the output path -->
-    <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
-  </PropertyGroup>
-  
-  <!-- don't bring in props/targets from packages, we're not consuming them we're
-       deploying them -->
-  <ItemDefinitionGroup>
-    <PackageReference>
-      <ExcludeAssets>Build</ExcludeAssets>
-    </PackageReference>
-  </ItemDefinitionGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/Directory.Build.targets b/eng/restore/Directory.Build.targets
deleted file mode 100644
index 07a510536af..00000000000
--- a/eng/restore/Directory.Build.targets
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-  <Import Project="..\..\Directory.Build.targets" />
-
-  <PropertyGroup>
-    <PrereleaseResolveNuGetPackages>true</PrereleaseResolveNuGetPackages>
-  </PropertyGroup>
-
-  <!-- Override build and GetTargetPath to return all items deployed -->
-  <Target Name="Build"
-          Condition=" '$(_InvalidConfigurationWarning)' != 'true' "
-          DependsOnTargets="$(BuildDependsOn)"
-          Returns="@(BinPlaceItem)" />
-
-  <!-- Depprojs need to run Compile in order to populate items that will be copied to output -->
-  <Target Name="GetTargetPath"
-          DependsOnTargets="Compile;GetBinPlaceItems"
-          Returns="@(BinPlaceItem)" />
-
-</Project>
diff --git a/eng/restore/analyzers/Configurations.props b/eng/restore/analyzers/Configurations.props
deleted file mode 100644
index d181ff13b98..00000000000
--- a/eng/restore/analyzers/Configurations.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netstandard2.0;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
diff --git a/eng/restore/analyzers/analyzers.depproj b/eng/restore/analyzers/analyzers.depproj
deleted file mode 100644
index 27dc13b8a5c..00000000000
--- a/eng/restore/analyzers/analyzers.depproj
+++ /dev/null
@@ -1,20 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <Language>C#</Language>
-  </PropertyGroup>
-
-  <!-- Import PackageReferences containing analyzers -->
-  <Import Project="$(RepositoryEngineeringDir)Analyzers.props" />
-
-  <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/eng/restore/binplacePackages/Configurations.props b/eng/restore/binplacePackages/Configurations.props
deleted file mode 100644
index 8c2ad7f6715..00000000000
--- a/eng/restore/binplacePackages/Configurations.props
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      net461;
-      netfx;
-      netstandard1.1;
-      netstandard1.2;
-      netstandard1.3;
-      netstandard1.4;
-      netstandard1.5;
-      netstandard1.6;
-      netstandard2.0;
-      netstandard2.0;
-      netcoreapp2.0;
-      netcoreapp3.0;
-      netcoreapp;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
diff --git a/eng/restore/binplacePackages/binplacePackages.depproj b/eng/restore/binplacePackages/binplacePackages.depproj
deleted file mode 100644
index a1b0d6b0934..00000000000
--- a/eng/restore/binplacePackages/binplacePackages.depproj
+++ /dev/null
@@ -1,49 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <BinPlaceRef>true</BinPlaceRef>
-    <BinPlaceRuntime>true</BinPlaceRuntime>
-    <NETStandardVersion Condition="'$(TargetsNetStandard)' == 'true'">$(TargetFramework.SubString(11))</NETStandardVersion>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <TargetsNetStandardLowerThan21 Condition="'$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &lt; 2.1">true</TargetsNetStandardLowerThan21>
-  </PropertyGroup>
-
-    <!-- Ref binplacing for all configurations -->
-  <ItemGroup>
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
-    </BinPlaceConfiguration>
-  </ItemGroup>
-
-  <!-- Runtime / test-runtime binplacing, when we aren't building better live version of these libs -->
-  <ItemGroup Condition="'$(TargetsNetFx)' == 'true'">
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <ItemName>BinPlaceLib</ItemName>
-      <RuntimePath>$(RuntimePath)</RuntimePath>
-    </BinPlaceConfiguration>
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <ItemName>BinPlaceLib</ItemName>
-      <RuntimePath>$(TestHostRuntimePath)</RuntimePath>
-    </BinPlaceConfiguration>
-  </ItemGroup>
-
-  <!-- This is to make sure that nothing unintended gets restored for netcoreapp. -->
-  <ItemGroup Condition="'$(TargetGroup)' != 'netcoreapp'">
-    <!-- runtime dependency: System.Diagnostics.PerformanceCounters netcoreapp2.0,net461 -->
-    <PackageReference Include="System.Memory" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or ('$(TargetsNetStandard)' == 'true' and '$(NETStandardVersion)' &gt;= 1.1)" />
-    <PackageReference Include="System.Numerics.Vectors" Version="4.5.0" Condition="'$(TargetsNetStandardLowerThan21)' == 'true' or '$(TargetsNetfx)' == 'true'" />
-    <PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.2" Condition="'$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetsNetfx)' == 'true' or '$(TargetsNetStandard)' == 'true'" />
-  </ItemGroup>
-  
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Bcl.AsyncInterfaces" Version="1.0.0" Condition="'$(TargetsNetStandard)' != 'true' or '$(NETStandardVersion)' &gt;= 2.0" />
-    <!-- Only include the assets from the direct packages we reference in the output -->
-    <PackageToInclude Include="@(PackageReference)" />
-  </ItemGroup>
-
-  <Target Name="AddHarvestedLibraries" BeforeTargets="CoreCompile"
-          Condition="'$(TargetsNetStandard)' != 'true'">
-    <ItemGroup>
-      <BinPlaceLib Include="@(ReferenceCopyLocalPaths)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/eng/restore/dirs.proj b/eng/restore/dirs.proj
deleted file mode 100644
index fe8d30165e4..00000000000
--- a/eng/restore/dirs.proj
+++ /dev/null
@@ -1,22 +0,0 @@
-<Project>
-  <Import Project="Directory.Build.props" />
-
-  <PropertyGroup>
-    <AdditionalBuildConfigurations>$(AdditionalBuildConfigurations);netstandard2.0-$(OSGroup)-$(ConfigurationGroup)-$(ArchGroup)</AdditionalBuildConfigurations>
-  </PropertyGroup>
-
-  <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" />
-    <Project Include="runtime/runtime.depproj" />
-    <Project Include="tools/tools.depproj" />
-    <Project Include="harvestPackages/harvestPackages.depproj" />
-    <Project Include="binplacePackages/binplacePackages.depproj" />
-  </ItemGroup>
-
-  <Import Project="$(RepositoryEngineeringDir)dir.traversal.targets" />
-</Project>
diff --git a/eng/restore/harvestPackages/Configurations.props b/eng/restore/harvestPackages/Configurations.props
deleted file mode 100644
index a5bb838e9e0..00000000000
--- a/eng/restore/harvestPackages/Configurations.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      package;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/harvestPackages/harvestPackages.depproj b/eng/restore/harvestPackages/harvestPackages.depproj
deleted file mode 100644
index bc320e9a922..00000000000
--- a/eng/restore/harvestPackages/harvestPackages.depproj
+++ /dev/null
@@ -1,44 +0,0 @@
-<Project InitialTargets="AddPackageDownload" Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
-  </PropertyGroup>
-
-  <Import Project="$(RepoRoot)pkg/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" />
-
-  <Target Name="AddPackageDownload">
-    <ItemGroup>
-      <_AllPkgProjs Include="$(RepoRoot)src/**/*.pkgproj" />
-    </ItemGroup>
-    <!-- Need separate ItemGroups so right metadata gets populated -->
-    <ItemGroup>
-      <_AllPkgProjsToPackageIdentity Include="@(_AllPkgProjs -> '%(Filename)')" />
-    </ItemGroup>
-
-    <GetLastStablePackage
-        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 -->
-    <ItemGroup>
-      <_OverridenPackageDownloads Include="@(_PackageDownload)" Condition="'@(PackageDownload)' == '@(_PackageDownload)' and %(Identity) != ''" />
-      <_PackageDownload Remove="@(_OverridenPackageDownloads)" />
-      <_PackageDownload Include="@(PackageDownload)" />
-
-      <PackageDownload Remove="@(PackageDownload)" />
-      <PackageDownload Include="@(_PackageDownload)" Condition="'%(_PackageDownload.IsImplicitlyDefined)' != 'true'" />
-      <!-- Add exact version to PackageDownload -->
-      <PackageDownload>
-        <Version>[%(Version)]</Version>
-      </PackageDownload>
-    </ItemGroup>
-  </Target>
-
-</Project>
\ No newline at end of file
diff --git a/eng/restore/netcoreapp/Configurations.props b/eng/restore/netcoreapp/Configurations.props
deleted file mode 100644
index 3fc1d78b054..00000000000
--- a/eng/restore/netcoreapp/Configurations.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp2.0;
-      netcoreapp2.1;
-      netcoreapp3.0;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/netcoreapp/netcoreapp.depproj b/eng/restore/netcoreapp/netcoreapp.depproj
deleted file mode 100644
index af7d0259003..00000000000
--- a/eng/restore/netcoreapp/netcoreapp.depproj
+++ /dev/null
@@ -1,19 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <!-- This project restores and publishes the targeting pack for specific versions of .NET Core.
-       With this, we are able to compile assemblies against shipped, stable versions of .NET Core. -->
-  <PropertyGroup>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <DisableImplicitFrameworkReferences>false</DisableImplicitFrameworkReferences>
-    <BinPlaceRef>true</BinPlaceRef>
-  </PropertyGroup>
-
-  <ItemGroup Condition="$(TargetFramework.StartsWith('netcoreapp2.'))">
-    <PackageReference Update="Microsoft.NETCore.App" IsImplicitlyDefined="false" PrivateAssets="None" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- for all configurations this project provides refs for that configuration -->
-    <BinPlaceConfiguration Include="$(Configuration)" RefPath="$(RefPath)" />
-    <FileToExclude Include="System.ComponentModel.Composition" />
-  </ItemGroup>
-</Project>
diff --git a/eng/restore/netfx/Configurations.props b/eng/restore/netfx/Configurations.props
deleted file mode 100644
index 490a182fc8c..00000000000
--- a/eng/restore/netfx/Configurations.props
+++ /dev/null
@@ -1,16 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <!-- Include netcoreapp since we need to generate facades between desktop and netcoreapp -->
-    <BuildConfigurations>
-      net45;
-      net451;
-      net46;
-      net461;
-      net462;
-      net47;
-      net471;
-      netfx;
-      netcoreapp;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
diff --git a/eng/restore/netfx/netfx.depproj b/eng/restore/netfx/netfx.depproj
deleted file mode 100644
index 89a96b83926..00000000000
--- a/eng/restore/netfx/netfx.depproj
+++ /dev/null
@@ -1,85 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <Import Project="$(SourceDir)\shims\netfxreference.props" />
-  <PropertyGroup>
-    <BinPlaceRef>true</BinPlaceRef>
-    <BinPlaceRuntime>true</BinPlaceRuntime>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <NETStandardSupportPackageId>NETStandard.Library.NETFramework</NETStandardSupportPackageId>
-    <NETStandardSupportPackageVersion>2.0.1-servicing-26011-01</NETStandardSupportPackageVersion>
-    <NETStandardSupportRoot>$(NuGetPackageRoot)$(NETStandardSupportPackageId.ToLower())\$(NETStandardSupportPackageVersion)\build</NETStandardSupportRoot>
-    <AddNetStandardSupportPackage Condition="'$(TargetFramework)' == 'net461' OR '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net47'">true</AddNetStandardSupportPackage>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(TargetsNetFx)' != 'true'">
-    <!-- For things not .NETFramework we need the net472 targeting pack to generate facades -->
-    <AssetTargetFallback>net472</AssetTargetFallback>
-    <NoWarn>$(NoWarn);NU1701</NoWarn>
-    <TargetingPackNugetPackageId>Microsoft.TargetingPack.NETFramework.v4.7.2</TargetingPackNugetPackageId>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <!-- For things not .NETFramework binplace to the NETFX ref path -->
-    <BinPlaceConfiguration Condition="'$(TargetsNetFx)' != 'true'" Include="$(Configuration)">
-      <RefPath>$(NetFxRefPath)</RefPath>
-    </BinPlaceConfiguration>
-
-    <!-- For things .NETFramework binplace to refpath -->
-    <BinPlaceConfiguration Condition="'$(TargetsNetFx)' == 'true'" Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
-    </BinPlaceConfiguration>
-  </ItemGroup>
-
-  <PropertyGroup>
-    <_TargetingPackVersion>1.0.1</_TargetingPackVersion>
-    <_TargetingPackVersion Condition="'$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.1' OR '$(TargetingPackNugetPackageId)' == 'Microsoft.TargetingPack.NETFramework.v4.7.2'">1.0.0</_TargetingPackVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="$(TargetingPackNugetPackageId)">
-      <Version >$(_TargetingPackVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="System.Memory" Condition="'$(TargetFramework)' == 'net45' OR '$(TargetFramework)' == 'net46'">
-      <Version>4.5.2</Version>
-    </PackageReference>
-    <PackageReference Include="System.Numerics.Vectors" Condition="'$(TargetGroup)' == 'net461' OR '$(TargetGroup)' == 'netfx'">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="$(NETStandardSupportPackageId)" Condition="'$(AddNetStandardSupportPackage)' == 'true'">
-      <Version>$(NETStandardSupportPackageVersion)</Version>
-    </PackageReference>
-
-    <FileToExclude Include="System.EnterpriseServices" />
-    <FileToExclude Include="System.EnterpriseServices.Thunk" />
-    <FileToExclude Include="System.EnterpriseServices.Wrapper" />
-  </ItemGroup>
-
-  <Target Name="AddNETStandardShims" AfterTargets="FilterNugetPackages"
-          Condition="'$(AddNetStandardSupportPackage)' == 'true'">
-    <ItemGroup>
-      <_netStandardReference Condition="'$(TargetFramework)' != 'net461' AND '$(TargetFramework)' != 'net462'"
-                             Include="$(NETStandardSupportRoot)\net47\lib\*.dll"
-                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net47\lib\%(FileName).dll')" />
-      <_netStandardReference Condition="'$(TargetFramework)' != 'net461'"
-                             Include="$(NETStandardSupportRoot)\net462\lib\*.dll"
-                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net462\lib\%(FileName).dll')" />
-      <_netStandardReference Include="$(NETStandardSupportRoot)\net461\lib\*.dll"
-                             Exclude="@(_netStandardReference->'$(NETStandardSupportRoot)\net461\lib\%(FileName).dll')" />
-
-      <_netStandardReference>
-        <Private>False</Private>
-        <NuGetPackageId>$(NETStandardSupportPackageId)</NuGetPackageId>
-        <NuGetPackageVersion>$(NETStandardSupportPackageVersion)</NuGetPackageVersion>
-      </_netStandardReference>
-
-      <_referenceByFileName Include="@(Reference->'%(FileName)%(Extension)')">
-        <OriginalIdentity>%(Identity)</OriginalIdentity>
-      </_referenceByFileName>
-      <_netStandardReferenceByFileName Include="@(_netStandardReference->'%(FileName)%(Extension)')" />
-
-      <_remainingReferenceByFileName Include="@(_referenceByFileName)" Exclude="@(_netStandardReferenceByFileName)" />
-      <_remainingReference Include="@(_remainingReferenceByFileName->'%(OriginalIdentity)')" />
-
-      <Reference Remove="@(Reference)" />
-      <Reference Include="@(_remainingReference);@(_netStandardReference)" />
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/eng/restore/netstandard/Configurations.props b/eng/restore/netstandard/Configurations.props
deleted file mode 100644
index 1ed1ca31fef..00000000000
--- a/eng/restore/netstandard/Configurations.props
+++ /dev/null
@@ -1,15 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netstandard1.0;
-      netstandard1.1;
-      netstandard1.2;
-      netstandard1.3;
-      netstandard1.4;
-      netstandard1.5;
-      netstandard1.6;
-      netstandard2.0;
-      netstandard2.0;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/netstandard/netstandard.depproj b/eng/restore/netstandard/netstandard.depproj
deleted file mode 100644
index dbde334f645..00000000000
--- a/eng/restore/netstandard/netstandard.depproj
+++ /dev/null
@@ -1,125 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <NETStandardVersion Condition="'$(TargetsNetStandard)' == 'true'">$(TargetFramework.SubString(11))</NETStandardVersion>
-    <IsNETStandard1x Condition="$(NETStandardVersion.StartsWith('1.'))">true</IsNETStandard1x>
-    <IsNETStandard2x Condition="$(NETStandardVersion.StartsWith('2.'))">true</IsNETStandard2x>
-    <BinPlaceRef>true</BinPlaceRef>
-    <NuGetDeploySourceItem>Reference</NuGetDeploySourceItem>
-    <_NETStandardTFMFolder Condition="'$(TargetFramework)' == 'netstandard2.0'">netstandard2.0</_NETStandardTFMFolder>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="NETStandard.Library">
-      <Version>$(NETStandardLibraryPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup Condition="'$(IsNETStandard1x)' == 'true'">
-    <PackageReference Include="System.Diagnostics.Contracts">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Diagnostics.Debug">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Dynamic.Runtime">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.Serialization.Primitives">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.3" Include="System.Reflection.TypeExtensions">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.2" Include="System.Data.SqlClient">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.3" Include="System.Security.Cryptography.Cng">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.1" Include="System.Reflection.Emit">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Emit.ILGeneration">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Reflection.Emit.Lightweight">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Runtime.WindowsRuntime">
-      <Version>4.3.0</Version>
-    </PackageReference>
-    <PackageReference Condition="'$(NETStandardVersion)' &gt;= 1.1" Include="System.Runtime.WindowsRuntime.UI.Xaml">
-      <Version>4.3.0</Version>
-    </PackageReference>
-  </ItemGroup>
-  <ItemGroup Condition="'$(IsNETStandard2x)' == 'true'">
-    <PackageReference Include="System.Security.Cryptography.Cng">
-      <Version>4.5.0</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.OpenSsl">
-      <Version>4.5.1</Version>
-    </PackageReference>
-    <PackageReference Include="System.Security.Cryptography.Pkcs">
-      <Version>4.5.2</Version>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <!-- for all configurations this project provides refs for that configuration -->
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <RefPath>$(RefPath)</RefPath>
-    </BinPlaceConfiguration>
-    <BinPlaceConfiguration Include="$(Configuration)">
-      <!-- copy shims to the testhost as well in order to be able to run the netfx tests -->
-      <RuntimePath>$(TestHostRootPath)</RuntimePath>
-    </BinPlaceConfiguration>
-  </ItemGroup>
-
-  <Target Name="AddNETStandard21Refs" AfterTargets="ResolveReferences">
-    <PropertyGroup>
-      <_NETStandard21RefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\netstandard2.1\ref</_NETStandard21RefFolder>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ExcludeNetStandard21Refs Include="System.Buffers" />
-      <ExcludeNetStandard21Refs Include="System.ComponentModel.Composition" />
-      <ExcludeNetStandard21Refs Include="System.Reflection.DispatchProxy" />
-      <ExcludeNetStandard21Refs Include="System.Reflection.Emit" />
-      <ExcludeNetStandard21Refs Include="System.Reflection.Emit.ILGeneration" />
-      <ExcludeNetStandard21Refs Include="System.Reflection.Emit.Lightweight" />
-      <_NetStandard21Files 
-        Include="$(_NETStandard21RefFolder)\*.dll"
-        Exclude="@(ExcludeNetStandard21Refs -> '$(_NETStandard21RefFolder)\%(Identity).dll')"  />
-    </ItemGroup>
-
-    <Error Condition="'@(_NetStandard21Files)' == ''" Text="Could not find package assets for netstandard2.1" />
-
-    <Copy SourceFiles="@(_NetStandard21Files)"
-          DestinationFolder="$(NetStandard21RefPath)"
-          SkipUnchangedFiles="true" />
-  </Target>
-
-  <Target Name="AddNETStandard20Refs" AfterTargets="ResolveReferences"
-          Condition="'$(_NETStandardTFMFolder)' != ''">
-    <PropertyGroup>
-      <_NETStandardRefFolder>$(NuGetPackageRoot)$(NETStandardLibraryPackageId.ToLower())\$(NETStandardLibraryPackageVersion)\build\$(_NETStandardTFMFolder)\ref</_NETStandardRefFolder>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <ExcludeNetStandardRefs Include="System.ComponentModel.Composition" />
-      <NetStandardRefs
-        Include="$(_NETStandardRefFolder)\*.dll"
-        Exclude="@(ExcludeNetStandardRefs -> '$(_NETStandardRefFolder)\%(Identity).dll')" />
-    </ItemGroup>
-
-    <Error Condition="'@(NetStandardRefs)' == ''" Text="Could not find package assets for netstandard2.0" />
-
-    <ItemGroup>
-      <Reference Include="@(NetStandardRefs)">
-        <Private>False</Private>
-        <NuGetPackageId>$(NETStandardLibraryPackageId)</NuGetPackageId>
-        <NuGetPackageVersion>$(NETStandardLibraryPackageVersion)</NuGetPackageVersion>
-      </Reference>
-    </ItemGroup>
-  </Target>
-</Project>
diff --git a/eng/restore/repoRestore.targets b/eng/restore/repoRestore.targets
index f3917de40be..f76976ba1f2 100644
--- a/eng/restore/repoRestore.targets
+++ b/eng/restore/repoRestore.targets
@@ -4,7 +4,7 @@
     <RestoreProjectStyle Condition="'$(MSBuildProjectExtension)' != '.depproj'">None</RestoreProjectStyle>
   </PropertyGroup>
 
-  <Import Project="$(RepositoryEngineeringDir)CodeAnalysis.targets" />
+  <Import Project="$(RepositoryEngineeringDir)codeAnalysis.targets" />
 
   <PropertyGroup>
     <!-- Nuget will normally disable all generated imports as part of a restore to avoid 
diff --git a/eng/restore/runtime/Configurations.props b/eng/restore/runtime/Configurations.props
deleted file mode 100644
index 2763918bc10..00000000000
--- a/eng/restore/runtime/Configurations.props
+++ /dev/null
@@ -1,11 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp3.0-Windows_NT;
-      netcoreapp3.0-Unix;
-      netcoreapp-Windows_NT;
-      netcoreapp-Unix;
-      mono;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
diff --git a/eng/restore/runtime/Directory.Build.props b/eng/restore/runtime/Directory.Build.props
deleted file mode 100644
index a86068c18c0..00000000000
--- a/eng/restore/runtime/Directory.Build.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <OutDirName>external.$(MSBuildProjectName)</OutDirName>
-  </PropertyGroup>
-  
-  <Import Project="..\Directory.Build.props" />
-</Project>
\ No newline at end of file
diff --git a/eng/restore/runtime/runtime.depproj b/eng/restore/runtime/runtime.depproj
deleted file mode 100644
index 421434766c7..00000000000
--- a/eng/restore/runtime/runtime.depproj
+++ /dev/null
@@ -1,126 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <RuntimeIdentifier>$(PackageRID)</RuntimeIdentifier>
-    <!-- We're using ToolRuntimeRID as a placeholder for the real corelib/runtime components until we have an actual set of runtime bits to consume for webassembly. -->
-    <RuntimeIdentifier Condition="'$(RuntimeOS)' == 'webassembly'">$(ToolRuntimeRID)</RuntimeIdentifier>
-    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
-    <SwapNativeForIL Condition="'$(SwapNativeForIL)' == '' AND ('$(ConfigurationGroup)' == 'Debug' OR '$(Coverage)' == 'true')">true</SwapNativeForIL>
-  </PropertyGroup>
-
-  <ItemGroup Condition="'$(DotNetBuildFromSource)' != 'true'">
-    <PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.7.0" />
-  </ItemGroup>
-
-  <PropertyGroup Condition="'$(TargetFramework)' == 'netcoreapp3.0'">
-    <!-- Non-shipping packages do not produce stable versions. -->
-    <MicrosoftNETCoreRuntimeCoreCLRPackageVersion>3.0.0-rc2.19462.14</MicrosoftNETCoreRuntimeCoreCLRPackageVersion>
-    <MicrosoftPrivateCorefxNETCoreAppVersion>4.6.0-rc2.19462.14</MicrosoftPrivateCorefxNETCoreAppVersion>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.Platforms" Version="$(MicrosoftNETCorePlatformsPackageVersion)" />
-    <PackageReference Include="transport.Microsoft.NETCore.Runtime.CoreCLR" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
-    <PackageReference Include="Microsoft.NETCore.TestHost" Version="$(MicrosoftNETCoreRuntimeCoreCLRPackageVersion)" />
-    <PackageReference Include="runtime.native.System.Data.SqlClient.sni" Version="$(RuntimeNativeSystemDataSqlClientSniPackageVersion)" />
-    <PackageReference Include="Microsoft.NETCore.DotNetHost" Version="$(MicrosoftNETCoreDotNetHostPackageVersion)" />
-    <PackageReference Include="Microsoft.NETCore.DotNetHostPolicy" Version="$(MicrosoftNETCoreDotNetHostPolicyPackageVersion)" />
-    <!-- We do not need apphost.exe and the 3.0 SDK will actually remove it.
-         Exclude here so that when building with the 2.x SDK we don't place it in the test shared framework.
-         This can be removed once we have a new SDK -->
-    <FileToExclude Include="apphost" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Condition="'$(TargetFramework)' == 'netcoreapp3.0'" Include="Microsoft.Private.Corefx.NETCoreApp" Version="$(MicrosoftPrivateCorefxNETCoreAppVersion)" />
-  </ItemGroup>
-
-  <!-- Setup the testing shared framework host -->
-  <Target Name="SetupTestingHost"
-          Condition="'$(BinPlaceTestSharedFramework)' == 'true'"
-          AfterTargets="AfterResolveReferences">
-    <PropertyGroup>
-      <GlobalJsonContent>$([System.IO.File]::ReadAllText('$(RepoRoot)global.json'))</GlobalJsonContent>
-      <DotNetVersion>$([System.Text.RegularExpressions.Regex]::Match($(GlobalJsonContent), '(%3F&lt;="dotnet": ").*(%3F=")'))</DotNetVersion>
-
-      <HostFxrFileName Condition="'$(TargetsWindows)' == 'true'">hostfxr</HostFxrFileName>
-      <HostFxrFileName Condition="'$(TargetsWindows)' != 'true'">libhostfxr</HostFxrFileName>
-      
-      <UseHardlink>true</UseHardlink>
-      <!-- workaround core-setup problem for hardlinking dotnet executable to testhost: core-setup #4742 -->
-      <UseHardlink Condition="'$(_runtimeOSFamily)' == 'FreeBSD'">false</UseHardlink>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <HostFxFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == '$(HostFxrFileName)'" />
-      <DotnetExe Include="@(ReferenceCopyLocalPaths)" Condition="'%(ReferenceCopyLocalPaths.Filename)' == 'dotnet'" />
-      <HostSdkFile Include="$(DotNetRoot)sdk\$(DotNetVersion)\**\*" />
-    </ItemGroup>
-
-    <Copy SourceFiles="@(HostFxFile)"
-          DestinationFolder="$(TestHostRootPath)host\fxr\$(ProductVersion)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="$(UseHardlink)" />
-
-    <Copy SourceFiles="@(DotnetExe)"
-          DestinationFolder="$(TestHostRootPath)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="$(UseHardlink)" />
-
-    <Exec Command="chmod +x $(TestHostRootPath)%(DotnetExe.Filename)%(DotnetExe.Extension)" Condition="'$(OS)' != 'Windows_NT'"/>
-
-    <Copy SourceFiles="@(HostSdkFile)"
-          DestinationFolder="$(TestHostRootPath)sdk\$(DotNetVersion)\%(RecursiveDir)"
-          SkipUnchangedFiles="true"
-          UseHardlinksIfPossible="$(UseHardlink)" />
-  </Target>
-
-  <Target Name="OverrideRuntime"
-          Condition="'$(CoreCLROverridePath)' != ''"
-          AfterTargets="AfterResolveReferences;FilterNugetPackages">
-    <Error Condition="!Exists('$(CoreCLROverridePath)')" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not exist." />
-    <PropertyGroup>
-      <CoreCLRPDBOverridePath Condition="'$(CoreCLRPDBOverridePath)' == '' and Exists('$(CoreCLROverridePath)/PDB')">$(CoreCLROverridePath)/PDB</CoreCLRPDBOverridePath>
-    </PropertyGroup>
-    <ItemGroup>
-      <CoreCLRFiles Include="$(CoreCLROverridePath)/*.*" />
-      <CoreCLRFiles Condition="'$(CoreCLRPDBOverridePath)' != ''" Include="$(CoreCLRPDBOverridePath)/*.pdb;$(CoreCLRPDBOverridePath)/*.dbg" />
-
-      <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'" />
-      <ReferenceCopyLocalPaths Include="@(CoreCLRFiles)" />
-    </ItemGroup>
-
-    <Error Condition="'@(CoreCLRFiles)' == ''" Text="The path provided to CoreCLROverridePath ($(CoreCLROverridePath)) does not contain any files." />
-  </Target>
-
-  <Target Name="GetCoreLibPackagePath" Condition="'$(CoreCLROverridePath)' == ''" DependsOnTargets="ResolveAssemblyReferences">
-    <ItemGroup>
-      <_CoreLibFile Include="@(ReferenceCopyLocalPaths)" Condition="'%(FileName)' == 'System.Private.CoreLib'" />
-    </ItemGroup>
-    <PropertyGroup>
-      <_CoreLibFilePath>%(_CoreLibFile.FullPath)</_CoreLibFilePath>
-      <_CoreLibPackagePath>$(_CoreLibFilePath.SubString(0, $(_CoreLibFilePath.IndexOf('runtimes'))))</_CoreLibPackagePath>
-    </PropertyGroup>
-    <Error Condition="'$(_CoreLibPackagePath)' == '' OR !Exists('$(_CoreLibPackagePath)')" 
-           Text="Could not locate the CoreClr package." />
-  </Target>
-
-  <Target Name="GetCoreCLRILFiles" DependsOnTargets="GetCoreLibPackagePath">
-    <ItemGroup>
-      <CoreCLRILFiles Condition="'$(CoreCLROverridePath)' == ''" Include="$(_CoreLibPackagePath)/**/il/*.*" />
-      <CoreCLRILFiles Condition="'$(CoreCLROverridePath)' != ''" Include="$(CoreCLROverridePath)/IL/*.*" />
-    </ItemGroup>
-    <Error Condition="'@(CoreCLRILFiles)' == ''" Text="Could not locate CoreCLR IL files." />
-  </Target>
-
-  <Target Name="SwapNativeForIL"
-          AfterTargets="AfterResolveReferences"
-          DependsOnTargets="GetCoreCLRILFiles;OverrideRuntime"
-          Condition="'$(SwapNativeForIL)' == 'true'">
-      <ItemGroup>
-        <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRILFiles->'%(FileName)%(Extension)')' == '%(FileName)%(Extension)'" />
-        <ReferenceCopyLocalPaths Remove="@(ReferenceCopyLocalPaths)" Condition="'@(CoreCLRILFiles->'%(FileName).ni%(Extension)')' == '%(FileName)%(Extension)'" />
-        <ReferenceCopyLocalPaths Include="@(CoreCLRILFiles)" />
-      </ItemGroup>
-  </Target>
-  
-</Project>
diff --git a/eng/restore/tools/Configurations.props b/eng/restore/tools/Configurations.props
deleted file mode 100644
index b796aca1749..00000000000
--- a/eng/restore/tools/Configurations.props
+++ /dev/null
@@ -1,7 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netstandard2.0;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/tools/tools.depproj b/eng/restore/tools/tools.depproj
deleted file mode 100644
index 579af95223f..00000000000
--- a/eng/restore/tools/tools.depproj
+++ /dev/null
@@ -1,17 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <OutputPath>$(ILAsmToolPath)</OutputPath>
-    <EnableBinPlacing>false</EnableBinPlacing>
-    <RuntimeIdentifier>$(ToolRuntimeRID)</RuntimeIdentifier>
-    <NoWarn>$(NoWarn);NU1603;NU1605</NoWarn>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NETCore.ILAsm">
-      <Version>$(MicrosoftNETCoreILAsmPackageVersion)</Version>
-    </PackageReference>
-    <PackageReference Include="Microsoft.NETCore.ILDAsm">
-      <Version>$(MicrosoftNETCoreILAsmPackageVersion)</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/winrt/Configurations.props b/eng/restore/winrt/Configurations.props
deleted file mode 100644
index d7ebc9bbced..00000000000
--- a/eng/restore/winrt/Configurations.props
+++ /dev/null
@@ -1,9 +0,0 @@
-<Project>
-  <PropertyGroup>
-    <BuildConfigurations>
-      netcoreapp3.0;
-      netcoreapp;
-      netstandard1.0;
-    </BuildConfigurations>
-  </PropertyGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/restore/winrt/winrt.depproj b/eng/restore/winrt/winrt.depproj
deleted file mode 100644
index ee9e2f3fa7c..00000000000
--- a/eng/restore/winrt/winrt.depproj
+++ /dev/null
@@ -1,15 +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>
-  </PropertyGroup>
-  <ItemGroup>
-    <PackageReference Include="Microsoft.TargetingPack.Private.WinRT">
-      <Version>1.0.5</Version>
-    </PackageReference>
-  </ItemGroup>
-</Project>
\ No newline at end of file
diff --git a/eng/sendtohelix.proj b/eng/sendtohelix.proj
deleted file mode 100644
index e3839f7d2a4..00000000000
--- a/eng/sendtohelix.proj
+++ /dev/null
@@ -1,104 +0,0 @@
-<Project InitialTargets="BuildHelixWorkItems" Sdk="Microsoft.DotNet.Helix.Sdk">
-  <PropertyGroup>
-    <NETCORE_ENGINEERING_TELEMETRY>Test</NETCORE_ENGINEERING_TELEMETRY>
-
-    <!-- Set helix source -->
-    <HelixSourcePrefix>pr/</HelixSourcePrefix>
-    <HelixSource Condition="'$(HelixSource)' == ''">$(HelixSourcePrefix)dotnet/corefx</HelixSource>
-    <HelixSource Condition="'$(BUILD_SOURCEBRANCH)' != ''">$(HelixSource)/$(BUILD_SOURCEBRANCH)</HelixSource>
-    
-    <!-- Set helix build to build number if available -->
-    <HelixBuild Condition="'$(HelixBuild)' == ''">$(BUILD_BUILDNUMBER)</HelixBuild>
-    <HelixBuild Condition="'$(HelixBuild)' == ''">default</HelixBuild>
-
-    <!-- For arm64 we set a 30min timeout temporarily until we split up slow test assemblies. -->
-    <TimeoutInSeconds Condition="'$(Platform)' == 'arm64'">1800</TimeoutInSeconds>
-    <TimeoutInSeconds Condition="'$(TimeoutInSeconds)' == ''">900</TimeoutInSeconds>
-    <_timeoutSpan>$([System.TimeSpan]::FromSeconds($(TimeoutInSeconds)))</_timeoutSpan>
-    
-    <!-- We need to enable xunit reporter so that it parses test results
-         Package testing doesn't run on xunit. -->
-    <EnableXunitReporter Condition="'$(TargetGroup)' != 'AllConfigurations'">true</EnableXunitReporter>
-    
-    <TestArchiveRuntimeFile>$(TestArchiveRuntimeRoot)test-runtime-$(BuildConfiguration).zip</TestArchiveRuntimeFile>
-    <TestArchiveRuntimeFile Condition="'$(TargetGroup)' == 'AllConfigurations'">$(TestArchiveRuntimeRoot)packages-testPayload-$(ConfigurationGroup).zip</TestArchiveRuntimeFile>
-
-    <!-- The helix runtime payload and the tests to run -->
-    <HelixCorrelationPayload Condition="'$(HelixCorrelationPayload)' == ''">$(TestArchiveRuntimeFile)</HelixCorrelationPayload>
-    <WorkItemArchiveWildCard Condition="'$(WorkItemArchiveWildCard)' == ''">$(TestArchiveTestsRoot)**/*.zip</WorkItemArchiveWildCard>
-
-    <HelixConfiguration>$(ConfigurationGroup)</HelixConfiguration>
-    <HelixArchitecture>$(ArchGroup)</HelixArchitecture>
-
-    <!-- This property is used to show the tests results in Azure Dev Ops. By setting this property the
-    test run name will be displayed as $(BuildConfiguration)-$(HelixTargetQueue) -->
-    <TestRunNamePrefix>$(BuildConfiguration)-</TestRunNamePrefix>
-    <TestRunNamePrefix Condition="'$(IsPackageTesting)' == 'true'">PackageTests-$(ConfigurationGroup)-$(ArchGroup)</TestRunNamePrefix>
-
-    <FailOnTestFailure Condition="'$(WaitForWorkItemCompletion)' != ''">$(WaitForWorkItemCompletion)</FailOnTestFailure>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(HelixType)' == ''">
-    <!-- For PRs we want helixtype to be the same for all frameworks except package testing-->
-    <TestScope Condition="'$(TestScope)' == ''">innerloop</TestScope>
-    <HelixType>test/functional/cli/$(TestScope)/</HelixType>
-    <HelixType Condition="'$(TargetGroup)' == 'AllConfigurations'">test/functional/packaging/</HelixType>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(HelixCommand)' == '' and '$(TargetGroup)' == 'AllConfigurations'">
-    <HelixPreCommands>set DOTNET_CLI_TELEMETRY_OPTOUT=1;set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1;set DOTNET_MULTILEVEL_LOOKUP=0</HelixPreCommands>
-
-    <HelixCommand>%HELIX_CORRELATION_PAYLOAD%\tools\dotnet.exe msbuild %HELIX_CORRELATION_PAYLOAD%\test.msbuild</HelixCommand>
-    <HelixCommand>$(HelixCommand) /warnaserror</HelixCommand>
-    <HelixCommand>$(HelixCommand) /p:PackageTestProjectsDir=%HELIX_WORKITEM_PAYLOAD%</HelixCommand>
-    <HelixCommand>$(HelixCommand) /p:RestorePackagesPath=%HELIX_WORKITEM_PAYLOAD%\packages</HelixCommand>
-    <HelixCommand>$(HelixCommand) /p:LocalPackagesPath="%HELIX_CORRELATION_PAYLOAD%\packages\"</HelixCommand>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(HelixCommand)' == ''">
-    <!--
-      For windows we need to use call, since the command is going to be called from a bat script created by Helix
-      and we exit /b at the end of RunTests.cmd, Helix runs some other commands after ours within the bat script,
-      if we don't use call, then we cause the parent script to exit, and anything after will not be executed.
-    -->
-    <HelixCommand Condition="'$(TargetsWindows)' == 'true'">call RunTests.cmd --runtime-path %HELIX_CORRELATION_PAYLOAD%</HelixCommand>
-    <HelixCommand Condition="'$(TargetsWindows)' != 'true'">./RunTests.sh --runtime-path "$HELIX_CORRELATION_PAYLOAD"</HelixCommand>
-  </PropertyGroup>
-
-  <!--
-    We need to include all dlls in the runtime path as inputs to make it really incremental if we use the root folder,
-    if a dll is updated, the folder's timestamp is not updated, therefore skipped.
-  -->
-  <ItemGroup>
-    <_RuntimeInputs Include="$(TestHostRootPath)**/*.dll" />
-  </ItemGroup>
-
-  <Target Name="CompressRuntimeDirectory"
-          Inputs="@(_RuntimeInputs);@(TestArchiveRuntimeDependency)"
-          Outputs="$(TestArchiveRuntimeFile)"
-          Condition="'$(TargetGroup)' != 'AllConfigurations'">
-
-    <MakeDir Directories="$(TestArchiveRuntimeRoot)" />
-    <ZipDirectory SourceDirectory="$(TestHostRootPath)"
-                  DestinationFile="$(TestArchiveRuntimeFile)"
-                  Overwrite="true" />
-
-  </Target>
-
-  <Target Name="BuildHelixWorkItems"
-          DependsOnTargets="CompressRuntimeDirectory">
-
-    <ItemGroup>
-      <HelixCorrelationPayload Include="$(HelixCorrelationPayload)" />
-
-      <_WorkItem Include="$(WorkItemArchiveWildCard)" Exclude="$(HelixCorrelationPayload)" />
-
-      <HelixWorkItem Include="@(_WorkItem -> '%(FileName)')">
-        <PayloadArchive>%(Identity)</PayloadArchive>
-        <Command>$(HelixCommand)</Command>
-        <Timeout>$(_timeoutSpan)</Timeout>
-      </HelixWorkItem>
-    </ItemGroup>
-
-  </Target>
-</Project>
diff --git a/eng/versioning.targets b/eng/versioning.targets
index ec0ceab21c0..cfad657c09d 100644
--- a/eng/versioning.targets
+++ b/eng/versioning.targets
@@ -10,7 +10,7 @@
 
   <!-- Assembly metadata indicating that an assembly is a framework (as opposed to user) assembly:
        Test projects need to not have this because of the way "IsFrameworkAssembly" APIs work to check this. -->
-  <ItemGroup Condition="'$(IsDotNetFrameworkProductAssembly)' == 'true' AND '$(IsTestProject)' != 'true'" >
+  <ItemGroup Condition="'$(IsTestProject)' != 'true'" >
     <AssemblyMetadata Include=".NETFrameworkAssembly">
       <Value></Value>
     </AssemblyMetadata>