From adb4d4101e308541f386cd049fcaa731345b3013 Mon Sep 17 00:00:00 2001
From: Vladimir Pecanac <vladimir.pecanac@gmail.com>
Date: Mon, 14 Sep 2026 15:52:11 +0200
Subject: [PATCH] MapControllers vs MapControllerRoute: retarget to net10.0,
 refresh test stack

- Both projects move from net8.0 to net10.0.
- Test packages: Microsoft.AspNetCore.Mvc.Testing 10.0.12, Microsoft.NET.Test.Sdk 18.10.0,
  xunit 2.9.3, xunit.runner.visualstudio 4.0.0, coverlet.collector 10.0.1.
- Remove the no-op <InternalsVisibleTo Include="Tests" /> from Tests.csproj: it named the
  test project itself, and both tests drive the app through WebApplicationFactory and HTTP.
- Remove seven leftover _ContentIncludedByDefault Remove= entries naming view files that no
  longer exist in the folder.
- Null-conditional on ContentType in ConventionIntegrationTest, which fixes the CS8602 the
  retarget surfaces under <Nullable>enable</Nullable>.

Build clean with 0 warnings, 9 of 9 tests pass on SDK 10.0.302 / runtime 10.0.10.
---
 .../MapControllersVsMapControllerRoute.csproj    | 12 +-----------
 .../Tests/ConventionIntegrationTest.cs           |  2 +-
 .../Tests/Tests.csproj                           | 16 ++++++----------
 3 files changed, 8 insertions(+), 22 deletions(-)

diff --git a/aspnetcore-features/MapControllersMapControllerRouteSln/MapControllersVsMapControllerRoute/MapControllersVsMapControllerRoute.csproj b/aspnetcore-features/MapControllersMapControllerRouteSln/MapControllersVsMapControllerRoute/MapControllersVsMapControllerRoute.csproj
index b0e49d6f5e..9c54a73a08 100644
--- a/aspnetcore-features/MapControllersMapControllerRouteSln/MapControllersVsMapControllerRoute/MapControllersVsMapControllerRoute.csproj
+++ b/aspnetcore-features/MapControllersMapControllerRouteSln/MapControllersVsMapControllerRoute/MapControllersVsMapControllerRoute.csproj
@@ -1,21 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
     </PropertyGroup>
 
-    <ItemGroup>
-      <_ContentIncludedByDefault Remove="Views\Customers\Detail.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Customers\Index.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Customers\Order.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Customers\SpecialRoute.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Shared\Error.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Shared\_Layout.cshtml" />
-      <_ContentIncludedByDefault Remove="Views\Shared\_ValidationScriptsPartial.cshtml" />
-    </ItemGroup>
-
     <ItemGroup>
       <Folder Include="wwwroot\" />
     </ItemGroup>
diff --git a/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/ConventionIntegrationTest.cs b/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/ConventionIntegrationTest.cs
index 38a855db3e..625fb9f43e 100644
--- a/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/ConventionIntegrationTest.cs
+++ b/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/ConventionIntegrationTest.cs
@@ -23,6 +23,6 @@ public async Task WhenMapControllerRouteRun_ThenSuccess(string url)
 
         response.EnsureSuccessStatusCode(); // Status Code 200-299
         Assert.Equal("text/html; charset=utf-8", 
-            response.Content.Headers.ContentType.ToString());
+            response.Content.Headers.ContentType?.ToString());
     }
 }
\ No newline at end of file
diff --git a/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/Tests.csproj b/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/Tests.csproj
index 0f168d00d5..147bc95042 100644
--- a/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/Tests.csproj
+++ b/aspnetcore-features/MapControllersMapControllerRouteSln/Tests/Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net10.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
 
@@ -10,23 +10,19 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.0"/>
-        <PackageReference Include="xunit" Version="2.4.2"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="10.0.12" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.10.0"/>
+        <PackageReference Include="xunit" Version="2.9.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="4.0.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="10.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
 
-    <ItemGroup>
-        <InternalsVisibleTo Include="Tests" />
-    </ItemGroup>
-
     <ItemGroup>
       <ProjectReference Include="..\MapControllersVsMapControllerRoute\MapControllersVsMapControllerRoute.csproj" />
     </ItemGroup>