Merge branch 'dotnet:main' into fix-openapi-description-bug-minimal-api

sander1095 · web-flow · commit cf68bbe8016c · 2025-02-25T12:37:01.000+01:00
diff --git a/eng/Signing.props b/eng/Signing.props
@@ -24,8 +24,6 @@
     <ItemsToSign Include="$(VisualStudioSetupOutputPath)**\*.vsix" />
     <ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.exe" />
     <ItemsToSign Include="$(ArtifactsDir)installers\$(Configuration)\**\*.msi" />
-    <ItemsToSign Remove="$(ArtifactsDir)installers\$(Configuration)\**\*.wixpack.zip" />
-    <ItemsToSign Remove="$(ArtifactsPackagesDir)**\*.wixpack.zip" />
     <ItemsToSign Remove="$(ArtifactsPackagesDir)**\*symbols.nupkg" />
   </ItemGroup>
 
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
@@ -36,7 +36,7 @@
 
   <PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
-    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
     <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj
@@ -44,7 +44,7 @@
 
   <PropertyGroup Condition="'$(BuildInstallers)' == 'true' or '$(TargetOsName)' == 'win'">
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
-    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64'">true</BuildDebPackage>
+    <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
     <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
diff --git a/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs b/src/Framework/AspNetCoreAnalyzers/src/SourceGenerators/PublicTopLevelProgramGenerator.cs
@@ -17,25 +17,27 @@ public partial class Program { }
 
     public void Initialize(IncrementalGeneratorInitializationContext context)
     {
-        var internalGeneratedProgramClass = context.CompilationProvider
+        var internalGeneratedProgramClass = context.CompilationProvider.Select(static (compilation, cancellationToken) =>
             // Get the entry point associated with the compilation, this maps to the Main method definition
-            .Select(static (compilation, cancellationToken) => compilation.GetEntryPoint(cancellationToken))
             // Get the containing symbol of the entry point, this maps to the Program class
-            .Select(static (symbol, _) => symbol?.ContainingSymbol)
-            // If the program class is already public, we don't need to generate anything.
-            .Select(static (symbol, _) => symbol?.DeclaredAccessibility == Accessibility.Public ? null : symbol)
-            // If the discovered `Program` type is not a class then its not
-            // generated and has been defined in source, so we can skip it
-            .Select(static (symbol, _) => symbol is INamedTypeSymbol { TypeKind: TypeKind.Class } ? symbol : null)
-            // If there are multiple partial declarations, then do nothing since we don't want
-            // to trample on visibility explicitly set by the user
-            .Select(static (symbol, _) => symbol is { DeclaringSyntaxReferences: { Length: 1 } declaringSyntaxReferences } ? declaringSyntaxReferences.Single() : null)
+            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.
-            .Select(static (declaringSyntaxReference, cancellationToken) => declaringSyntaxReference?.GetSyntax(cancellationToken) is ClassDeclarationSyntax ? null : declaringSyntaxReference);
+            declaringSyntaxReferences.Single().GetSyntax(cancellationToken) is not ClassDeclarationSyntax
+        );
 
         context.RegisterSourceOutput(internalGeneratedProgramClass, (context, result) =>
         {
-            if (result is not null)
+            if (result)
             {
                 context.AddSource("PublicTopLevelProgram.Generated.g.cs", PublicPartialProgramClassSource);
             }
diff --git a/src/Http/Http.Extensions/test/ModuleInitializer.cs b/src/Http/Http.Extensions/test/ModuleInitializer.cs
@@ -0,0 +1,11 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Runtime.CompilerServices;
+
+public static class ModuleInitializer
+{
+    [ModuleInitializer]
+    public static void Init() =>
+        VerifySourceGenerators.Initialize();
+}
diff --git a/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateParameters.verified.txt b/src/Http/Http.Extensions/test/ValidationsGenerator/snapshots/ValidationsGeneratorTests.CanValidateParameters.verified.txt
diff --git a/src/Http/WebUtilities/src/BufferedReadStream.cs b/src/Http/WebUtilities/src/BufferedReadStream.cs
@@ -108,8 +108,8 @@ public override long Position
                 if (innerOffset <= _bufferCount)
                 {
                     // Yes, just skip some of the buffered data
-                    _bufferOffset += innerOffset;
-                    _bufferCount -= innerOffset;
+                    _bufferOffset += _bufferCount - innerOffset;
+                    _bufferCount = innerOffset;
                 }
                 else
                 {
diff --git a/src/Http/WebUtilities/test/MultipartReaderTests.cs b/src/Http/WebUtilities/test/MultipartReaderTests.cs
@@ -80,7 +80,6 @@ public class MultipartReaderTests
 "<!DOCTYPE html><title>Content of a.html.</title>\r\n" +
 "\r\n" +
 "--9051914041544843365972754266--\r\n";
-
     private const string TwoPartBodyIncompleteBuffer =
 "--9051914041544843365972754266\r\n" +
 "Content-Disposition: form-data; name=\"text\"\r\n" +
@@ -315,6 +314,43 @@ public void MultipartReader_BufferSizeMustBeLargerThanBoundary_Throws()
         });
     }
 
+    [Fact]
+    public async Task MultipartReader_ReadMultipartBodyWithFilesForDeferredCopy_Success()
+    {
+        var stream = MakeStream(ThreePartBody);
+        var reader = new MultipartReader(Boundary, stream);
+
+        await reader.ReadNextSectionAsync(); // skip text field section
+
+        var section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+        Assert.Equal(2, section.Headers.Count);
+        Assert.Equal("form-data; name=\"file1\"; filename=\"a.txt\"", section.Headers["Content-Disposition"][0]);
+        Assert.Equal("text/plain", section.Headers["Content-Type"][0]);
+        var stream1 = section.Body;
+
+        section = await reader.ReadNextSectionAsync();
+        Assert.NotNull(section);
+        Assert.Equal(2, section.Headers.Count);
+        Assert.Equal("form-data; name=\"file2\"; filename=\"a.html\"", section.Headers["Content-Disposition"][0]);
+        Assert.Equal("text/html", section.Headers["Content-Type"][0]);
+        var stream2 = section.Body;
+
+        Assert.Null(await reader.ReadNextSectionAsync());
+
+        Assert.True(stream1.CanSeek);
+        Assert.Equal(0, stream1.Seek(0, SeekOrigin.Begin));
+        var buffer = new MemoryStream();
+        await stream1.CopyToAsync(buffer);
+        Assert.Equal("Content of a.txt.\r\n", Encoding.ASCII.GetString(buffer.ToArray()));
+
+        Assert.True(stream2.CanSeek);
+        Assert.Equal(0, stream2.Seek(0, SeekOrigin.Begin));
+        buffer = new MemoryStream();
+        await stream2.CopyToAsync(buffer);
+        Assert.Equal("<!DOCTYPE html><title>Content of a.html.</title>\r\n", Encoding.ASCII.GetString(buffer.ToArray()));
+    }
+
     [Fact]
     public async Task MultipartReader_TwoPartBodyIncompleteBuffer_TwoSectionsReadSuccessfullyThirdSectionThrows()
     {
diff --git a/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs b/src/Mvc/Mvc.ApiExplorer/src/DefaultApiDescriptionProvider.cs
@@ -315,9 +315,21 @@ internal static void ProcessIsRequired(ApiParameterContext context, MvcOptions m
                 parameter.IsRequired = true;
             }
 
-            if (parameter.Source == BindingSource.Path && parameter.RouteInfo != null && !parameter.RouteInfo.IsOptional)
+            if (parameter.Source == BindingSource.Path && parameter.RouteInfo != null)
             {
-                parameter.IsRequired = true;
+                // Locate the corresponding route parameter metadata.
+                var routeParam = context.RouteParameters
+                    .FirstOrDefault(rp => string.Equals(rp.Name, parameter.Name, StringComparison.OrdinalIgnoreCase));
+
+                // If the parameter is defined as a catch-all, mark it as optional.
+                if (routeParam != null && routeParam.IsCatchAll)
+                {
+                    parameter.IsRequired = false;
+                }
+                else if (!parameter.RouteInfo.IsOptional)
+                {
+                    parameter.IsRequired = true;
+                }
             }
         }
     }
