diff --git a/Directory.Build.props b/Directory.Build.props
index a67312c42..a5ddc8ace 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -47,10 +47,6 @@
     <LocalBuildToolsTaskFile>$(LocalBuildToolsTaskDir)local.tasks.dll</LocalBuildToolsTaskFile>
   </PropertyGroup>
 
-  <PropertyGroup>
-    <HostMachineInfoProps>$(ObjDir)HostMachineInfo.props</HostMachineInfoProps>
-  </PropertyGroup>
-
   <PropertyGroup>
     <!--
       This name is used to create a GIT repository URL https://github.com/dotnet/$(GitHubRepositoryName) used to find source code for debugging
@@ -76,6 +72,9 @@
     <RunningOnUnix Condition="'$(OS)'!='Windows_NT'">true</RunningOnUnix>
 
     <RunningOnCore Condition="'$(MSBuildRuntimeType)' == 'core'">true</RunningOnCore>
+
+    <HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(RunningOnCore)' == 'true'">$([System.Runtime.InteropServices.RuntimeInformation]::RuntimeIdentifier)</HostRuntimeIdentifier>
+    <HostRuntimeIdentifier Condition="'$(HostRuntimeIdentifier)' == '' and '$(RunningOnCore)' != 'true'">win-$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture.ToString().ToLowerInvariant)</HostRuntimeIdentifier>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -163,11 +162,8 @@
     <ExeSuffix Condition="'$(OSGroup)'=='Windows_NT'">.exe</ExeSuffix>
   </PropertyGroup>
 
-  <Import Project="$(HostMachineInfoProps)"
-          Condition="Exists('$(HostMachineInfoProps)')" />
-
-  <PropertyGroup Condition="'$(OutputRid)' == '' and '$(HostMachineRid)' != ''">
-    <OutputRid>$(HostMachineRid.Remove($(HostMachineRid.LastIndexOf('-'))))-$(TargetArchitecture)</OutputRid>
+  <PropertyGroup Condition="'$(OutputRid)' == '' and '$(HostRuntimeIdentifier)' != ''">
+    <OutputRid>$(HostRuntimeIdentifier.Remove($(HostRuntimeIdentifier.LastIndexOf('-'))))-$(TargetArchitecture)</OutputRid>
   </PropertyGroup>
 
   <!-- Portable -->
diff --git a/Directory.Build.targets b/Directory.Build.targets
index c6dd4f565..b5bcca96e 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -6,7 +6,6 @@
   <!-- Provide default targets which can be hooked onto or overridden as necessary -->
   <Target Name="Pack" />
 
-  <UsingTask TaskName="GetTargetMachineInfo" AssemblyFile="$(LocalBuildToolsTaskFile)" />
   <UsingTask TaskName="RegenerateReadmeTable" AssemblyFile="$(LocalBuildToolsTaskFile)" />
 
   <PropertyGroup>
@@ -61,26 +60,6 @@
   <Target Name="GetInstallerLocations"
           DependsOnTargets="GetProductVersions" />
 
-  <Target Name="CreateHostMachineInfoFile">
-    <GetTargetMachineInfo>
-      <Output PropertyName="HostMachineRid" TaskParameter="RuntimeIdentifier" />
-    </GetTargetMachineInfo>
-
-    <PropertyGroup>
-      <HostMachineInfoPropsContent>
-&lt;Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"&gt;
-  &lt;PropertyGroup&gt;
-    &lt;HostMachineRid&gt;$(HostMachineRid)&lt;/HostMachineRid&gt;
-  &lt;/PropertyGroup&gt;
-&lt;/Project&gt;
-      </HostMachineInfoPropsContent>
-    </PropertyGroup>
-
-    <WriteLinesToFile File="$(HostMachineInfoProps)"
-                      Lines="$(HostMachineInfoPropsContent)"
-                      Overwrite="True" />
-  </Target>
-
   <Target Name="GetLatestCommitHash"
           Condition="'$(LatestCommit)' == ''">
     <!-- Get the latest commit hash -->
diff --git a/eng/Build.props b/eng/Build.props
index 306be1b57..3bb6145c9 100644
--- a/eng/Build.props
+++ b/eng/Build.props
@@ -79,8 +79,7 @@
       Properties="RepoRoot=$(RepoRoot)"
       Targets="
         Restore;
-        Build;
-        CreateHostMachineInfoFile"/>
+        Build"/>
     
     <WriteLinesToFile
       File="$(RepoTasksOutputFile)"
diff --git a/eng/Signing.props b/eng/Signing.props
index 253f26bda..5e580448c 100644
--- a/eng/Signing.props
+++ b/eng/Signing.props
@@ -24,18 +24,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(SignBinaries)' == 'true'">
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostfxr.dll" />
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/hostpolicy.dll" />
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/dotnet.exe" />
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/ijwhost.dll" />
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/winrthost.dll" />
-    <ItemsToSign Include="$(BaseOutputRootPath)corehost/**/nethost.dll" />
-
     <ItemsToSign Include="$(CrossGenRootPath)**/*.dll" />
