Merge branch 'main' into darc-main-e4893e14-f6c2-4dae-a11b-2ff4d00b15c9

Author: JamesNK

.azure/pipelines/localization.yml

@@ -25,13 +25,42 @@ parameters:
 variables:
 - name: _TeamName
   value: AspNetCore
-- template: /eng/common/templates/variables/pool-providers.yml
-
-jobs:
-- ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
-  - template: /eng/common/templates/job/onelocbuild.yml
-    parameters:
-      CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
-      LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
-      LclSource: lclFilesFromPackage
-      MirrorRepo: aspnetcore
+- template: /eng/common/templates-official/variables/pool-providers.yml@self
+
+
+resources:
+  repositories:
+  # Repo: 1ESPipelineTemplates/1ESPipelineTemplates
+  - repository: 1esPipelines
+    type: git
+    name: 1ESPipelineTemplates/1ESPipelineTemplates
+    ref: refs/tags/release
+
+extends:
+  template: v1/1ES.Official.PipelineTemplate.yml@1esPipelines
+  parameters:
+    sdl:
+      sourceAnalysisPool:
+        name: $(DncEngInternalBuildPool)
+        image: 1es-windows-2022
+        os: windows
+      codeql:
+        compiled:
+          enabled: false
+          justificationForDisabling: "This pipeline doesn't build any code. The product code is already scanned in the main pipeline (aspnetcore-ci)"
+    pool:
+      name: $(DncEngInternalBuildPool)
+      image: 1es-windows-2022
+      os: windows
+
+    stages:
+    - stage: build
+      displayName: Build
+      jobs:
+      - ${{ if and(ne(variables['System.TeamProject'], 'public'), or(eq(variables['Build.SourceBranch'], 'refs/heads/main'), eq(variables['Build.Reason'], 'Manual'))) }}:
+        - template: /eng/common/templates-official/job/onelocbuild.yml@self
+          parameters:
+            CreatePr: ${{ or(ne(variables['Build.Reason'], 'Manual'), eq(parameters.createPr, 'true')) }}
+            LclPackageId: 'LCL-JUNO-PROD-ASPNETCORE'
+            LclSource: lclFilesFromPackage
+            MirrorRepo: aspnetcore

eng/Version.Details.xml

@@ -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.49.0-jammy-amd64 AS final
+FROM mcr.microsoft.com/playwright/dotnet:v1.50.0-jammy-amd64 AS final
 COPY --from=build ./app ./
 COPY ./exec.sh ./
 

eng/Versions.props

@@ -12,7 +12,9 @@ public class PublicProgramSourceGenerator : IIncrementalGenerator
 {
     private const string PublicPartialProgramClassSource = """
 // <auto-generated />
+#pragma warning disable CS1591
 public partial class Program { }
+#pragma warning restore CS1591
 """;
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
@@ -21,17 +23,17 @@ public void Initialize(IncrementalGeneratorInitializationContext context)
             // Get the entry point associated with the compilation, this maps to the Main method definition
             // Get the containing symbol of the entry point, this maps to the Program class
             compilation.GetEntryPoint(cancellationToken)?.ContainingSymbol is INamedTypeSymbol
-                {
-                    // If the discovered `Program` type is not a class then its not
-                    // generated and has been defined in source, so we can skip it
-                    // If the program class is already public, we don't need to generate anything.
-                    DeclaredAccessibility: not Accessibility.Public,
-                    TypeKind: TypeKind.Class,
-                    // If there are multiple partial declarations, then do nothing since we don't want
-                    // to trample on visibility explicitly set by the user
-                    DeclaringSyntaxReferences: { Length: 1 } declaringSyntaxReferences
-                } &&
-            // If the `Program` class is already declared in user code, we don't need to generate anything.
+            {
+                // If the program class is already public, we don't need to generate anything
+                DeclaredAccessibility: not Accessibility.Public,
+                // If the discovered `Program` type is not a class then its not
+                // generated and has been defined in source, so we can skip it
+                TypeKind: TypeKind.Class,
+                // If there are multiple partial declarations, then do nothing since we don't want
+                // to trample on visibility explicitly set by the user
+                DeclaringSyntaxReferences: { Length: 1 } declaringSyntaxReferences
+            } &&
+            // If the `Program` class is already declared in user code, we don't need to generate anything
             declaringSyntaxReferences.Single().GetSyntax(cancellationToken) is not ClassDeclarationSyntax
         );
 

