Merge branch 'dotnet:main' into main

ecampuslearning · Jun 15, 2024 · e40b352 · e40b352
2 parents b575097 + e558b05
commit e40b352
Show file tree

Hide file tree

Showing 276 changed files with 6,968 additions and 4,008 deletions.
diff --git a/.azure/pipelines/blazor-daily-tests.yml b/.azure/pipelines/blazor-daily-tests.yml
@@ -1,13 +1,12 @@
 # Uses Scheduled Triggers, which aren't supported in YAML yet.
-# https://learn.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
+# https://learn.microsoft.com/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
 
 # Daily Tests for Blazor
 # These use Sauce Labs resources, hence they run daily rather than per-commit.
 
 # We just need one Windows machine because all it does is trigger SauceLabs.
 variables:
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-      - group: DotNet-MSRC-Storage
       - group: AzureDevOps-Artifact-Feeds-Pats
   - name: SAUCE_CONNECT_DOWNLOAD_ON_INSTALL
     value: true

diff --git a/.azure/pipelines/ci-public.yml b/.azure/pipelines/ci-public.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds

diff --git a/.azure/pipelines/ci.yml b/.azure/pipelines/ci.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds
@@ -114,6 +114,11 @@ variables:
 - ${{ if in(variables['Build.Reason'], 'PullRequest') }}:
   - name: _SignType
     value: test
+# Exclude artifacts & .packages folders from CodeQL scans
+- name: LGTM_INDEX_FILTERS
+  value: |
+    exclude:.packages
+    exclude:artifacts
 - template: /eng/common/templates-official/variables/pool-providers.yml@self
 
 resources:
@@ -136,7 +141,7 @@ extends:
     sdl:
       sourceAnalysisPool:
         name: NetCore1ESPool-Svc-Internal
-        image: 1es-windows-2022
+        image: windows.vs2022.amd64
         os: windows
     containers:
       alpine319WithNode:

diff --git a/.azure/pipelines/components-e2e-tests.yml b/.azure/pipelines/components-e2e-tests.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds

diff --git a/.azure/pipelines/devBuilds.yml b/.azure/pipelines/devBuilds.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds

diff --git a/.azure/pipelines/jobs/default-build.yml b/.azure/pipelines/jobs/default-build.yml
@@ -26,7 +26,7 @@
 #       publishOnError: boolean
 #           Should artifacts be published if previous step failed?
 #   dependsOn: string | [ string ]
-#       For fan-out/fan-in. https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#job
+#       For fan-out/fan-in. https://learn.microsoft.com/azure/devops/pipelines/yaml-schema?view=azure-devops&tabs=schema#job
 #   condition: string
 #       A condition which can be used to skip the job completely
 #   codeSign: boolean
@@ -43,7 +43,7 @@
 #   variables: [array]
 #       Job-specific variables. Defined using either name/value pairs or a variable list (using name or group syntax).
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details
 #
 
 parameters:
@@ -436,6 +436,9 @@ jobs:
           env:
             Token: $(dn-bot-dnceng-artifact-feeds-rw)
 
+      # Call the NugetAuthenticate task to add creds for added feeds.
+      - task: NuGetAuthenticate@1
+
       # Add COMPlus_* environment variables to build steps.
       - ${{ if ne(parameters.steps, '')}}:
         - ${{ each step in parameters.steps }}:

diff --git a/.azure/pipelines/localization.yml b/.azure/pipelines/localization.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 schedules:

diff --git a/.azure/pipelines/quarantined-pr.yml b/.azure/pipelines/quarantined-pr.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds

diff --git a/.azure/pipelines/richnav.yml b/.azure/pipelines/richnav.yml
@@ -1,5 +1,5 @@
 #
-# See https://learn.microsoft.com/en-us/azure/devops/pipelines/yaml-schema for details on this file.
+# See https://learn.microsoft.com/azure/devops/pipelines/yaml-schema for details on this file.
 #
 
 # Configure which branches trigger builds

