Add support for .NET 6 builds

mythz · mythz · commit 3a1b72e7a6ad · 2021-10-27T10:51:00.000+08:00
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -44,11 +44,11 @@
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <DefineConstants>$(DefineConstants);NET50</DefineConstants>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);NET6_0</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
   </PropertyGroup>
 
diff --git a/src/ServiceStack.OrmLite.Firebird/ServiceStack.OrmLite.Firebird.csproj b/src/ServiceStack.OrmLite.Firebird/ServiceStack.OrmLite.Firebird.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.Firebird</PackageId>
     <AssemblyName>ServiceStack.OrmLite.Firebird</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite.Firebird - Fast, code-first, config-free POCO ORM</Title>
     <PackageDescription>
       Light, simple and fast convention-based code-first POCO ORM for Firebird.
diff --git a/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj b/src/ServiceStack.OrmLite.MySql/ServiceStack.OrmLite.MySql.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.MySql</PackageId>
     <AssemblyName>ServiceStack.OrmLite.MySql</AssemblyName>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite.MySql - Fast, code-first, config-free POCO ORM</Title>
     <PackageDescription>
       Light, simple and fast convention-based code-first POCO ORM for MySQL.
diff --git a/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj b/src/ServiceStack.OrmLite.MySqlConnector/ServiceStack.OrmLite.MySqlConnector.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net452;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net452;netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>ServiceStack.OrmLite.MySqlConnector</AssemblyName>
     <PackageId>ServiceStack.OrmLite.MySqlConnector</PackageId>
     <RootNamespace>ServiceStack.OrmLite.MySql</RootNamespace>
diff --git a/src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj b/src/ServiceStack.OrmLite.Oracle/ServiceStack.OrmLite.Oracle.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>ServiceStack.OrmLite.Oracle</AssemblyName>
     <PackageId>ServiceStack.OrmLite.Oracle</PackageId>
     <Title>OrmLite.Oracle - Fast, code-first, config-free POCO ORM</Title>
@@ -22,6 +22,10 @@
     <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
   </ItemGroup>
 
+  <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+    <PackageReference Include="Oracle.ManagedDataAccess.Core" Version="2.19.120" />
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\ServiceStack.OrmLite\ServiceStack.OrmLite.csproj" />
     <PackageReference Include="ServiceStack.Common" Version="$(Version)" />
diff --git a/src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj b/src/ServiceStack.OrmLite.PostgreSQL/ServiceStack.OrmLite.PostgreSQL.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.PostgreSQL</PackageId>
     <AssemblyName>ServiceStack.OrmLite.PostgreSQL</AssemblyName>
-    <TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net461;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite.PostgreSQL - Fast, code-first, config-free POCO ORM</Title>
     <PackageDescription>
       Light, simple and fast convention-based code-first POCO ORM for PostgreSQL.
diff --git a/src/ServiceStack.OrmLite.SqlServer.Converters/ServiceStack.OrmLite.SqlServer.Converters.csproj b/src/ServiceStack.OrmLite.SqlServer.Converters/ServiceStack.OrmLite.SqlServer.Converters.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.SqlServer.Converters</PackageId>
     <AssemblyName>ServiceStack.OrmLite.SqlServer.Converters</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite.SqlServer.Converters - Converters for SQL Server Types</Title>
     <PackageDescription>
       Add OrmLite Converters for SQL Servers SqlGeography and SqlGeometry Types
diff --git a/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj b/src/ServiceStack.OrmLite.SqlServer.Data/ServiceStack.OrmLite.SqlServer.Data.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.SqlServer.Data</PackageId>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>ServiceStack.OrmLite.SqlServer.Data</AssemblyName>
     <RootNamespace>ServiceStack.OrmLite.SqlServer</RootNamespace>
     <Title>OrmLite.SqlServer - Fast, code-first, config-free POCO ORM</Title>
diff --git a/src/ServiceStack.OrmLite.SqlServer/ServiceStack.OrmLite.SqlServer.csproj b/src/ServiceStack.OrmLite.SqlServer/ServiceStack.OrmLite.SqlServer.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite.SqlServer</PackageId>
     <AssemblyName>ServiceStack.OrmLite.SqlServer</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite.SqlServer - Fast, code-first, config-free POCO ORM</Title>
     <PackageDescription>
       Light, simple and fast convention-based code-first POCO ORM for Sql Server.