src/Components/benchmarkapps/Wasm.Performance/dockerfile

@@ -7,6 +7,13 @@ namespace Microsoft.AspNetCore.SourceGenerators.Tests;
 
 public class PublicTopLevelProgramGeneratorTests
 {
+    private const string ExpectedGeneratedSource = """
+// <auto-generated />
+#pragma warning disable CS1591
+public partial class Program { }
+#pragma warning restore CS1591
+""";
+
     [Fact]
     public async Task GeneratesSource_ProgramWithTopLevelStatements()
     {
@@ -20,12 +27,33 @@ public async Task GeneratesSource_ProgramWithTopLevelStatements()
 app.Run();
 """;
 
-        var expected = """
-// <auto-generated />
-public partial class Program { }
+        await VerifyCS.VerifyAsync(source, "PublicTopLevelProgram.Generated.g.cs", ExpectedGeneratedSource);
+    }
+
+    // The compiler synthesizes a Program class in the global namespace due to top-level statements
+    // The Foo.Program class is completely unrelated to the entry point and is just as any regular type
+    // Hence, we will expect to see the source generated in these scenarios
+    [Theory]
+    [InlineData("public partial class Program { }")]
+    [InlineData("internal partial class Program { }")]
+    public async Task GeneratesSource_IfProgramDefinedInANamespace (string declaration)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+var app = WebApplication.Create();
+
+app.MapGet("/", () => "Hello, World!");
+
+app.Run();
+
+namespace Foo
+{
+    {{declaration}}
+}
 """;
 
-        await VerifyCS.VerifyAsync(source, "PublicTopLevelProgram.Generated.g.cs", expected);
+        await VerifyCS.VerifyAsync(source, "PublicTopLevelProgram.Generated.g.cs", ExpectedGeneratedSource);
     }
 
     [Fact]
@@ -86,6 +114,31 @@ public static void Main()
         await VerifyCS.VerifyAsync(source);
     }
 
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitPublicProgramClassInNamespace()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    public class Program
+    {
+        public static void Main()
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
     [Fact]
     public async Task DoesNotGeneratorSource_ExplicitInternalProgramClass()
     {
@@ -108,6 +161,31 @@ public static void Main()
         await VerifyCS.VerifyAsync(source);
     }
 
+    [Fact]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramClassInNamespace()
+    {
+        var source = """
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    internal class Program
+    {
+        public static void Main()
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
     [Theory]
     [InlineData("interface")]
     [InlineData("struct")]
@@ -127,6 +205,33 @@ public static void Main(string[] args)
         app.Run();
     }
 }