diff --git a/.azure/pipelines/signalr-daily-tests.yml b/.azure/pipelines/signalr-daily-tests.yml
@@ -1,12 +1,11 @@
 # Uses Scheduled Triggers, which aren't supported in YAML yet.
-# https://learn.microsoft.com/en-us/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
+# https://learn.microsoft.com/azure/devops/pipelines/build/triggers?view=vsts&tabs=yaml#scheduled
 
 # Daily Tests for ASP.NET Core SignalR
 # These use Sauce Labs resources, hence they run daily rather than per-commit.
 
 variables:
   - ${{ if ne(variables['System.TeamProject'], 'public') }}:
-    - group: DotNet-MSRC-Storage
     - group: AzureDevOps-Artifact-Feeds-Pats
   - template: /eng/common/templates-official/variables/pool-providers.yml@self
 

diff --git a/.editorconfig b/.editorconfig
@@ -4,7 +4,7 @@
 ;
 ; Here are some resources for what's supported for .NET/C#
 ; https://kent-boogaart.com/blog/editorconfig-reference-for-c-developers
-; https://learn.microsoft.com/en-us/visualstudio/ide/editorconfig-code-style-settings-reference
+; https://learn.microsoft.com/visualstudio/ide/editorconfig-code-style-settings-reference
 ;
 ; Be **careful** editing this because some of the rules don't support adding a severity level
 ; For instance if you change to `dotnet_sort_system_directives_first = true:warning` (adding `:warning`)

diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml
@@ -497,19 +497,19 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 9.0-preview5
+          milestone: 9.0-preview6
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/9.0-preview4
+          branch: release/9.0-preview5
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 9.0-preview4
-      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview4 branch'
+          milestone: 9.0-preview5
+      description: '[Milestone Assignments] Assign Milestone to PRs merged to release/9.0-preview5 branch'
     - if:
       - payloadType: Issues
       - isAction:
@@ -527,7 +527,7 @@ configuration:
 
             Because there are different components involved in providing debugging experience, we've put together a small troubleshooting guide that you can follow, to help us better understand where to direct this issue to, to get a faster resolution.
 
