Merge branch 'releases/7.x.x'

PawelGerr · Nov 13, 2024 · a8d888d · a8d888d
2 parents 158af73 + f9b2756
commit a8d888d
Show file tree

Hide file tree

Showing 18 changed files with 175 additions and 113 deletions.
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
@@ -25,13 +25,14 @@ jobs:
 
     steps:
 
-      - name: install .NET Core 7/8 SDKs
+      - name: install .NET Core 7/8/9 SDKs
         uses: actions/setup-dotnet@v2
         with:
           include-prerelease: false
           dotnet-version: |
             7.0.x
             8.0.x
+            9.0.x
 
       - name: checkout repository
         uses: actions/checkout@v3

diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
@@ -9,13 +9,14 @@ jobs:
 
     steps:
 
-      - name: install .NET Core 7/8 SDKs
+      - name: install .NET Core 7/8/9 SDKs
         uses: actions/setup-dotnet@v2
         with:
           include-prerelease: false
           dotnet-version: |
             7.0.x
             8.0.x
+            9.0.x
 
       - name: .NET info
         run: dotnet --info

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -13,7 +13,7 @@
       <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
       <RootNamespace>Thinktecture</RootNamespace>
       <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
-      <LangVersion>12.0</LangVersion>
+      <LangVersion>13.0</LangVersion>
       <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally> 
       <Nullable>enable</Nullable>
       <ImplicitUsings>enable</ImplicitUsings>

diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -1,28 +1,28 @@
-<Project>
-  <ItemGroup>
-    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
-    <PackageVersion Include="CsvHelper" Version="33.0.1" />
-    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
-    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
-    <PackageVersion Include="MessagePack" Version="2.5.192" />
-    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
-    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="8.0.10" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
-    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
-    <PackageVersion Include="NSubstitute" Version="5.3.0" />
-    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
-    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
-    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
-    <PackageVersion Include="xunit" Version="2.9.2" />
-    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
-  </ItemGroup>
+<Project>
+  <ItemGroup>
+    <PackageVersion Include="BenchmarkDotNet" Version="0.14.0" />
+    <PackageVersion Include="CsvHelper" Version="33.0.1" />
+    <PackageVersion Include="FluentAssertions" Version="6.12.2" />
+    <PackageVersion Include="JetBrains.Profiler.Api" Version="1.4.8" />
+    <PackageVersion Include="MessagePack" Version="2.5.192" />
+    <PackageVersion Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Analyzer.Testing" Version="1.1.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.CodeFix.Testing" Version="1.1.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.SourceGenerators.Testing" Version="1.1.2" />
+    <PackageVersion Include="Microsoft.CodeAnalysis.CSharp.Workspaces" Version="4.11.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0" />
+    <PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
+    <PackageVersion Include="NSubstitute" Version="5.3.0" />
+    <PackageVersion Include="NSubstitute.Analyzers.CSharp" Version="1.0.17" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+  </ItemGroup>
 </Project>
diff --git a/Thinktecture.Runtime.Extensions.sln b/Thinktecture.Runtime.Extensions.sln
@@ -82,6 +82,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extens
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore8.Tests", "test\Thinktecture.Runtime.Extensions.EntityFrameworkCore8.Tests\Thinktecture.Runtime.Extensions.EntityFrameworkCore8.Tests.csproj", "{6638BCDF-A0A1-4742-B611-A67946CFB803}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore9", "src\Thinktecture.Runtime.Extensions.EntityFrameworkCore9\Thinktecture.Runtime.Extensions.EntityFrameworkCore9.csproj", "{08F267E9-A291-4613-BB41-75F164E2415D}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Thinktecture.Runtime.Extensions.EntityFrameworkCore9.Tests", "test\Thinktecture.Runtime.Extensions.EntityFrameworkCore9.Tests\Thinktecture.Runtime.Extensions.EntityFrameworkCore9.Tests.csproj", "{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -188,6 +192,14 @@ Global
 		{6638BCDF-A0A1-4742-B611-A67946CFB803}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6638BCDF-A0A1-4742-B611-A67946CFB803}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{6638BCDF-A0A1-4742-B611-A67946CFB803}.Release|Any CPU.Build.0 = Release|Any CPU
