diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bac8cc29d411..88701d4d1b81 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,13 +3,13 @@ - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 8547938aefa24475a04877285553f0b2663ae249 - + https://github.com/dotnet/arcade - 590a102630c7efc7ca6f652f7c6c47dee4c4086c + 8547938aefa24475a04877285553f0b2663ae249 https://github.com/dotnet/runtime diff --git a/eng/Versions.props b/eng/Versions.props index 207981d5bad1..cd672b87bddd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -20,7 +20,7 @@ 1.5.0 15.4.8 15.4.8 - 5.0.0-beta.20228.4 + 5.0.0-beta.20256.5 0.11.2 diff --git a/eng/azure-pipelines.yml b/eng/azure-pipelines.yml index df35ad96b660..6b5bbb2142e6 100644 --- a/eng/azure-pipelines.yml +++ b/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 diff --git a/eng/common/internal/Tools.csproj b/eng/common/internal/Tools.csproj index 1a39a7ef3f67..f46d5efe2e32 100644 --- a/eng/common/internal/Tools.csproj +++ b/eng/common/internal/Tools.csproj @@ -4,6 +4,7 @@ net472 false + false diff --git a/eng/common/performance/performance-setup.ps1 b/eng/common/performance/performance-setup.ps1 index 1763a1a97b0e..f5e6ca688b70 100644 --- a/eng/common/performance/performance-setup.ps1 +++ b/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" } diff --git a/eng/common/performance/performance-setup.sh b/eng/common/performance/performance-setup.sh index b9eecf94bd01..34eed8b672f1 100755 --- a/eng/common/performance/performance-setup.sh +++ b/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 diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 79c25e7f3ef9..f997be4331d2 100644 --- a/eng/common/sdk-task.ps1 +++ b/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 diff --git a/global.json b/global.json index e573e8b40aae..8b480467734b 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "tools": { - "dotnet": "3.1.101", + "dotnet": "5.0.100-preview.5.20251.2", "runtimes": { "dotnet": [ "3.0.0" @@ -8,7 +8,7 @@ } }, "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" } } diff --git a/lint.cmd b/lint.cmd index e885c0c2dfc9..0857c2635be5 100644 --- a/lint.cmd +++ b/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 %*""" diff --git a/lint.sh b/lint.sh index 6391766a559c..6f1cebc51d4e 100755 --- a/lint.sh +++ b/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 $@ diff --git a/src/linker/Linker.Steps/MarkStep.cs b/src/linker/Linker.Steps/MarkStep.cs index b5e0f03d24eb..96af89382b1b 100644 --- a/src/linker/Linker.Steps/MarkStep.cs +++ b/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)); } diff --git a/test/ILLink.Tasks.IntegrationTests/WebApiTest.cs b/test/ILLink.Tasks.IntegrationTests/WebApiTest.cs index 75775fe3c33d..a8a9c4950dbc 100644 --- a/test/ILLink.Tasks.IntegrationTests/WebApiTest.cs +++ b/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); }