[edit] upgrade all projects to .NET 10 and bump test/benchmark dependencies

i4004 · i4004 · commit 74d7a74e542c · 2026-06-26T09:45:13.000+05:00
- Target framework updated from net9.0 to net10.0 across all projects
- CI workflow updated to dotnet 10.0.x and net10.0 test framework
- VSCode launch/task configs updated to net10.0 output paths
- BenchmarkDotNet bumped to 0.15.*, Microsoft.NET.Test.Sdk to 18.7.*
- NUnit bumped to 4.6.*, NUnit3TestAdapter to 6.2.*
- Simplify.Web core deps bumped (Configuration.Binder/Json 10.0.9,
  Simplify.DI 4.3.0, Simplify.Templates 2.0.3, Simplify.System 1.6.3)
- SampleApp.WindowsServiceHosted: remove System.ServiceModel reference,
  bump Microsoft.AspNetCore to 2.3.11, Simplify.WindowsServices to 2.16.*
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -17,7 +17,7 @@ jobs:
         os: [ubuntu-latest, windows-2025-vs2026]
         include:
           - os: ubuntu-latest
-            test-framework-command: --framework net9.0
+            test-framework-command: --framework net10.0
 
     steps:
       - name: Code Checkout
@@ -26,7 +26,7 @@ jobs:
       - name: Install DotNet
         uses: actions/setup-dotnet@v5
         with:
-          dotnet-version: "9.0.x"
+          dotnet-version: "10.0.x"
 
       - name: Restore Dependencies
         run: dotnet restore
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Angular Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net9.0/SampleApp.Angular.dll",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net10.0/SampleApp.Angular.dll",
 			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
@@ -23,7 +23,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Angular Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net9.0/SampleApp.Angular.dll",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net10.0/SampleApp.Angular.dll",
 			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
@@ -41,8 +41,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Api Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net9.0/SampleApp.Api.dll",
-			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net9.0/",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net10.0/SampleApp.Api.dll",
+			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net10.0/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
 				"action": "openExternally",
@@ -58,8 +58,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Classic Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net9.0/SampleApp.Classic.dll",
-			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net9.0/",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net10.0/SampleApp.Classic.dll",
+			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net10.0/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
 				"action": "openExternally",
@@ -75,8 +75,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build",
-			"program": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net9.0/Simplify.Web.Benchmark.dll",
-			"cwd": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net9.0/",
+			"program": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net10.0/Simplify.Web.Benchmark.dll",
+			"cwd": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net10.0/",
 			"internalConsoleOptions": "openOnSessionStart"
 		},
 	]
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -12,11 +12,13 @@
 		"Krylkov",
 		"localizable",
 		"Loggable",
+		"msbuild",
 		"mscorlib",
 		"NETSTANDARD",
 		"OWIN",
 		"Redirector",