+		{08F267E9-A291-4613-BB41-75F164E2415D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{08F267E9-A291-4613-BB41-75F164E2415D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{08F267E9-A291-4613-BB41-75F164E2415D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{08F267E9-A291-4613-BB41-75F164E2415D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -218,6 +230,8 @@ Global
 		{47D09BE4-27F2-4C1A-8797-E8AF64E1ACEA} = {AE711F89-41F2-4519-B20D-BA1FAB0EB364}
 		{C95464AC-EC8A-404A-A8BE-7D6B17F87D80} = {8F117684-7943-4DCE-8861-F2B854924837}
 		{6638BCDF-A0A1-4742-B611-A67946CFB803} = {AE711F89-41F2-4519-B20D-BA1FAB0EB364}
+		{08F267E9-A291-4613-BB41-75F164E2415D} = {8F117684-7943-4DCE-8861-F2B854924837}
+		{03AA88D5-6E6F-4D19-BC90-311ACC7A0BF6} = {AE711F89-41F2-4519-B20D-BA1FAB0EB364}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {1C34F508-A60B-4C0E-AFA0-0F4CFFB23603}

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "8.0.400",
+    "version": "9.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -7,8 +7,8 @@
    <Import Condition=" exists('$(ParentPropsFile)') " Project="$(ParentPropsFile)" />
 
    <PropertyGroup>
-       <TargetFrameworks>net8.0</TargetFrameworks>
-      <NoWarn>$(NoWarn);CS1591;CA1052;CA1062;CA1303;CA1707;CA1801;CA2000</NoWarn>
+       <TargetFrameworks>net9.0</TargetFrameworks>
+      <NoWarn>$(NoWarn);CS1591;CA1052;CA1062;CA1303;CA1707;CA1801;CA2000;NU1903</NoWarn>
       <IsPackable>false</IsPackable>
       <ImplicitUsings>disable</ImplicitUsings>
       <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>

diff --git a/...tensions.EntityFrameworkCore6/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.csproj b/...tensions.EntityFrameworkCore6/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.csproj
@@ -12,7 +12,7 @@
    </ItemGroup>
 
    <ItemGroup>
-      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="6.0.35" />
+      <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="6.0.36" />
    </ItemGroup>
 
 </Project>
diff --git a/...tensions.EntityFrameworkCore8/Thinktecture.Runtime.Extensions.EntityFrameworkCore8.csproj b/...tensions.EntityFrameworkCore8/Thinktecture.Runtime.Extensions.EntityFrameworkCore8.csproj
@@ -1,20 +1,20 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
-        <PackageTags>common;EntityFrameworkCore</PackageTags>
-        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\Thinktecture.Runtime.Extensions\Thinktecture.Runtime.Extensions.csproj"/>
-
-        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources\**\*.cs"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational"/>
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
+        <PackageTags>common;EntityFrameworkCore</PackageTags>
+        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Thinktecture.Runtime.Extensions\Thinktecture.Runtime.Extensions.csproj"/>
+
+        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources\**\*.cs"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" VersionOverride="8.0.11"/>
+    </ItemGroup>
+
+</Project>
diff --git a/...tensions.EntityFrameworkCore9/Thinktecture.Runtime.Extensions.EntityFrameworkCore9.csproj b/...tensions.EntityFrameworkCore9/Thinktecture.Runtime.Extensions.EntityFrameworkCore9.csproj
@@ -0,0 +1,20 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <Description>Extends Entity Framework Core to support some components from Thinktecture.Runtime.Extensions.</Description>
+        <PackageTags>common;EntityFrameworkCore</PackageTags>
+        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\Thinktecture.Runtime.Extensions\Thinktecture.Runtime.Extensions.csproj"/>
+
+        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Sources\**\*.cs"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" />
+    </ItemGroup>
+
+</Project>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
@@ -1,32 +1,33 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
-   <PropertyGroup>
-      <ParentPropsFile>$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))</ParentPropsFile>
-   </PropertyGroup>
+    <PropertyGroup>
+        <ParentPropsFile>$([MSBuild]::GetPathOfFileAbove('Directory.Build.props', '$(MSBuildThisFileDirectory)../'))</ParentPropsFile>
+    </PropertyGroup>
 
-   <Import Condition=" exists('$(ParentPropsFile)') " Project="$(ParentPropsFile)" />
+    <Import Condition=" exists('$(ParentPropsFile)') " Project="$(ParentPropsFile)"/>
 
-   <PropertyGroup>
-      <Nullable>disable</Nullable>
-      <IsPackable>false</IsPackable>
-      <ImplicitUsings>disable</ImplicitUsings>
-      <NoWarn>$(NoWarn);CS1591;CA1707</NoWarn>
-      <RootNamespace>Thinktecture.Runtime.Tests</RootNamespace>
-      <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
-   </PropertyGroup>
+    <PropertyGroup>
+        <Nullable>disable</Nullable>
+        <IsPackable>false</IsPackable>
+        <ImplicitUsings>disable</ImplicitUsings>
+        <NoWarn>$(NoWarn);CS1591;CA1707;NU1903;NETSDK1206;NU1904</NoWarn>
+        <RootNamespace>Thinktecture.Runtime.Tests</RootNamespace>
+        <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
+        <TargetFrameworks>net7.0;net8.0;net9.0</TargetFrameworks>
+    </PropertyGroup>
 
-   <ItemGroup>
-      <PackageReference Include="Microsoft.NET.Test.Sdk" />
-      <PackageReference Include="FluentAssertions" />
-      <PackageReference Include="NSubstitute" />
-      <PackageReference Include="NSubstitute.Analyzers.CSharp" />
-      <PackageReference Include="xunit" />
-      <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all" />
-   </ItemGroup>
+    <ItemGroup>
+        <PackageReference Include="Microsoft.NET.Test.Sdk"/>
+        <PackageReference Include="FluentAssertions"/>
+        <PackageReference Include="NSubstitute"/>
+        <PackageReference Include="NSubstitute.Analyzers.CSharp"/>
+        <PackageReference Include="xunit"/>
+        <PackageReference Include="xunit.runner.visualstudio" PrivateAssets="all"/>
+    </ItemGroup>
 
-   <ItemGroup>
-      <Using Include="FluentAssertions" />
-      <Using Include="Xunit" />
-   </ItemGroup>
+    <ItemGroup>
+        <Using Include="FluentAssertions"/>
+        <Using Include="Xunit"/>
+    </ItemGroup>
 
 </Project>
diff --git a/...ityFrameworkCore6.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.Tests.csproj b/...ityFrameworkCore6.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore6.Tests.csproj
@@ -11,7 +11,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="6.0.35" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="6.0.36" />
     </ItemGroup>
 
 </Project>
diff --git a/...ityFrameworkCore8.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore8.Tests.csproj b/...ityFrameworkCore8.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore8.Tests.csproj
@@ -1,22 +1,22 @@
-<Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
-        <TargetFrameworks>net8.0</TargetFrameworks>
-    </PropertyGroup>
-
-    <ItemGroup>
-        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore8\Thinktecture.Runtime.Extensions.EntityFrameworkCore8.csproj"/>
-        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer"/>
-        <ProjectReference Include="..\Thinktecture.Runtime.Extensions.Tests.Shared\Thinktecture.Runtime.Extensions.Tests.Shared.csproj"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources\**\*.cs"/>
-    </ItemGroup>
-
-    <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
-    </ItemGroup>
-
-</Project>
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore8\Thinktecture.Runtime.Extensions.EntityFrameworkCore8.csproj"/>
+        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer"/>
+        <ProjectReference Include="..\Thinktecture.Runtime.Extensions.Tests.Shared\Thinktecture.Runtime.Extensions.Tests.Shared.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources\**\*.cs"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" VersionOverride="8.0.11" />
+    </ItemGroup>
+
+</Project>
diff --git a/...ityFrameworkCore9.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore9.Tests.csproj b/...ityFrameworkCore9.Tests/Thinktecture.Runtime.Extensions.EntityFrameworkCore9.Tests.csproj
@@ -0,0 +1,22 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <DefineConstants>$(DefineConstants);COMPLEX_TYPES</DefineConstants>
+        <TargetFrameworks>net8.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.EntityFrameworkCore9\Thinktecture.Runtime.Extensions.EntityFrameworkCore9.csproj"/>
+        <ProjectReference Include="..\..\src\Thinktecture.Runtime.Extensions.SourceGenerator\Thinktecture.Runtime.Extensions.SourceGenerator.csproj" SetTargetFramework="TargetFramework=netstandard2.0" ReferenceOutputAssembly="false" OutputItemType="Analyzer"/>
+        <ProjectReference Include="..\Thinktecture.Runtime.Extensions.Tests.Shared\Thinktecture.Runtime.Extensions.Tests.Shared.csproj"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <Compile Include="..\Thinktecture.Runtime.Extensions.EntityFrameworkCore.Tests.Sources\**\*.cs"/>
+    </ItemGroup>
+
+    <ItemGroup>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" />
+    </ItemGroup>
+
+</Project>
diff --git a/...Runtime.Extensions.SourceGenerator.Tests/SourceGeneratorTests/SourceGeneratorTestsBase.cs b/...Runtime.Extensions.SourceGenerator.Tests/SourceGeneratorTests/SourceGeneratorTestsBase.cs
@@ -78,11 +78,8 @@ public static Dictionary<string, string> GetGeneratedOutputs<T>(string source, p
 
    protected static void AssertOutput(string output, string expectedOutput)
    {
-      if (Environment.NewLine == "\n")
-      {
-         output = output?.Replace("\r\n", Environment.NewLine);
-         expectedOutput = expectedOutput?.Replace("\r\n", Environment.NewLine);
-      }
+      output = output?.Replace("\r\n", "\n");
+      expectedOutput = expectedOutput?.Replace("\r\n", "\n");
 
       output.Should().Be(expectedOutput);
    }

diff --git a/test/Thinktecture.Runtime.Extensions.SourceGenerator.Tests/Verifiers/AnalyzerVerifier.cs b/test/Thinktecture.Runtime.Extensions.SourceGenerator.Tests/Verifiers/AnalyzerVerifier.cs
@@ -46,9 +46,12 @@ public AnalyzerTest(
          ExpectedDiagnostics.AddRange(expected);
 #if NET7
          ReferenceAssemblies = new ReferenceAssemblies("net7.0", new PackageIdentity("Microsoft.NETCore.App.Ref","7.0.0"), Path.Combine("ref", "7.0.0"));
-#else
+#elif NET8_0
          ReferenceAssemblies = new ReferenceAssemblies("net8.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.0"), Path.Combine("ref", "8.0.0"));
+#else
+         ReferenceAssemblies = new ReferenceAssemblies("net9.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "9.0.0"), Path.Combine("ref", "9.0.0"));
 #endif
+
          foreach (var additionalReference in additionalReferences)
          {
             TestState.AdditionalReferences.Add(additionalReference);

diff --git a/test/Thinktecture.Runtime.Extensions.SourceGenerator.Tests/Verifiers/CodeFixVerifier.cs b/test/Thinktecture.Runtime.Extensions.SourceGenerator.Tests/Verifiers/CodeFixVerifier.cs
@@ -71,9 +71,12 @@ public CodeFixTest(
          ExpectedDiagnostics.AddRange(expected);
 #if NET7
          ReferenceAssemblies = new ReferenceAssemblies("net7.0", new PackageIdentity("Microsoft.NETCore.App.Ref","7.0.0"), Path.Combine("ref", "7.0.0"));
-#else
+#elif NET8_0
          ReferenceAssemblies = new ReferenceAssemblies("net8.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "8.0.0"), Path.Combine("ref", "8.0.0"));
+#else
+         ReferenceAssemblies = new ReferenceAssemblies("net9.0", new PackageIdentity("Microsoft.NETCore.App.Ref", "9.0.0"), Path.Combine("ref", "9.0.0"));
 #endif
+
          foreach (var additionalReference in additionalReferences)
          {
             TestState.AdditionalReferences.Add(additionalReference);