riganti · tomasherceg · Mar 16, 2025 · Mar 16, 2025 · Mar 16, 2025 · Mar 16, 2025
diff --git a/.github/setup/action.yml b/.github/setup/action.yml
@@ -36,7 +36,7 @@ runs:
     with:
       dotnet-version: |
         8.0.x
-        6.0.x
+        9.0.x
   - if: ${{ runner.os == 'Windows' }}
     uses: microsoft/setup-msbuild@v1.1
 

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -37,43 +37,43 @@ jobs:
 
     # framework
     - name: Core
-      run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
     - name: Framework
-      run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Framework/Framework --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
     - name: Testing
-      run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Framework/Testing --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # hosting
     - name: Hosting.AspNetCore
-      run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Framework/Hosting.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # command-line
     - name: CommandLine
-      run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net6.0 /WarnAsError
+      run: dotnet build src/Tools/CommandLine --configuration ${{ matrix.configuration }} --no-restore --framework net8.0 /WarnAsError
 
     # swashbuckle
     - name: Api.Swashbuckle.AspNetCore
-      run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Api/Swashbuckle.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # hot reload
     - name: HotReload.Common
-      run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Tools/HotReload/Common --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
     - name: HotReload.AspNetCore
-      run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Tools/HotReload/AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # application insights
     - name: Tracing.ApplicationInsights
-      run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Tracing/ApplicationInsights --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
     - name: Tracing.ApplicationInsights.AspNetCore
-      run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Tracing/ApplicationInsights.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # miniprofiler
     - name: Tracing.MiniProfiler.AspNetCore
-      run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/Tracing/MiniProfiler.AspNetCore --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
     # dynamic data
     - name: DynamicData
-      run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net6.0 /WarnAsError
+      run: dotnet build src/DynamicData/DynamicData --configuration ${{ matrix.configuration }} --no-restore --no-incremental --framework net8.0 /WarnAsError
 
   build-all:
     name: Build all projects without errors
@@ -125,15 +125,15 @@ jobs:
         title: Framework Tests
         github-token: ${{ secrets.GITHUB_TOKEN }}
         target-framework: net472
-    - name: Analyzers.Tests (net6.0)
+    - name: Analyzers.Tests (net8.0)
       uses: ./.github/unittest
       if: ${{ success() || failure() }}
       with:
         project: src/Analyzers/Analyzers.Tests
         name: analyzers-tests
         title: Analyzer Tests
         github-token: ${{ secrets.GITHUB_TOKEN }}
-        target-framework: net6.0
+        target-framework: net8.0
     # - name: Analyzers.Tests (net7.0)
     #   uses: ./.github/unittest
     #   with:

diff --git a/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj b/src/Analyzers/Analyzers.Tests/DotVVM.Analyzers.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
     <Nullable>enable</Nullable>

diff --git a/...Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj b/...Api/Swashbuckle.AspNetCore.Tests/DotVVM.Framework.Api.Swashbuckle.AspNetCore.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 

diff --git a/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj b/src/Api/Swashbuckle.AspNetCore/DotVVM.Framework.Api.Swashbuckle.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>$(DotnetCoreTargetVersion)</TargetFrameworks>
     <PackageId>DotVVM.Api.Swashbuckle.AspNetCore</PackageId>
     <Description>Swashbuckle.AspNetCore extensions for DotVVM.</Description>
   </PropertyGroup>

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -25,8 +25,12 @@
     <NoWarn>$(NoWarn);CS1591;CS1573</NoWarn>
     <Deterministic>true</Deterministic>
     <PreserveCompilationContext>true</PreserveCompilationContext>
