Merge branch 'main' into maraf/BlazorHotReloadCleanup2

Author: maraf

.github/copilot-instructions.md

@@ -32,3 +32,11 @@
 ## Running tests
 
 * To build and run tests in the repo, use the `build.sh` script that is located in each subdirectory within the `src` folder. For example, to run the build with tests in the `src/Http` directory, run `./src/Http/build.sh -test`.
+
+## .NET Environment
+
+* Before running any `dotnet` commands in this repository, always activate the locally installed .NET environment first by running the appropriate activation script from the repository root:
+  * On Windows: `. ./activate.ps1` (from repository root)
+  * On Linux/Mac: `source activate.sh` (from repository root)
+* If not in the repository root, navigate there first or use the full path to the activation script.
+* This ensures that the correct version of .NET SDK is used for the repository.

.github/policies/resourceManagement.yml

@@ -441,18 +441,18 @@ configuration:
           branch: main
       then:
       - addMilestone:
-          milestone: 10.0-preview7
+          milestone: 10.0-rc1
       description: '[Milestone Assignments] Assign Milestone to PRs merged to the `main` branch'
     - if:
       - payloadType: Pull_Request
       - isAction:
           action: Closed
       - targetsBranch:
-          branch: release/10.0-preview6
+          branch: release/10.0-preview7
       then:
       - removeMilestone
       - addMilestone:
-          milestone: 10.0-preview6
+          milestone: 10.0-preview7
       description: '[Milestone Assignments] Assign Milestone to PRs merged to release/10.0-preview1 branch'
     - if:
       - payloadType: Issues

eng/Version.Details.props

@@ -0,0 +1 @@
+<!-- will get filled in the next backflow -->

eng/Version.Details.xml

@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25372.103",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25372.103",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25372.103",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25373.104",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25373.104",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25373.104",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }

eng/Versions.props

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
+FROM mcr.microsoft.com/dotnet/sdk:latest AS build
 
 ENV StressRunDuration=0
 ARG DEBIAN_FRONTEND=noninteractive
@@ -29,7 +29,7 @@ RUN .dotnet/dotnet publish -c Release -r linux-x64 --sc true -o /app ./src/Compo
 RUN chmod +x /app/Wasm.Performance.Driver
 
 WORKDIR /app
-FROM mcr.microsoft.com/playwright/dotnet:v1.53.0-jammy-amd64 AS final
+FROM mcr.microsoft.com/playwright/dotnet:v1.54.0-jammy-amd64 AS final
 COPY --from=build ./app ./
 COPY ./exec.sh ./
 

global.json

@@ -1,7 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements.
 // The .NET Foundation licenses this file to you under the MIT license.
 
-using System.Collections;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
 using System.Text.Json;
@@ -94,6 +93,23 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
             JsonConverterHelper.GetFieldType(field),
             name);
 
+        // A property with a wrapper type is usually the underlying type on the DTO.
+        // For example, a field of type google.protobuf.StringValue will have a property of type string.
+        // However, the wrapper type is exposed if someone manually creates a DTO with it, or there is a problem
+        // detecting wrapper type in code generation. For example, https://github.com/protocolbuffers/protobuf/issues/22744
+        FieldDescriptor? wrapperTypeValueField = null;
+        if (field.FieldType == FieldType.Message && ServiceDescriptorHelpers.IsWrapperType(field.MessageType))
+        {
+            var property = field.ContainingType.ClrType.GetProperty(field.PropertyName);
+
+            // Check if the property type is the same as the field type. This means the property is StringValue, et al,
+            // and additional conversion is required.
+            if (property != null && property.PropertyType == field.MessageType.ClrType)
+            {
+                wrapperTypeValueField = field.MessageType.FindFieldByName("value");
+            }
+        }
+
         propertyInfo.ShouldSerialize = (o, v) =>
         {
             // Properties that don't have this flag set are only used to deserialize incoming JSON.
@@ -105,7 +121,13 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
         };
         propertyInfo.Get = (o) =>
         {
-            return field.Accessor.GetValue((IMessage)o);
+            var value = field.Accessor.GetValue((IMessage)o);
+            if (wrapperTypeValueField != null && value is IMessage wrapperMessage)
+            {
+                return wrapperTypeValueField.Accessor.GetValue(wrapperMessage);
+            }
+
+            return value;
         };
 
         if (field.IsMap || field.IsRepeated)
