diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml index c37d31ea54..9996b79ef7 100644 --- a/.azure/pipelines/jobs/default-build.yml +++ b/.azure/pipelines/jobs/default-build.yml @@ -99,10 +99,10 @@ jobs: ${{ if eq(parameters.useHostedUbuntu, false) }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool - queue: BuildPool.Ubuntu.1604.Amd64.Open + queue: BuildPool.Ubuntu.1804.Amd64.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCoreInternal-Pool - queue: BuildPool.Ubuntu.1604.Amd64 + queue: BuildPool.Ubuntu.1804.Amd64 ${{ if eq(parameters.agentOs, 'Windows') }}: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCorePublic-Pool diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml index 35e103e180..5b89191bd8 100644 --- a/.azure/pipelines/quarantined-pr.yml +++ b/.azure/pipelines/quarantined-pr.yml @@ -128,7 +128,7 @@ jobs: - template: jobs/default-build.yml parameters: jobName: Linux_Quarantined_Test - jobDisplayName: "Tests: Ubuntu 16.04 x64" + jobDisplayName: "Tests: Ubuntu 18.04 x64" agentOs: Linux timeoutInMinutes: 60 isTestingJob: true diff --git a/.gitmodules b/.gitmodules index a64d406129..596f3ee4d9 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,7 +1,8 @@ -[submodule "googletest"] +[submodule "src/submodules/googletest"] path = src/submodules/googletest url = https://github.com/google/googletest - + branch = master [submodule "src/submodules/MessagePack-CSharp"] path = src/submodules/MessagePack-CSharp url = https://github.com/aspnet/MessagePack-CSharp.git + branch = release/5.0 diff --git a/docs/Helix.md b/docs/Helix.md index 477574dc2c..49c076b3be 100644 --- a/docs/Helix.md +++ b/docs/Helix.md @@ -18,17 +18,17 @@ This will restore, and then publish all the test project including some bootstra ## Overview of the helix usage in our pipelines -- Required queues: Windows10, OSX, Ubuntu1604 -- Full queue matrix: Windows[7, 81, 10], Ubuntu[1604, 1804, 2004], Centos7, Debian9, Redhat7, Fedora28, Arm64 (Win10, Debian9) -- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/master/eng/targets/Helix.Common.props) +- Required queues: Windows10, OSX, Ubuntu1804 +- Full queue matrix: Windows[7, 81, 10], Ubuntu[1804, 2004], Debian9, Redhat7, Arm64 (Win10, Debian9) +- The queues are defined in [Helix.Common.props](https://github.com/dotnet/aspnetcore/blob/main/eng/targets/Helix.Common.props) [aspnetcore-ci](https://dev.azure.com/dnceng/public/_build?definitionId=278) runs non quarantined tests against the required helix queues as a required PR check and all builds on all branches. -[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public master. +[aspnetcore-helix-matrix](https://dev.azure.com/dnceng/public/_build?definitionId=837) runs non quarantined tests against all queues twice a day only on public main. -[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on master every 4 hours. +[aspnetcore-quarantined-pr](https://dev.azure.com/dnceng/public/_build?definitionId=869) runs only quarantined tests against the required queues on PRs and on main every 4 hours. -[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public master once a day at 11 PM. +[aspnetcore-quarantined-tests](https://dev.azure.com/dnceng/public/_build?definitionId=331) runs only quarantined tests against all queues only on public main once a day at 11 PM. You can always manually queue pipeline runs by clicking on the link to the pipeline -> Run Pipeline -> select your branch/tag and commit diff --git a/eng/scripts/RunHelix.ps1 b/eng/scripts/RunHelix.ps1 index 777077b421..1f5e43d5fd 100644 --- a/eng/scripts/RunHelix.ps1 +++ b/eng/scripts/RunHelix.ps1 @@ -8,25 +8,38 @@ .PARAMETER HelixQueues Set the Helix queues to use. The list is '+' or ';'-separated. Some supported queues: - Ubuntu.1604.Amd64.Open Ubuntu.1804.Amd64.Open + Ubuntu.2004.Amd64.Open Windows.10.Amd64.Open + Windows.10.Amd64.Server20H2.Open Windows.81.Amd64.Open Windows.7.Amd64.Open OSX.1014.Amd64.Open - Centos.7.Amd64.Open Debian.9.Amd64.Open Redhat.7.Amd64.Open .PARAMETER RunQuarantinedTests By default quarantined tests are not run. Set this to $true to run only the quarantined tests. +.PARAMETER TargetArchitecture + The CPU architecture to build for (x64, x86, arm). Default=x64 +.PARAMETER MSBuildArguments + Additional MSBuild arguments to be passed through. #> +[CmdletBinding(PositionalBinding = $false)] param( [Parameter(Mandatory=$true)] [string]$Project, + [string]$HelixQueues = "Windows.10.Amd64.Open", + [switch]$RunQuarantinedTests, + + [ValidateSet('x64', 'x86', 'arm', 'arm64')] [string]$TargetArchitecture = "x64", - [bool]$RunQuarantinedTests = $false + + # Capture the rest + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$MSBuildArguments ) + $ErrorActionPreference = 'Stop' $ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138 @@ -43,4 +56,5 @@ Write-Host -ForegroundColor Yellow "And if packing for a different platform, add $HelixQueues = $HelixQueues -replace ";", "%3B" dotnet msbuild $Project /t:Helix /p:TargetArchitecture="$TargetArchitecture" /p:IsRequiredCheck=true ` /p:IsHelixDaily=true /p:HelixTargetQueues=$HelixQueues /p:RunQuarantinedTests=$RunQuarantinedTests ` - /p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log + /p:_UseHelixOpenQueues=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log ` + @MSBuildArguments diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props index 07b8246029..9a93090fa4 100644 --- a/eng/targets/Helix.Common.props +++ b/eng/targets/Helix.Common.props @@ -20,9 +20,9 @@ - + - + @@ -30,11 +30,10 @@ - - + diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs index d8b16ff741..07ba2eb34d 100644 --- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs +++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs @@ -79,9 +79,6 @@ namespace Microsoft.AspNetCore.Identity.Test [Theory] [MemberData(nameof(ScriptWithFallbackSrcData))] - // Ubuntu 16 uses an old version of OpenSSL that doesn't work well when an intermediate CA is expired. - // We've decided to not run these tests against that OS anymore and will run on newer versions of Ubuntu. - [SkipOnHelix("Skip on Ubuntu 16", Queues = "Ubuntu.1604.Amd64.Open;Ubuntu.1604.Amd64")] public async Task IdentityUI_ScriptTags_FallbackSourceContent_Matches_CDNContent(ScriptTag scriptTag) { var wwwrootDir = Path.Combine(GetProjectBasePath(), "wwwroot", scriptTag.Version); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp index 9b5bf6e9e6..b505f574f9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/ConfigUtilityTests.cpp @@ -4,6 +4,7 @@ #include "stdafx.h" #include "gmock/gmock.h" using ::testing::_; +using ::testing::DoAll; using ::testing::NiceMock; namespace ConfigUtilityTests diff --git a/src/submodules/MessagePack-CSharp b/src/submodules/MessagePack-CSharp index a4a14ce447..1fd19e6cc1 160000 --- a/src/submodules/MessagePack-CSharp +++ b/src/submodules/MessagePack-CSharp @@ -1 +1 @@ -Subproject commit a4a14ce447e4ef694af1a485fb672db35e766111 +Subproject commit 1fd19e6cc1a58bce9153933324164ec80ed560cf diff --git a/src/submodules/googletest b/src/submodules/googletest index 4e4df226fc..f5e592d8ee 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 4e4df226fc197c0dda6e37f5c8c3845ca1e73a49 +Subproject commit f5e592d8ee5ffb1d9af5be7f715ce3576b8bf9c4