-    <DefaultTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.1;net6.0;net472</DefaultTargetFrameworks>
-    <DefaultTargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.1;net6.0</DefaultTargetFrameworks>
+    <OldFrameworkTargetVersion>net472</OldFrameworkTargetVersion>
+    <DotnetCoreTargetVersion>net8.0</DotnetCoreTargetVersion>
+    <DotnetCoreLatestTargetVersion>net9.0</DotnetCoreLatestTargetVersion>
+    <!-- we keep netstandard2.1 target, because it quite reliably disallows using new .NET Core APIs which would other only fail on Windows -->
+    <DefaultTargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">netstandard2.1;$(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion)</DefaultTargetFrameworks>
+    <DefaultTargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">netstandard2.1;$(DotnetCoreTargetVersion);</DefaultTargetFrameworks>
     <DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
     <AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
   </PropertyGroup>

diff --git a/src/Framework/Core/DotVVM.Core.csproj b/src/Framework/Core/DotVVM.Core.csproj
@@ -16,10 +16,10 @@
     <EmbeddedResource Include="compiler\resources\**\*" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.1' ">
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.3.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net472' ">
     <Reference Include="System" />
@@ -28,6 +28,7 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
     <DefineConstants>$(DefineConstants);RELEASE</DefineConstants>

diff --git a/src/Framework/Framework/Compilation/DotvvmCompilationException.cs b/src/Framework/Framework/Compilation/DotvvmCompilationException.cs
@@ -91,12 +91,6 @@ public DotvvmCompilationException(DotvvmCompilationDiagnostic primaryError, IEnu
         }
 
         public DotvvmCompilationException(string message, IEnumerable<TokenBase>? tokens) : this(message, null, tokens) { }
-        protected DotvvmCompilationException(
-            SerializationInfo info,
-            StreamingContext context) : base(info, context)
-        {
-            CompilationError = new DotvvmCompilationDiagnostic(this.Message, DiagnosticSeverity.Error, null, innerException: this.InnerException);
-        }
 
         /// <summary> Creates a compilation error if the provided list of diagnostics contains an error. </summary>
         public static DotvvmCompilationException? TryCreateFromDiagnostics(IEnumerable<DotvvmCompilationDiagnostic> diagnostics)

diff --git a/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs b/src/Framework/Framework/Configuration/DotvvmConfigurationException.cs
@@ -102,9 +102,5 @@ private static void BuildControlsMessage(List<DotvvmConfigurationAssertResult<Do
                 }
             }
         }
