[main] Source code updates from dotnet/dotnet

.editorconfig

@@ -155,6 +155,10 @@ csharp_space_between_square_brackets = false
 # License header
 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.
 
+[src/libraries/System.Net.Http/src/System/Net/Http/{SocketsHttpHandler/Http3RequestStream.cs,BrowserHttpHandler/BrowserHttpHandler.cs}]
+# disable CA2025, the analyzer throws a NullReferenceException when processing this file: https://github.com/dotnet/roslyn-analyzers/issues/7652
+dotnet_diagnostic.CA2025.severity = none
+
 # C++ Files
 [*.{cpp,h,in}]
 curly_bracket_next_line = true

Directory.Build.props

@@ -303,6 +303,7 @@
                                 '$(MSBuildProjectExtension)' != '.pkgproj' and
                                 '$(UsingMicrosoftNoTargetsSdk)' != 'true' and
                                 '$(UsingMicrosoftTraversalSdk)' != 'true'">true</IsSourceProject>
+    <IsInBuildToolProject Condition="$(MSBuildProjectName.EndsWith('_inbuild'))">true</IsInBuildToolProject>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(IsReferenceAssemblyProject)' == 'true'">

Directory.Build.targets

@@ -15,7 +15,8 @@
     <!-- If our bootstrap build didn't add a new RID to the graph, fall back to the frozen graph. -->
     <BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(UseBootstrapLayout)' != 'true'">
+  <!-- In-build tools use all assets from the SDK that's being used to build the product. Don't use the live RID graph for these tools. -->
+  <PropertyGroup Condition="'$(UseBootstrapLayout)' != 'true' and '$(IsInBuildToolProject)' != 'true'">
     <!-- Keep in sync with outputs defined in Microsoft.NETCore.Platforms.csproj. -->
     <BundledRuntimeIdentifierGraphFile>$([MSBuild]::NormalizePath('$(ArtifactsBinDir)', 'Microsoft.NETCore.Platforms', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>
     <BundledRuntimeIdentifierGraphFile Condition="!Exists('$(BundledRuntimeIdentifierGraphFile)')">$([MSBuild]::NormalizePath('$(LibrariesProjectRoot)', 'Microsoft.NETCore.Platforms', 'src', 'runtime.json'))</BundledRuntimeIdentifierGraphFile>

eng/CodeAnalysis.src.globalconfig

@@ -564,6 +564,9 @@ dotnet_diagnostic.CA2021.severity = warning
 # CA2022: Avoid inexact read with 'Stream.Read'
 dotnet_diagnostic.CA2022.severity = warning
 
+# CA2025: Ensure tasks using 'IDisposable' instances complete before the instances are disposed
+dotnet_diagnostic.CA2025.severity = warning
+
 # CA2100: Review SQL queries for security vulnerabilities
 dotnet_diagnostic.CA2100.severity = none
 

eng/CodeAnalysis.test.globalconfig

@@ -561,6 +561,9 @@ dotnet_diagnostic.CA2021.severity = none
 # CA2022: Avoid inexact read with 'Stream.Read'
 dotnet_diagnostic.CA2022.severity = none
 
+# CA2025: Ensure tasks using 'IDisposable' instances complete before the instances are disposed
+dotnet_diagnostic.CA2025.severity = none
+
 # CA2100: Review SQL queries for security vulnerabilities
 dotnet_diagnostic.CA2100.severity = none