Merge branch 'main' into haok/duende

Author: HaoK

.azure/pipelines/jobs/default-build.yml

@@ -120,12 +120,7 @@ jobs:
       ${{ if eq(parameters.agentOs, 'Windows') }}:
         ${{ if eq(variables['System.TeamProject'], 'public') }}:
           name: NetCore1ESPool-Public
-          ${{ if ne(parameters.isAzDOTestingJob, true) }}:
-            # Visual Studio Build Tools
-            demands: ImageOverride -equals Build.Server.Amd64.VS2019.BT.Open
-          ${{ if eq(parameters.isAzDOTestingJob, true) }}:
-            # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing
-            demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open
+          demands: ImageOverride -equals 1es-windows-2019-open
         ${{ if eq(variables['System.TeamProject'], 'internal') }}:
           name: NetCore1ESPool-Internal
           # Visual Studio Enterprise - contains some stuff, like SQL Server and IIS Express, that we use for testing

.config/dotnet-tools.json

@@ -178,6 +178,9 @@ dotnet_diagnostic.CA1846.severity = warning
 # CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.CA1847.severity = warning
 
+# CA1852: Seal internal types
+dotnet_diagnostic.CA1852.severity = warning
+
 # CA2007: Consider calling ConfigureAwait on the awaited task
 dotnet_diagnostic.CA2007.severity = warning
 
@@ -302,6 +305,8 @@ dotnet_diagnostic.CA1845.severity = suggestion
 dotnet_diagnostic.CA1846.severity = suggestion
 # CA1847: Use string.Contains(char) instead of string.Contains(string) with single characters
 dotnet_diagnostic.CA1847.severity = suggestion
+# CA1852: Seal internal types
+dotnet_diagnostic.CA1852.severity = suggestion
 # CA2007: Consider calling ConfigureAwait on the awaited task
 dotnet_diagnostic.CA2007.severity = suggestion
 # CA2008: Do not create tasks without passing a TaskScheduler

.editorconfig

@@ -50,18 +50,6 @@ updates:
     labels:
       - area-infrastructure
     target-branch: "release/3.1"
-  - package-ecosystem: "gitsubmodule"
-    directory: "/"
-    schedule:
-      interval: "monthly"
-    allow:
-      - dependency-type: "all"
-    commit-message:
-      prefix: "[release/5.0] "
-      include: scope
-    labels:
-      - area-infrastructure
-    target-branch: "release/5.0"
   - package-ecosystem: "gitsubmodule"
     directory: "/"
     schedule:

.github/dependabot.yml

@@ -31,16 +31,17 @@ modules/
 *.snk
 *.so
 *.suo
+*.svclog
 *.tlog
 *.user
 *.userprefs
 *.vspx
 
 # Specific files, typically generated by tools
+.config/dotnet-tools.json
 msbuild.ProjectImports.zip
 StyleCop.Cache
 UpgradeLog.htm
 .idea
-*.svclog
 mono_crash.*.json
 mono_crash.*.blob

.gitignore

@@ -1618,8 +1618,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "testassets", "testassets",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CorsMiddlewareWebSite", "src\Middleware\CORS\test\testassets\CorsMiddlewareWebSite\CorsMiddlewareWebSite.csproj", "{9B240135-3D1E-4EE6-B870-D810F3C856FB}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DotNetToolsInstaller", "src\ProjectTemplates\testassets\DotNetToolsInstaller\DotNetToolsInstaller.csproj", "{C0FD6DB3-9407-4F07-B909-16762E579ECB}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Installers", "Installers", "{5E46DC83-C39C-4E3A-B242-C064607F4367}"
 EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "aspnetcoreCA", "src\Installers\Windows\AspNetCoreModule-Setup\CustomAction\aspnetcoreCA.vcxproj", "{7C27E72F-54D0-4820-8CFA-5E4BE640974B}"
@@ -1706,6 +1704,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLi
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.RateLimiting.Tests", "src\Middleware\RateLimiting\test\Microsoft.AspNetCore.RateLimiting.Tests.csproj", "{41FF4F96-98D2-4482-A2A7-4B179E80D285}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HelixTestRunner", "eng\tools\HelixTestRunner\HelixTestRunner.csproj", "{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Html.Abstractions.Tests", "src\Html.Abstractions\test\Microsoft.AspNetCore.Html.Abstractions.Tests.csproj", "{487EF7BE-5009-4C70-B79E-45519BDD9603}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -9778,22 +9780,6 @@ Global
 		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x64.Build.0 = Release|Any CPU
 		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.ActiveCfg = Release|Any CPU
 		{9B240135-3D1E-4EE6-B870-D810F3C856FB}.Release|x86.Build.0 = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|arm64.ActiveCfg = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|arm64.Build.0 = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x64.Build.0 = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Debug|x86.Build.0 = Debug|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|arm64.ActiveCfg = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|arm64.Build.0 = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x64.ActiveCfg = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x64.Build.0 = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x86.ActiveCfg = Release|Any CPU
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB}.Release|x86.Build.0 = Release|Any CPU
 		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|Any CPU.ActiveCfg = Debug|Win32
 		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|arm64.ActiveCfg = Debug|Win32
 		{7C27E72F-54D0-4820-8CFA-5E4BE640974B}.Debug|x64.ActiveCfg = Debug|x64