-
-        protected DotvvmConfigurationException(SerializationInfo info, StreamingContext context) : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/Framework/Framework/DotVVM.Framework.csproj b/src/Framework/Framework/DotVVM.Framework.csproj
@@ -1,7 +1,7 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <AssemblyTitle>DotVVM</AssemblyTitle>
-    <TargetFrameworks>$(DefaultTargetFrameworks)</TargetFrameworks>
+    <TargetFrameworks>$(DefaultTargetFrameworks);$(DotnetCoreLatestTargetVersion)</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs b/src/Framework/Framework/Security/CorruptedCsrfTokenException.cs
@@ -9,9 +9,6 @@ public class CorruptedCsrfTokenException: Exception
     {
         /// If the client is supposed to retry the request after renewing the CSRF token by the <see cref="DotVVM.Framework.Hosting.Middlewares.DotvvmCsrfTokenMiddleware" />
         public bool RetryRequest { get; }
-        protected CorruptedCsrfTokenException(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
-        {
-        }
 
         public CorruptedCsrfTokenException(string message, bool retry = true) : base(message)
         {

diff --git a/src/Framework/Framework/Testing/TestCookieCollection.cs b/src/Framework/Framework/Testing/TestCookieCollection.cs
@@ -30,9 +30,5 @@ public TestCookieCollection(int capacity) : base(capacity)
         public TestCookieCollection(int capacity, IEqualityComparer<string> comparer) : base(capacity, comparer)
         {
         }
-
-        protected TestCookieCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
-        {
-        }
     }
 }
diff --git a/src/Framework/Framework/Testing/TestHeaderCollection.cs b/src/Framework/Framework/Testing/TestHeaderCollection.cs
@@ -31,10 +31,6 @@ public TestHeaderCollection(int capacity, IEqualityComparer<string> comparer) :
         {
         }
 
-        protected TestHeaderCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
-        {
-        }
-
         string? IHeaderCollection.this[string key]
         {
             get => this.TryGetValue(key, out var headers) ? string.Join("; ", headers) : null;

diff --git a/src/Framework/Framework/Testing/TestQueryCollection.cs b/src/Framework/Framework/Testing/TestQueryCollection.cs
@@ -31,10 +31,6 @@ public TestQueryCollection(int capacity, IEqualityComparer<string> comparer) : b
         {
         }
 
-        protected TestQueryCollection(System.Runtime.Serialization.SerializationInfo info, System.Runtime.Serialization.StreamingContext context) : base(info, context)
-        {
-        }
-
         public bool Equals(TestQueryCollection? other) =>
             Object.ReferenceEquals(this, other) ||
             other != null && other.OrderBy(k => k.Key).SequenceEqual(this.OrderBy(k => k.Key));

diff --git a/src/Framework/Framework/Utils/ReflectionUtils.cs b/src/Framework/Framework/Utils/ReflectionUtils.cs
@@ -478,7 +478,11 @@ public static Type MakeNullableType(this Type type)
                 return BoxingUtils.Zero;
             // see https://github.com/dotnet/runtime/issues/90697
             // notably we can't use Activator.CreateInstance, because C# now allows default constructors in structs
+#if DotNetCore
+            return RuntimeHelpers.GetUninitializedObject(type);
+#else
             return FormatterServices.GetUninitializedObject(type);
+#endif
         }
 
         public static Type UnwrapTaskType(this Type type)

diff --git a/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj b/src/Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFrameworks>netstandard2.1;net6.0</TargetFrameworks>
+    <TargetFrameworks>$(DotnetCoreTargetVersion)</TargetFrameworks>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <AssemblyOriginatorKeyFile>dotvvmwizard.snk</AssemblyOriginatorKeyFile>
     <SignAssembly>true</SignAssembly>

diff --git a/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs b/src/Framework/Hosting.AspNetCore/Hosting/DotvvmHeaderCollection.cs
@@ -76,7 +76,9 @@ public bool Remove(KeyValuePair<string, string[]> item)
         public bool IsReadOnly => OriginalHeaders.IsReadOnly;
         public void Add(string key, string[] value)
         {
+#pragma warning disable ASP0019 // Don't use Add to append headers
             OriginalHeaders.Add(key, new StringValues(value));
+#pragma warning restore ASP0019
         }
 
         public bool ContainsKey(string key)
@@ -115,4 +117,4 @@ protected static KeyValuePair<string, StringValues> ConvertKeyValuePair(KeyValue
             new KeyValuePair<string, StringValues>(toConvert.Key, new StringValues(toConvert.Value));
         #endregion
     }
-}
+}
diff --git a/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj b/src/Samples/Api.AspNetCore/DotVVM.Samples.BasicSamples.Api.AspNetCore.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj b/src/Samples/Api.AspNetCoreLatest/DotVVM.Samples.BasicSamples.Api.AspNetCoreLatest.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreLatestTargetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/...mples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj b/...mples/ApplicationInsights.AspNetCore/DotVVM.Samples.ApplicationInsights.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <ApplicationInsightsResourceId>/subscriptions/1f41fa3c-37d6-4b89-b5dc-913463de0d9a/resourcegroups/DotVVMWeb/providers/microsoft.insights/components/DotvvmTrackingPoints</ApplicationInsightsResourceId>
     <ApplicationInsightsAnnotationResourceId>/subscriptions/1f41fa3c-37d6-4b89-b5dc-913463de0d9a/resourcegroups/DotVVMWeb/providers/microsoft.insights/components/DotvvmTrackingPoints</ApplicationInsightsAnnotationResourceId>
   </PropertyGroup>

diff --git a/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj b/src/Samples/AspNetCore/DotVVM.Samples.BasicSamples.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj b/src/Samples/AspNetCoreLatest/DotVVM.Samples.BasicSamples.AspNetCoreLatest.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net8.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreLatestTargetVersion)</TargetFramework>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>

