Merge branch 'main' into taparik/byteArrayDirectInterop

Author: TanayParikh

eng/Version.Details.xml

@@ -5610,9 +5610,9 @@ write-file-atomic@^3.0.0:
     typedarray-to-buffer "^3.1.5"
 
 ws@^7.4.4, ws@^7.4.5:
-  version "7.4.5"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.5.tgz#a484dd851e9beb6fdb420027e3885e8ce48986c1"
-  integrity sha512-xzyu3hFvomRfXKH8vOFMU3OguG6oOvhXMo3xsGy3xWExqaM2dxBbVxuD99O7m3ZUFMvvscsZDqxfgMaRr/Nr1g==
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
 
 xml-name-validator@^3.0.0:
   version "3.0.0"

eng/Versions.props

@@ -1,3 +1,3 @@
 @ECHO OFF
-SET RepoRoot=%~dp0..\..
+SET RepoRoot=%~dp0..\..\..
 %RepoRoot%\eng\build.cmd -projects %~dp0**\*.*proj %*

src/Components/Web.JS/yarn.lock

@@ -3,5 +3,5 @@
 set -euo pipefail
 
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-repo_root="$DIR/../.."
+repo_root="$DIR/../../.."
 "$repo_root/eng/build.sh" --projects "$DIR/**/*.*proj" "$@"

src/FileProviders/Embedded/build.cmd

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
@@ -100,10 +100,13 @@ This package is an internal implementation of the .NET Core SDK and is not meant
     <!--
       Determine the crossgen2 package path property name. Special case linux-musl-arm and linux-musl-arm64 because they
       are built on an Ubuntu container with cross compilation tools. linux-musl-x64 is built in an alpine container.
+      Special case the crossgen2 package reference on Windows to avoid the x86 package when building in Visual Studio.
     -->
     <BuildOsName>$(TargetOsName)</BuildOsName>
     <BuildOsName Condition="'$(TargetOsName)' == 'linux-musl' and '$(TargetArchitecture)'!='x64'">linux</BuildOsName>
-    <Crossgen2PackageRootVariableName>PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(BuildArchitecture)</Crossgen2PackageRootVariableName>
+    <Crossgen2BuildArchitecture Condition=" '$(BuildOsName)' == 'win' ">x64</Crossgen2BuildArchitecture>
+    <Crossgen2BuildArchitecture Condition=" '$(Crossgen2BuildArchitecture)' == '' ">$(BuildArchitecture)</Crossgen2BuildArchitecture>
+    <Crossgen2PackageRootVariableName>PkgMicrosoft_NETCore_App_Crossgen2_$(BuildOsName)-$(Crossgen2BuildArchitecture)</Crossgen2PackageRootVariableName>
 
     <AssetTargetFallback>$(AssetTargetFallback);native,Version=0.0</AssetTargetFallback>
 
@@ -126,7 +129,7 @@ This package is an internal implementation of the .NET Core SDK and is not meant
       This package contains the crossgen2 tool. Unfortunately, it doesn't make the tool easy to use.
       $(GeneratePathProperty) and hacks in the _ExpandRuntimePackageRoot target work around the gaps.
     -->
-    <Reference Include="Microsoft.NETCore.App.Crossgen2.$(BuildOsName)-$(BuildArchitecture)"
+    <Reference Include="Microsoft.NETCore.App.Crossgen2.$(BuildOsName)-$(Crossgen2BuildArchitecture)"
         ExcludeAssets="All"
         PrivateAssets="All"
         GeneratePathProperty="true" />

src/FileProviders/Embedded/build.sh

@@ -205,7 +205,10 @@ public override bool CanWrite
             get { return false; }
         }
 
-        /// <inheritdoc/>
+        /// <summary>
+        /// The total bytes read from and buffered by the stream so far, it will not represent the full
+        /// data length until the stream is fully buffered. e.g. using <c>stream.DrainAsync()</c>.
+        /// </summary>
         public override long Length
         {
             get { return _buffer.Length; }

src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.csproj

@@ -28,7 +28,7 @@ public static IPolicyRegistry<string> AddPolicyRegistry(this IServiceCollection
             }
 
             // Create an empty registry, register and return it as an instance. This is the best way to get a
-            // single instance registered using both interfaces.
+            // single instance registered using all the interfaces.
             var registry = new PolicyRegistry();
 
             services.AddSingleton<IConcurrentPolicyRegistry<string>>(registry);
@@ -90,7 +90,7 @@ public static IServiceCollection AddPolicyRegistry(this IServiceCollection servi
             }
 
             // Create an empty registry, configure it and register it as an instance.
-            // This is the best way to get a single instance registered using both interfaces.
+            // This is the best way to get a single instance registered using all the interfaces.
             services.AddSingleton(serviceProvider =>
             {
                 var registry = new PolicyRegistry();

src/Http/WebUtilities/src/FileBufferingReadStream.cs

@@ -41,7 +41,7 @@ public class ApiDescription
         /// <summary>
         /// Gets or sets relative url path template (relative to application root) for this api.
         /// </summary>
-        public string RelativePath { get; set; } = default!;
+        public string? RelativePath { get; set; }
 
         /// <summary>
         /// Gets the list of possible formats for a request.
@@ -60,4 +60,4 @@ public class ApiDescription
         /// </remarks>
         public IList<ApiResponseType> SupportedResponseTypes { get; } = new List<ApiResponseType>();
     }
-}
+}

src/HttpClientFactory/Polly/src/DependencyInjection/PollyServiceCollectionExtensions.cs

@@ -9,7 +9,6 @@ Microsoft.AspNetCore.Mvc.IActionResult</Description>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageTags>aspnetcore;aspnetcoremvc</PackageTags>
     <IsPackable>false</IsPackable>
-    <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>