[automated] Merge branch 'release/8.0' => 'main'

.editorconfig

@@ -16,7 +16,7 @@ spelling_exclusion_path = .\eng\spellchecking_exclusions.dic
 
 file_header_template = Licensed to the .NET Foundation under one or more agreements.\nThe .NET Foundation licenses this file to you under the MIT license.
 
-[*.{appxmanifest,axml,build,config,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,yml,xml,xsd}]
+[*.{appxmanifest,axml,build,config,proj,csproj,dbml,discomap,dtd,json,jsproj,lsproj,njsproj,nuspec,proj,props,resjson,resw,resx,StyleCop,targets,tasks,vbproj,yml,xml,xsd}]
 indent_style = space
 indent_size = 2
 tab_width = 2

Directory.Build.props

@@ -37,7 +37,7 @@
 
   <PropertyGroup>
     <CheckForOverflowUnderflow>false</CheckForOverflowUnderflow>
-    <LangVersion>preview</LangVersion>
+    <LangVersion>latest</LangVersion>
     <Nullable>enable</Nullable>
     <ImplicitUsings>disable</ImplicitUsings>
     <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>

Directory.Build.targets

@@ -28,7 +28,7 @@
     <NoWarn>$(NoWarn);AD0001</NoWarn>
 
     <!-- Experimental warnings are for customers, not for this repo -->
-    <NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012</NoWarn>
+    <NoWarn>$(NoWarn);EXTEXP0001;EXTEXP0002;EXTEXP0003;EXTEXP0004;EXTEXP0005;EXTEXP0006;EXTEXP0007;EXTEXP0008;EXTEXP0009;EXTEXP0010;EXTEXP0011;EXTEXP0012;EXTEXP0013</NoWarn>
 
     <!-- NU5104: A stable release of a package should not have a prerelease dependency -->
     <NoWarn>$(NoWarn);NU5104</NoWarn>

README.md

