Merging internal commits for release/9.0

.gitattributes

@@ -86,4 +86,14 @@ bootstrap*.map eol=lf
 bootstrap*.css eol=lf
 
 # VerifyTests
-*.verified.txt text eol=lf working-tree-encoding=UTF-8
+*.verified.txt text eol=lf working-tree-encoding=UTF-8
+
+###############################################################################
+# Patch/diff files must keep LF line endings so `git apply` can parse them
+# correctly on machines where core.autocrlf=true (the Git-for-Windows default).
+# Empty-file-creation entries in these patches have no `--- /dev/null` / `+++ b/...`
+# lines, which makes the parser sensitive to a stray CR before the next
+# `diff --git` header. Forcing LF avoids that.
+###############################################################################
+*.diff eol=lf
+*.patch eol=lf

NuGet.config

@@ -6,8 +6,10 @@
     <!--  Begin: Package sources from dotnet-extensions -->
     <!--  End: Package sources from dotnet-extensions -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-f2c8152" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-runtime-f2c8152e/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-46c88f8" value="https://pkgs.dev.azure.com/dnceng/internal/_packaging/darc-int-dotnet-efcore-46c88f8c/nuget/v3/index.json" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
     <add key="dotnet-eng" value="https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-eng/nuget/v3/index.json" />
@@ -30,8 +32,10 @@
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
     <!--  Begin: Package sources from dotnet-efcore -->
+    <add key="darc-int-dotnet-efcore-46c88f8" value="true" />
     <!--  End: Package sources from dotnet-efcore -->
     <!--  Begin: Package sources from dotnet-runtime -->
+    <add key="darc-int-dotnet-runtime-f2c8152" value="true" />
     <!--  End: Package sources from dotnet-runtime -->
     <!--End: Package sources managed by Dependency Flow automation. Do not edit the sources above.-->
   </disabledPackageSources>

eng/build.ps1