-
-    <ItemsToSign Include="$(ArtifactsBinDir)Microsoft.DotNet.PlatformAbstractions/**/*.dll" />
-    <ItemsToSign Include="$(ArtifactsBinDir)Microsoft.Extensions.DependencyModel/**/*.dll" />
-    <ItemsToSign Include="$(ArtifactsBinDir)Microsoft.NET.HostModel/**/*.dll" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(SignMsiFiles)' == 'true'">
diff --git a/global.json b/global.json
index 34dc55ac8..97d605a7e 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "tools": {
-    "dotnet": "3.1.101"
+    "dotnet": "5.0.100-preview.5.20228.8"
   },
   "msbuild-sdks": {
     "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20201.2",
diff --git a/src/windowsdesktop/Directory.Build.props b/src/windowsdesktop/Directory.Build.props
index 4b971c5b5..8ce121e2c 100644
--- a/src/windowsdesktop/Directory.Build.props
+++ b/src/windowsdesktop/Directory.Build.props
@@ -9,7 +9,7 @@
     <TestRestoreNuGetConfigFile>$(ObjDir)TestNuGetConfig\NuGet.config</TestRestoreNuGetConfigFile>
     <InternalNupkgCacheDir>$(ObjDir)ExtraNupkgsForTestRestore\</InternalNupkgCacheDir>
     <TestArchitectures>$(TargetArchitecture)</TestArchitectures>
-    <TestInfraTargetFramework>netcoreapp3.0</TestInfraTargetFramework>
+    <TestInfraTargetFramework>netcoreapp5.0</TestInfraTargetFramework>
   </PropertyGroup>
 
 </Project>
diff --git a/src/windowsdesktop/Directory.Build.targets b/src/windowsdesktop/Directory.Build.targets
index b329a1ebb..2a4116204 100644
--- a/src/windowsdesktop/Directory.Build.targets
+++ b/src/windowsdesktop/Directory.Build.targets
@@ -57,12 +57,8 @@
   </Target>
 
   <Target Name="DetermineTestOutputDirectory">
-    <GetTargetMachineInfo>
-      <Output TaskParameter="RuntimeIdentifier" PropertyName="_HostRid" />
-    </GetTargetMachineInfo>
-
     <PropertyGroup>
-      <TestTargetRid Condition="'$(TestTargetRid)' == ''">$(_HostRid)</TestTargetRid>
+      <TestTargetRid Condition="'$(TestTargetRid)' == ''">$(HostRuntimeIdentifier)</TestTargetRid>
       <TestsOutputName Condition="'$(TestsOutputName)' == ''">$(MSBuildProjectName)</TestsOutputName>
 
       <TestsOutputRootDir Condition="'$(TestsOutputRootDir)' == ''">$(ArtifactsDir)tests/$(ConfigurationGroup)/</TestsOutputRootDir>
diff --git a/tools-local/tasks/GetTargetMachineInfo.cs b/tools-local/tasks/GetTargetMachineInfo.cs
deleted file mode 100644
index 67aa53b36..000000000
--- a/tools-local/tasks/GetTargetMachineInfo.cs
+++ /dev/null
@@ -1,67 +0,0 @@
-// Licensed to the .NET Foundation under one or more agreements.
-// The .NET Foundation licenses this file to you under the MIT license.
-// See the LICENSE file in the project root for more information.
-
-using Microsoft.Build.Framework;
-using System.Runtime.InteropServices;
-
-namespace Microsoft.DotNet.Build.Tasks
-{
-    public class GetTargetMachineInfo : BuildTask
-    {
-        [Output]
-        public string TargetOS { get; set; }
-
-        [Output]
-        public string TargetArch { get; set; }
-
-        [Output]
-        public string RuntimeIdentifier { get; set; }
-
-        public override bool Execute()
-        {
-            switch (RuntimeInformation.OSArchitecture)
-            {
-                case Architecture.X64:
-                    TargetArch = "x64";
-                    break;
-                case Architecture.X86:
-                    TargetArch = "x86";
-                    break;
-                case Architecture.Arm:
-                    TargetArch = "arm";
-                    break;
-                case Architecture.Arm64:
-                    TargetArch = "arm64";
-                    break;
-            }
-
-            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
-                TargetOS = "Windows_NT";
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-                TargetOS = "Linux";
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
-                TargetOS = "OSX";
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("FREEBSD")))
-                TargetOS = "FreeBSD";
-            else if (RuntimeInformation.IsOSPlatform(OSPlatform.Create("NETBSD")))
-                TargetOS = "NetBSD";
-
-            RuntimeIdentifier = Microsoft.DotNet.PlatformAbstractions.RuntimeEnvironment.GetRuntimeIdentifier();
-
-            if (TargetArch == null)
-            {
-                Log.LogError("{0} is null", nameof(TargetArch));
-                return false;
-            }
-
-            if (TargetOS == null)
-            {
-                Log.LogError("{0} is null", nameof(TargetOS));
-                return false;
-            }
-
-            return true;
-        }
-    }
-}
diff --git a/tools-local/tasks/local.tasks.csproj b/tools-local/tasks/local.tasks.csproj
index 3fc5e54be..4eac498ff 100644
--- a/tools-local/tasks/local.tasks.csproj
+++ b/tools-local/tasks/local.tasks.csproj
@@ -17,7 +17,6 @@
   <ItemGroup>
     <PackageReference Include="NuGet.ProjectModel" Version="$(NugetProjectModelVersion)" />
     <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
-    <PackageReference Include="Microsoft.DotNet.PlatformAbstractions" Version="2.1.0" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' != 'net46'">