Remove references to PlatformAbstractions. (#763)

* Remove references to PlatformAbstractions.

This will allow us to remove the PlatformAbstractions library from dotnet/runtime.

I needed to update the SDK used so I can use the new RuntimeInformation.RuntimeIdentifier API that is only in .NET 5.

Contributes to dotnet/runtime#3470

* Remove leftover UsingTask

* Add back CrossGenRootPath to sign binaries

* Fix the tests by updating the TFM to 5.0

Author: eerhardt

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 -->

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>
@@ -60,26 +59,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 -->

eng/Build.props

@@ -79,8 +79,7 @@
       Properties="RepoRoot=$(RepoRoot)"
       Targets="
         Restore;
-        Build;
-        CreateHostMachineInfoFile"/>
+        Build"/>
 
     <WriteLinesToFile
       File="$(RepoTasksOutputFile)"

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'">

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",

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>

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>

tools-local/tasks/GetTargetMachineInfo.cs

@@ -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'">