diff --git a/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj b/src/Samples/MiniProfiler.AspNetCore/DotVVM.Samples.MiniProfiler.AspNetCore.csproj
@@ -1,6 +1,6 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
   </PropertyGroup>
   <ItemGroup>
     <Content Include="**\*.dothtml" />
@@ -14,11 +14,11 @@
     <Content Include="Views\default.dotmaster" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.32" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.32" />
-    <PackageReference Include="MiniProfiler.AspNetCore" Version="4.2.22" />
-    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.2.22" />
-    <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.2.22" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="8.0.14" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.14" />
+    <PackageReference Include="MiniProfiler.AspNetCore" Version="4.5.4" />
+    <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.5.4" />
+    <PackageReference Include="MiniProfiler.EntityFrameworkCore" Version="4.5.4" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../../Tracing/MiniProfiler.AspNetCore/DotVVM.Tracing.MiniProfiler.AspNetCore.csproj" />

diff --git a/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj b/src/Samples/Tests/Abstractions/DotVVM.Testing.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj b/src/Samples/Tests/CompletenessChecker/DotVVM.Samples.Tests.CompletenessChecker.csproj
@@ -2,7 +2,7 @@
 <Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -19,4 +19,4 @@
     <None Include="App.config" />
   </ItemGroup>
 
-</Project>
+</Project>
diff --git a/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj b/src/Samples/Tests/Tests/DotVVM.Samples.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>$(DotnetCoreTargetVersion)</TargetFramework>
     <IsPackable>false</IsPackable>
 
     <!-- Use this to run agains local clone of the Selenium Utils repo -->

diff --git a/src/Tests/DotVVM.Framework.Tests.csproj b/src/Tests/DotVVM.Framework.Tests.csproj
@@ -13,8 +13,8 @@
   </PropertyGroup>
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">net8.0;net472</TargetFrameworks>
-    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">net8.0</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' == 'Windows_NT' ">$(DotnetCoreTargetVersion);$(OldFrameworkTargetVersion)</TargetFrameworks>
+    <TargetFrameworks Condition=" '$(OS)' != 'Windows_NT' ">$(DotnetCoreTargetVersion)</TargetFrameworks>
   </PropertyGroup>
   <PropertyGroup>
     <SignAssembly>true</SignAssembly>
@@ -30,17 +30,17 @@
     <ProjectReference Include="../Framework/Testing/DotVVM.Framework.Testing.csproj" />
     <ProjectReference Include="../AutoUI/Core/DotVVM.AutoUI.csproj" />
   </ItemGroup>
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net8.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' != '$(OldFrameworkTargetVersion)'">
     <DefineConstants>$(DefineConstants);DotNetCore</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net472'">
+  <ItemGroup Condition="'$(TargetFramework)' == '$(OldFrameworkTargetVersion)'">
     <ProjectReference Include="../Framework/Hosting.Owin/DotVVM.Framework.Hosting.Owin.csproj" />
     <PackageReference Include="CheckTestOutput" Version="0.6.3" />
     <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
     <PackageReference Include="System.Text.Encoding.CodePages" Version="6.0.0" />
     <Compile Remove="AspCore/CachingTests.cs" />
   </ItemGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
+  <ItemGroup Condition="'$(TargetFramework)' != '$(OldFrameworkTargetVersion)'">
     <ProjectReference Include="../Framework/Hosting.AspNetCore/DotVVM.Framework.Hosting.AspNetCore.csproj" />
     <PackageReference Include="CheckTestOutput" Version="0.6.3" />
   </ItemGroup>
-Original file line number
+Diff line change
@@ Expand Up / @@ -36,7 +36,7 @@ runs: @@
         with:
           dotnet-version: |
 .0.x
-.0.x
+.0.x
       - if: ${{ runner.os == 'Windows' }}
         uses: microsoft/setup-msbuild@v1.1
@@ Expand Down @@