Merge remote-tracking branch 'upstream/main' into BlazorWasmPreloadPlaceholderTemplate

maraf · maraf · commit b9876bc22e4b · 2025-04-14T14:49:44.000+02:00
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/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/EnhancedNavigationTest.cs
@@ -668,6 +668,7 @@ public void CanUpdateHrefOnLinkTagWithIntegrity()
     }
 
     [Theory]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60875")]
     // [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875
     [InlineData(false, true, false)]
     [InlineData(true, true, false)]
diff --git a/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs b/src/Middleware/ResponseCaching/test/CachedResponseBodyTests.cs
@@ -4,6 +4,7 @@
 using System.Buffers;
 using System.Diagnostics;
 using System.IO.Pipelines;
+using Microsoft.AspNetCore.InternalTesting;
 
 namespace Microsoft.AspNetCore.ResponseCaching.Tests;
 
@@ -70,6 +71,7 @@ public async Task Copy_SingleSegment()
     }
 
     [Fact]
+    [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61293")]
     public async Task Copy_MultipleSegments()
     {
         var segments = new List<byte[]>
diff --git a/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in b/src/ProjectTemplates/Web.ProjectTemplates/WebApiAot-CSharp.csproj.in
@@ -14,6 +14,6 @@
   <ItemGroup>
     <PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="${MicrosoftAspNetCoreOpenApiVersion}" Condition="'$(EnableOpenAPI)' == 'True'" />
   </ItemGroup>
+  
   <!--#endif -->
-
 </Project>
diff --git a/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj b/src/SignalR/clients/csharp/Http.Connections.Client/src/Microsoft.AspNetCore.Http.Connections.Client.csproj
@@ -25,7 +25,7 @@
     <Reference Include="Microsoft.AspNetCore.Http.Connections.Common" />
     <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
-    <Reference Include="System.Net.ServerSentEvents" />
+    <Reference Include="System.Net.ServerSentEvents" Condition="'$(TargetFramework)' != '$(DefaultNetCoreTargetFramework)'" />
   </ItemGroup>
 
   <ItemGroup Condition="'$(TargetFramework)' == '$(DefaultNetFxTargetFramework)' OR '$(MSBuildRestoreSessionId)' == ''">
diff --git a/src/SiteExtensions/Directory.Build.props b/src/SiteExtensions/Directory.Build.props
@@ -2,11 +2,12 @@
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)..\, Directory.Build.props))\Directory.Build.props" />
 
   <PropertyGroup>
-    <MicrosoftWebXdtExtensionsPath>$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
-    <MicrosoftWebXdtExtensionsPath Condition="'$(DotNetBuildPass)' == '2'">$(ArtifactsBinDir)Microsoft.Web.Xdt.Extensions\$(TargetArchitecture)\$(Configuration)\net462\Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
+    <MicrosoftWebXdtExtensionsDir>$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsDir Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(ArtifactsBinDir)', 'Microsoft.Web.Xdt.Extensions', '$(TargetArchitecture)', '$(Configuration)', 'net462'))</MicrosoftWebXdtExtensionsDir>
+    <MicrosoftWebXdtExtensionsPath>$(MicrosoftWebXdtExtensionsDir)Microsoft.Web.Xdt.Extensions.dll</MicrosoftWebXdtExtensionsPath>
     <BaseIntermediateOutputPath Condition="'$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(TargetArchitecture)'))</BaseIntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(Configuration)\</IntermediateOutputPath>
-    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$(BaseIntermediateOutputPath)$(PlatformName)\$(Configuration)\</IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' == 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(Configuration)'))</IntermediateOutputPath>
+    <IntermediateOutputPath Condition="'$(PlatformName)' != 'AnyCPU' AND '$(DotNetBuildPass)' == '2'">$([MSBuild]::NormalizeDirectory('$(BaseIntermediateOutputPath)', '$(PlatformName)', '$(Configuration)'))</IntermediateOutputPath>
   </PropertyGroup>
 
-</Project>
+</Project>

Original file line number	Diff line number	Diff line change
`@@ -668,6 +668,7 @@ public void CanUpdateHrefOnLinkTagWithIntegrity()`
`668`	`668`	`}`
`669`	`669`
`670`	`670`	`[Theory]`
	`671`	`+ [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/60875")]`
`671`	`672`	`// [InlineData(false, false, false)] // https://github.com/dotnet/aspnetcore/issues/60875`
`672`	`673`	`[InlineData(false, true, false)]`
`673`	`674`	`[InlineData(true, true, false)]`
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@`
`4`	`4`	`using System.Buffers;`
`5`	`5`	`using System.Diagnostics;`
`6`	`6`	`using System.IO.Pipelines;`
	`7`	`+using Microsoft.AspNetCore.InternalTesting;`
`7`	`8`
`8`	`9`	`namespace Microsoft.AspNetCore.ResponseCaching.Tests;`
`9`	`10`
`@@ -70,6 +71,7 @@ public async Task Copy_SingleSegment()`
`70`	`71`	`}`
`71`	`72`
`72`	`73`	`[Fact]`
	`74`	`+ [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/61293")]`
`73`	`75`	`public async Task Copy_MultipleSegments()`
`74`	`76`	`{`
`75`	`77`	`var segments = new List<byte[]>`