Merge branch 'main' into marcpopMSFT-improvecopilotformating

Author: marcpopMSFT

.github/copilot-instructions.md

@@ -7,6 +7,7 @@ Coding Style and Changes:
 - Do not allow unused `using` directives to be committed.
 - Commit your changes, and then format them.
 - Add the format commit SHA to the .git-blame-ignore-revs file so that the commit doesn't dirty git blame in the future
+- Use `#if NET` blocks for .NET Core specific code, and `#if NETFRAMEWORK` for .NET Framework specific code.
 
 Testing:
 - Large changes should always include test changes.

NuGet.config

@@ -3,6 +3,8 @@
   <packageSources>
     <clear />
     <!--Begin: Package sources managed by Dependency Flow automation. Do not edit the sources below.-->
+    <!--  Begin: Package sources from microsoft-testfx -->
+    <!--  End: Package sources from microsoft-testfx -->
     <!--  Begin: Package sources from dotnet-aspire -->
     <!--  End: Package sources from dotnet-aspire -->
     <!--  Begin: Package sources from dotnet-runtime -->

eng/Version.Details.props

@@ -140,8 +140,8 @@ This file should be imported by eng/Versions.props
     <!-- dotnet/core-setup dependencies -->
     <NETStandardLibraryRefPackageVersion>2.1.0</NETStandardLibraryRefPackageVersion>
     <!-- microsoft/testfx dependencies -->
-    <MicrosoftTestingPlatformPackageVersion>1.9.0-preview.25479.5</MicrosoftTestingPlatformPackageVersion>
-    <MSTestPackageVersion>3.11.0-preview.25479.5</MSTestPackageVersion>
+    <MicrosoftTestingPlatformPackageVersion>2.0.0-preview.25506.5</MicrosoftTestingPlatformPackageVersion>
+    <MSTestPackageVersion>4.0.0-preview.25506.5</MSTestPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -553,13 +553,13 @@
       <Uri>https://github.com/dotnet/dotnet</Uri>
       <Sha>6befeceeaece5c9cb9730878aeaf4667f7c29b70</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Testing.Platform" Version="1.9.0-preview.25479.5">
+    <Dependency Name="Microsoft.Testing.Platform" Version="2.0.0-preview.25506.5">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>fb48f61b25dd221f0b7568863080ab5339df8def</Sha>
+      <Sha>f6f7b6dfab12e4a24ad74184d7ff884cf90cd972</Sha>
     </Dependency>
-    <Dependency Name="MSTest" Version="3.11.0-preview.25479.5">
+    <Dependency Name="MSTest" Version="4.0.0-preview.25506.5">
       <Uri>https://github.com/microsoft/testfx</Uri>
-      <Sha>fb48f61b25dd221f0b7568863080ab5339df8def</Sha>
+      <Sha>f6f7b6dfab12e4a24ad74184d7ff884cf90cd972</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Configuration.Ini" Version="10.0.0-rc.1.25479.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>

src/BuiltInTools/BrowserRefresh/BrowserRefreshMiddleware.cs

@@ -170,6 +170,8 @@ internal static bool IsBrowserDocumentRequest(HttpContext context)
             if (request.Headers.TryGetValue("Sec-Fetch-Dest", out var values) &&
                 !StringValues.IsNullOrEmpty(values) &&
                 !string.Equals(values[0], "document", StringComparison.OrdinalIgnoreCase) &&
+                !string.Equals(values[0], "frame", StringComparison.OrdinalIgnoreCase) &&
+                !string.Equals(values[0], "iframe", StringComparison.OrdinalIgnoreCase) &&
                 !IsProgressivelyEnhancedNavigation(context.Request))
             {
                 // See https://github.com/dotnet/aspnetcore/issues/37326.

test/Microsoft.AspNetCore.Watch.BrowserRefresh.Tests/BrowserRefreshMiddlewareTest.cs

@@ -183,6 +183,30 @@ public void IsBrowserDocumentRequest_ReturnsTrue_IfRequestFetchMetadataRequestHe
         [Theory]
         [InlineData("frame")]
         [InlineData("iframe")]
+        public void IsBrowserDocumentRequest_ReturnsTrue_IfRequestFetchMetadataRequestHeaderIsFrame(string headerValue)
+        {
+            // Arrange
+            var context = new DefaultHttpContext
+            {
+                Request =
+                {
+                    Method = "Post",
+                    Headers =
+                    {
+                        ["Accept"] = "text/html",
+                        ["Sec-Fetch-Dest"] = headerValue,
+                    },
+                },
+            };
+
+            // Act
+            var result = BrowserRefreshMiddleware.IsBrowserDocumentRequest(context);
+
+            // Assert
+            Assert.True(result);
+        }
+
+        [Theory]
         [InlineData("serviceworker")]
         public void IsBrowserDocumentRequest_ReturnsFalse_IfRequestFetchMetadataRequestHeaderIsNotDocument(string headerValue)
         {

test/TestAssets/TestProjects/TestProjectSolutionWithCodeCoverage/TestProject/TestProject.csproj

@@ -1,13 +1,12 @@
-<Project Sdk="MSTest.Sdk/3.9.3">
+<Project Sdk="MSTest.Sdk/4.0.0-preview.25506.5">
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), testAsset.props))\testAsset.props" />
 
 	<PropertyGroup>
 		<TargetFramework>$(CurrentTargetFramework)</TargetFramework>
 		<GenerateTestingPlatformEntryPoint>False</GenerateTestingPlatformEntryPoint>
-		<MicrosoftTestingExtensionsCodeCoverageVersion>17.12.6</MicrosoftTestingExtensionsCodeCoverageVersion>
 
 	</PropertyGroup>
 
 	<!-- references to the code to test -->
 
-</Project>
+</Project>