@@ -432,6 +432,20 @@ if ($BinaryLog) {
 # Capture MSBuild crash logs
 $env:MSBUILDDEBUGPATH = $LogDir
 
+pushd
+$patch_file1 = "../upstream-patch.diff"
+$patch_file2 = "../msgpack-fix-full.diff"
+cd $RepoRoot/src/submodules/MessagePack-CSharp
+# Only apply patches if they haven't been applied yet
+$patch_check_file = "$RepoRoot/src/submodules/MessagePack-CSharp/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.cs"
+$searchWord = "TrySkipNextArray"
+$found = Select-String -Path $patch_check_file -Pattern $searchWord
+if ($found) {
+    git apply $patch_file1 -v
+    git apply $patch_file2 -v
+}
+popd
+
 $local:exit_code = $null
 try {
     # Set this global property so Arcade will always initialize the toolset. The error message you get when you build on a clean machine

eng/build.sh

@@ -369,6 +369,20 @@ fi
 # Capture MSBuild crash logs
 export MSBUILDDEBUGPATH="$log_dir"
 
+prev_dir=$(pwd)
+patch_file1="../upstream-patch.diff"
+patch_file2="../msgpack-fix-full.diff"
+cd $repo_root/src/submodules/MessagePack-CSharp
+if command -v git > /dev/null 2>&1; then
+    # Only apply patches if they haven't been applied yet
+    patch_check_file="$repo_root/src/submodules/MessagePack-CSharp/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/MessagePackReader.cs"
+    if grep -q -- "TrySkipNextArray" "$patch_check_file"; then
+        git apply "$patch_file1" -v
+        git apply "$patch_file2" -v
+    fi
+fi
+cd "$prev_dir"
+
 # Set this global property so Arcade will always initialize the toolset. The error message you get when you build on a clean machine
 # with -norestore is not obvious about what to do to fix it. As initialization takes very little time, we think always initializing
 # the toolset is a better default behavior.

eng/scripts/CodeCheck.ps1

@@ -213,7 +213,7 @@ try {
 
     # Temporary: Disable check for blazor js file and nuget.config (updated automatically for
     # internal builds)
-    $changedFilesExclusions = @("src/Components/Web.JS/dist/Release/blazor.server.js", "src/Components/Web.JS/dist/Release/blazor.web.js", "NuGet.config")
+    $changedFilesExclusions = @("src/Components/Web.JS/dist/Release/blazor.server.js", "src/Components/Web.JS/dist/Release/blazor.web.js", "NuGet.config", "src/submodules/MessagePack-CSharp")
 
     if ($changedFiles) {
         foreach ($file in $changedFiles) {

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/CallHandlers/CallHandlerDescriptorInfo.cs

@@ -24,7 +24,14 @@ public CallHandlerDescriptorInfo(
         BodyFieldDescriptor = bodyFieldDescriptor;
         RouteParameterDescriptors = routeParameterDescriptors;
         RouteAdapter = routeAdapter;
-        PathDescriptorsCache = new ConcurrentDictionary<string, List<FieldDescriptor>?>();
+        PathDescriptorsCache = new ConcurrentDictionary<string, List<FieldDescriptor>>();
+
+        var jsonPaths = new HashSet<string>(StringComparer.Ordinal);
+        foreach (var routeParameter in routeParameterDescriptors.Values)
+        {
+            jsonPaths.Add(routeParameter.JsonPath);
+        }
+        RouteParameterJsonPaths = jsonPaths;
     }
 
     public FieldDescriptor? ResponseBodyDescriptor { get; }
@@ -34,5 +41,6 @@ public CallHandlerDescriptorInfo(
     public FieldDescriptor? BodyFieldDescriptor { get; }
     public Dictionary<string, RouteParameter> RouteParameterDescriptors { get; }
     public JsonTranscodingRouteAdapter RouteAdapter { get; }
-    public ConcurrentDictionary<string, List<FieldDescriptor>?> PathDescriptorsCache { get; }
+    public HashSet<string> RouteParameterJsonPaths { get; }
+    public ConcurrentDictionary<string, List<FieldDescriptor>> PathDescriptorsCache { get; }
 }

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/JsonRequestHelpers.cs

@@ -361,11 +361,18 @@ private static async ValueTask<byte[]> ReadDataAsync(JsonTranscodingServerCallCo
 
     private static List<FieldDescriptor>? GetPathDescriptors(JsonTranscodingServerCallContext serverCallContext, IMessage requestMessage, string path)
     {
-        return serverCallContext.DescriptorInfo.PathDescriptorsCache.GetOrAdd(path, p =>
+        // Must not add null values for paths that don't resolve to a descriptor
+        var cache = serverCallContext.DescriptorInfo.PathDescriptorsCache;
+        if (cache.TryGetValue(path, out var pathDescriptors))
         {
-            ServiceDescriptorHelpers.TryResolveDescriptors(requestMessage.Descriptor, p.Split('.'), allowJsonName: true, out var pathDescriptors);
             return pathDescriptors;
-        });
+        }
+        if (ServiceDescriptorHelpers.TryResolveDescriptors(requestMessage.Descriptor, path.Split('.'), allowJsonName: true, out pathDescriptors))
+        {
+            cache.TryAdd(path, pathDescriptors);
+            return pathDescriptors;
+        }
+        return null;
     }
 
     public static async ValueTask SendMessage<TResponse>(JsonTranscodingServerCallContext serverCallContext, JsonSerializerOptions serializerOptions, TResponse message, CancellationToken cancellationToken) where TResponse : class
@@ -408,24 +415,25 @@ private static bool CanBindQueryStringVariable(JsonTranscodingServerCallContext
     {
         if (serverCallContext.DescriptorInfo.BodyDescriptor != null)
         {
-            var bodyFieldName = serverCallContext.DescriptorInfo.BodyFieldDescriptor?.Name;
+            var bodyFieldDescriptor = serverCallContext.DescriptorInfo.BodyFieldDescriptor;
 
-            // Null field name indicates "*" which means the entire message is bound to the body.
-            if (bodyFieldName == null)
+            // Null field descriptor indicates "*" which means the entire message is bound to the body.
+            if (bodyFieldDescriptor?.Name is null)
             {
                 return false;
             }
 
-            // Exact match
-            if (variable == bodyFieldName)
+            var bodyFieldName = bodyFieldDescriptor.Name;
+            var bodyFieldJsonName = bodyFieldDescriptor.JsonName;
+
+            // Exact match (proto name or JSON name)
+            if (variable == bodyFieldName || variable == bodyFieldJsonName)
             {
                 return false;
             }
 
-            // Nested field of field name.
-            if (bodyFieldName.Length + 1 < variable.Length &&
-                variable.StartsWith(bodyFieldName, StringComparison.Ordinal) &&
-                variable[bodyFieldName.Length] == '.')
+            // Nested field of body field (proto name prefix or JSON name prefix).
+            if (IsNestedBodyField(variable, bodyFieldName) || IsNestedBodyField(variable, bodyFieldJsonName))
             {
                 return false;
             }
@@ -436,6 +444,20 @@ private static bool CanBindQueryStringVariable(JsonTranscodingServerCallContext
             return false;
         }
 
+        // Also check JSON name aliases. Route parameter keys use proto names (e.g. "user_id"),
+        // but query parameters can use JSON names (e.g. "userId") which resolve to the same field.
+        if (serverCallContext.DescriptorInfo.RouteParameterJsonPaths.Contains(variable))
+        {
+            return false;
+        }
+
         return true;
     }
+
+    private static bool IsNestedBodyField(string variable, string bodyFieldName)
+    {
+        return bodyFieldName.Length + 1 < variable.Length &&
+            variable.StartsWith(bodyFieldName, StringComparison.Ordinal) &&
+            variable[bodyFieldName.Length] == '.';
+    }
 }

src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.IntegrationTests/RouteTests.cs

@@ -105,6 +105,37 @@ Task<HelloReply> UnaryMethod(ComplextHelloRequest request, ServerCallContext con
         Assert.Equal("Hello complex_greeter/test2/b last_name!", result.RootElement.GetProperty("message").GetString());
     }
 
+    [Fact]
+    public async Task ComplexParameter_NestedJsonNameQueryString_DoesNotOverwriteRouteValue()
+    {
+        // Arrange
+        Task<HelloReply> UnaryMethod(ComplextHelloRequest request, ServerCallContext context)
+        {
+            return Task.FromResult(new HelloReply { Message = $"Hello {request.Name.FirstName} {request.Name.LastName}!" });
+        }
+        var method = Fixture.DynamicGrpc.AddUnaryMethod<ComplextHelloRequest, HelloReply>(
+            UnaryMethod,
+            Greeter.Descriptor.FindMethodByName("SayHelloComplexCatchAll3"));
+
+        var client = new HttpClient(Fixture.Handler) { BaseAddress = new Uri("http://localhost") };
+
+        // route.binding sets
+        // request.Name.LastName = "last_name";
+        // request.Name.FirstName = "complex_greeter/test2/b"
+        // ----
+        // query binding tries to overwrite with
+        // name.firstName=query_first
+        // name.lastName=query_last
+
+        // Act
+        var response = await client.GetAsync("/v1/last_name/complex_greeter/test2/b/c/d/two?name.firstName=query_first&name.lastName=query_last").DefaultTimeout();
+        var responseStream = await response.Content.ReadAsStreamAsync();
+        using var result = await JsonDocument.ParseAsync(responseStream);
+
+        // Assert
+        Assert.Equal("Hello complex_greeter/test2/b last_name!", result.RootElement.GetProperty("message").GetString());
+    }
+
     [Fact]
     public async Task SimpleCatchAllParameter_PrefixSuffixSlashes_MatchUrl_SuccessResult()
     {

src/Grpc/JsonTranscoding/test/Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests/Proto/transcoding.proto

@@ -218,6 +218,7 @@ message HelloRequest {
   string hiding_field_name = 24 [json_name="field_name"];
   repeated SubMessage repeated_messages = 25;
   map<int32, int32> map_keyint_valueint = 26;
+  SubMessage sub_data = 27;
 }
 
 message HelloReply {