From 21d3dc0cb428ceabcc52a6c3453bbf9f5f5d58f5 Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Tue, 14 Dec 2021 16:11:09 -0800
Subject: [PATCH] [release/3.1] Remove Helix remnants (#39004)
Have no Helix jobs in any existing pipeline
- Helix mentions are just confusing here
- `tell-mode` because this cleanup affects only test and test asset projects.
Changes:
- remove Helix-related files
- clean out Helix mentions in miscellaneous files
- clean out Helix mentions in *.csproj files
- clean out Helix mentions in *.cs files
---
.azure/pipelines/helix-test.yml | 27 -----
Directory.Build.targets | 4 -
docs/Helix.md | 66 -----------
docs/ProjectProperties.md | 1 -
eng/Version.Details.xml | 4 -
eng/helix/Directory.Build.props | 2 -
eng/helix/Directory.Build.targets | 2 -
eng/helix/content/InstallNode.ps1 | 71 -----------
eng/helix/content/README.md | 3 -
eng/helix/content/RunPowershell.cmd | 11 --
eng/helix/content/installnode.sh | 31 -----
.../content/mssql/InstallSqlServerLocalDB.ps1 | 43 -------
eng/helix/content/runtests.cmd | 63 ----------
eng/helix/content/runtests.sh | 112 ------------------
eng/helix/helix.proj | 51 --------
eng/targets/CSharp.Common.props | 3 -
eng/targets/CSharp.Common.targets | 2 -
eng/targets/Helix.Common.props | 56 ---------
eng/targets/Helix.props | 47 --------
eng/targets/Helix.targets | 91 --------------
global.json | 3 +-
.../Analyzers/test/AnalyzerTestBase.cs | 9 +-
...Microsoft.AspNetCore.Analyzers.Test.csproj | 8 +-
...hentication.AzureAD.FunctionalTests.csproj | 3 -
.../Analyzers/test/AnalyzerTestBase.cs | 7 --
...pNetCore.Components.Analyzers.Tests.csproj | 6 +-
...Core.Components.Authorization.Tests.csproj | 3 -
...crosoft.AspNetCore.Components.Tests.csproj | 3 -
.../Components/test/RendererTest.cs | 3 +-
...t.AspNetCore.Components.Forms.Tests.csproj | 3 -
...oft.AspNetCore.Components.Web.Tests.csproj | 3 -
....Components.WebAssembly.Build.Tests.csproj | 3 -
...soft.AspNetCore.Components.E2ETests.csproj | 8 +-
.../ServerComponentRenderingTest.cs | 5 +-
.../test/E2ETest/Tests/FormsTest.cs | 1 -
.../test/DataProtectionProviderTests.cs | 2 -
...ore.DataProtection.Extensions.Tests.csproj | 3 -
...icrosoft.AspNetCore.FunctionalTests.csproj | 6 +-
.../testassets/Directory.Build.props | 2 +-
.../Microsoft.AspNetCore.App.UnitTests.csproj | 4 -
.../Microsoft.AspNetCore.Hosting.Tests.csproj | 3 -
src/Hosting/Hosting/test/WebHostTests.cs | 3 -
....AspNetCore.Hosting.FunctionalTests.csproj | 7 +-
.../test/testassets/Directory.Build.props | 2 +-
.../ConfigureSigningCredentialsTests.cs | 7 +-
.../Configuration/SigningKeysLoaderTests.cs | 9 +-
...iAuthorization.IdentityServer.Tests.csproj | 3 -
.../Infrastructure/ServerFactory.cs | 4 +-
...AspNetCore.Identity.FunctionalTests.csproj | 9 --
.../Identity.Test/IdentityUIScriptsTest.cs | 4 +-
.../Microsoft.AspNetCore.Identity.Test.csproj | 4 -
.../test/testassets/Directory.Build.props | 2 +-
.../Diagnostics.FunctionalTests.csproj | 3 -
.../UnitTests/WebSocketMiddlewareTests.cs | 1 -
.../test/Infrastructure/MvcTestSource.cs | 8 +-
.../test/Mvc.Analyzers.Test.csproj | 8 +-
.../test/Infrastructure/MvcTestSource.cs | 8 +-
.../test/Mvc.Api.Analyzers.Test.csproj | 8 +-
...soft.AspNetCore.Mvc.FunctionalTests.csproj | 2 -
.../test/ProjectTemplates.Tests.csproj | 6 +-
...entication.Negotiate.FunctionalTest.csproj | 6 -
...tCore.Authentication.Negotiate.Test.csproj | 6 -
...soft.AspNetCore.Authentication.Test.csproj | 6 -
.../AuthSamples.FunctionalTests.csproj | 4 -
.../test/FunctionalTests/HttpsTests.cs | 6 -
...Core.Server.HttpSys.FunctionalTests.csproj | 8 --
.../Inprocess/FrebTests.cs | 1 -
.../Inprocess/StartupTests.cs | 1 -
.../IIS/IIS/test/Directory.Build.props | 3 +-
src/Servers/IIS/IIS/test/FunctionalTest.props | 10 --
.../Kestrel/test/GeneratedCodeTests.cs | 3 +-
...oft.AspNetCore.Server.Kestrel.Tests.csproj | 3 -
.../BindTests/AddressRegistrationTests.cs | 3 -
.../FunctionalTests/Http2/HandshakeTests.cs | 2 -
.../FunctionalTests/Http2/ShutdownTests.cs | 2 -
.../test/FunctionalTests/RequestTests.cs | 7 --
.../Http2/TlsTests.cs | 1 -
.../HttpsConnectionMiddlewareTests.cs | 4 +-
.../InMemory.FunctionalTests.csproj | 3 -
.../LoggingConnectionMiddlewareTests.cs | 1 -
.../Interop.FunctionalTests/H2SpecTests.cs | 3 +-
.../Interop.FunctionalTests.csproj | 5 -
.../test/Interop.FunctionalTests/Utilities.cs | 7 +-
.../Libuv.BindTests/Libuv.BindTests.csproj | 8 --
.../Libuv.FunctionalTests.csproj | 3 -
.../Sockets.BindTests.csproj | 3 -
.../Sockets.FunctionalTests.csproj | 3 -
.../ServerComparison.FunctionalTests.csproj | 6 +-
src/Servers/testassets/Directory.Build.props | 3 +-
src/Shared/test/SkipOnHelixAttribute.cs | 50 --------
.../test/CertificateManagerTests.cs | 18 +--
...e.DeveloperCertificates.XPlat.Tests.csproj | 5 +-
.../dotnet-microsoft.openapi.Tests.csproj | 1 -
.../dotnet-watch/test/DotNetWatcherTests.cs | 3 +-
.../dotnet-watch/test/GlobbingAppTests.cs | 6 +-
src/Tools/dotnet-watch/test/NoDepsAppTests.cs | 3 +-
.../test/dotnet-watch.Tests.csproj | 3 -
97 files changed, 47 insertions(+), 1039 deletions(-)
delete mode 100644 .azure/pipelines/helix-test.yml
delete mode 100644 docs/Helix.md
delete mode 100644 eng/helix/Directory.Build.props
delete mode 100644 eng/helix/Directory.Build.targets
delete mode 100644 eng/helix/content/InstallNode.ps1
delete mode 100644 eng/helix/content/README.md
delete mode 100644 eng/helix/content/RunPowershell.cmd
delete mode 100644 eng/helix/content/installnode.sh
delete mode 100644 eng/helix/content/mssql/InstallSqlServerLocalDB.ps1
delete mode 100644 eng/helix/content/runtests.cmd
delete mode 100644 eng/helix/content/runtests.sh
delete mode 100644 eng/helix/helix.proj
delete mode 100644 eng/targets/Helix.Common.props
delete mode 100644 eng/targets/Helix.props
delete mode 100644 eng/targets/Helix.targets
delete mode 100644 src/Shared/test/SkipOnHelixAttribute.cs
diff --git a/.azure/pipelines/helix-test.yml b/.azure/pipelines/helix-test.yml
deleted file mode 100644
index ad17b9963ea..00000000000
--- a/.azure/pipelines/helix-test.yml
+++ /dev/null
@@ -1,27 +0,0 @@
-# Don't run CI for this config yet. We're not ready to move official builds on to Azure Pipelines
-trigger: none
-
-# Run PR validation on all branches
-pr:
- branches:
- include:
- - '*'
-
-jobs:
-- template: jobs/default-build.yml
- parameters:
- jobName: Helix_x64
- jobDisplayName: 'Tests: Helix x64'
- agentOs: Windows
- timeoutInMinutes: 240
- steps:
- - script: .\restore.cmd -ci
- displayName: Restore
- - script: .\build.cmd -ci -NoRestore -test -projects eng\helix\helix.proj /p:IsHelixJob=true /p:BuildAllProjects=true /p:BuildNative=true -bl
- displayName: Run build.cmd helix target
- env:
- SYSTEM_ACCESSTOKEN: $(System.AccessToken) # We need to set this env var to publish helix results to Azure Dev Ops
- artifacts:
- - name: Helix_logs
- path: artifacts/log/
- publishOnError: true
diff --git a/Directory.Build.targets b/Directory.Build.targets
index 417057a3090..0adf3d03a8f 100644
--- a/Directory.Build.targets
+++ b/Directory.Build.targets
@@ -1,5 +1,4 @@
<Project>
-
<PropertyGroup>
<!-- Only build Microsoft.AspNetCore.App and ref/ assemblies in source build. -->
<!-- Analyzer package are needed in source build for WebSDK -->
@@ -96,8 +95,6 @@
<IsPackable Condition="'$(IsPackable)' == '' AND ('$(IsImplementationProject)' == 'true' OR '$(IsAnalyzersProject)' == 'true') ">true</IsPackable>
<IsPackable Condition="'$(IsPackable)' == '' ">false</IsPackable>
-
- <BuildHelixPayload Condition="'$(BuildHelixPayload)' == '' AND '$(IsTestProject)' == 'true'">true</BuildHelixPayload>
</PropertyGroup>
<PropertyGroup>
@@ -168,5 +165,4 @@
<Import Project="eng\targets\Wix.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.wixproj'" />
<Import Project="eng\targets\Npm.Common.targets" Condition="'$(MSBuildProjectExtension)' == '.npmproj'" />
<Import Project="eng\targets\ReferenceAssembly.targets" Condition=" $(HasReferenceAssembly) " />
-
</Project>
diff --git a/docs/Helix.md b/docs/Helix.md
deleted file mode 100644
index e8261acc854..00000000000
--- a/docs/Helix.md
+++ /dev/null
@@ -1,66 +0,0 @@
-Helix testing in ASP.NET Core
-==============================
-
-Helix is the distributed test platform that we use to run tests. We build a helix payload that contains the publish directory of every test project that we want to test
-send a job with with this payload to a set of queues for the various combinations of OS that we want to test
-for example: `Windows.10.Amd64.ClientRS4.VS2017.Open`, `OSX.1012.Amd64.Open`, `Ubuntu.1804.Amd64.Open`. Helix takes care of unzipping, running the job, and reporting results.
-
-For more info about helix see: [SDK](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md), [JobSender](https://github.com/dotnet/arcade/blob/master/src/Microsoft.DotNet.Helix/Sdk/Readme.md)
-
-## Running helix tests locally
-
-To run Helix tests for one particular test project:
-
-```
-cd src/MyCode/test
-dotnet msbuild /t:Helix
-```
-
-To run tests for the entire repo, run:
-
-```
-.\eng\scripts\TestHelix.ps1
-```
-
-This will restore, and then publish all of the test projects including some bootstrapping scripts that will install the correct dotnet runtime/sdk before running the test assemblies on the helix machine, and upload the job to helix.
-
-
-## How do I look at the results of a helix run on Azure Pipelines?
-There's a link embedded in the build.cmd log of the helix target on Azure Pipelines, near the bottom right that will look something like this:
-```
-2019-02-07T21:55:48.1516089Z Results will be available from https://mc.dot.net/#/user/aspnetcore/pr~2Faspnet~2Faspnetcore/ci/20190207.34
-2019-02-07T21:56:43.2209607Z Job 0dedeef6-210e-4815-89f9-fd07513179fe is completed with 108 finished work items.
-2019-02-07T21:56:43.5091018Z Job 4c45a464-9464-4321-906c-2503320066b0 is completed with 108 finished work items.
-2019-02-07T21:56:43.6863473Z Job 91a826de-fd51-42c2-9e7e-84bbe18b16cf is completed with 108 finished work items.
-2019-02-07T21:56:43.8591328Z Job b3595ab8-049d-4775-9cea-d1140a0cb446 is completed with 108 finished work items.
-2019-02-07T21:56:44.0384313Z Job 2f174f2b-f6b1-4683-8303-3f120865c341 is completed with 108 finished work items.
-2019-02-07T21:56:44.2069520Z Job b9387311-e670-4e18-9c84-479b7bfe67d1 is completed with 111 finished work items.
-2019-02-07T21:56:44.3946686Z Job 43582e31-5648-47be-ac42-8a5e4129f15f is completed with 108 finished work items.
-2019-02-07T21:56:44.5568847Z Job 1e6b0051-21a4-4b75-93f3-f739bb71d5dc is completed with 108 finished work items.
-2019-02-07T22:01:26.0028154Z Job d597c581-f81b-446c-8daf-7c6511b526f7 is completed with 108 finished work items.
-2019-02-07T22:06:33.6898567Z Job 82f27d4c-9099-4f0e-b383-870c24d8dc2c is completed with 108 finished work items.
-```
-
-The link will take you to an overview of all the tests with clickable links to the logs and each run broken down by queue.
-
-All of the helix runs for aspnetcore can be found here https://mc.dot.net/#/user/aspnetcore/builds
-
-## What do I do if a test fails?
-You can simulate how most tests run locally:
-```
-dotnet publish
-cd <the publish directory>
-dotnet vstest My.Tests.dll
-```
-
-If that doesn't help, you can try the Get Repro environment link from mission control and try to debug that way.
-
-## Differences from running tests locally
-Most tests that don't just work on helix automatically are ones that depend on the source code being accessible. The helix payloads only contain whatever is in the publish directories, so any thing else that test depends on will need to be included to the payload (TBD how to do this).
-
-## How to skip tests on helix
-There are two main ways to opt out of helix
-- Skipping the entire test project via `<BuildHelixPayload>false</BuildHelixPayload>` in csproj (the default value for this is IsTestProject).
-- Skipping an individual test via `[SkipOnHelix("url to github issue")]` which might require including a compile reference to: `<Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />`
-
-Make sure to file an issue for any skipped tests and include that in a comment next to either of these
diff --git a/docs/ProjectProperties.md b/docs/ProjectProperties.md
index 24e186c2885..dd4ecf7e570 100644
--- a/docs/ProjectProperties.md
+++ b/docs/ProjectProperties.md
@@ -9,4 +9,3 @@ IsPackable | Set to `true` when the project should produce a package. Th
IsShipping | Set to `true` when the project output is intended for use by customers. Defaults to `true` for analyzer, implementation and specification test projects; `false` otherwise.
IsShippingPackage | Set to `true` when a package produced from project is intended for use by customers. Defaults to `IsShipping`. Note this may be `true` even for projects with `IsPackable` set to `false`.
IsAspNetCoreApp | Set to `true` when the assembly is part of the [Microsoft.AspNetCore.App shared framework](./SharedFramework.md) and is not available as a NuGet package (unless `IsPackable` is also set to `true` -- the default). Defaults to `false`.
-TestDependsOnMssql | Set to `true` when your tests depends on SQL Server. This will ensure distribute tests on Helix install LocalDB ([more information on Helix](./Helix.md)). Defaults to `false`.
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index 7a688538cbb..c5297fbaf60 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -426,10 +426,6 @@
<Uri>https://github.com/dotnet/arcade</Uri>
<Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
</Dependency>
- <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="2.0.0-beta.21552.6">
- <Uri>https://github.com/dotnet/arcade</Uri>
- <Sha>afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7</Sha>
- </Dependency>
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.21-servicing.21522.3" CoherentParentDependency="Microsoft.EntityFrameworkCore">
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
<Sha>c7c07d575c22a9686fe9e07cda4d21cdd1151b33</Sha>
diff --git a/eng/helix/Directory.Build.props b/eng/helix/Directory.Build.props
deleted file mode 100644
index 8c119d5413b..00000000000
--- a/eng/helix/Directory.Build.props
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
diff --git a/eng/helix/Directory.Build.targets b/eng/helix/Directory.Build.targets
deleted file mode 100644
index 8c119d5413b..00000000000
--- a/eng/helix/Directory.Build.targets
+++ /dev/null
@@ -1,2 +0,0 @@
-<Project>
-</Project>
diff --git a/eng/helix/content/InstallNode.ps1 b/eng/helix/content/InstallNode.ps1
deleted file mode 100644
index 862e6125826..00000000000
--- a/eng/helix/content/InstallNode.ps1
+++ /dev/null
@@ -1,71 +0,0 @@
- <#
- .SYNOPSIS
- Installs NodeJs from http://nodejs.org/dist on a machine
- .DESCRIPTION
- This script installs NodeJs from http://nodejs.org/dist on a machine.
- .PARAMETER Version
- The version of NodeJS to install.
- .PARAMETER InstallDir
- The directory to install NodeJS to.
- .LINK
- https://nodejs.org/en/
- #>
-param(
- [Parameter(Mandatory = $true)]
- $Version,
-
- [Parameter(Mandatory = $true)]
- $InstallDir
-)
-
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
-
-Set-StrictMode -Version 1
-
-if (Get-Command "node.exe" -ErrorAction SilentlyContinue)
-{
- Write-Host "Found node.exe in PATH"
- exit
-}
-
-if (Test-Path "$output_dir\node.exe")
-{
- Write-Host "Node.exe found at $output_dir"
- exit
-}
-
-$nodeFile="node-v$Version-win-x64"
-$url="http://nodejs.org/dist/v$Version/$nodeFile.zip"
-Write-Host "Starting download of NodeJs ${Version} from $url"
-Invoke-WebRequest -UseBasicParsing -Uri "$url" -OutFile "nodejs.zip"
-Write-Host "Done downloading NodeJS ${Version}"
-
-$tempPath = [System.IO.Path]::GetTempPath()
-$tempDir = Join-Path $tempPath nodejs
-New-Item -Path "$tempDir" -ItemType "directory" -Force
-Write-Host "Extracting to $tempDir"
-
-if (Get-Command -Name 'Microsoft.PowerShell.Archive\Expand-Archive' -ErrorAction Ignore) {
- # Use built-in commands where possible as they are cross-plat compatible
- Microsoft.PowerShell.Archive\Expand-Archive -Path "nodejs.zip" -DestinationPath $tempDir
-}
-else {
- # Fallback to old approach for old installations of PowerShell
- Add-Type -AssemblyName System.IO.Compression.FileSystem
- [System.IO.Compression.ZipFile]::ExtractToDirectory("nodejs.zip", $tempDir)
-}
-
-Write-Host "Expanded NodeJs"
-New-Item -Path "$InstallDir" -ItemType "directory" -Force
-Write-Host "Copying $tempDir\$nodeFile\node.exe to $InstallDir"
-Copy-Item "$tempDir\$nodeFile\node.exe" "$InstallDir\node.exe"
-
-if (Test-Path "$InstallDir\node.exe")
-{
- Write-Host "Node.exe copied to $InstallDir"
-}
-else
-{
- Write-Host "Node.exe not copied to $InstallDir"
-}
diff --git a/eng/helix/content/README.md b/eng/helix/content/README.md
deleted file mode 100644
index 9afae21e767..00000000000
--- a/eng/helix/content/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# Helix content
-
-The content of this folder is included in the test payload for each Helix work item. The code here is mean to be used alongside test binaries.
diff --git a/eng/helix/content/RunPowershell.cmd b/eng/helix/content/RunPowershell.cmd
deleted file mode 100644
index f76939d6034..00000000000
--- a/eng/helix/content/RunPowershell.cmd
+++ /dev/null
@@ -1,11 +0,0 @@
-@ECHO OFF
-
-SET _TAIL=%*
-CALL SET _TAIL=%%_TAIL:*%1=%%
-
-SET POWERSHELL=%windir%\System32\WindowsPowerShell\v1.0\powershell.exe
-
-rem Force 64bit powershell
-if /i "%PROCESSOR_ARCHITEW6432%" EQU "AMD64" SET POWERSHELL=%windir%\sysnative\WindowsPowerShell\v1.0\powershell.exe
-echo "PS: Running '%~dp0%1' %_TAIL%"
-%POWERSHELL% -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = ''; try { & '%~dp0%1' %_TAIL%; exit $LASTEXITCODE } catch { write-host $_; exit 1 }"
diff --git a/eng/helix/content/installnode.sh b/eng/helix/content/installnode.sh
deleted file mode 100644
index 0442958ac2f..00000000000
--- a/eng/helix/content/installnode.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/usr/bin/env bash
-
-# Cause the script to fail if any subcommand fails
-set -e
-
-if type -P "node" &>/dev/null; then
- echo "node is in \$PATH"
- exit
-fi
-
-node_version=$1
-arch=$2
-osname=`uname -s`
-if [ "$osname" = "Darwin" ]; then
- platformarch="darwin-$arch"
-else
- platformarch="linux-$arch"
-fi
-echo "PlatformArch: $platformarch"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-output_dir="$DIR/node"
-url="http://nodejs.org/dist/v$node_version/node-v$node_version-$platformarch.tar.gz"
-echo "Downloading from: $url"
-tmp="$(mktemp -d -t install-node.XXXXXX)"
-trap "rm -rf $tmp" EXIT
-cd "$tmp"
-curl -Lsfo $(basename $url) "$url"
-echo "Installing node from $(basename $url) $url"
-mkdir $output_dir
-echo "Unpacking to $output_dir"
-tar --strip-components 1 -xzf "node-v$node_version-$platformarch.tar.gz" --no-same-owner --directory "$output_dir"
diff --git a/eng/helix/content/mssql/InstallSqlServerLocalDB.ps1 b/eng/helix/content/mssql/InstallSqlServerLocalDB.ps1
deleted file mode 100644
index 8621112ac65..00000000000
--- a/eng/helix/content/mssql/InstallSqlServerLocalDB.ps1
+++ /dev/null
@@ -1,43 +0,0 @@
-<#
-.SYNOPSIS
- Installs SQL Server 2016 Express LocalDB on a machine.
-.DESCRIPTION
- This script installs Microsoft SQL Server 2016 Express LocalDB on a machine.
-.PARAMETER Force
- Force the script to run the MSI, even it it appears LocalDB is installed.
-.LINK
- https://docs.microsoft.com/en-us/sql/database-engine/configure-windows/sql-server-2016-express-localdb?view=sql-server-2016
- https://docs.microsoft.com/en-us/sql/database-engine/install-windows/install-sql-server-from-the-command-prompt?view=sql-server-2016
-#>
-param(
- [switch]$Force
-)
-$ErrorActionPreference = 'Stop'
-$ProgressPreference = 'SilentlyContinue' # Workaround PowerShell/PowerShell#2138
-Set-StrictMode -Version 1
-
-$intermedateDir = "$PSScriptRoot\obj"
-mkdir $intermedateDir -ErrorAction Ignore | Out-Null
-
-if (-not $Force -and (Test-Path 'HKLM:\SOFTWARE\Microsoft\Microsoft SQL Server\RefCount\SqlLocalDB13')) {
- Write-Host "SQL Server 2016 Express LocalDB is already installed. Exiting without action. Call this script again with -Force to run the installation anyways."
- exit 0
-}
-
-Write-Host "Installing SQL Server 2016 Express LocalDB" -f Magenta
-
-# Download SqlLocalDB.msi.
-$installerFilename = "SqlLocalDB.msi"
-$installerPath = "$intermedateDir\$installerFilename"
-Write-Host ""
-Write-Host "Downloading '$installerFilename' to '$installerPath'."
-Invoke-WebRequest -OutFile $installerPath -UseBasicParsing `
- -Uri 'https://download.microsoft.com/download/9/0/7/907AD35F-9F9C-43A5-9789-52470555DB90/ENU/SqlLocalDB.msi'
-
-# Install LocalDB.
-$arguments = '/package', "`"$installerPath`"", '/NoRestart', '/Passive', `
- 'IACCEPTSQLLOCALDBLICENSETERMS=YES', 'HIDEPROGRESSBAR=YES'
-Write-Host ""
-Write-Host "Running 'msiexec $arguments'."
-$process = Start-Process msiexec.exe -ArgumentList $arguments -NoNewWindow -PassThru -Verbose -Wait
-exit $process.ExitCode
diff --git a/eng/helix/content/runtests.cmd b/eng/helix/content/runtests.cmd
deleted file mode 100644
index 935b23647d8..00000000000
--- a/eng/helix/content/runtests.cmd
+++ /dev/null
@@ -1,63 +0,0 @@
-@echo off
-REM Disable "!Foo!" expansions because they break the filter syntax
-setlocal disableextensions
-
-set target=%1
-set targetFrameworkIdentifier=%2
-set sdkVersion=%3
-set runtimeVersion=%4
-set helixQueue=%5
-set arch=%6
-
-set DOTNET_HOME=%HELIX_CORRELATION_PAYLOAD%\sdk
-set DOTNET_ROOT=%DOTNET_HOME%\%arch%
-set DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-set DOTNET_MULTILEVEL_LOOKUP=0
-set DOTNET_CLI_HOME=%HELIX_CORRELATION_PAYLOAD%\home
-
-set PATH=%DOTNET_ROOT%;%PATH%;%HELIX_CORRELATION_PAYLOAD%\node\bin
-
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Version %sdkVersion% -InstallDir %DOTNET_ROOT%"
-powershell.exe -NoProfile -ExecutionPolicy unrestricted -Command "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; &([scriptblock]::Create((Invoke-WebRequest -useb 'https://dot.net/v1/dotnet-install.ps1'))) -Architecture %arch% -Runtime dotnet -Version %runtimeVersion% -InstallDir %DOTNET_ROOT%"
-
-set HELIX=%helixQueue%
-
-if (%targetFrameworkIdentifier%==.NETFramework) (
- xunit.console.exe %target% -xml testResults.xml
- exit /b %ERRORLEVEL%
-)
-
-%DOTNET_ROOT%\dotnet vstest %target% -lt >discovered.txt
-find /c "Exception thrown" discovered.txt
-REM "ERRORLEVEL is not %ERRORLEVEL%" https://blogs.msdn.microsoft.com/oldnewthing/20080926-00/?p=20743/
-if not errorlevel 1 (
- echo Exception thrown during test discovery. 1>&2
- type discovered.txt 1>&2
- exit /b 1
-)
-
-set exit_code=0
-
-REM Run non-flaky tests first
-REM We need to specify all possible Flaky filters that apply to this environment, because the flaky attribute
-REM only puts the explicit filter traits the user provided in
-REM Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md
-set NONFLAKY_FILTER="Flaky:All!=true&Flaky:Helix:All!=true&Flaky:Helix:Queue:All!=true&Flaky:Helix:Queue:%HELIX%!=true"
-echo Running non-flaky tests.
-%DOTNET_ROOT%\dotnet vstest %target% --logger:trx --TestCaseFilter:%NONFLAKY_FILTER%
-if errorlevel 1 (
- echo Failure in non-flaky test 1>&2
- set exit_code=1
- REM DO NOT EXIT
-)
-
-set FLAKY_FILTER="Flaky:All=true|Flaky:Helix:All=true|Flaky:Helix:Queue:All=true|Flaky:Helix:Queue:%HELIX%=true"
-echo Running known-flaky tests.
-%DOTNET_ROOT%\dotnet vstest %target% --TestCaseFilter:%FLAKY_FILTER%
-if errorlevel 1 (
- echo Failure in flaky test 1>&2
- REM DO NOT EXIT and DO NOT SET EXIT_CODE to 1
-)
-
-exit /b %exit_code%
-
diff --git a/eng/helix/content/runtests.sh b/eng/helix/content/runtests.sh
deleted file mode 100644
index e864f097dec..00000000000
--- a/eng/helix/content/runtests.sh
+++ /dev/null
@@ -1,112 +0,0 @@
-#!/usr/bin/env bash
-
-test_binary_path="$1"
-dotnet_sdk_version="$2"
-dotnet_runtime_version="$3"
-helix_queue_name="$4"
-
-RESET="\033[0m"
-RED="\033[0;31m"
-YELLOW="\033[0;33m"
-MAGENTA="\033[0;95m"
-DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-# Ensures every invocation of dotnet apps uses the same dotnet.exe
-# Add $random to path to ensure tests don't expect dotnet to be in a particular path
-export DOTNET_ROOT="$DIR/.dotnet$RANDOM"
-
-# Ensure dotnet comes first on PATH
-export PATH="$DOTNET_ROOT:$PATH:$DIR/node/bin"
-
-# Prevent fallback to global .NET locations. This ensures our tests use the shared frameworks we specify and don't rollforward to something else that might be installed on the machine
-export DOTNET_MULTILEVEL_LOOKUP=0
-
-# Avoid contaminating userprofiles
-# Add $random to path to ensure tests don't expect home to be in a particular path
-export DOTNET_CLI_HOME="$DIR/.home$RANDOM"
-
-export DOTNET_SKIP_FIRST_TIME_EXPERIENCE=1
-
-# Used by SkipOnHelix attribute
-export helix="$helix_queue_name"
-
-
-RESET="\033[0m"
-RED="\033[0;31m"
-YELLOW="\033[0;33m"
-MAGENTA="\033[0;95m"
-
-curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh
-if [ $? -ne 0 ]; then
- download_retries=3
- while [ $download_retries -gt 0 ]; do
- curl -o dotnet-install.sh -sSL https://dot.net/v1/dotnet-install.sh
- if [ $? -ne 0 ]; then
- let download_retries=download_retries-1
- echo -e "${YELLOW}Failed to download dotnet-install.sh. Retries left: $download_retries.${RESET}"
- else
- download_retries=0
- fi
- done
-fi
-
-# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs)
-chmod +x "dotnet-install.sh"; sync
-
-./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT"
-if [ $? -ne 0 ]; then
- sdk_retries=3
- while [ $sdk_retries -gt 0 ]; do
- ./dotnet-install.sh --version $dotnet_sdk_version --install-dir "$DOTNET_ROOT"
- if [ $? -ne 0 ]; then
- let sdk_retries=sdk_retries-1
- echo -e "${YELLOW}Failed to install .NET Core SDK $version. Retries left: $sdk_retries.${RESET}"
- else
- sdk_retries=0
- fi
- done
-fi
-
-./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT"
-if [ $? -ne 0 ]; then
- runtime_retries=3
- while [ $runtime_retries -gt 0 ]; do
- ./dotnet-install.sh --runtime dotnet --version $dotnet_runtime_version --install-dir "$DOTNET_ROOT"
- if [ $? -ne 0 ]; then
- let runtime_retries=runtime_retries-1
- echo -e "${YELLOW}Failed to install .NET Core runtime $version. Retries left: $runtime_retries.${RESET}"
- else
- runtime_retries=0
- fi
- done
-fi
-
-$DOTNET_ROOT/dotnet vstest $test_binary_path -lt >discovered.txt
-if grep -q "Exception thrown" discovered.txt; then
- echo -e "${RED}Exception thrown during test discovery${RESET}".
- cat discovered.txt
- exit 1
-fi
-
-# Run non-flaky tests first
-# We need to specify all possible Flaky filters that apply to this environment, because the flaky attribute
-# only puts the explicit filter traits the user provided in the flaky attribute
-# Filter syntax: https://github.com/Microsoft/vstest-docs/blob/master/docs/filter.md
-NONFLAKY_FILTER="Flaky:All!=true&Flaky:Helix:All!=true&Flaky:Helix:Queue:All!=true&Flaky:Helix:Queue:$helix_queue_name!=true"
-echo "Running non-flaky tests."
-$DOTNET_ROOT/dotnet vstest $test_binary_path --logger:trx --TestCaseFilter:"$NONFLAKY_FILTER"
-nonflaky_exitcode=$?
-if [ $nonflaky_exitcode != 0 ]; then
- echo "Non-flaky tests failed!" 1>&2
- # DO NOT EXIT
-fi
-
-FLAKY_FILTER="Flaky:All=true|Flaky:Helix:All=true|Flaky:Helix:Queue:All=true|Flaky:Helix:Queue:$helix_queue_name=true"
-echo "Running known-flaky tests."
-$DOTNET_ROOT/dotnet vstest $test_binary_path --TestCaseFilter:"$FLAKY_FILTER"
-if [ $? != 0 ]; then
- echo "Flaky tests failed!" 1>&2
- # DO NOT EXIT
-fi
-
-exit $nonflaky_exitcode
diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj
deleted file mode 100644
index 105134743c1..00000000000
--- a/eng/helix/helix.proj
+++ /dev/null
@@ -1,51 +0,0 @@
-<Project Sdk="Microsoft.DotNet.Helix.Sdk" DefaultTargets="Test" TreatAsLocalProperty="ProjectToBuild">
-
- <PropertyGroup>
- <!--
- When invoking helix.proj for the whole repo with build.cmd, ProjectToBuild will be set to the path to this project.
- This must be reset in order for Build.props to evaluate a list of projects to be tested on Helix.
- -->
- <ProjectToBuild Condition="'$(ProjectToBuild)' == '$(MSBuildProjectFullPath)'"/>
- </PropertyGroup>
-
- <Import Project="..\targets\Helix.Common.props" />
- <Import Project="..\Build.props" />
-
- <ItemGroup>
- <HelixTargetQueue Include="@(HelixAvailableTargetQueue)" />
- </ItemGroup>
-
- <PropertyGroup>
- <HelixSource>pr/aspnet/aspnetcore</HelixSource>
- <HelixBuild>private-$(USERNAME)</HelixBuild>
- <HelixBuild Condition=" '$(USERNAME)' == '' ">private-$(USER)</HelixBuild>
- <IsExternal>true</IsExternal>
- <SkipInvalidConfigurations>true</SkipInvalidConfigurations>
- <MaxRetryCount Condition="'$(MaxRetryCount)' == ''">2</MaxRetryCount>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' == 'true' ">
- <HelixType>ci</HelixType>
- <Creator>aspnetcore</Creator>
- <HelixBuild>$(BUILD_BUILDNUMBER).$(TargetArchitecture).$(SYSTEM_JOBATTEMPT)</HelixBuild>
- <WaitForWorkItemCompletion>true</WaitForWorkItemCompletion>
- <EnableAzurePipelinesReporter>true</EnableAzurePipelinesReporter>
- <FailOnMissionControlTestFailure>true</FailOnMissionControlTestFailure>
- </PropertyGroup>
-
- <PropertyGroup Condition=" '$(ContinuousIntegrationBuild)' != 'true' ">
- <HelixType>dev</HelixType>
- <Creator>$(USERNAME)</Creator>
- <Creator Condition="'$(USERNAME)' == ''">$(USER)</Creator>
- <HelixBuild>$([System.DateTime]::Now.ToString('yyyyMMddHHmm'))</HelixBuild>
- </PropertyGroup>
-
- <Target Name="Gather" BeforeTargets="Build">
- <MSBuild Projects="@(ProjectToBuild)"
- Targets="CreateHelixPayload"
- SkipNonexistentTargets="true">
- <Output TaskParameter="TargetOutputs" ItemName="HelixWorkItem" />
- </MSBuild>
- </Target>
-
-</Project>
diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props
index 4eb0169a6e7..1ee4ae02865 100644
--- a/eng/targets/CSharp.Common.props
+++ b/eng/targets/CSharp.Common.props
@@ -1,5 +1,4 @@
<Project>
-
<PropertyGroup>
<LangVersion>8.0</LangVersion>
@@ -36,6 +35,4 @@
</ItemDefinitionGroup>
<Import Project="CSharp.ReferenceAssembly.props" Condition="'$(IsReferenceAssemblyProject)' == 'true'" />
- <Import Project="Helix.props" Condition="'$(IsTestProject)' == 'true'" />
-
</Project>
diff --git a/eng/targets/CSharp.Common.targets b/eng/targets/CSharp.Common.targets
index 877665a63ba..679323c9813 100644
--- a/eng/targets/CSharp.Common.targets
+++ b/eng/targets/CSharp.Common.targets
@@ -1,5 +1,4 @@
<Project>
-
<!-- For 'legacy' .csproj files, set map TargetFrameworkVersion back to TargetFramework -->
<PropertyGroup Condition=" '$(TargetFramework)' == '' AND '$(TargetFrameworks)' == '' ">
<TargetFramework>net$(TargetFrameworkVersion.Substring(1).Replace('.',''))</TargetFramework>
@@ -30,5 +29,4 @@
<Import Project="Packaging.targets" />
<Import Project="ResolveReferences.targets" />
- <Import Project="Helix.targets" Condition="'$(IsTestProject)' == 'true'" />
</Project>
diff --git a/eng/targets/Helix.Common.props b/eng/targets/Helix.Common.props
deleted file mode 100644
index 8ea26294a25..00000000000
--- a/eng/targets/Helix.Common.props
+++ /dev/null
@@ -1,56 +0,0 @@
-<Project>
- <ItemDefinitionGroup>
- <HelixAvailableTargetQueue>
- <EnableByDefault>true</EnableByDefault>
- </HelixAvailableTargetQueue>
- </ItemDefinitionGroup>
-
- <!-- this file is shared between Helix.proj and .csproj files -->
- <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true'">
- <HelixAvailablePlatform Include="Windows" />
- <HelixAvailablePlatform Include="OSX" />
- <HelixAvailablePlatform Include="Linux" />
- </ItemGroup>
-
- <!-- x64 queues -->
- <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'x64'">
- <HelixAvailableTargetQueue Include="Windows.10.Amd64.ClientRS4.VS2017.Open" Platform="Windows" />
- <HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
- <HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" EnableByDefault="false" />
- <HelixAvailableTargetQueue Include="OSX.1013.Amd64.Open" Platform="OSX" />
- <HelixAvailableTargetQueue Include="Ubuntu.1604.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Ubuntu.1804.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Centos.7.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Debian.8.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
- <HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64'">
- <!-- arm64 queues -->
- <HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
-
- <!-- Need to resolve permission issues on this docker queue
- <HelixAvailableTargetQueue Include="(Alpine.38.Arm64)Ubuntu.1604.Arm64.Docker@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.8-helix-arm64v8-46e69dd-20190327215724" Platform="Linux" />
- <HelixAvailableTargetQueue Include="(Ubuntu-1804.Arm64.Open)Ubuntu.1604.Arm64.Docker.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-18.04-helix-arm64v8-6f28fa9-20190606004102" Platform="Linux" />
- -->
- </ItemGroup>
-
- <ItemGroup Condition="'$(IsWindowsOnlyTest)' == 'true'">
- <HelixAvailablePlatform Include="Windows" />
-
- <HelixAvailableTargetQueue Include="Windows.10.Amd64.EnterpriseRS3.ASPNET.Open" Platform="Windows" />
- <HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
- <HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
-
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\update_schema.ps1" />
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\TestCert.pfx" />
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\AspNetCoreModuleV2\AspNetCore\aspnetcore_schema_v2.xml" />
-
- <HelixPreCommand Include="call RunPowershell.cmd update_schema.ps1 || exit /b 1" />
- <HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
- </ItemGroup>
-</Project>
diff --git a/eng/targets/Helix.props b/eng/targets/Helix.props
deleted file mode 100644
index 30a5903b9a7..00000000000
--- a/eng/targets/Helix.props
+++ /dev/null
@@ -1,47 +0,0 @@
-<Project>
-
- <Import Project="Helix.Common.props" />
-
- <ItemDefinitionGroup>
- <HelixContent>
- <CopyToBuildDirectory>Never</CopyToBuildDirectory>
- <CopyToPublishDirectory>Always</CopyToPublishDirectory>
- </HelixContent>
- </ItemDefinitionGroup>
-
- <PropertyGroup>
- <CreateHelixPayload>true</CreateHelixPayload>
- <HelixTimeout>00:30:00</HelixTimeout>
- <IsWindowsHelixQueue>false</IsWindowsHelixQueue>
- <IsWindowsHelixQueue Condition="$(HelixTargetQueue.Contains('Windows')) or $(HelixTargetQueue.Contains('windows'))">true</IsWindowsHelixQueue>
- <HelixTestName>$(MSBuildProjectName)-$(TargetFramework)</HelixTestName>
- <HelixUseArchive>false</HelixUseArchive>
- <LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">true</LoggingTestingDisableFileLogging>
- <NodeVersion>10.15.3</NodeVersion>
- </PropertyGroup>
-
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
- <HelixProjectPlatform Include="Windows" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' != '.NETFramework'">
- <HelixProjectPlatform Include="@(HelixAvailablePlatform)" />
- </ItemGroup>
-
- <ItemGroup>
- <HelixContent Include="$(RepoRoot)eng\helix\content\**\*" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TestDependsOnMssql)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
- <HelixPreCommand Include="call RunPowershell.cmd mssql\InstallSqlServerLocalDB.ps1 || exit /b 1" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TestDependsOnNode)' == 'true' AND '$(IsWindowsHelixQueue)' == 'false'">
- <HelixPreCommand Include="./installnode.sh $(NodeVersion) $(TargetArchitecture)" />
- </ItemGroup>
-
- <ItemGroup Condition="'$(TestDependsOnNode)' == 'true' AND '$(IsWindowsHelixQueue)' == 'true'">
- <HelixPreCommand Include="call RunPowershell.cmd InstallNode.ps1 $(NodeVersion) %25HELIX_CORRELATION_PAYLOAD%25\node\bin || exit /b 1" />
- </ItemGroup>
-
-</Project>
diff --git a/eng/targets/Helix.targets b/eng/targets/Helix.targets
deleted file mode 100644
index d3a45dfa457..00000000000
--- a/eng/targets/Helix.targets
+++ /dev/null
@@ -1,91 +0,0 @@
-<Project>
-
- <!-- Item group has to be defined here becasue Helix.props is evaluated before xunit.runner.console.props -->
- <ItemGroup Condition="'$(TargetFrameworkIdentifier)' == '.NETFramework'">
- <HelixContent Condition="'$(XunitConsole472Path)' != ''" Include="$([System.IO.Path]::GetDirectoryName('$(XunitConsole472Path)'))/**/*" />
- </ItemGroup>
-
- <ItemGroup>
- <Content Include="@(HelixContent)" />
- </ItemGroup>
-
-<!--
-
-This target is meant to be used when invoking helix tests on one project at a time.
-
-Usage: dotnet msbuild /t:Helix src/MyTestProject.csproj
-
--->
- <Target Name="Helix">
- <MSBuild Projects="$(MSBuildThisFileDirectory)..\helix\helix.proj"
- Properties="ProjectToBuild=$(MSBuildProjectFullPath)" />
- </Target>
-
- <!-- Build the actual helix work items to send to helix queues -->
- <Target Name="CreateHelixPayload" Returns="@(HelixWorkItem)">
- <ItemGroup>
- <_TargetFrameworks Remove="@(_TargetFrameworks)" />
- <_TargetFrameworks Include="$(TargetFrameworks);$(TargetFramework)" />
- </ItemGroup>
-
- <MSBuild Projects="$(MSBuildProjectFullPath)"
- Targets="_CreateHelixPayloadInner"
- Properties="TargetFramework=%(_TargetFrameworks.Identity);">
- <Output TaskParameter="TargetOutputs" ItemName="HelixWorkItem" />
- </MSBuild>
- </Target>
-
- <Target Name="_SetCreateHelixPayload">
- <PropertyGroup>
- <_SelectedPlatforms>@(HelixProjectPlatform)</_SelectedPlatforms>
- </PropertyGroup>
-
- <ItemGroup>
- <!-- Include default queues based on platform -->
- <_HelixProjectTargetQueue Include="%(HelixAvailableTargetQueue.Identity)" Condition="'%(HelixAvailableTargetQueue.Identity)' != '' AND '$(_SelectedPlatforms.Contains(%(Platform)))' == 'true' AND '%(EnableByDefault)' == 'true'" />
-
- <_HelixApplicableTargetQueue Include="%(_HelixProjectTargetQueue.Identity)" Condition="'%(Identity)' == '$(HelixTargetQueue)'" />
- </ItemGroup>
-
- <PropertyGroup>
- <BuildHelixPayload Condition="'@(_HelixApplicableTargetQueue->Count())' == '0'">false</BuildHelixPayload>
- <BuildHelixPayload Condition="'$(TargetArchitecture)' == 'arm64' AND '$(SkipHelixArm)' == 'true'">false</BuildHelixPayload>
- </PropertyGroup>
- </Target>
-
- <Target Name="_PublishHelixArchive" DependsOnTargets="Publish" >
- <ZipDirectory Condition="'$(HelixUseArchive)' == 'true'" SourceDirectory="$(PublishDir)" DestinationFile="$(PublishDir)../$(HelixTestName).zip" Overwrite="true" />
- <RemoveDir Condition="'$(HelixUseArchive)' == 'true'" Directories="$(PublishDir)" />
- </Target>
-
- <Target Name="_CreateHelixWorkItem" Condition="$(BuildHelixPayload)">
-
- <PropertyGroup>
- <!-- Extract the effective queue name from this format "(name)host@dockerimage". This is sometimes used in test code to skip tests. -->
- <_HelixFriendlyNameTargetQueue>$(HelixTargetQueue)</_HelixFriendlyNameTargetQueue>
- <_HelixFriendlyNameTargetQueue Condition="$(HelixTargetQueue.Contains('@'))">$(HelixTargetQueue.Substring(1, $([MSBuild]::Subtract($(HelixTargetQueue.LastIndexOf(')')), 1))))</_HelixFriendlyNameTargetQueue>
- </PropertyGroup>
-
- <MSBuild Projects="$(MSBuildProjectFullPath)" Targets="_PublishHelixArchive" RemoveProperties="HelixTargetQueue;TestRunId" />
-
- <ConvertToAbsolutePath Paths="$(PublishDir)">
- <Output TaskParameter="AbsolutePaths" PropertyName="PublishAbsoluteDir" />
- </ConvertToAbsolutePath>
- <ItemGroup>
- <HelixWorkItem Include="$(HelixTestName)">
- <PayloadArchive Condition="'$(HelixUseArchive)' == 'true'">$(PublishAbsoluteDir)../$(HelixTestName).zip</PayloadArchive>
- <PayloadDirectory Condition="'$(HelixUseArchive)' == 'false'">$(PublishAbsoluteDir)</PayloadDirectory>
- <TestAssembly>$(TargetFileName)</TestAssembly>
- <PreCommands>@(HelixPreCommand)</PreCommands>
- <PostCommands>@(HelixPostCommand)</PostCommands>
- <Command Condition="$(IsWindowsHelixQueue)">call runtests.cmd $(TargetFileName) $(TargetFrameworkIdentifier) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture)</Command>
- <Command Condition="!$(IsWindowsHelixQueue)">./runtests.sh $(TargetFileName) $(NETCoreSdkVersion) $(MicrosoftNETCoreAppRuntimeVersion) $(_HelixFriendlyNameTargetQueue) $(TargetArchitecture)</Command>
- <Timeout>$(HelixTimeout)</Timeout>
- </HelixWorkItem>
- </ItemGroup>
- </Target>
-
- <Target Name="_CreateHelixPayloadInner" Returns="@(HelixWorkItem)" DependsOnTargets="_SetCreateHelixPayload;_CreateHelixWorkItem">
- </Target>
-
-</Project>
diff --git a/global.json b/global.json
index aa81b23cb74..a8b7c6dac24 100644
--- a/global.json
+++ b/global.json
@@ -26,7 +26,6 @@
},
"msbuild-sdks": {
"Yarn.MSBuild": "1.15.2",
- "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6",
- "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21552.6"
+ "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6"
}
}
diff --git a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
index 269c50a394b..9ab261faec1 100644
--- a/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
+++ b/src/Analyzers/Analyzers/test/AnalyzerTestBase.cs
@@ -49,14 +49,7 @@ namespace Microsoft.AspNetCore.Analyzers
private static string GetProjectDirectory()
{
- // On helix we use the published test files
- if (SkipOnHelixAttribute.OnHelix())
- {
- return AppContext.BaseDirectory;
- }
-
-// This test code needs to be updated to support distributed testing.
-// See https://github.com/aspnet/AspNetCore/issues/10422
+ // This test code needs to be updated to support distributed testing.
#pragma warning disable 0618
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Analyzers");
#pragma warning restore 0618
diff --git a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
index 87d62d3fdad..8f1d7b6036d 100644
--- a/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
+++ b/src/Analyzers/Analyzers/test/Microsoft.AspNetCore.Analyzers.Test.csproj
@@ -1,20 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<RootNamespace>Microsoft.AspNetCore.Analyzers</RootNamespace>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/10422 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
@@ -31,5 +26,4 @@
<Reference Include="Microsoft.AspNetCore.Mvc" />
<Reference Include="Microsoft.AspNetCore.SignalR" />
</ItemGroup>
-
</Project>
diff --git a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
index d2cb51194b0..608bcff5c3b 100644
--- a/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
+++ b/src/Azure/AzureAD/test/FunctionalTests/Microsoft.AspNetCore.Authentication.AzureAD.FunctionalTests.csproj
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Test asset publishing not working on arm64 https://github.com/aspnet/AspNetCore/issues/11205 -->
- <SkipHelixArm>true</SkipHelixArm>
</PropertyGroup>
<ItemGroup>
diff --git a/src/Components/Analyzers/test/AnalyzerTestBase.cs b/src/Components/Analyzers/test/AnalyzerTestBase.cs
index 8c1ae953762..a847c99a866 100644
--- a/src/Components/Analyzers/test/AnalyzerTestBase.cs
+++ b/src/Components/Analyzers/test/AnalyzerTestBase.cs
@@ -49,14 +49,7 @@ namespace Microsoft.AspNetCore.Components.Analyzers
private static string GetProjectDirectory()
{
- // On helix we use the published test files
- if (SkipOnHelixAttribute.OnHelix())
- {
- return AppContext.BaseDirectory;
- }
-
// This test code needs to be updated to support distributed testing.
- // See https://github.com/aspnet/AspNetCore/issues/10422
#pragma warning disable 0618
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Components");
#pragma warning restore 0618
diff --git a/src/Components/Analyzers/test/Microsoft.AspNetCore.Components.Analyzers.Tests.csproj b/src/Components/Analyzers/test/Microsoft.AspNetCore.Components.Analyzers.Tests.csproj
index 10085017d1f..8fe605d3795 100644
--- a/src/Components/Analyzers/test/Microsoft.AspNetCore.Components.Analyzers.Tests.csproj
+++ b/src/Components/Analyzers/test/Microsoft.AspNetCore.Components.Analyzers.Tests.csproj
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/10422 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
</PropertyGroup>
@@ -19,7 +16,6 @@
</ItemGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
</Project>
diff --git a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj
index 5f7ae8f772c..08785cebf83 100644
--- a/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj
+++ b/src/Components/Authorization/test/Microsoft.AspNetCore.Components.Authorization.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Components.Authorization</RootNamespace>
@@ -12,7 +11,5 @@
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
-
</Project>
diff --git a/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj b/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
index fd2a5406c16..76faab37df0 100644
--- a/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
+++ b/src/Components/Components/test/Microsoft.AspNetCore.Components.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Components</RootNamespace>
@@ -12,7 +11,5 @@
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
-
</Project>
diff --git a/src/Components/Components/test/RendererTest.cs b/src/Components/Components/test/RendererTest.cs
index d0e2affea23..bb2d2f204c6 100644
--- a/src/Components/Components/test/RendererTest.cs
+++ b/src/Components/Components/test/RendererTest.cs
@@ -2810,8 +2810,7 @@ namespace Microsoft.AspNetCore.Components.Test
Assert.Equal(10, component.OnAfterRenderCallCount);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7487")]
+ [Fact]
public async Task CanTriggerEventHandlerDisposedInEarlierPendingBatchAsync()
{
// This represents the scenario where the same event handler is being triggered
diff --git a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj
index 6c611379a5c..215a499f614 100644
--- a/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj
+++ b/src/Components/Forms/test/Microsoft.AspNetCore.Components.Forms.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Components.Forms</RootNamespace>
@@ -11,7 +10,5 @@
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
-
</Project>
diff --git a/src/Components/Web/test/Microsoft.AspNetCore.Components.Web.Tests.csproj b/src/Components/Web/test/Microsoft.AspNetCore.Components.Web.Tests.csproj
index 5c8a5a0d199..fb38abaeca8 100644
--- a/src/Components/Web/test/Microsoft.AspNetCore.Components.Web.Tests.csproj
+++ b/src/Components/Web/test/Microsoft.AspNetCore.Components.Web.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Components</RootNamespace>
@@ -13,7 +12,5 @@
<ItemGroup>
<Compile Include="$(ComponentsSharedSourceRoot)test\**\*.cs" LinkBase="Helpers" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
-
</Project>
diff --git a/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj b/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
index 035bc4ad6cf..9042f2962b8 100644
--- a/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
+++ b/src/Components/WebAssembly/Build/test/Microsoft.AspNetCore.Components.WebAssembly.Build.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
@@ -31,7 +30,6 @@
<ItemGroup>
<ProjectReference Include="..\..\testassets\StandaloneApp\StandaloneApp.csproj" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>
@@ -60,5 +58,4 @@
MicrosoftNetCompilersToolsetPackageVersion=$(MicrosoftNetCompilersToolsetPackageVersion);
MicrosoftNETSdkRazorPackageVersion=$(MicrosoftNETSdkRazorPackageVersion)" />
</Target>
-
</Project>
diff --git a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
index abfdec36e1e..51b2c58cd59 100644
--- a/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
+++ b/src/Components/test/E2ETest/Microsoft.AspNetCore.Components.E2ETests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<!-- Shared testing infrastructure for running E2E tests using selenium -->
<Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
@@ -7,15 +6,11 @@
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>Components.E2ETests</TestGroupName>
- <!-- https://github.com/aspnet/AspNetCore/issues/6857 -->
- <BuildHelixPayload>false</BuildHelixPayload>
-
<!-- Run on platforms where we support Selenium -->
<SkipTests Condition="'$(SeleniumE2ETestsSupported)' != 'true'">true</SkipTests>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
-
<OutputPath />
<GenerateLoggingTestingAssemblyAttributes>false</GenerateLoggingTestingAssemblyAttributes>
@@ -68,5 +63,4 @@
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>
-
</Project>
diff --git a/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs b/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
index 41d775c892b..c72b66773ee 100644
--- a/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
+++ b/src/Components/test/E2ETest/ServerExecutionTests/ServerComponentRenderingTest.cs
@@ -36,10 +36,9 @@ namespace Microsoft.AspNetCore.Components.E2ETest.ServerExecutionTests
$"{typeof(InvalidOperationException).FullName}: The current thread is not associated with the Dispatcher. Use InvokeAsync() to switch execution to the Dispatcher when triggering rendering or component state.",
() => result.Text);
}
-
+
[Fact]
- [Flaky("https://github.com/dotnet/aspnetcore-internal/issues/3615", FlakyOn.Helix.All)]
public override void CanDispatchAsyncWorkToSyncContext()
- => base.CanDispatchAsyncWorkToSyncContext();
+ => base.CanDispatchAsyncWorkToSyncContext();
}
}
diff --git a/src/Components/test/E2ETest/Tests/FormsTest.cs b/src/Components/test/E2ETest/Tests/FormsTest.cs
index 46b62805232..6a2df1db15f 100644
--- a/src/Components/test/E2ETest/Tests/FormsTest.cs
+++ b/src/Components/test/E2ETest/Tests/FormsTest.cs
@@ -191,7 +191,6 @@ namespace Microsoft.AspNetCore.Components.E2ETest.Tests
}
[Fact]
- [Flaky("https://github.com/dotnet/aspnetcore-internal/issues/3615", FlakyOn.Helix.All)]
public void InputDateInteractsWithEditContext_NonNullableDateTime()
{
var appElement = MountTypicalValidationComponent();
diff --git a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
index 965f472d280..47fcd63724a 100644
--- a/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
+++ b/src/DataProtection/Extensions/test/DataProtectionProviderTests.cs
@@ -115,7 +115,6 @@ namespace Microsoft.AspNetCore.DataProtection
[ConditionalFact]
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
public void System_UsesProvidedDirectoryAndCertificate()
{
var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx");
@@ -165,7 +164,6 @@ namespace Microsoft.AspNetCore.DataProtection
[ConditionalFact]
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
public void System_UsesProvidedCertificateNotFromStore()
{
using (var store = new X509Store(StoreName.My, StoreLocation.CurrentUser))
diff --git a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
index f184844f0cb..ce1fc35fb18 100644
--- a/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
+++ b/src/DataProtection/Extensions/test/Microsoft.AspNetCore.DataProtection.Extensions.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
@@ -7,7 +6,6 @@
<ItemGroup>
<Compile Include="..\..\shared\test\*.cs" />
<Content Include="TestFiles\**\*" CopyToOutputDirectory="PreserveNewest" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>
@@ -15,5 +13,4 @@
<Reference Include="Microsoft.AspNetCore.DataProtection.Abstractions" />
<Reference Include="Microsoft.AspNetCore.DataProtection.Extensions" />
</ItemGroup>
-
</Project>
diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
index 41aee06e07a..abf1adb264d 100644
--- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
+++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/Microsoft.AspNetCore.FunctionalTests.csproj
@@ -1,14 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/10424 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
diff --git a/src/DefaultBuilder/testassets/Directory.Build.props b/src/DefaultBuilder/testassets/Directory.Build.props
index b49282fb6f9..cf22da6830c 100644
--- a/src/DefaultBuilder/testassets/Directory.Build.props
+++ b/src/DefaultBuilder/testassets/Directory.Build.props
@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
</PropertyGroup>
diff --git a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
index 8233dc19180..8fab7300a0e 100644
--- a/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
+++ b/src/Framework/test/Microsoft.AspNetCore.App.UnitTests.csproj
@@ -1,10 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore</RootNamespace>
- <!-- https://github.com/aspnet/AspNetCore/issues/7939: This unit test requires the shared framework be available in Helix. -->
- <BuildHelixPayload>false</BuildHelixPayload>
<VerifyAncmBinary Condition="'$(TargetOsName)' == 'win' AND '$(TargetArchitecture)' != 'arm'">true</VerifyAncmBinary>
</PropertyGroup>
@@ -105,5 +102,4 @@
</AssemblyAttribute>
</ItemGroup>
</Target>
-
</Project>
diff --git a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
index 62619a73b24..e84f753fc48 100644
--- a/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
+++ b/src/Hosting/Hosting/test/Microsoft.AspNetCore.Hosting.Tests.csproj
@@ -1,11 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="$(SharedSourceRoot)EventSource.Testing\TestEventListener.cs" />
<Compile Include="$(SharedSourceRoot)EventSource.Testing\TestCounterListener.cs" />
<Content Include="testroot\**\*" CopyToOutputDirectory="PreserveNewest" CopyToPublishDirectory="PreserveNewest" />
@@ -24,5 +22,4 @@
<Reference Include="Microsoft.Extensions.Options" />
<Reference Include="System.Threading.Channels" />
</ItemGroup>
-
</Project>
diff --git a/src/Hosting/Hosting/test/WebHostTests.cs b/src/Hosting/Hosting/test/WebHostTests.cs
index c1499accffb..08f2849a7f8 100644
--- a/src/Hosting/Hosting/test/WebHostTests.cs
+++ b/src/Hosting/Hosting/test/WebHostTests.cs
@@ -198,7 +198,6 @@ namespace Microsoft.AspNetCore.Hosting
}
[ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7291")]
public async Task WebHostStopAsyncUsesDefaultTimeoutIfGivenTokenDoesNotFire()
{
var data = new Dictionary<string, string>
@@ -238,7 +237,6 @@ namespace Microsoft.AspNetCore.Hosting
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2244", FlakyOn.Helix.All)]
public async Task WebHostStopAsyncUsesDefaultTimeoutIfNoTokenProvided()
{
var data = new Dictionary<string, string>
@@ -314,7 +312,6 @@ namespace Microsoft.AspNetCore.Hosting
}
[ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7291")]
public void WebHostApplicationLifetimeEventsOrderedCorrectlyDuringShutdown()
{
using (var host = CreateBuilder()
diff --git a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
index 75a2f330f75..ec4f085d49e 100644
--- a/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
+++ b/src/Hosting/test/FunctionalTests/Microsoft.AspNetCore.Hosting.FunctionalTests.csproj
@@ -1,14 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/8247 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
@@ -23,5 +19,4 @@
<Reference Include="Microsoft.Extensions.Logging.Console" />
<Reference Include="Microsoft.Extensions.Logging.Testing" />
</ItemGroup>
-
</Project>
diff --git a/src/Hosting/test/testassets/Directory.Build.props b/src/Hosting/test/testassets/Directory.Build.props
index b49282fb6f9..cf22da6830c 100644
--- a/src/Hosting/test/testassets/Directory.Build.props
+++ b/src/Hosting/test/testassets/Directory.Build.props
@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
</PropertyGroup>
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
index a72e1282377..81815047728 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/ConfigureSigningCredentialsTests.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
X509KeyStorageFlags.DefaultKeySet);
[ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
[FrameworkSkipCondition(RuntimeFrameworks.CLR)]
public void Configure_AddsDevelopmentKeyFromConfiguration()
{
@@ -63,8 +62,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
}
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
+ [Fact]
public void Configure_LoadsPfxCertificateCredentialFromConfiguration()
{
// Arrange
@@ -93,8 +91,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer
Assert.Equal("AC8FDF4BD4C10841BD24DC88D983225D10B43BB2", key.Certificate.Thumbprint);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
+ [Fact]
public void Configure_LoadsCertificateStoreCertificateCredentialFromConfiguration()
{
try
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
index ced72bd9cc7..14bcb09e7b3 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Configuration/SigningKeysLoaderTests.cs
@@ -58,8 +58,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
Assert.Equal("Couldn't find a valid certificate with subject 'Invalid' on the 'CurrentUser\\My'", exception.Message);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
+ [Fact]
public static void LoadFromStoreCert_SkipsCertificatesNotYetValid()
{
try
@@ -81,8 +80,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
}
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
+ [Fact]
public static void LoadFromStoreCert_PrefersCertificatesCloserToExpirationDate()
{
try
@@ -104,8 +102,7 @@ namespace Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Configuration
}
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6720")]
+ [Fact]
public static void LoadFromStoreCert_SkipsExpiredCertificates()
{
try
diff --git a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
index e50086da719..0739e44afcf 100644
--- a/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
+++ b/src/Identity/ApiAuthorization.IdentityServer/test/Microsoft.AspNetCore.ApiAuthorization.IdentityServer.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<!-- We are a package that depends on the shared framework, this allows us to
@@ -12,7 +11,6 @@
<FrameworkReference Remove="Microsoft.AspNetCore.App" />
<Reference Include="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>
@@ -29,5 +27,4 @@
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
-
</Project>
diff --git a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
index 8258bb2e74b..998735d2b48 100644
--- a/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
+++ b/src/Identity/test/Identity.FunctionalTests/Infrastructure/ServerFactory.cs
@@ -96,14 +96,14 @@ namespace Microsoft.AspNetCore.Identity.FunctionalTests
var path = typeof(ServerFactory<,>).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
.Single(a => a.Key == "Microsoft.AspNetCore.Testing.IdentityUIProjectPath").Value;
- path = Directory.Exists(path) ? Path.Combine(path, "wwwroot") : Path.Combine(FindHelixSlnFileDirectory(), "UI", "wwwroot");
+ path = Directory.Exists(path) ? Path.Combine(path, "wwwroot") : Path.Combine(FindSlnFileDirectory(), "UI", "wwwroot");
var updatedContent = content.Replace("{TEST_PLACEHOLDER}", path);
File.WriteAllText(versionedPath, updatedContent);
}
- private string FindHelixSlnFileDirectory()
+ private string FindSlnFileDirectory()
{
var applicationPath = Path.GetDirectoryName(typeof(ServerFactory<,>).Assembly.Location);
var directoryInfo = new DirectoryInfo(applicationPath);
diff --git a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
index e52a467e243..dc739316721 100644
--- a/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
+++ b/src/Identity/test/Identity.FunctionalTests/Microsoft.AspNetCore.Identity.FunctionalTests.csproj
@@ -1,9 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Test asset publishing not working on arm64 https://github.com/aspnet/AspNetCore/issues/11205 -->
- <SkipHelixArm>true</SkipHelixArm>
<!-- Avoid CS1705 errors due to mix of assemblies brought in transitively. -->
<CompileUsingReferenceAssemblies>false</CompileUsingReferenceAssemblies>
</PropertyGroup>
@@ -55,11 +52,6 @@
<_Parameter1>Microsoft.AspNetCore.Testing.IdentityUIProjectPath</_Parameter1>
<_Parameter2>$([System.IO.Path]::GetDirectoryName('%(_IdentitUIProjectPath.MSBuildSourceProjectFile)'))</_Parameter2>
</AssemblyAttribute>
-
- <AssemblyAttribute Include="System.Reflection.AssemblyMetadataAttribute" Condition="'$(HelixType)' == 'ci'">
- <_Parameter1>Microsoft.AspNetCore.Testing.IsHelixCI</_Parameter1>
- <_Parameter2>true</_Parameter2>
- </AssemblyAttribute>
</ItemGroup>
</Target>
@@ -81,5 +73,4 @@
<!-- Drop a dummy sln to specify content root location -->
<WriteLinesToFile File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" Encoding="Unicode" />
</Target>
-
</Project>
diff --git a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
index 68f9091c793..04a827399c6 100644
--- a/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
+++ b/src/Identity/test/Identity.Test/IdentityUIScriptsTest.cs
@@ -166,10 +166,10 @@ namespace Microsoft.AspNetCore.Identity.Test
{
var projectPath = typeof(IdentityUIScriptsTest).Assembly.GetCustomAttributes<AssemblyMetadataAttribute>()
.Single(a => a.Key == "Microsoft.AspNetCore.Testing.DefaultUIProjectPath").Value;
- return Directory.Exists(projectPath) ? projectPath : Path.Combine(FindHelixSlnFileDirectory(), "UI");
+ return Directory.Exists(projectPath) ? projectPath : Path.Combine(FindSlnFileDirectory(), "UI");
}
- private static string FindHelixSlnFileDirectory()
+ private static string FindSlnFileDirectory()
{
var applicationPath = Path.GetDirectoryName(typeof(IdentityUIScriptsTest).Assembly.Location);
var directoryInfo = new DirectoryInfo(applicationPath);
diff --git a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
index ee81519dde1..ac038530ae8 100644
--- a/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
+++ b/src/Identity/test/Identity.Test/Microsoft.AspNetCore.Identity.Test.csproj
@@ -1,12 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
<ItemGroup>
<Compile Include="$(IdentityTestSharedSourceRoot)**\*.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>
@@ -40,6 +38,4 @@
<!-- Drop a dummy sln to specify content root location -->
<WriteLinesToFile File="$(PublishDir)\contentroot.sln" Lines="Ignored" Overwrite="true" Encoding="Unicode" />
</Target>
-
-
</Project>
diff --git a/src/Middleware/CORS/test/testassets/Directory.Build.props b/src/Middleware/CORS/test/testassets/Directory.Build.props
index b49282fb6f9..cf22da6830c 100644
--- a/src/Middleware/CORS/test/testassets/Directory.Build.props
+++ b/src/Middleware/CORS/test/testassets/Directory.Build.props
@@ -2,7 +2,7 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
</PropertyGroup>
diff --git a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
index b7caf9c87e3..5912b91c32c 100644
--- a/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
+++ b/src/Middleware/Diagnostics/test/FunctionalTests/Diagnostics.FunctionalTests.csproj
@@ -1,10 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<SignAssembly>false</SignAssembly>
<AssemblyName>Diagnostics.FunctionalTests</AssemblyName>
- <TestDependsOnMssql>true</TestDependsOnMssql>
</PropertyGroup>
<ItemGroup>
@@ -20,5 +18,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.TestHost" />
</ItemGroup>
-
</Project>
diff --git a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
index 89e815a75a5..b6bb307bbe5 100644
--- a/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
+++ b/src/Middleware/WebSockets/test/UnitTests/WebSocketMiddlewareTests.cs
@@ -550,7 +550,6 @@ namespace Microsoft.AspNetCore.WebSockets.Test
}
[Fact]
- [Flaky("https://github.com/aspnet/AspNetCore/issues/8187", FlakyOn.Helix.All)]
public async Task OriginIsNotValidatedForNonWebSocketRequests()
{
using (var server = KestrelWebSocketHelpers.CreateServer(LoggerFactory, out var port, context =>
diff --git a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
index 244bd263a1b..17f14cd7aa8 100644
--- a/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
+++ b/src/Mvc/Mvc.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -26,13 +26,7 @@ namespace Microsoft.AspNetCore.Mvc
private static string GetProjectDirectory()
{
- // On helix we use the published test files
- if (SkipOnHelixAttribute.OnHelix())
- {
- return AppContext.BaseDirectory;
- }
-
-// https://github.com/aspnet/AspNetCore/issues/9431
+ // https://github.com/aspnet/AspNetCore/issues/9431
#pragma warning disable 0618
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
#pragma warning restore 0618
diff --git a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
index b3730770e35..32533142a39 100644
--- a/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
+++ b/src/Mvc/Mvc.Analyzers/test/Mvc.Analyzers.Test.csproj
@@ -1,21 +1,16 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<PreserveCompilationContext>true</PreserveCompilationContext>
<RootNamespace>Microsoft.AspNetCore.Mvc.Analyzers</RootNamespace>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/9431 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
<None Include="xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Remove="TestFiles\TagHelpersInCodeBlocksAnalyzerTest\*.*" />
<Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
@@ -26,5 +21,4 @@
<Reference Include="Microsoft.AspNetCore.Analyzer.Testing" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>
-
</Project>
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
index 95510e5e464..d67c1d8a510 100644
--- a/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
+++ b/src/Mvc/Mvc.Api.Analyzers/test/Infrastructure/MvcTestSource.cs
@@ -26,13 +26,7 @@ namespace Microsoft.AspNetCore.Mvc
private static string GetProjectDirectory()
{
- // On helix we use the published test files
- if (SkipOnHelixAttribute.OnHelix())
- {
- return AppContext.BaseDirectory;
- }
-
-// https://github.com/aspnet/AspNetCore/issues/9431
+ // https://github.com/aspnet/AspNetCore/issues/9431
#pragma warning disable 0618
var solutionDirectory = TestPathUtilities.GetSolutionRootDirectory("Mvc");
#pragma warning restore 0618
diff --git a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
index 19a3a347336..bbadd08d685 100644
--- a/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
+++ b/src/Mvc/Mvc.Api.Analyzers/test/Mvc.Api.Analyzers.Test.csproj
@@ -1,20 +1,15 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<RootNamespace>Microsoft.AspNetCore.Mvc.Api.Analyzers</RootNamespace>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/9431 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
<Compile Include="..\..\Mvc.Analyzers\test\Infrastructure\MvcDiagnosticAnalyzerRunner.cs" Link="Infrastructure\MvcDiagnosticAnalyzerRunner.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestFiles\**\*.*" CopyToPublishDirectory="PreserveNewest" />
</ItemGroup>
@@ -24,5 +19,4 @@
<Reference Include="Microsoft.AspNetCore.Analyzer.Testing" />
<Reference Include="Microsoft.CodeAnalysis.CSharp.Workspaces" />
</ItemGroup>
-
</Project>
diff --git a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
index 70385d88d57..96df18ed6b8 100644
--- a/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
+++ b/src/Mvc/test/Mvc.FunctionalTests/Microsoft.AspNetCore.Mvc.FunctionalTests.csproj
@@ -9,8 +9,6 @@
<TestGroupName>Mvc.FunctionalTests</TestGroupName>
<!-- The test asset projects this depends on are not strong-named. -->
<SignAssembly>false</SignAssembly>
- <!-- https://github.com/aspnet/AspNetCore/issues/10423 -->
- <BuildHelixPayload>false</BuildHelixPayload>
</PropertyGroup>
<ItemGroup>
diff --git a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
index 016e024dc2b..bb8ac906f4d 100644
--- a/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
+++ b/src/ProjectTemplates/test/ProjectTemplates.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<!-- Shared testing infrastructure for running E2E tests using selenium -->
<Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.props" />
@@ -11,9 +10,7 @@
<RunTemplateTests Condition="'$(RunTemplateTests)' == ''" >true</RunTemplateTests>
<SkipTests Condition="'$(RunTemplateTests)' != 'true'">true</SkipTests>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <!-- https://github.com/aspnet/AspNetCore/issues/6857 -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
@@ -149,5 +146,4 @@
<!-- Shared testing infrastructure for running E2E tests using selenium -->
<Import Project="$(SharedSourceRoot)E2ETesting\E2ETesting.targets" />
-
</Project>
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj
index d0c7e5a9a2f..9494ee20ce8 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/Microsoft.AspNetCore.Authentication.Negotiate.FunctionalTest.csproj
@@ -1,14 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
</PropertyGroup>
- <ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
- </ItemGroup>
-
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authentication.Negotiate" />
<Reference Include="Microsoft.AspNetCore.Routing" />
@@ -20,5 +15,4 @@
<ItemGroup>
<Content Include="negotiateAuthCert.pfx" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
-
</Project>
diff --git a/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj b/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj
index 7af38dfa4a4..4b9d98f03eb 100644
--- a/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj
+++ b/src/Security/Authentication/Negotiate/test/Negotiate.Test/Microsoft.AspNetCore.Authentication.Negotiate.Test.csproj
@@ -1,13 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
</PropertyGroup>
- <ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
- </ItemGroup>
-
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authentication.Negotiate" />
<Reference Include="Microsoft.AspNetCore.Diagnostics" />
@@ -15,5 +10,4 @@
<Reference Include="Microsoft.AspNetCore.TestHost" />
<Reference Include="Microsoft.Extensions.Hosting" />
</ItemGroup>
-
</Project>
diff --git a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
index 815d30e0277..28165c69cbb 100644
--- a/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
+++ b/src/Security/Authentication/test/Microsoft.AspNetCore.Authentication.Test.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFrameworks>$(DefaultNetCoreTargetFramework)</TargetFrameworks>
</PropertyGroup>
@@ -33,10 +32,6 @@
<EmbeddedResource Include="OpenIdConnect\wellknownkeys.json" />
</ItemGroup>
- <ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
- </ItemGroup>
-
<ItemGroup>
<Reference Include="Microsoft.AspNetCore.Authentication.Certificate" />
<Reference Include="Microsoft.AspNetCore.Authentication.Cookies" />
@@ -51,5 +46,4 @@
<Reference Include="Microsoft.AspNetCore.TestHost" />
<Reference Include="Microsoft.Net.Http.Headers" />
</ItemGroup>
-
</Project>
diff --git a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
index 9808064e241..bef70c0de20 100644
--- a/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
+++ b/src/Security/test/AuthSamples.FunctionalTests/AuthSamples.FunctionalTests.csproj
@@ -1,11 +1,8 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<IsSampleProject>false</IsSampleProject>
<PlatformTarget>AnyCPU</PlatformTarget>
- <!-- Test asset publishing not working on arm64 https://github.com/aspnet/AspNetCore/issues/11205 -->
- <SkipHelixArm>true</SkipHelixArm>
</PropertyGroup>
<Import Project="$(MvcTestingTargets)" Condition="'$(MvcTestingTargets)' != ''" />
@@ -78,5 +75,4 @@
Overwrite="true"
Encoding="Unicode" />
</Target>
-
</Project>
diff --git a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
index 6bbaeb13cb9..e4cdf5c5155 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/HttpsTests.cs
@@ -25,7 +25,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
public class HttpsTests
{
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_200OK_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
@@ -39,7 +38,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_SendHelloWorld_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, httpContext =>
@@ -55,7 +53,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_EchoHelloWorld_Success()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -73,7 +70,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
public async Task Https_ClientCertNotSent_ClientCertNotPresent()
{
using (Utilities.CreateDynamicHttpsServer(out var address, async httpContext =>
@@ -110,7 +106,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
[OSDontSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
public async Task Https_SkipsITlsHandshakeFeatureOnWin7()
{
@@ -133,7 +128,6 @@ namespace Microsoft.AspNetCore.Server.HttpSys
}
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2209", FlakyOn.Helix.All)]
[OSSkipCondition(OperatingSystems.Windows, WindowsVersions.Win7, WindowsVersions.Win2008R2)]
public async Task Https_SetsITlsHandshakeFeature()
{
diff --git a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
index 281d455f5e6..8e536ea263a 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
+++ b/src/Servers/HttpSys/test/FunctionalTests/Microsoft.AspNetCore.Server.HttpSys.FunctionalTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<TestGroupName>HttpSys.FunctionalTests</TestGroupName>
@@ -15,11 +14,4 @@
<!--Imitate IIS Express so we can use it's cert bindings-->
<PackageTags>214124cd-d05b-4309-9af9-9caa44b2b74a</PackageTags>
</PropertyGroup>
-
- <ItemGroup>
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\TestCert.pfx" />
- <HelixContent Include="$(RepoRoot)src\Servers\IIS\tools\UpdateIISExpressCertificate.ps1" />
- <HelixPreCommand Include="call RunPowershell.cmd UpdateIISExpressCertificate.ps1 || exit /b 1" />
- </ItemGroup>
-
</Project>
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
index 2e2866e98e0..77c5b9364e3 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/FrebTests.cs
@@ -80,7 +80,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
// I think this test is flaky due to freb file not being created quickly enough.
// Adding extra logging, marking as flaky, and repeating should help
[ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2570", FlakyOn.Helix.All)]
[Repeat(10)]
[RequiresIIS(IISCapability.FailedRequestTracingModule)]
public async Task CheckFrebDisconnect()
diff --git a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
index 2d152fcccae..a6c06aba4d7 100644
--- a/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
+++ b/src/Servers/IIS/IIS/test/Common.FunctionalTests/Inprocess/StartupTests.cs
@@ -113,7 +113,6 @@ namespace Microsoft.AspNetCore.Server.IIS.FunctionalTests.InProcess
[SkipIfNotAdmin]
[RequiresNewShim]
[RequiresIIS(IISCapability.PoolEnvironmentVariables)]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore-Internal/issues/2221")]
public async Task StartsWithDotnetInstallLocation(RuntimeArchitecture runtimeArchitecture)
{
var deploymentParameters = Fixture.GetBaseDeploymentParameters();
diff --git a/src/Servers/IIS/IIS/test/Directory.Build.props b/src/Servers/IIS/IIS/test/Directory.Build.props
index 6f6f9211685..5001167484a 100644
--- a/src/Servers/IIS/IIS/test/Directory.Build.props
+++ b/src/Servers/IIS/IIS/test/Directory.Build.props
@@ -2,12 +2,11 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
<!-- IIS tests are Windows-only -->
<IsWindowsOnlyTest>true</IsWindowsOnlyTest>
</PropertyGroup>
-
</Project>
diff --git a/src/Servers/IIS/IIS/test/FunctionalTest.props b/src/Servers/IIS/IIS/test/FunctionalTest.props
index 85821152392..3435c8ba3b7 100644
--- a/src/Servers/IIS/IIS/test/FunctionalTest.props
+++ b/src/Servers/IIS/IIS/test/FunctionalTest.props
@@ -1,12 +1,5 @@
<Project>
-
- <PropertyGroup>
- <HelixTimeout>00:45:00</HelixTimeout>
- </PropertyGroup>
-
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
-
<Content Include="..\Common.FunctionalTests\AppHostConfig\*.config" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
@@ -17,7 +10,6 @@
</Target>
<Target Name="CopyAssets" AfterTargets="Publish" Condition="'@(PublishedTestAsset->Count())' != '0'">
-
<ItemGroup>
<_FilesToCopy Include="%(PublishedTestAsset.Path)\**\*">
<DestinationDir>$(PublishDir)\%(PublishedTestAsset.Identity)\</DestinationDir>
@@ -25,7 +17,5 @@
</ItemGroup>
<Copy SourceFiles="@(_FilesToCopy)" DestinationFiles="@(_FilesToCopy->'%(DestinationDir)%(RecursiveDir)%(FileName)%(Extension)')" />
-
</Target>
-
</Project>
diff --git a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
index 67969b30f59..db5700f559b 100644
--- a/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
+++ b/src/Servers/Kestrel/Kestrel/test/GeneratedCodeTests.cs
@@ -12,8 +12,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
{
public class GeneratedCodeTests
{
- [ConditionalFact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2223", FlakyOn.Helix.All)]
+ [Fact]
public void GeneratedCodeIsUpToDate()
{
var httpHeadersGeneratedPath = Path.Combine(AppContext.BaseDirectory,"shared", "GeneratedContent", "HttpHeaders.Generated.cs");
diff --git a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
index cade793bc20..bbe7d162080 100644
--- a/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
+++ b/src/Servers/Kestrel/Kestrel/test/Microsoft.AspNetCore.Server.Kestrel.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
@@ -7,7 +6,6 @@
<ItemGroup>
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(KestrelRoot)Core\src\Internal\Http\HttpHeaders.Generated.cs" LinkBase="shared\GeneratedContent" CopyToOutputDirectory="PreserveNewest" />
<Content Include="$(KestrelRoot)Core\src\Internal\Http\HttpProtocol.Generated.cs" LinkBase="shared\GeneratedContent" CopyToOutputDirectory="PreserveNewest" />
@@ -23,5 +21,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
index b3375788240..20e2235ad49 100644
--- a/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
+++ b/src/Servers/Kestrel/test/BindTests/AddressRegistrationTests.cs
@@ -32,7 +32,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalFact]
[HostNameIsReachable]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7267")]
public async Task RegisterAddresses_HostName_Success()
{
var hostName = Dns.GetHostName();
@@ -158,7 +157,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
[ConditionalTheory]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2179", FlakyOn.Helix.All)]
[MemberData(nameof(AddressRegistrationDataIPv6ScopeId))]
[IPv6SupportedCondition]
[IPv6ScopeIdPresentCondition]
@@ -345,7 +343,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalFact]
[HostNameIsReachable]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7267")]
public async Task ListenAnyIP_HostName_Success()
{
var hostName = Dns.GetHostName();
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
index aaf101cced1..ff86d6f1bd7 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
@@ -80,7 +80,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[ConditionalFact]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task TlsAlpnHandshakeSelectsHttp2From1and2()
{
@@ -111,7 +110,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[ConditionalFact]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task TlsAlpnHandshakeSelectsHttp2()
{
diff --git a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
index af2b768fd1d..82f166adbc3 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/Http2/ShutdownTests.cs
@@ -23,7 +23,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
{
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10)]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
public class ShutdownTests : TestApplicationErrorLoggerLoggedTest
{
private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
@@ -44,7 +43,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
[CollectDump]
[ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/9985", Queues = "Fedora.28.Amd64.Open")]
[Flaky("https://github.com/aspnet/AspNetCore/issues/9985", FlakyOn.All)]
public async Task GracefulShutdownWaitsForRequestsToFinish()
{
diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
index 6e4a5b88034..1953b86c6bd 100644
--- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
+++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs
@@ -132,9 +132,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
[ConditionalFact]
[IPv6SupportedCondition]
-#if LIBUV
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1977", FlakyOn.Helix.All)] // https://github.com/aspnet/AspNetCore/issues/8109
-#endif
public Task RemoteIPv6Address()
{
return TestRemoteIPAddress("[::1]", "[::1]", "::1");
@@ -538,7 +535,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
[Theory]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2181", FlakyOn.Helix.All)]
[MemberData(nameof(ConnectionMiddlewareData))]
public async Task ConnectionClosedTokenFiresOnServerFIN(ListenOptions listenOptions)
{
@@ -791,9 +787,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests
}
[Theory]
-#if LIBUV
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1971", FlakyOn.Helix.All)]
-#endif
[MemberData(nameof(ConnectionMiddlewareData))]
public async Task AppCanHandleClientAbortingConnectionMidRequest(ListenOptions listenOptions)
{
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
index f52e83eb62d..a1bfb7c88fb 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/Http2/TlsTests.cs
@@ -29,7 +29,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests.Http2
private static X509Certificate2 _x509Certificate2 = TestResources.GetTestCertificate();
[ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/7000")]
public async Task TlsHandshakeRejectsTlsLessThan12()
{
using (var server = new TestServer(context =>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
index 45e21934be8..fdf7efb0df9 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/HttpsConnectionMiddlewareTests.cs
@@ -424,8 +424,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
}
}
- [ConditionalTheory]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/1950", FlakyOn.Helix.All)]
+ [Theory]
[InlineData(ClientCertificateMode.AllowCertificate)]
[InlineData(ClientCertificateMode.RequireCertificate)]
public async Task ValidationFailureRejectsConnection(ClientCertificateMode mode)
@@ -594,7 +593,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
[InlineData(HttpProtocols.Http2)]
[InlineData(HttpProtocols.Http1AndHttp2)]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/10428", Queues = "Debian.8.Amd64.Open")] // Debian 8 uses OpenSSL 1.0.1 which does not support HTTP/2
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81)]
public async Task ListenOptionsProtolsCanBeSetAfterUseHttps(HttpProtocols httpProtocols)
{
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
index bab72483413..0abc6aeb54c 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/InMemory.FunctionalTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
@@ -10,7 +9,6 @@
<ItemGroup>
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="$(RepoRoot)src\Shared\Buffers.MemoryPool\*.cs" LinkBase="MemoryPool" />
<Compile Include="$(KestrelSharedSourceRoot)\CorrelationIdGenerator.cs" Link="Internal\CorrelationIdGenerator.cs" />
@@ -27,5 +25,4 @@
<Reference Include="Microsoft.Extensions.TypeNameHelper.Sources" />
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
index 753e05814ae..31539e50b3c 100644
--- a/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
+++ b/src/Servers/Kestrel/test/InMemory.FunctionalTests/LoggingConnectionMiddlewareTests.cs
@@ -14,7 +14,6 @@ namespace Microsoft.AspNetCore.Server.Kestrel.InMemory.FunctionalTests
public class LoggingConnectionMiddlewareTests : LoggedTest
{
[Fact]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2276", FlakyOn.Helix.All)]
public async Task LoggingConnectionMiddlewareCanBeAddedBeforeAndAfterHttps()
{
await using (var server = new TestServer(context =>
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
index 2c5f39382d9..27378d010b9 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/H2SpecTests.cs
@@ -19,9 +19,8 @@ namespace Interop.FunctionalTests
{
public class H2SpecTests : LoggedTest
{
- [ConditionalTheory]
+ [Theory]
[MemberData(nameof(H2SpecTestCases))]
- [Flaky("https://github.com/aspnet/AspNetCore-Internal/issues/2225", FlakyOn.Helix.All)]
public async Task RunIndividualTestCase(H2SpecTestCase testCase)
{
var hostBuilder = new WebHostBuilder()
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
index 3a1b3e76709..3f7500f5c71 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Interop.FunctionalTests.csproj
@@ -1,13 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
<TestGroupName>Interop.FunctionalTests</TestGroupName>
<!-- WebDriver is not strong named, so this test assembly cannot be strong-named either. -->
<SignAssembly>false</SignAssembly>
- <!-- See: https://github.com/aspnet/AspNetCore/issues/7299 -->
- <BuildHelixPayload>false</BuildHelixPayload>
</PropertyGroup>
<ItemGroup>
@@ -18,7 +15,6 @@
<Compile Include="$(KestrelSharedSourceRoot)test\TestConstants.cs" LinkBase="shared" />
<Compile Include="$(KestrelSharedSourceRoot)test\TestResources.cs" LinkBase="shared" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
</ItemGroup>
<ItemGroup>
@@ -28,5 +24,4 @@
<Reference Include="Selenium.WebDriver" />
<Reference Include="Selenium.WebDriver.ChromeDriver" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
index a8223118a02..0ea8789eefb 100644
--- a/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
+++ b/src/Servers/Kestrel/test/Interop.FunctionalTests/Utilities.cs
@@ -9,12 +9,11 @@ namespace Interop.FunctionalTests
{
internal static bool CurrentPlatformSupportsAlpn()
{
- return // "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support"
+ return
+ // "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support"
new MinimumOSVersionAttribute(OperatingSystems.Windows, WindowsVersions.Win81).IsMet
// "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492"
- && new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet
- // Debian 8 uses OpenSSL 1.0.1 which does not support ALPN
- && new SkipOnHelixAttribute("https://github.com/aspnet/AspNetCore/issues/10428") { Queues = "Debian.8.Amd64.Open" }.IsMet;
+ && new OSSkipConditionAttribute(OperatingSystems.MacOSX).IsMet;
}
}
}
diff --git a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
index 22cabcb14ac..40f4af00d85 100644
--- a/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
+++ b/src/Servers/Kestrel/test/Libuv.BindTests/Libuv.BindTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
@@ -7,12 +6,6 @@
</PropertyGroup>
<ItemGroup>
- <!-- https://github.com/aspnet/AspNetCore/issues/8046 -->
- <HelixProjectPlatform Remove="OSX" />
- </ItemGroup>
-
- <ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Libuv.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
@@ -25,5 +18,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
index d9ee70e3fca..c2e319ba6f7 100644
--- a/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Libuv.FunctionalTests/Libuv.FunctionalTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<DefineConstants Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(DefineConstants);MACOS</DefineConstants>
@@ -12,7 +11,6 @@
<ItemGroup>
<Compile Include="..\FunctionalTests\**\*.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\*.cs" LinkBase="shared\TransportTestHelpers" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
@@ -26,5 +24,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
index 3ad3eb297af..f4acb59829c 100644
--- a/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
+++ b/src/Servers/Kestrel/test/Sockets.BindTests/Sockets.BindTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<ServerGarbageCollection>true</ServerGarbageCollection>
@@ -7,7 +6,6 @@
</PropertyGroup>
<ItemGroup>
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="..\BindTests\**\*.cs" />
<Compile Include="..\Sockets.FunctionalTests\TransportSelector.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
@@ -20,5 +18,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Transport.Sockets" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
index 4bc4f8fbdf9..6d845701b4b 100644
--- a/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
+++ b/src/Servers/Kestrel/test/Sockets.FunctionalTests/Sockets.FunctionalTests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<DefineConstants Condition="$([MSBuild]::IsOSPlatform('OSX'))">$(DefineConstants);MACOS</DefineConstants>
@@ -10,7 +9,6 @@
<ItemGroup>
<Compile Include="..\FunctionalTests\**\*.cs" />
<Compile Include="$(SharedSourceRoot)NullScope.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Compile Include="$(KestrelSharedSourceRoot)test\*.cs" LinkBase="shared" />
<Compile Include="$(KestrelSharedSourceRoot)test\TransportTestHelpers\*.cs" LinkBase="shared\TransportTestHelpers" />
<Content Include="$(KestrelSharedSourceRoot)test\TestCertificates\*.pfx" LinkBase="shared\TestCertificates" CopyToOutputDirectory="PreserveNewest" />
@@ -23,5 +21,4 @@
<Reference Include="Microsoft.AspNetCore.Server.Kestrel.Core" />
<Reference Include="Newtonsoft.Json" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj
index 4dd2e88fd4a..6979ba945be 100644
--- a/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj
+++ b/src/Servers/test/FunctionalTests/ServerComparison.FunctionalTests.csproj
@@ -1,13 +1,10 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
- <BuildHelixPayload>false</BuildHelixPayload>
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
-
</PropertyGroup>
<ItemGroup>
@@ -23,5 +20,4 @@
<Reference Include="Serilog.Extensions.Logging" />
<Reference Include="Serilog.Sinks.File" />
</ItemGroup>
-
</Project>
diff --git a/src/Servers/testassets/Directory.Build.props b/src/Servers/testassets/Directory.Build.props
index 4be9d418190..cf22da6830c 100644
--- a/src/Servers/testassets/Directory.Build.props
+++ b/src/Servers/testassets/Directory.Build.props
@@ -2,9 +2,8 @@
<Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
<PropertyGroup>
- <!-- Tests do not work on Helix or when bin/ directory is not in project directory due to undeclared dependency on test content. -->
+ <!-- Tests do not work when bin/ directory is not in project directory due to undeclared dependency on test content. -->
<BaseOutputPath />
<OutputPath />
</PropertyGroup>
-
</Project>
diff --git a/src/Shared/test/SkipOnHelixAttribute.cs b/src/Shared/test/SkipOnHelixAttribute.cs
deleted file mode 100644
index e1a74467bc7..00000000000
--- a/src/Shared/test/SkipOnHelixAttribute.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-// Copyright (c) .NET Foundation. All rights reserved.
-// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
-
-using System;
-using System.Linq;
-
-namespace Microsoft.AspNetCore.Testing.xunit
-{
- /// <summary>
- /// Skip test if running on helix (or a particular helix queue).
- /// </summary>
- [AttributeUsage(AttributeTargets.Method | AttributeTargets.Class, AllowMultiple = false)]
- public class SkipOnHelixAttribute : Attribute, ITestCondition
- {
- public SkipOnHelixAttribute(string issueUrl)
- {
- if (string.IsNullOrEmpty(issueUrl))
- {
- throw new ArgumentException();
- }
- IssueUrl = issueUrl;
- }
-
- public string IssueUrl { get; }
-
- public bool IsMet
- {
- get
- {
- var skip = OnHelix() && (Queues == null || Queues.ToLowerInvariant().Split(";").Contains(GetTargetHelixQueue().ToLowerInvariant()));
- return !skip;
- }
- }
-
- // Queues that should be skipped on, i.e. "Windows.10.Amd64.ClientRS4.VS2017.Open;OSX.1012.Amd64.Open"
- public string Queues { get; set; }
-
- public string SkipReason
- {
- get
- {
- return $"This test is skipped on helix";
- }
- }
-
- public static bool OnHelix() => !string.IsNullOrEmpty(GetTargetHelixQueue());
-
- public static string GetTargetHelixQueue() => Environment.GetEnvironmentVariable("helix");
- }
-}
diff --git a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
index d3be27defb4..e323a0db878 100644
--- a/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
+++ b/src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
@@ -28,8 +28,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
public ITestOutputHelper Output { get; }
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_CreatesACertificate_WhenThereAreNoHttpsCertificates()
{
try
@@ -123,8 +122,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
}
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_DoesNotCreateACertificate_WhenThereIsAnExistingHttpsCertificates()
{
// Arrange
@@ -154,8 +152,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
Assert.Equal(httpsCertificate.GetCertHashString(), exportedCertificate.GetCertHashString());
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateIfVersionIsIncorrect()
{
_fixture.CleanupCertificates();
@@ -170,8 +167,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
Assert.Empty(httpsCertificateList);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_ReturnsExpiredCertificateForEmptyVersionField()
{
_fixture.CleanupCertificates();
@@ -187,8 +183,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
Assert.Empty(httpsCertificateList);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_ReturnsValidIfVersionIsZero()
{
_fixture.CleanupCertificates();
@@ -202,8 +197,7 @@ namespace Microsoft.AspNetCore.Certificates.Generation.Tests
Assert.NotEmpty(httpsCertificateList);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/6721")]
+ [Fact]
public void EnsureCreateHttpsCertificate_ReturnValidIfCertIsNewer()
{
_fixture.CleanupCertificates();
diff --git a/src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj b/src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj
index dd470dbf374..ee9924c58bd 100644
--- a/src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj
+++ b/src/Tools/FirstRunCertGenerator/test/Microsoft.AspNetCore.DeveloperCertificates.XPlat.Tests.csproj
@@ -1,12 +1,9 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
</PropertyGroup>
<ItemGroup>
- <Reference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
+ <Reference Include="Microsoft.AspNetCore.DeveloperCertificates.XPlat" />
</ItemGroup>
-
</Project>
diff --git a/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
index 288c651ed30..1d216328e8c 100644
--- a/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
+++ b/src/Tools/Microsoft.dotnet-openapi/test/dotnet-microsoft.openapi.Tests.csproj
@@ -12,7 +12,6 @@
<ItemGroup>
<Compile Include="$(ToolSharedSourceRoot)TestHelpers\**\*.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestContent\*" LinkBase="TestContent\" CopyToOutputDirectory="PreserveNewest" />
<Compile Include="$(SharedSourceRoot)Process\ProcessExtensions.cs" />
</ItemGroup>
diff --git a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
index d6e57ee5cf3..c89e8b6853a 100644
--- a/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
+++ b/src/Tools/dotnet-watch/test/DotNetWatcherTests.cs
@@ -22,8 +22,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
_app = new KitchenSinkApp(logger);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/8267")]
+ [Fact]
public async Task RunsWithDotnetWatchEnvVariable()
{
Assert.True(string.IsNullOrEmpty(Environment.GetEnvironmentVariable("DOTNET_WATCH")), "DOTNET_WATCH cannot be set already when this test is running");
diff --git a/src/Tools/dotnet-watch/test/GlobbingAppTests.cs b/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
index 8667c06e7d0..5235af013c6 100644
--- a/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
+++ b/src/Tools/dotnet-watch/test/GlobbingAppTests.cs
@@ -85,8 +85,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
await _app.HasRestarted();
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/8267")]
+ [Fact]
public async Task ChangeExcludedFile()
{
await _app.StartWatcherAsync();
@@ -99,8 +98,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.NotSame(restart, finished);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/8267")]
+ [Fact]
public async Task ListsFiles()
{
await _app.PrepareAsync();
diff --git a/src/Tools/dotnet-watch/test/NoDepsAppTests.cs b/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
index 4f2b4204927..b43a916d761 100644
--- a/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
+++ b/src/Tools/dotnet-watch/test/NoDepsAppTests.cs
@@ -42,8 +42,7 @@ namespace Microsoft.DotNet.Watcher.Tools.FunctionalTests
Assert.NotEqual(processIdentifier, processIdentifier2);
}
- [ConditionalFact]
- [SkipOnHelix("https://github.com/aspnet/AspNetCore/issues/8267")]
+ [Fact]
public async Task RestartProcessThatTerminatesAfterFileChange()
{
await _app.StartWatcherAsync();
diff --git a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
index 219f55d6f42..91970961ea0 100644
--- a/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
+++ b/src/Tools/dotnet-watch/test/dotnet-watch.Tests.csproj
@@ -1,5 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk">
-
<PropertyGroup>
<TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
<AssemblyName>Microsoft.DotNet.Watcher.Tools.Tests</AssemblyName>
@@ -9,7 +8,6 @@
<ItemGroup>
<Compile Include="$(ToolSharedSourceRoot)TestHelpers\**\*.cs" />
- <Compile Include="$(SharedSourceRoot)test\SkipOnHelixAttribute.cs" />
<Content Include="TestProjects\**\*" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>
@@ -41,5 +39,4 @@
Targets="Publish"
Properties="PublishDir=$(PublishDir)\tool\;Configuration=$(Configuration)" />
</Target>
-
</Project>
--
GitLab