-            You can find it [here](https://learn.microsoft.com/en-us/aspnet/core/blazor/debug?tabs=visual-studio#troubleshoot).
+            You can find it [here](https://learn.microsoft.com/aspnet/core/blazor/debug?tabs=visual-studio#troubleshoot).
 
             If these troubleshooting docs resolve your problem, please close the issue. Otherwise we'll follow up.
       description: Provide Blazor WASM Debugging Troubleshooting link
@@ -670,7 +670,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 6.0.31
+          milestone: 6.0.32
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch'
     - if:
       - payloadType: Pull_Request
@@ -681,7 +681,7 @@ configuration:
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 8.0.6
+          milestone: 8.0.7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch'
     - if:
       - payloadType: Issues

diff --git a/.github/workflows/update-sdk.yml b/.github/workflows/update-sdk.yml
@@ -20,7 +20,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v4
-    - uses: martincostello/update-dotnet-sdk@9d42ad9bcbd97a74394c7273c9c616b4bf136b53 # v3.1.3
+    - uses: martincostello/update-dotnet-sdk@67d6e2b14939c06978a7f80444157296c3defe14 # v3.2.3
       with:
         quality: 'daily'
         repo-token: ${{ secrets.GITHUB_TOKEN }}
diff --git a/AspNetCore.sln b/AspNetCore.sln
@@ -1812,6 +1812,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Static
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.StaticAssets.Tests", "src\StaticAssets\test\Microsoft.AspNetCore.StaticAssets.Tests.csproj", "{9536C284-65B4-4884-BB50-06D629095C3E}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentInsider.Tests", "src\Tools\GetDocumentInsider\tests\GetDocumentInsider.Tests.csproj", "{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GetDocumentSample", "src\Tools\GetDocumentInsider\sample\GetDocumentSample.csproj", "{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -10941,6 +10945,38 @@ Global
 		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x64.Build.0 = Release|Any CPU
 		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.ActiveCfg = Release|Any CPU
 		{9536C284-65B4-4884-BB50-06D629095C3E}.Release|x86.Build.0 = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|arm64.Build.0 = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x64.Build.0 = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Debug|x86.Build.0 = Debug|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|arm64.ActiveCfg = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|arm64.Build.0 = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x64.ActiveCfg = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x64.Build.0 = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x86.ActiveCfg = Release|Any CPU
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B}.Release|x86.Build.0 = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|arm64.ActiveCfg = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|arm64.Build.0 = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x64.Build.0 = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Debug|x86.Build.0 = Debug|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|Any CPU.Build.0 = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|arm64.ActiveCfg = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|arm64.Build.0 = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x64.ActiveCfg = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x64.Build.0 = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.ActiveCfg = Release|Any CPU
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -11836,6 +11872,8 @@ Global
 		{274100A5-5B2D-4EA2-AC42-A62257FC6BDC} = {017429CC-C5FB-48B4-9C46-034E29EE2F06}
 		{4D8DE54A-4F32-4881-B07B-DDC79619E573} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
 		{9536C284-65B4-4884-BB50-06D629095C3E} = {274100A5-5B2D-4EA2-AC42-A62257FC6BDC}
+		{6A19D94D-2BC6-4198-BE2E-342688FDBA4B} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
+		{D8F7091E-A2D1-4E81-BA7C-97EAE392D683} = {A1B75FC7-A777-4412-A635-D0C9ED8FE7A0}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3E8720B3-DBDD-498C-B383-2CC32A054E8F}

diff --git a/docs/AddingNewProjects.md b/docs/AddingNewProjects.md
@@ -50,4 +50,4 @@ while the second (the one with condition `'$(BuildMainlyReferenceProviders)' ==
 3. Add your project name to the lists in `src\Framework\test\TestData.cs`. This is not strictly necessary for the project to work but there is a test on CI that will fail if this is not done. Make sure to include your project in a way that maintains alphabetical order.
 
 ## Manually saving solution and solution filter files
-VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a tutorial link [here](https://learn.microsoft.com/en-us/visualstudio/ide/filtered-solutions).
+VS is pretty good at keeping the files up to date and organized correctly. It will also prompt you if it finds an error and, in most cases, offer a solution to fix the issue. Sometimes just saving the file will trigger VS to resolve any issues automatically. However, if you would like to add a new solution filter file or update one manually you can find a tutorial link [here](https://learn.microsoft.com/visualstudio/ide/filtered-solutions).
diff --git a/docs/BuildErrors.md b/docs/BuildErrors.md
@@ -2,6 +2,8 @@
 
 This document is for common build errors and how to resolve them.
 
+NB: Some problems might be due to older build assets that conflict with newer commits. It's recommended to run `git clean -xddff` between checkouts. If this command fails due to locked files you can try to stop any existing `dotnet` or `.NET Host` process and retry.
+
 ## Warning BUILD001
 
 > warning BUILD001: Reference to '&hellip;' was removed since the last stable release of this package. &hellip;

diff --git a/docs/BuildFromSource.md b/docs/BuildFromSource.md
@@ -59,10 +59,13 @@ The steps you follow next depend on your preferred development environment:
     ./restore.cmd
     ```
 
-1. You'll typically focus on one project in the repo. You can use the `startvs.cmd` command to launch Visual Studio in a particular project area. For example, to launch Visual Studio in the `Components` project:
+1. You'll typically focus on one project in the repo. You can use the `startvs.cmd` command to launch Visual Studio in a particular project area. For example, to launch Visual Studio in the `src/Http` project, after you have built it with `./build.cmd`:
+
+    > :bulb: The `build.cmd` script will be local to the directory of the project you opened. For example, the script located in the `src/Http` directory. If you want to build the whole tree, use the `build.cmd` that is located in the `eng` directory.
 
     ```powershell
-    cd src\Components
+    cd src/Http
+    ./build.cmd
     ./startvs.cmd
     ```
 

diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md
@@ -4,7 +4,7 @@ Daily builds include the latest source code changes. They are not supported for
 
 If you want to download the latest daily build and use it in a project, then you need to:
 
-* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/installer#table).
+* Obtain the latest [build of the .NET Core SDK](https://github.com/dotnet/sdk/blob/main/documentation/package-table.md).
 * Add a NuGet.Config to your project directory with the following content:
 
 ## .NET 8

diff --git a/docs/Trimming.md b/docs/Trimming.md
@@ -30,7 +30,7 @@ The first step to trimming an ASP.NET Core assembly is adding it to `Linkability
 
 ## Fix trim warnings
 
-[Introduction to trim warnings](https://learn.microsoft.com/en-us/dotnet/core/deploying/trimming/fixing-warnings) and [Prepare .NET libraries for trimming](https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming) discuss how to fix trim warnings. There is also a complete list of all the trim warnings with some more detail.
+[Introduction to trim warnings](https://learn.microsoft.com/dotnet/core/deploying/trimming/fixing-warnings) and [Prepare .NET libraries for trimming](https://learn.microsoft.com/dotnet/core/deploying/trimming/prepare-libraries-for-trimming) discuss how to fix trim warnings. There is also a complete list of all the trim warnings with some more detail.
 
 ## Updating the baselines
 

diff --git a/eng/Dependencies.props b/eng/Dependencies.props
@@ -85,6 +85,7 @@ and are generated based on the last package release.
     <LatestPackageReference Include="System.Net.Http" />
     <LatestPackageReference Include="System.Net.Http.Json" />
     <LatestPackageReference Include="System.Net.Sockets" />
+    <LatestPackageReference Include="System.Net.ServerSentEvents" />
     <LatestPackageReference Include="System.Private.Uri" />
     <LatestPackageReference Include="System.Reflection.Metadata" />
     <LatestPackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />

diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props
@@ -11,7 +11,7 @@
   <!--
     Remove inner source .globalconfig file as both the inner and outer config files get loaded and cause a conflict.
     Leaving the inner will cause all conflicting settings to be ignored.
-    https://learn.microsoft.com/en-us/dotnet/fundamentals/code-analysis/configuration-files#general-options.
+    https://learn.microsoft.com/dotnet/fundamentals/code-analysis/configuration-files#general-options.
     This only needs to be done if there is an inner clone.
   -->
   <Target Name="RemoveInnerGlobalConfig"

diff --git a/eng/TrimmableProjects.props b/eng/TrimmableProjects.props
@@ -85,8 +85,12 @@
     <TrimmableProject Include="Microsoft.AspNetCore.SpaServices.Extensions" />
     <TrimmableProject Include="Microsoft.AspNetCore.StaticFiles" />
     <TrimmableProject Include="Microsoft.AspNetCore.WebSockets" />
+    <TrimmableProject Include="Microsoft.AspNetCore.SignalR.Client.Core" />
+    <TrimmableProject Include="Microsoft.AspNetCore.SignalR.Client" />
+    <TrimmableProject Include="Microsoft.AspNetCore.Http.Connections.Client" />
     <TrimmableProject Include="Microsoft.AspNetCore.Http.Connections.Common" />
     <TrimmableProject Include="Microsoft.AspNetCore.Http.Connections" />
+    <TrimmableProject Include="Microsoft.AspNetCore.SignalR.Protocols.Json" />
     <TrimmableProject Include="Microsoft.AspNetCore.SignalR.Common" />
     <TrimmableProject Include="Microsoft.AspNetCore.StaticAssets" />
     <TrimmableProject Include="Microsoft.AspNetCore.Components.Authorization" />