@@ -22,4 +22,8 @@
     <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="System.Data.SqlClient" Version="4.8.2" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs b/src/ServiceStack.OrmLite.SqlServer/SqlServerOrmLiteDialectProvider.cs
@@ -13,7 +13,7 @@
 using ServiceStack.DataAnnotations;
 using ServiceStack.OrmLite.SqlServer.Converters;
 using ServiceStack.Text;
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
 using ApplicationException = System.InvalidOperationException;
 #endif
 
diff --git a/src/ServiceStack.OrmLite.Sqlite.Cil/ServiceStack.OrmLite.Sqlite.Cil.csproj b/src/ServiceStack.OrmLite.Sqlite.Cil/ServiceStack.OrmLite.Sqlite.Cil.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net5.0</TargetFramework>
+        <TargetFramework>net6.0</TargetFramework>
         <AssemblyName>ServiceStack.OrmLite.Sqlite</AssemblyName>
         <PackageId>ServiceStack.OrmLite.Sqlite.Cil</PackageId>
         <Title>OrmLite.Sqlite with SQLitePCLRaw CIL</Title>
diff --git a/src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj b/src/ServiceStack.OrmLite.Sqlite.Data/ServiceStack.OrmLite.Sqlite.Data.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>ServiceStack.OrmLite.Sqlite</AssemblyName>
     <PackageId>ServiceStack.OrmLite.Sqlite.Data</PackageId>
     <RootNamespace>ServiceStack.OrmLite.Sqlite</RootNamespace>
diff --git a/src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs b/src/ServiceStack.OrmLite.Sqlite/Converters/SqliteDateTimeConverter.cs
@@ -117,7 +117,7 @@ public override object FromDbValue(Type fieldType, object value)
 
             if (DateStyle == DateTimeKind.Utc)
             {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 //.NET Core returns correct Local time but as Unspecified so change to Local and Convert to UTC
                 dateTime = DateTime.SpecifyKind(dateTime, DateTimeKind.Local).ToUniversalTime();
 #else
diff --git a/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj b/src/ServiceStack.OrmLite.Sqlite/ServiceStack.OrmLite.Sqlite.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
     <AssemblyName>ServiceStack.OrmLite.Sqlite</AssemblyName>
     <PackageId>ServiceStack.OrmLite.Sqlite</PackageId>
     <Title>OrmLite.Sqlite - Fast, code-first, config-free POCO ORM</Title>
diff --git a/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs b/src/ServiceStack.OrmLite.Sqlite/SqliteOrmLiteDialectProviderBase.cs
@@ -28,7 +28,7 @@ protected SqliteOrmLiteDialectProviderBase()
             base.RegisterConverter<Guid>(new SqliteGuidConverter());
             base.RegisterConverter<bool>(new SqliteBoolConverter());
             base.RegisterConverter<byte[]>(new SqliteByteArrayConverter());
-#if NETSTANDARD2_0            
+#if NETSTANDARD2_0 || NET6_0            
             base.RegisterConverter<char>(new SqliteCharConverter());
 #endif
             this.Variables = new Dictionary<string, string>
@@ -114,7 +114,7 @@ public override IDbConnection CreateConnection(string connectionString, Dictiona
                         Directory.CreateDirectory(existingDir);
                     }
                 }
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 connString.AppendFormat(@"Data Source={0};", connectionString.Trim());
 #else
                 connString.AppendFormat(@"Data Source={0};Version=3;New=True;Compress=True;", connectionString.Trim());
diff --git a/src/ServiceStack.OrmLite/Converters/SpecialConverters.cs b/src/ServiceStack.OrmLite/Converters/SpecialConverters.cs
@@ -6,7 +6,7 @@
 using System.Reflection;
 using System.Runtime.Serialization;
 using ServiceStack.DataAnnotations;
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
 using System.Globalization;
 #endif
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteConfig.cs b/src/ServiceStack.OrmLite/OrmLiteConfig.cs
@@ -156,7 +156,7 @@ public static void ResetLogFactory(ILogFactory logFactory=null)
         
         public static bool DisableColumnGuessFallback { get; set; }
         public static bool StripUpperInLike { get; set; } 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
             = true;
 #endif
 
diff --git a/src/ServiceStack.OrmLite/OrmLiteContext.cs b/src/ServiceStack.OrmLite/OrmLiteContext.cs
@@ -3,7 +3,7 @@
 using System.Collections.Concurrent;
 using System.Collections.Generic;
 using System.Data;
