[master] Update dependencies from dotnet/arcade (dotnet#1180)

* Update dependencies from https://github.com/dotnet/arcade build 20200506.5

- Microsoft.DotNet.ApiCompat: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5
- Microsoft.DotNet.Arcade.Sdk: 5.0.0-beta.20228.4 -> 5.0.0-beta.20256.5

* Add restore to lint.sh/cmd

* Remove lint restore from azure-pipelines.yml

* Make sure the Lint step fails on violations

* Disable https listening in WebApiTest.cs

It doesn't play nice with CI environments.

* Disable WebApi test on CI on macOS

Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com>
Co-authored-by: Alexander Köplinger <[email protected]>

eng/Version.Details.xml

@@ -3,13 +3,13 @@
   <ProductDependencies>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20228.4">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20256.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
+      <Sha>8547938aefa24475a04877285553f0b2663ae249</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20228.4">
+    <Dependency Name="Microsoft.DotNet.ApiCompat" Version="5.0.0-beta.20256.5">
       <Uri>https://github.com/dotnet/arcade</Uri>
-      <Sha>590a102630c7efc7ca6f652f7c6c47dee4c4086c</Sha>
+      <Sha>8547938aefa24475a04877285553f0b2663ae249</Sha>
     </Dependency>
     <Dependency Name="Microsoft.NET.Sdk.IL" Version="5.0.0-preview.5.20260.5">
       <Uri>https://github.com/dotnet/runtime</Uri>

eng/Versions.props

@@ -20,7 +20,7 @@
     <SystemReflectionMetadataVersion>1.5.0</SystemReflectionMetadataVersion>
     <MicrosoftBuildFrameworkVersion>15.4.8</MicrosoftBuildFrameworkVersion>
     <MicrosoftBuildUtilitiesCoreVersion>15.4.8</MicrosoftBuildUtilitiesCoreVersion>
-    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20228.4</MicrosoftDotNetApiCompatVersion>
+    <MicrosoftDotNetApiCompatVersion>5.0.0-beta.20256.5</MicrosoftDotNetApiCompatVersion>
     <!-- We depend on (and redistribute) the official Mono.Cecil NuGet package built from https://github.com/jbevain/cecil -->
     <MonoCecilVersion>0.11.2</MonoCecilVersion>
   </PropertyGroup>

eng/azure-pipelines.yml

@@ -126,13 +126,7 @@ stages:
       steps:
       - checkout: self
         submodules: true
-      - task: DotNetCoreCLI@2
-        displayName: 'Restore dotnet tools'
-        inputs:
-          command: 'custom'
-          custom: 'tool'
-          arguments: 'restore'
-      - script: ./lint.sh --dry-run
+      - script: ./lint.sh --dry-run --check
 
   - ${{ if eq(variables.officialBuild, 'false') }}:
     - job: Linux_Mono

eng/common/internal/Tools.csproj

@@ -4,6 +4,7 @@
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
     <ImportDirectoryBuildTargets>false</ImportDirectoryBuildTargets>
+    <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
   </PropertyGroup>
   <ItemGroup>
     <!-- Clear references, the SDK may add some depending on UsuingToolXxx settings, but we only want to restore the following -->

eng/common/performance/performance-setup.ps1

@@ -3,7 +3,7 @@ Param(
     [string] $CoreRootDirectory,
     [string] $BaselineCoreRootDirectory,
     [string] $Architecture="x64",
-    [string] $Framework="netcoreapp5.0",
+    [string] $Framework="net5.0",
     [string] $CompilationMode="Tiered",
     [string] $Repository=$env:BUILD_REPOSITORY_NAME,
     [string] $Branch=$env:BUILD_SOURCEBRANCH,
@@ -31,7 +31,8 @@ $HelixSourcePrefix = "pr"
 
 $Queue = "Windows.10.Amd64.ClientRS4.DevEx.15.8.Open"
 
-if ($Framework.StartsWith("netcoreapp")) {
+# TODO: Implement a better logic to determine if Framework is .NET Core or >= .NET 5.
+if ($Framework.StartsWith("netcoreapp") -or ($Framework -eq "net5.0")) {
     $Queue = "Windows.10.Amd64.ClientRS5.Open"
 }
 

eng/common/performance/performance-setup.sh

@@ -4,7 +4,7 @@ source_directory=$BUILD_SOURCESDIRECTORY
 core_root_directory=
 baseline_core_root_directory=
 architecture=x64
-framework=netcoreapp5.0
+framework=net5.0
 compilation_mode=tiered
 repository=$BUILD_REPOSITORY_NAME
 branch=$BUILD_SOURCEBRANCH

eng/common/sdk-task.ps1

@@ -59,14 +59,15 @@ try {
 
   if( $msbuildEngine -eq "vs") {
     # Ensure desktop MSBuild is available for sdk tasks.
-    if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "vs" )) {
-      $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.4`" }") -MemberType NoteProperty
+    if( -not ($GlobalJson.tools.PSObject.Properties.Name -contains "vs" )) {
+      $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty
     }
     if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) {
-      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.4.0-alpha" -MemberType NoteProperty
+      $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "16.5.0-alpha" -MemberType NoteProperty
     }
 
-    InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
+    $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true
+    $global:_MSBuildExe = "$($xcopyMSBuildToolsFolder)\MSBuild\Current\Bin\MSBuild.exe"
   }
 
   $taskProject = GetSdkTaskProject $task

global.json

@@ -1,14 +1,14 @@
 {
   "tools": {
-    "dotnet": "3.1.101",
+    "dotnet": "5.0.100-preview.5.20251.2",
     "runtimes": {
       "dotnet": [
         "3.0.0"
       ]
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20221.14",
+    "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20256.5",
     "Microsoft.NET.Sdk.IL": "5.0.0-preview.5.20260.5"
   }
 }

lint.cmd

@@ -1,2 +1,3 @@
 @echo off
+powershell -ExecutionPolicy ByPass -NoProfile -command "Set-Location %~dp0; & """%~dp0eng\dotnet.ps1""" ""tool restore"""
 powershell -ExecutionPolicy ByPass -NoProfile -command "Set-Location %~dp0; & """%~dp0eng\dotnet.ps1""" ""tool run dotnet-format --verbosity diagnostic -f . --exclude src/analyzer,src/tuner,external %*"""

lint.sh

@@ -13,4 +13,5 @@ while [[ -h $source ]]; do
 done
 
 scriptroot="$( cd -P "$( dirname "$source" )" && pwd )"
+"$scriptroot/eng/dotnet.sh" tool restore
 "$scriptroot/eng/dotnet.sh" tool run dotnet-format --verbosity diagnostic -f . --exclude src/analyzer,src/tuner,external $@

src/linker/Linker.Steps/MarkStep.cs

@@ -276,7 +276,7 @@ internal void MarkEntireType (TypeDefinition type, bool includeBaseTypes, in Dep
 			}
 
 			Annotations.Mark (type, reason);
-			var baseTypeDefinition = type.BaseType?.Resolve();
+			var baseTypeDefinition = type.BaseType?.Resolve ();
 			if (includeBaseTypes && baseTypeDefinition != null) {
 				MarkEntireType (baseTypeDefinition, includeBaseTypes: true, new DependencyInfo (DependencyKind.BaseType, type));
 			}

test/ILLink.Tasks.IntegrationTests/WebApiTest.cs

@@ -1,6 +1,7 @@
 using System;
 using System.IO;
 using System.Xml.Linq;
+using System.Runtime.InteropServices;
 using Xunit;
 using Xunit.Abstractions;
 
@@ -30,7 +31,7 @@ public string SetupProject ()
 			}
 
 			Directory.CreateDirectory (projectRoot);
-			int ret = CommandHelper.Dotnet ("new webapi", projectRoot);
+			int ret = CommandHelper.Dotnet ("new webapi --no-https", projectRoot);
 			if (ret != 0) {
 				LogMessage ("dotnet new failed");
 				Assert.True (false);
@@ -78,6 +79,11 @@ public WebApiTest (WebApiFixture fixture, ITestOutputHelper output) : base (outp
 		[Fact]
 		public void RunWebApiStandalone ()
 		{
+			if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX) && !String.IsNullOrEmpty (Environment.GetEnvironmentVariable ("TF_BUILD"))) {
+				// CI has issues with the HTTPS dev cert
+				return;
+			}
+
 			string executablePath = BuildAndLink (fixture.csproj, selfContained: true);
 			CheckOutput (executablePath, selfContained: true);
 		}