@@ -10227,6 +10213,38 @@ Global
 		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x64.Build.0 = Release|Any CPU
 		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.ActiveCfg = Release|Any CPU
 		{41FF4F96-98D2-4482-A2A7-4B179E80D285}.Release|x86.Build.0 = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|arm64.Build.0 = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x64.Build.0 = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Debug|x86.Build.0 = Debug|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.ActiveCfg = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|arm64.Build.0 = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.ActiveCfg = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x64.Build.0 = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.ActiveCfg = Release|Any CPU
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F}.Release|x86.Build.0 = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|arm64.Build.0 = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x64.Build.0 = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Debug|x86.Build.0 = Debug|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|Any CPU.Build.0 = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|arm64.ActiveCfg = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|arm64.Build.0 = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x64.ActiveCfg = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x64.Build.0 = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x86.ActiveCfg = Release|Any CPU
+		{487EF7BE-5009-4C70-B79E-45519BDD9603}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -11028,7 +11046,6 @@ Global
 		{3F0C05F5-47EF-4896-8D32-4C80C4563286} = {B5E22428-DAD8-4275-B8F0-14EC2174DDFE}
 		{83FA6123-6EC3-47F3-A0DC-A10225B5EB16} = {45211BB8-4F51-427D-ADA2-7478E3398A60}
 		{9B240135-3D1E-4EE6-B870-D810F3C856FB} = {83FA6123-6EC3-47F3-A0DC-A10225B5EB16}
-		{C0FD6DB3-9407-4F07-B909-16762E579ECB} = {08D53E58-4AAE-40C4-8497-63EC8664F304}
 		{5E46DC83-C39C-4E3A-B242-C064607F4367} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
 		{7C27E72F-54D0-4820-8CFA-5E4BE640974B} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
 		{7324770C-0871-4D73-BE3D-5E2F3E9E1B1E} = {D30A658D-61F6-444B-9AC7-F66A1A1B86B6}
@@ -11070,6 +11087,8 @@ Global
 		{2299CCD8-8F9C-4F2B-A633-9BF4DA81022B} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
 		{3AEFB466-6310-4F3F-923F-9154224E3629} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
 		{EFC8EA45-572D-4D8D-A597-9045A2D8EC40} = {2299CCD8-8F9C-4F2B-A633-9BF4DA81022B}
+		{51D07AA9-6297-4F66-A7BD-71CE7E3F4A3F} = {0F84F170-57D0-496B-8E2C-7984178EF69F}
+		{487EF7BE-5009-4C70-B79E-45519BDD9603} = {412D4C15-F48F-4DB1-940A-131D1AA87088}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

AspNetCore.sln