-#if !NETSTANDARD2_0
+#if !NETSTANDARD2_0 && !NET6_0
 using System.Runtime.Remoting.Messaging;
 #endif
 using System.Threading;
@@ -23,7 +23,7 @@ public class OrmLiteContext
         [ThreadStatic]
         public static IDictionary ContextItems;
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
         AsyncLocal<IDictionary> localContextItems = new AsyncLocal<IDictionary>();
 #endif
 
@@ -40,7 +40,7 @@ public virtual IDictionary Items
 
         private IDictionary GetItems()
         {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
             if (UseThreadStatic)
                 return ContextItems;
 
@@ -63,14 +63,14 @@ private IDictionary GetItems()
 
         private IDictionary CreateItems(IDictionary items = null)
         {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 if (UseThreadStatic)
                 {
-                    ContextItems = items ?? (items = new Dictionary<object, object>());
+                    ContextItems = items ??= new Dictionary<object, object>();
                 }
                 else
                 {
-                    localContextItems.Value = items ?? (items = new ConcurrentDictionary<object, object>());
+                    localContextItems.Value = items ??= new ConcurrentDictionary<object, object>();
                 }
 #else                
             try
@@ -101,7 +101,7 @@ public void ClearItems()
             }
             else
             {
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 localContextItems.Value = new ConcurrentDictionary<object, object>();                
 #else                
                 CallContext.FreeNamedDataSlot(_key);
diff --git a/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj b/src/ServiceStack.OrmLite/ServiceStack.OrmLite.Core.csproj
@@ -4,7 +4,7 @@
     <PackageId>ServiceStack.OrmLite.Core</PackageId>
     <AssemblyName>ServiceStack.OrmLite</AssemblyName>
     <RootNamespace>ServiceStack.OrmLite</RootNamespace>
-    <TargetFrameworks>netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>netstandard2.0;net6.0</TargetFrameworks>
     <Title>ServiceStack.OrmLite .NET Standard 2.0</Title>
     <PackageDescription>
       .NET Standard 2.0 version of ServiceStack.OrmLite
@@ -29,4 +29,15 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
+    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj b/src/ServiceStack.OrmLite/ServiceStack.OrmLite.csproj
@@ -3,7 +3,7 @@
   <PropertyGroup>
     <PackageId>ServiceStack.OrmLite</PackageId>
     <AssemblyName>ServiceStack.OrmLite</AssemblyName>
-    <TargetFrameworks>net45;netstandard2.0</TargetFrameworks>
+    <TargetFrameworks>net45;netstandard2.0;net6.0</TargetFrameworks>
     <Title>OrmLite - Fast, code-first, config-free POCO ORM</Title>
     <PackageDescription>
       Common library for the Light, simple and fast convention-based code-first POCO, OrmLite.
@@ -35,4 +35,15 @@
     <PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />
   </ItemGroup>
 
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <PackageReference Include="System.Dynamic.Runtime" Version="4.3.0" />
+    <PackageReference Include="System.Reflection.Emit" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.7.0" />
+    <PackageReference Include="System.Reflection.TypeExtensions" Version="4.7.0" />
+    <PackageReference Include="System.Collections.NonGeneric" Version="4.3.0" />
+    <PackageReference Include="System.Xml.XmlDocument" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Primitives" Version="4.3.0" />
+    <PackageReference Include="System.ComponentModel.Annotations" Version="5.0.0" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/ServiceStack.OrmLite/SqlBuilder.cs b/src/ServiceStack.OrmLite/SqlBuilder.cs
@@ -69,7 +69,7 @@ public void AddDynamicParams(object cmdParams)
             public object CreateDynamicType()
             {
                 var assemblyName = new AssemblyName { Name = "tmpAssembly" };
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 var typeBuilder =
                     AssemblyBuilder.DefineDynamicAssembly(assemblyName, AssemblyBuilderAccess.Run)
                     .DefineDynamicModule("tmpModule")
@@ -144,7 +144,7 @@ public object CreateDynamicType()
 
                 ctorIL.Emit(OpCodes.Ret);
 
-#if NETSTANDARD2_0
+#if NETSTANDARD2_0 || NET6_0
                 var generetedType = typeBuilder.CreateTypeInfo().AsType();
 #else
                 var generetedType = typeBuilder.CreateType();
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
@@ -37,11 +37,11 @@
     <DefineConstants>$(DefineConstants);NETSTANDARD;NETSTANDARD2_1</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
-    <DefineConstants>$(DefineConstants);NET50</DefineConstants>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
+    <DefineConstants>$(DefineConstants);NET6_0</DefineConstants>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net5.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' OR '$(TargetFramework)' == 'netstandard2.1' OR '$(TargetFramework)' == 'netcoreapp3.1' OR '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
   </PropertyGroup>
 
diff --git a/tests/ServiceStack.OrmLite.MySql.Tests/ServiceStack.OrmLite.MySql.Tests.csproj b/tests/ServiceStack.OrmLite.MySql.Tests/ServiceStack.OrmLite.MySql.Tests.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-<!--    <TargetFrameworks>net472;net5.0</TargetFrameworks>-->
+<!--    <TargetFrameworks>net472;net6.0</TargetFrameworks>-->
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.OrmLite.MySql.Tests</AssemblyName>
     <OutputType>Library</OutputType>
diff --git a/tests/ServiceStack.OrmLite.MySqlConnector.Tests/ServiceStack.OrmLite.MySqlConnector.Tests.csproj b/tests/ServiceStack.OrmLite.MySqlConnector.Tests/ServiceStack.OrmLite.MySqlConnector.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.OrmLite.MySqlConnector.Tests</AssemblyName>
     <OutputType>Library</OutputType>
diff --git a/tests/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj b/tests/ServiceStack.OrmLite.Oracle.Tests/ServiceStack.OrmLite.Oracle.Tests.csproj
@@ -1,13 +1,13 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-<!--    <TargetFrameworks>net472;net5.0</TargetFrameworks>-->
+<!--    <TargetFrameworks>net472;net6.0</TargetFrameworks>-->
     <AssemblyName>ServiceStack.OrmLite.Oracle.Tests</AssemblyName>
     <PackageId>ServiceStack.OrmLite.Oracle.Tests</PackageId>
     <LangVersion>default</LangVersion>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <DefineConstants>$(DefineConstants);NETCORE_SUPPORT;NETCORE</DefineConstants>
   </PropertyGroup>
 
@@ -36,7 +36,7 @@
     <Reference Include="System.ComponentModel.DataAnnotations" />
   </ItemGroup>
 
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net5.0' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net6.0' ">
     <PackageReference Include="System.Runtime" Version="4.3.1" />
     <PackageReference Include="System.Runtime.Serialization.Xml" Version="4.3.0" />
     <PackageReference Include="System.Reflection" Version="4.3.0" />
diff --git a/tests/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj b/tests/ServiceStack.OrmLite.PostgreSQL.Tests/ServiceStack.OrmLite.PostgreSQL.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-<!--    <TargetFrameworks>net472;net5.0</TargetFrameworks>-->
+<!--    <TargetFrameworks>net472;net6.0</TargetFrameworks>-->
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.OrmLite.PostgreSQL.Tests</AssemblyName>
     <OutputType>Library</OutputType>
diff --git a/tests/ServiceStack.OrmLite.SqlServer.Tests/ServiceStack.OrmLite.SqlServer.Tests.csproj b/tests/ServiceStack.OrmLite.SqlServer.Tests/ServiceStack.OrmLite.SqlServer.Tests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <TargetFramework>net472</TargetFramework>
-<!--    <TargetFrameworks>net472;net5.0</TargetFrameworks>-->
+<!--    <TargetFrameworks>net472;net6.0</TargetFrameworks>-->
     <PackageId>ServiceStack.OrmLite.SqlServerTests</PackageId>
     <RootNamespace>ServiceStack.OrmLite.SqlServerTests</RootNamespace>
     <LangVersion>default</LangVersion>
diff --git a/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj b/tests/ServiceStack.OrmLite.SqliteTests/ServiceStack.OrmLite.SqliteTests.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net5.0</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0</TargetFrameworks>
     <DebugType>portable</DebugType>
     <AssemblyName>ServiceStack.OrmLite.SqliteTests</AssemblyName>
     <AssemblyTitle>ServiceStack.OrmLite.Sqlite32Tests</AssemblyTitle>
diff --git a/tests/ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj b/tests/ServiceStack.OrmLite.Tests.Setup/ServiceStack.OrmLite.Tests.Setup.csproj
diff --git a/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj b/tests/ServiceStack.OrmLite.Tests/ServiceStack.OrmLite.Tests.csproj