@@ -115,13 +137,13 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
         }
         else
         {
-            propertyInfo.Set = GetSetMethod(field);
+            propertyInfo.Set = GetSetMethod(field, wrapperTypeValueField);
         }
 
         return propertyInfo;
     }
 
-    private static Action<object, object?> GetSetMethod(FieldDescriptor field)
+    private static Action<object, object?> GetSetMethod(FieldDescriptor field, FieldDescriptor? wrapperTypeValueField)
     {
         Debug.Assert(!field.IsRepeated && !field.IsMap, "Collections shouldn't have a setter.");
 
@@ -135,19 +157,27 @@ private JsonPropertyInfo CreatePropertyInfo(JsonTypeInfo typeInfo, string name,
                     throw new InvalidOperationException($"Multiple values specified for oneof {field.RealContainingOneof.Name}.");
                 }
 
-                SetFieldValue(field, (IMessage)o, v);
+                SetFieldValue(field, wrapperTypeValueField, (IMessage)o, v);
             };
         }
 
         return (o, v) =>
         {
-            SetFieldValue(field, (IMessage)o, v);
+            SetFieldValue(field, wrapperTypeValueField, (IMessage)o, v);
         };
 
-        static void SetFieldValue(FieldDescriptor field, IMessage m, object? v)
+        static void SetFieldValue(FieldDescriptor field, FieldDescriptor? wrapperTypeValueField, IMessage m, object? v)
         {
             if (v != null)
             {
+                // This field exposes a wrapper type. Need to create a wrapper instance and set the value on it.
+                if (wrapperTypeValueField != null && v is not IMessage)
+                {
+                    var wrapper = (IMessage)Activator.CreateInstance(field.MessageType.ClrType)!;
+                    wrapperTypeValueField.Accessor.SetValue(wrapper, v);
+                    v = wrapper;
+                }
+
                 field.Accessor.SetValue(m, v);
             }
             else

src/Components/benchmarkapps/Wasm.Performance/dockerfile

@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages;
 using Transcoding;
 using Xunit.Abstractions;
 
@@ -531,6 +532,25 @@ public void NullableWrappers()
         AssertReadJson<HelloRequest.Types.Wrappers>(json);
     }
 
+    [Fact]
+    public void NullableWrappers_Type()
+    {
+        var json = @"{
+  ""stringValue"": ""A string"",
+  ""int32Value"": 1,
+  ""int64Value"": ""2"",
+  ""floatValue"": 1.2,
+  ""doubleValue"": 1.1,
+  ""boolValue"": true,
+  ""uint32Value"": 3,
+  ""uint64Value"": ""4"",
+  ""bytesValue"": ""SGVsbG8gd29ybGQ=""
+}";
+
+        var result = AssertReadJson<WrappersMessage>(json, serializeOld: false);
+        Assert.Equal("A string", result.StringValue.Value);
+    }
+
     [Fact]
     public void NullValue_Default_Null()
     {

src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Internal/Json/MessageTypeInfoResolver.cs

@@ -11,6 +11,7 @@
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Internal.Json;
 using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.Infrastructure;
+using Microsoft.AspNetCore.Grpc.JsonTranscoding.Tests.TestObjects.ProtobufMessages;
 using Transcoding;
 using Xunit.Abstractions;
 using Type = System.Type;
@@ -201,6 +202,25 @@ public void NullableWrappers()
         AssertWrittenJson(wrappers);
     }
 
+    [Fact]
+    public void NullableWrappers_Types()
+    {
+        var wrappers = new WrappersMessage
+        {
+            BoolValue = new BoolValue { Value = true },
+            BytesValue = new BytesValue { Value = ByteString.CopyFrom(Encoding.UTF8.GetBytes("Hello world")) },
+            DoubleValue = new DoubleValue { Value = 1.1 },
+            FloatValue = new FloatValue { Value = 1.2f },
+            Int32Value = new Int32Value { Value = 1 },
+            Int64Value = new Int64Value { Value = 2L },
+            StringValue = new StringValue { Value = "A string" },
+            Uint32Value = new UInt32Value { Value = 3U },
+            Uint64Value = new UInt64Value { Value = 4UL }
+        };
+
+        AssertWrittenJson(wrappers);
+    }
+
     [Fact]
     public void NullableWrapper_Root_Int32()
     {