-		"registrator"
+		"registrator",
+		"snupkg"
 	],
 	"coverage-gutters.coverageFileNames": [
 		"lcov*.info"
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -54,7 +54,7 @@
 			"args": [
 				"test",
 				"-f",
-				"net9.0",
+				"net10.0",
 				"--filter",
 				"TestCategory!=\"Benchmark\"",
 				"/p:CollectCoverage=true",
diff --git a/src/SampleApps/SampleApp.Angular/Properties/PublishProfiles/Release.pubxml b/src/SampleApps/SampleApp.Angular/Properties/PublishProfiles/Release.pubxml
@@ -11,7 +11,7 @@
 		<PublishUrl>publish\</PublishUrl>
 		<WebPublishMethod>FileSystem</WebPublishMethod>
 		<SiteUrlToLaunchAfterPublish />
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<ProjectGuid>aca3aa9d-de1c-40fa-9e72-adb1bcb82e13</ProjectGuid>
 		<SelfContained>false</SelfContained>
 	</PropertyGroup>
diff --git a/src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj b/src/SampleApps/SampleApp.Angular/SampleApp.Angular.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
 
diff --git a/src/SampleApps/SampleApp.Api/SampleApp.Api.csproj b/src/SampleApps/SampleApp.Api/SampleApp.Api.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<ImplicitUsings>enable</ImplicitUsings>
diff --git a/src/SampleApps/SampleApp.Classic.Tests/SampleApp.Classic.Tests.csproj b/src/SampleApps/SampleApp.Classic.Tests/SampleApp.Classic.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 
 		<Authors>Alexander Krylkov</Authors>
 		<Product>Simplify</Product>
@@ -12,9 +12,9 @@
 		<ProjectReference Include="..\SampleApp.Classic\SampleApp.Classic.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.*" />
-		<PackageReference Include="NUnit" Version="4.3.*" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.6.*" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.*" />
+		<PackageReference Include="NUnit" Version="4.6.*" />
+		<PackageReference Include="NUnit3TestAdapter" Version="6.2.*" />
 		<PackageReference Include="Moq" Version="4.20.*" />
 	</ItemGroup>
 </Project>
diff --git a/src/SampleApps/SampleApp.Classic/SampleApp.Classic.csproj b/src/SampleApps/SampleApp.Classic/SampleApp.Classic.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net9.0</TargetFramework>
+		<TargetFramework>net10.0</TargetFramework>
 		<OutputType>Exe</OutputType>
 		<IsPackable>false</IsPackable>
 
diff --git a/src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj b/src/SampleApps/SampleApp.WindowsServiceHosted/SampleApp.WindowsServiceHosted.csproj
@@ -14,11 +14,8 @@
 		<ProjectReference Include="..\..\Simplify.Web\Simplify.Web.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<Reference Include="System.ServiceModel" />
-	</ItemGroup>
-	<ItemGroup>
-		<PackageReference Include="Microsoft.AspNetCore" Version="2.2.0" />
-		<PackageReference Include="Simplify.WindowsServices" Version="2.14.*" />
+		<PackageReference Include="Microsoft.AspNetCore" Version="2.3.11" />
+		<PackageReference Include="Simplify.WindowsServices" Version="2.16.*" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Update="Templates\Master.tpl">
diff --git a/src/Simplify.Web.Benchmark/Simplify.Web.Benchmark.csproj b/src/Simplify.Web.Benchmark/Simplify.Web.Benchmark.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0</TargetFrameworks>
+		<TargetFrameworks>net10.0</TargetFrameworks>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Optimize>true</Optimize>
 		<OutputType>Exe</OutputType>
@@ -14,6 +14,6 @@
 		<ProjectReference Include="..\Simplify.Web\Simplify.Web.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.*" />
+		<PackageReference Include="BenchmarkDotNet" Version="0.15.*" />
 	</ItemGroup>
 </Project>
diff --git a/src/Simplify.Web.Meta.Tests/Simplify.Web.Meta.Tests.csproj b/src/Simplify.Web.Meta.Tests/Simplify.Web.Meta.Tests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net48</TargetFrameworks>
+		<TargetFrameworks>net10.0;net48</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
diff --git a/src/Simplify.Web.RegistrationsTests/Simplify.Web.RegistrationsTests.csproj b/src/Simplify.Web.RegistrationsTests/Simplify.Web.RegistrationsTests.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net48</TargetFrameworks>
+		<TargetFrameworks>net10.0;net48</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
@@ -14,8 +14,8 @@
 		<ProjectReference Include="..\Simplify.Web\Simplify.Web.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.*" />
-		<PackageReference Include="NUnit" Version="4.3.*" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.6.*" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.*" />
+		<PackageReference Include="NUnit" Version="4.6.*" />
+		<PackageReference Include="NUnit3TestAdapter" Version="6.2.*" />
 	</ItemGroup>
 </Project>
diff --git a/src/Simplify.Web.Tests/Simplify.Web.Tests.csproj b/src/Simplify.Web.Tests/Simplify.Web.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net9.0;net48</TargetFrameworks>
+		<TargetFrameworks>net10.0;net48</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
@@ -14,16 +14,15 @@
 		<ProjectReference Include="..\Simplify.Web\Simplify.Web.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="coverlet.msbuild" Version="6.0.*" />
-		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.13.*" />
+		<PackageReference Include="coverlet.msbuild" Version="10.0.1" />
+		<PackageReference Include="Microsoft.NET.Test.Sdk" Version="18.7.*" />
 		<PackageReference Include="Moq" Version="4.20.*" />
-		<PackageReference Include="NUnit" Version="4.3.*" />
-		<PackageReference Include="NUnit3TestAdapter" Version="4.6.*" />
-		<PackageReference Include="Simplify.System" Version="1.6.2" />
+		<PackageReference Include="NUnit" Version="4.6.*" />
+		<PackageReference Include="NUnit3TestAdapter" Version="6.2.*" />
 		<PackageReference Include="Simplify.Xml" Version="1.4.*" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'net48' ">
-		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.2.2" />
+		<PackageReference Include="Microsoft.AspNetCore.Http" Version="2.3.11" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Remove="Templates\Test.tpl" />
diff --git a/src/Simplify.Web/CHANGELOG.md b/src/Simplify.Web/CHANGELOG.md
@@ -1,8 +1,28 @@
 # Changelog
 
+## [5.3.0] - 2026-06-26
+
+### Added
+
+- Explicit .NET 10 Support
+
+### Added
+
+- Removed .NET 6 Support
+
+### Dependencies
+
+- Microsoft.Extensions.Configuration.Binder bump to 10.0.9
+- Microsoft.Extensions.Configuration.Json bump to 10.0.9
+- Simplify.DI bump to 4.3
+- Simplify.Templates to 2.0.3
+- Simplify.System bump to 1.6.3
+- Simplify.String.Sources internal bump to 1.2.3
+- Simplify.Xml.Sources internal bump to 1.4.1
+
 ## [5.2.0] - 2026-06-01
 
-## Security
+### Security
 
 - StaticFiles: prevent path traversal by normalizing the resolved path with
   Path.GetFullPath, rejecting '..' / NUL sequences, and verifying containment
@@ -25,7 +45,7 @@
 
 - LanguageManager: language cookie switched from SameSite=None to Lax.
 
-## Fixed
+### Fixed
 
 - WebContext: pass leaveOpen:true to the StreamReader used to consume the
   request body so subsequent middleware/model binders can still read it;
@@ -46,7 +66,7 @@
   a ConcurrentDictionary cache and unify sync/async paths on a single
   SemaphoreSlim to avoid duplicate-add races.
 
-## Dependencies
+### Dependencies
 
 - Microsoft.Extensions.Configuration.Binder bump to 8.0.2
 - Simplify.DI bump to 4.2.11
diff --git a/src/Simplify.Web/Simplify.Web.csproj b/src/Simplify.Web/Simplify.Web.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;netstandard2.1;netstandard2.0</TargetFrameworks>
+		<TargetFrameworks>net10.0;netstandard2.1;netstandard2.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<WarningsAsErrors>nullable</WarningsAsErrors>
@@ -9,7 +9,7 @@
 		<SymbolPackageFormat>snupkg</SymbolPackageFormat>
 		<GenerateDocumentationFile>true</GenerateDocumentationFile>
 
-		<Version>5.2</Version>
+		<Version>5.3</Version>
 
 		<Description>Lightweight and fast .NET web-framework based on MVC and OWIN</Description>
 		<Product>Simplify</Product>
@@ -33,19 +33,19 @@
 	</ItemGroup>
 	<ItemGroup>
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.2" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-		<PackageReference Include="Simplify.DI" Version="4.2.11" />
-		<PackageReference Include="Simplify.Templates" Version="2.0.2" />
-		<PackageReference Include="Simplify.String.Sources" Version="1.2.2" PrivateAssets="All" />
-		<PackageReference Include="Simplify.System" Version="1.6.2" />
-		<PackageReference Include="Simplify.Xml.Sources" Version="1.4.0" PrivateAssets="All" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="10.0.9" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="10.0.9" />
+		<PackageReference Include="Simplify.DI" Version="4.3.0" />
+		<PackageReference Include="Simplify.Templates" Version="2.0.3" />
+		<PackageReference Include="Simplify.String.Sources" Version="1.2.3" PrivateAssets="All" />
+		<PackageReference Include="Simplify.System" Version="1.6.3" />
+		<PackageReference Include="Simplify.Xml.Sources" Version="1.4.1" PrivateAssets="All" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net10.0' ">
 		<FrameworkReference Include="Microsoft.AspNetCore.App" />
 	</ItemGroup>
 	<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' Or '$(TargetFramework)' == 'netstandard2.0' Or '$(TargetFramework)' == 'net48' ">
-		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.2.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.3.11" />
 	</ItemGroup>
 	<ItemGroup>
 		<None Include="..\..\images\icon.png" Pack="true" Visible="false" PackagePath="" />
diff --git a/src/Simplify.Web/StaticFiles/StaticFileResponseExtensions.cs b/src/Simplify.Web/StaticFiles/StaticFileResponseExtensions.cs
@@ -1,6 +1,5 @@
 using System;
 using Microsoft.AspNetCore.Http;
-using Simplify.System;
 using Simplify.Web.Http.Mime;
 using Simplify.Web.Http.ResponseTime;
 using Simplify.Web.StaticFiles.Context;
@@ -21,6 +20,6 @@ public static void SetNewReturningFileAttributes(this HttpResponse response, ISt
 	{
 		response.SetContentMimeType(context.RelativeFilePath);
 		response.SetLastModifiedTime(context.LastModificationTime);
-		response.Headers["Expires"] = new DateTimeOffset(TimeProvider.Current.Now.AddYears(1)).ToString("R");
+		response.Headers["Expires"] = new DateTimeOffset(Simplify.System.TimeProvider.Current.Now.AddYears(1)).ToString("R");
 	}
 }