diff --git a/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs b/src/Mvc/Mvc.ApiExplorer/test/DefaultApiDescriptionProviderTest.cs
@@ -32,6 +32,36 @@ namespace Microsoft.AspNetCore.Mvc.Description;
 
 public class DefaultApiDescriptionProviderTest
 {
+    [Fact]
+    public void OnlyCatchAllParameter_IsReportedAsOptional()
+    {
+        // Arrange: Create an action descriptor with a multi-parameter route template.
+        var action = CreateActionDescriptor();
+        action.AttributeRouteInfo = new AttributeRouteInfo
+        {
+            Template = "/products/{category}/items/{group}/inventory/{**any}"
+        };
+
+        // Act: Get the API descriptions using the existing helper.
+        var descriptions = GetApiDescriptions(action);
+
+        // Assert: Only the 'any' parameter should be optional.
+        var description = Assert.Single(descriptions);
+        var categoryParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "category", StringComparison.OrdinalIgnoreCase));
+        var groupParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "group", StringComparison.OrdinalIgnoreCase));
+        var anyParameter = Assert.Single(description.ParameterDescriptions,
+            p => string.Equals(p.Name, "any", StringComparison.OrdinalIgnoreCase));
+
+        // The non-catch-all parameters should be required.
+        Assert.True(categoryParameter.IsRequired);
+        Assert.True(groupParameter.IsRequired);
+
+        // The catch-all parameter should be optional.
+        Assert.False(anyParameter.IsRequired);
+    }
+
     [Fact]
     public void GetApiDescription_IgnoresNonControllerActionDescriptor()
     {

Original file line number	Diff line number	Diff line change
`@@ -108,8 +108,8 @@ public override long Position`
`108`	`108`	`if (innerOffset <= _bufferCount)`
`109`	`109`	`{`
`110`	`110`	`// Yes, just skip some of the buffered data`
`111`		`- _bufferOffset += innerOffset;`
`112`		`- _bufferCount -= innerOffset;`
	`111`	`+ _bufferOffset += _bufferCount - innerOffset;`
	`112`	`+ _bufferCount = innerOffset;`
`113`	`113`	`}`
`114`	`114`	`else`
`115`	`115`	`{`