@@ -137,3 +137,20 @@ Goal is to balance cost/flakiness against having some coverage of supported dist
 - Example PR: dotnet/dotnet-buildtools-prereqs-docker#398
 - Summary is to update [manifest.json](https://github.com/dotnet/dotnet-buildtools-prereqs-docker/blob/main/manifest.json) with an entry for the new dockerfiles, and then add the docker files as well to dotnet-buildtools-prereqs-docker
 - The resulting new docker queue id will be found in: [image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json](https://github.com/dotnet/versions/blob/main/build-info/docker/image-info.dotnet-dotnet-buildtools-prereqs-docker-main.json)
+
+## Investigating helix run time issues
+
+Kusto has all of the helix job data, using a particular job id, with the following query you can get a breakdown of the test projects that take the longest.  Ideally to take advantage of the largest fan out, we want smaller test projects since the longest running test project will be the gate for finishing the entire helix test job.
+
+https://dataexplorer.azure.com/clusters/engsrvprod/databases/engineeringdata
+
+```
+WorkItems
+| where JobName == "bc108374-750c-4084-853e-bc5b9b0d553e"
+| where Name != JobName
+| extend RunTime = Finished-Started
+| top 20 by RunTime desc  
+| project FriendlyName, RunTime
+```
+
+![image](https://user-images.githubusercontent.com/6537861/144129895-e1e82815-4192-431c-a7b3-dd055b813978.png)

docs/Helix.md

@@ -33,7 +33,7 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda
 
 * In [eng/Versions.props](/eng/Versions.props), increment `DefaultNetCoreTargetFramework` by 1.
 * Do a global repo search for the current version string, and update almost everything by 1 (e.g. find `net7`, replace with `net8`). See the PR linked above for examples - this shouldn't be done blindly, but on a case-by-case basis. Most things should be updated, and most choices should be obvious.
-  * Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/helix/content/RunTests/RunTests.csproj](/eng/helix/content/RunTests/RunTests.csproj). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`.
+  * Exceptions to this are [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/HelixTestRunner/HelixTestRunner.csproj](/eng/tools/HelixTestRunner/HelixTestRunner.csproj). These build without the workarounds from [eng/tools/GenerateFiles/Directory.Build.targets.in](/eng/tools/GenerateFiles/Directory.Build.targets.in), and need to be kept at the previous TFM until we get an SDK containing a runtime with the new TFM. Generally this means we have to hard-code the previous TFM for these files, rather than using `DefaultNetCoreTargetFramework`.
 * Add a reference to the new `SiteExtensions` package for the previous Major Version.
   1. Add references to [src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj](/src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj) to `Microsoft.AspNetCore.AzureAppServices.SiteExtension.{PreviousMajorVersion}.0.x64` and `Microsoft.AspNetCore.AzureAppServices.SiteExtension.{PreviousMajorVersion}.0.x86`.
   2. Add entries in [eng/Versions.props](/eng/Versions.props) similar to [these](https://github.com/dotnet/aspnetcore/blob/216c92b78bce31d5e81a70b589707ec2ae5ab21a/eng/Versions.props#L224-L226) - the version should be from the latest released build of .Net.
@@ -56,4 +56,4 @@ Once dotnet/runtime has updated their TFM, we update ours in the dependency upda
 
 ## Ingesting an SDK with the new TFM
 
-Typically we update the SDK we use in `main` every Monday. Once we have one that contains `Microsoft.Netcore.App` entries with the new TFM, we can update [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/helix/content/RunTests/RunTests.csproj](/eng/helix/content/RunTests/RunTests.csproj) to use `DefaultNetCoreTargetFramework` again rather than hard-coding the previous TFM.
+Typically we update the SDK we use in `main` every Monday. Once we have one that contains `Microsoft.Netcore.App` entries with the new TFM, we can update [eng/tools/RepoTasks/RepoTasks.csproj](/eng/tools/RepoTasks/RepoTasks.csproj), [eng/tools/RepoTasks/RepoTasks.tasks](/eng/tools/RepoTasks/RepoTasks.tasks), and [eng/tools/HelixTestRunner/HelixTestRunner.csproj](/eng/helix/tools/HelixTestRunner.csproj) to use `DefaultNetCoreTargetFramework` again rather than hard-coding the previous TFM.

docs/UpdatingMajorVersionAndTFM.md

@@ -169,7 +169,7 @@
                           $(RepoRoot)src\Hosting\**\*.*proj;
                           $(RepoRoot)src\Http\**\*.*proj;
                           $(RepoRoot)src\HttpClientFactory\**\*.*proj;
-                          $(RepoRoot)src\Html.Abstractions\*.*proj;
+                          $(RepoRoot)src\Html.Abstractions\**\*.*proj;
                           $(RepoRoot)src\Identity\**\*.*proj;
                           $(RepoRoot)src\Servers\**\*.csproj;
                           $(RepoRoot)src\Security\**\*.*proj;
@@ -199,6 +199,7 @@
                           $(RepoRoot)src\Extensions\**\*.csproj;
                           $(RepoRoot)src\BuildAfterTargetingPack\*.csproj;
                           $(RepoRoot)src\OpenApi\**\*.csproj;
+                          $(RepoRoot)eng\tools\HelixTestRunner\HelixTestRunner.csproj;
                           "
                         Exclude="
                           @(ProjectToBuild);

eng/Build.props

@@ -68,16 +68,19 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.CommandLine.Experimental" />
     <LatestPackageReference Include="System.ComponentModel" />
     <LatestPackageReference Include="System.ComponentModel.Annotations" />
+    <LatestPackageReference Include="System.Configuration.ConfigurationManager" />
     <LatestPackageReference Include="System.Diagnostics.DiagnosticSource" />
     <LatestPackageReference Include="System.Diagnostics.EventLog" />
     <LatestPackageReference Include="System.DirectoryServices.Protocols" />
     <LatestPackageReference Include="System.IO.Pipelines" />
     <LatestPackageReference Include="System.Net.Http" />
     <LatestPackageReference Include="System.Net.Http.Json" />
     <LatestPackageReference Include="System.Net.Sockets" />
+    <LatestPackageReference Include="System.Private.Uri" />
     <LatestPackageReference Include="System.Reflection.Metadata" />
     <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <LatestPackageReference Include="System.Security.Cryptography.Pkcs" />
+    <LatestPackageReference Include="System.Security.Cryptography.X509Certificates" />
     <LatestPackageReference Include="System.Security.Cryptography.Xml" />
     <LatestPackageReference Include="System.Security.Permissions" />
     <LatestPackageReference Include="System.Security.Principal.Windows" />