+""";
+
+        await VerifyCS.VerifyAsync(source);
+    }
+
+    [Theory]
+    [InlineData("interface")]
+    [InlineData("struct")]
+    public async Task DoesNotGeneratorSource_ExplicitInternalProgramTypeInNamespace(string type)
+    {
+        var source = $$"""
+using Microsoft.AspNetCore.Builder;
+
+namespace Foo
+{
+    internal {{type}} Program
+    {
+        public static void Main(string[] args)
+        {
+            var app = WebApplication.Create();
+
+            app.MapGet("/", () => "Hello, World!");
+
+            app.Run();
+        }
+    }
+}
 """;
 
         await VerifyCS.VerifyAsync(source);

src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs

@@ -22,7 +22,6 @@ namespace Microsoft.AspNetCore.Hosting.Tests;
 public class HostingApplicationDiagnosticsTests : LoggedTest
 {
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57259")]
     public async Task EventCountersAndMetricsValues()
     {
         // Arrange

src/Framework/AspNetCoreAnalyzers/test/SourceGenerators/PublicTopLevelProgramGeneratorTests.cs

@@ -176,7 +176,6 @@ public void UnhandledException()
     }
 
     [Fact]
-    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/57259")]
     public async Task VerifyCountersFireWithCorrectValues()
     {
         // Arrange

src/Hosting/Hosting/test/HostingApplicationDiagnosticsTests.cs

@@ -18,9 +18,12 @@ internal static void EmitQueryOrHeaderParameterPreparation(this EndpointParamete
     {
         codeWriter.WriteLine(endpointParameter.EmitParameterDiagnosticComment());
 
-        var assigningCode = endpointParameter.Source is EndpointParameterSource.Header
-            ? $"httpContext.Request.Headers[\"{endpointParameter.LookupName}\"]"
-            : $"httpContext.Request.Query[\"{endpointParameter.LookupName}\"]";
+        var assigningCode = (endpointParameter.Source, endpointParameter.IsArray) switch
+        {
+            (EndpointParameterSource.Header, true) => $"httpContext.Request.Headers.GetCommaSeparatedValues(\"{endpointParameter.LookupName}\")",
+            (EndpointParameterSource.Header, false) => $"httpContext.Request.Headers[\"{endpointParameter.LookupName}\"]",
+            _ => $"httpContext.Request.Query[\"{endpointParameter.LookupName}\"]"
+        };
         codeWriter.WriteLine($"var {endpointParameter.EmitAssigningCodeResult()} = {assigningCode};");
 
         // If we are not optional, then at this point we can just assign the string value to the handler argument,

src/Hosting/Hosting/test/Internal/HostingEventSourceTests.cs

@@ -52,6 +52,7 @@ public static partial class RequestDelegateFactory
     private static readonly MethodInfo ExecuteTaskResultOfTMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteTaskResult), BindingFlags.NonPublic | BindingFlags.Static)!;
     private static readonly MethodInfo ExecuteValueResultTaskOfTMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteValueTaskResult), BindingFlags.NonPublic | BindingFlags.Static)!;
     private static readonly MethodInfo ExecuteAwaitedReturnMethod = typeof(RequestDelegateFactory).GetMethod(nameof(ExecuteAwaitedReturn), BindingFlags.NonPublic | BindingFlags.Static)!;
+    private static readonly MethodInfo GetHeaderSplitMethod = typeof(ParsingHelpers).GetMethod(nameof(ParsingHelpers.GetHeaderSplit), BindingFlags.Public | BindingFlags.Static, [typeof(IHeaderDictionary), typeof(string)])!;
     private static readonly MethodInfo GetRequiredServiceMethod = typeof(ServiceProviderServiceExtensions).GetMethod(nameof(ServiceProviderServiceExtensions.GetRequiredService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider) })!;
     private static readonly MethodInfo GetServiceMethod = typeof(ServiceProviderServiceExtensions).GetMethod(nameof(ServiceProviderServiceExtensions.GetService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider) })!;
     private static readonly MethodInfo GetRequiredKeyedServiceMethod = typeof(ServiceProviderKeyedServiceExtensions).GetMethod(nameof(ServiceProviderKeyedServiceExtensions.GetRequiredKeyedService), BindingFlags.Public | BindingFlags.Static, new Type[] { typeof(IServiceProvider), typeof(object) })!;
@@ -1955,8 +1956,14 @@ private static Expression BindParameterFromExpression(
                 Expression.Convert(Expression.Constant(parameter.DefaultValue), parameter.ParameterType)));
     }
 
-    private static Expression BindParameterFromProperty(ParameterInfo parameter, MemberExpression property, PropertyInfo itemProperty, string key, RequestDelegateFactoryContext factoryContext, string source) =>
-        BindParameterFromValue(parameter, GetValueFromProperty(property, itemProperty, key, GetExpressionType(parameter.ParameterType)), factoryContext, source);
+    private static Expression BindParameterFromProperty(ParameterInfo parameter, MemberExpression property, PropertyInfo itemProperty, string key, RequestDelegateFactoryContext factoryContext, string source)
+    {
+        var valueExpression = (source == "header" && parameter.ParameterType.IsArray)
+            ? Expression.Call(GetHeaderSplitMethod, property, Expression.Constant(key))
+            : GetValueFromProperty(property, itemProperty, key, GetExpressionType(parameter.ParameterType));
+
+        return BindParameterFromValue(parameter, valueExpression, factoryContext, source);
+    }
 
     private static Type? GetExpressionType(Type type) =>
         type.IsArray ? typeof(string[]) :