@@ -53,10 +53,6 @@ This project has adopted the code of conduct defined by the [Contributor Covenan
 
 General .NET OSS discussions: [.NET Foundation Discussions](https://github.com/dotnet-foundation/Home/discussions)
 
-## Code of Conduct
-
-This project uses the [.NET Foundation Code of Conduct](https://dotnetfoundation.org/code-of-conduct) to define expected conduct in our community. Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting a project maintainer at [email protected].
-
 ## License
 
 .NET (including the runtime repo) is licensed under the [MIT](LICENSE.TXT) license.

docs/building.md

@@ -148,7 +148,8 @@ This sets up necessary environmental variables and opens the repository in VS Co
 * Windows Forms uses Visual Studio MSBuild but for certain features we require the latest MSBuild from .NET Core/.NET SDK. If you are on an official version of [Visual Studio][VS-download] (i.e. not a Preview version), then you may need to enable previews for .NET Core/.NET SDKs in VS.
   * you can do this in VS under Tools->Options->Environment->Preview Features->Use previews of the .Net Core SDK (Requires restart)
 * When restoring packages, if you get the following message: "The SSL connection could not be established, see inner exception. Unable to read data from the transport connection", try disabling IPv6 on your network adapter.
-
+* When the public API surface is updated, you need to update the API baselines manifest files for the impacted assemblies. [Here is an example](https://github.com/dotnet/extensions/blob/3e6ac0735cb62d4c8b63e131d956397a87ea26f7/src/Libraries/Microsoft.Extensions.AsyncState/Microsoft.Extensions.AsyncState.json) for the `Microsoft.Extensions.AsyncState` project. To update the manifest of all the local assemblies, invoke the script `./scripts/MakeApiBaselines.ps1`.
+```
 ---
 
 1. **"Solution"** means the collections of projects specified in `eng/build.proj` or an actual "sln" file at the root of the repository that represents the generated "filtered" solution (e.g., `SDK.sln`).

docs/list-of-diagnostics.md

@@ -27,3 +27,4 @@ if desired.
 | `EXTEXP0010` | Object pool experiments |
 | `EXTEXP0011` | Document database experiments |
 | `EXTEXP0012` | Auto-activation experiments |
+| `EXTEXP0013` | HttpLogging middleware experiments |

eng/MSBuild/Packaging.props

@@ -7,6 +7,11 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <!-- Similar to https://github.com/dotnet/arcade/blob/main/src/Microsoft.DotNet.Arcade.Sdk/tools/RepoLayout.props#L48 -->
+    <SrcLibrariesDir>$([MSBuild]::NormalizeDirectory('$(RepoRoot)', 'src', 'Libraries'))</SrcLibrariesDir>
+  </PropertyGroup>
+
   <!-- strong name signing control -->
   <PropertyGroup Condition="'$(SignArtifacts)' == 'true' ">
     <DelaySign>true</DelaySign>

eng/MSBuild/ProjectStaging.targets

@@ -1,7 +1,7 @@
 <Project>
 
   <!-- Produce errors if we don't have all the right properties defined -->
-  <Target Name="_CheckPropsExist" Condition="'$(Stage)' != ''" BeforeTargets="Build">
+  <Target Name="_CheckPropsExist" Condition="'$(Stage)' != '' and $(Stage) != 'transport'" BeforeTargets="Build">
     <Error Condition="'$(Stage)' != 'dev' AND '$(Stage)' != 'normal' AND '$(Stage)' != 'obsolete'" Text="Stage property must be dev|normal|obsolete" />
     <Error Condition="'$(Description)' == ''" Text="Missing Description property." />
     <Error Condition="'$(Workstream)' == ''" Text="Missing Workstream property." />

eng/build.proj

@@ -5,7 +5,8 @@
     <!-- We recursively add all of the test projects -->
     <_ProjectsToBuild Include="$(MSBuildThisFileDirectory)..\test\**\*.csproj" />
     <_ProjectsToBuild Include="$(MSBuildThisFileDirectory)..\bench\**\*.csproj" />
-
+    <!-- Additionally, include the transport project that is not defined as a csproj -->
+    <_ProjectsToBuild Include="$(MSBuildThisFileDirectory)..\src\Packages\Microsoft.Internal.Extensions.DotNetApiDocs.Transport\Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj" />
     <!-- Add all the projects we want to build as project references, so the traversal SDK can build them -->
     <ProjectReference Include="@(_ProjectsToBuild)" />
   </ItemGroup>

eng/pipelines/templates/BuildAndTest.yml

@@ -32,7 +32,7 @@ steps:
   #       Write-Host 'isWindows: ${{ parameters.isWindows }}'
   #       Write-Host 'skipTests: ${{ parameters.skipTests }}'
   #       Write-Host 'skipQualityGates: ${{ parameters.skipQualityGates }}'
-  #       Get-ChildItem env:* | Sort-Object Name  
+  #       Get-ChildItem env:* | Sort-Object Name
   #   displayName: Debug
 
   - pwsh: |
@@ -94,6 +94,16 @@ steps:
           ArtifactName: CodeCoverageResults
 
   - ${{ if eq(parameters.isWindows, 'true') }}:
+    - script: ${{ parameters.buildScript }}
+              -projects $(Build.SourcesDirectory)/src/Packages/Microsoft.Internal.Extensions.DotNetApiDocs.Transport/Microsoft.Internal.Extensions.DotNetApiDocs.Transport.proj
+              -restore -build
+              -pack
+              -publish $(_PublishArgs)
+              -configuration ${{ parameters.buildConfig }}
+              /bl:${{ parameters.repoLogPath }}/transport.binlog
+              $(_OfficialBuildIdArgs)
+      displayName: Build and publish docs transport package
+
     - script: ${{ parameters.buildScript }}
               -pack
               -sign $(_SignArgs)
@@ -103,4 +113,4 @@ steps:
               /bl:${{ parameters.repoLogPath }}/pack.binlog
               /p:Restore=false /p:Build=false
               $(_OfficialBuildIdArgs)
-      displayName: Pack, Sign, and Publish
+      displayName: Pack, sign, and publish

global.json

@@ -1,22 +1,22 @@
 {
   "sdk": {
-    "version": "9.0.100-alpha.1.23504.14"
+    "version": "9.0.100-alpha.1.23523.1"
   },
   "tools": {
-    "dotnet": "9.0.100-alpha.1.23504.14",
+    "dotnet": "9.0.100-alpha.1.23523.1",
     "runtimes": {
       "dotnet/x64": [
-        "8.0.0-rtm.23475.7",
+        "8.0.0-rtm.23516.15",
         "$(MicrosoftNETCoreAppRuntimewinx64Version)"
       ],
       "aspnetcore/x64": [
-        "8.0.0-rtm.23475.5",
+        "8.0.0-rtm.23517.6",
         "$(MicrosoftAspNetCoreAppRuntimewinx64Version)"
       ]
     }
   },
   "msbuild-sdks": {
-    "Microsoft.Build.NoTargets": "3.5.0",
+    "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.2.0",
     "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.23510.4",
     "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.23510.4"

scripts/MakeApiBaselines.ps1

@@ -4,6 +4,12 @@
     Creates API baseline files representing the current API surface exposed by this repo.
 #>
 
+if ($PSVersionTable.PSVersion.Major -lt 6) {
+    Write-Host "PowerShell 6.0 or greater is required to run this script. See https://aka.ms/install-powershell."
+    Write-Host "Current version:" $PSVersionTable.PSVersion.ToString()
+    exit
+}
+
 $Project = $PSScriptRoot + "/../eng/Tools/ApiChief/ApiChief.csproj"
 $Command = $PSScriptRoot + "/../artifacts/bin/ApiChief/Debug/net8.0/ApiChief.exe"
 

scripts/SlngenReferencing.ps1

@@ -2,10 +2,9 @@
 
 <#
 .SYNOPSIS
-Create solution file that contains all packages referencing mentioned keywords.
+Creates a solution file that contains all the packages referencing specific keywords.
 .DESCRIPTION
-This script will help you when changing public API of the package and would like to adjust all internal R9 usages.
-It will generate a solution file with all packages that references a project matching given keywords.
+This script will generate a solution file with all the packages that reference a project matching given keywords.
 .EXAMPLE
     PS> .\SlngenReferencing.ps1 AsyncState
 #>

src/Directory.Build.props

@@ -9,12 +9,12 @@
     <ErrorLog>$(MSBuildProjectFullPath).$([System.Guid]::NewGuid().ToString().Substring(0,8)).sarif</ErrorLog>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition=" '$(IsPackable)' == 'true' and '$(IsShipping)' == 'true' ">
     <PackageReadmeFile>README.md</PackageReadmeFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <None Condition="'$(IsPackable)' == 'true'" Include="README.md" Pack="true" PackagePath="\" />
+    <None Condition=" '$(IsPackable)' == 'true' and '$(IsShipping)' == 'true' " Include="README.md" Pack="true" PackagePath="\" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(RunRoslynSdlAnalyzers)' == 'True'">

src/Generators/Microsoft.Gen.EnumStrings/Parser.cs

@@ -211,12 +211,17 @@ private void ParseAttributeList(INamedTypeSymbol? implicitEnumType, IEnumerable<
                         members = members.Distinct(new EntryComparer());
                     }
 
+                    var resultingNamespace = nspace ??
+                        (enumType.ContainingNamespace.IsGlobalNamespace
+                            ? string.Empty
+                            : enumType.ContainingNamespace.ToString());
+
                     results.Add(new ToStringMethod(
                         enumType.ToDisplayString(SymbolDisplayFormat.FullyQualifiedFormat),
                         members.Select(kvp => kvp.Key).ToList(),
                         members.Select(kvp => kvp.Value).ToList(),
                         flags,
-                        nspace ?? enumType.ContainingNamespace.ToString(),
+                        resultingNamespace,
                         className ?? enumType.Name + "Extensions",
                         methodName ?? "ToInvariantString",
                         classModifiers ?? "internal static",

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Log.cs

@@ -0,0 +1,13 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System;
+using Microsoft.Extensions.Logging;
+
+namespace Microsoft.AspNetCore.Diagnostics;
+
+internal static partial class Log
+{
+    [LoggerMessage(0, LogLevel.Warning, "Enricher failed: {Enricher}.")]
+    internal static partial void EnricherFailed(this ILogger logger, Exception exception, string enricher);
+}

src/Libraries/Microsoft.AspNetCore.Diagnostics.Middleware/Logging/HeaderReader.cs

@@ -1,6 +1,8 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
+#if NET8_0_OR_GREATER
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -19,17 +21,10 @@ public HeaderReader(IDictionary<string, DataClassification> headersToLog, IRedac
     {
         _redactorProvider = redactorProvider;
 
-        _headers = headersToLog.Count == 0
-            ? Array.Empty<KeyValuePair<string, DataClassification>>()
-            : headersToLog.ToArray();
+        _headers = headersToLog.Count == 0 ? [] : headersToLog.ToArray();
     }
 
-    /// <summary>
-    /// Reads headers and applies filtering (if required).
-    /// </summary>
-    /// <param name="headers">A collection of headers to be read from.</param>
-    /// <param name="listToFill">A list to be filled with headers.</param>
-    public void Read(IHeaderDictionary headers, List<KeyValuePair<string, string>> listToFill)
+    public void Read(IHeaderDictionary headers, IList<KeyValuePair<string, object?>> logContext, string prefix)
     {
         if (headers.Count == 0)
         {
@@ -42,8 +37,9 @@ public void Read(IHeaderDictionary headers, List<KeyValuePair<string, string>> l
             {
                 var provider = _redactorProvider.GetRedactor(header.Value);
                 var redacted = provider.Redact(headerValue.ToString());
-                listToFill.Add(new(header.Key, redacted));
+                logContext.Add(new(prefix + header.Key, redacted));
             }
         }
     }
 }
+#endif