.NET 6.0

cincuranet · cincuranet · commit 4dd5b4cf6337 · 2021-11-12T11:06:39.000+01:00
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -24,11 +24,6 @@ jobs:
         with:
           dotnet-version: 6.0.x
 
-      - name: .NET 5.0
-        uses: actions/setup-dotnet@v1
-        with:
-          dotnet-version: 5.0.x
-
       - name: Build
         run: |
           try {
diff --git a/include.ps1 b/include.ps1
@@ -7,5 +7,5 @@ function Check-ExitCode() {
 }
 
 function Get-UsedTargetFramework() {
-	return 'net5.0'
+	return 'net6.0'
 }
diff --git a/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj b/src/EntityFramework.Firebird.Tests/EntityFramework.Firebird.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
@@ -11,7 +11,7 @@
 		<OutputType>Exe</OutputType>
 		<StartupObject>FirebirdSql.Data.TestsBase.Program</StartupObject>
 	</PropertyGroup>
-	<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
+	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
 		<None Remove="app.config" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/src/EntityFramework.Firebird.Tests/EntityFrameworkTestsBase.cs b/src/EntityFramework.Firebird.Tests/EntityFrameworkTestsBase.cs
@@ -27,7 +27,7 @@ public abstract class EntityFrameworkTestsBase : FbTestsBase
 	{
 		static EntityFrameworkTestsBase()
 		{
-#if NET5_0
+#if NET6_0
 			System.Data.Common.DbProviderFactories.RegisterFactory(FbProviderServices.ProviderInvariantName, FirebirdClientFactory.Instance);
 #endif
 			DbConfiguration.SetConfiguration(new FbTestDbContext.Conf());
diff --git a/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj b/src/FirebirdSql.Data.FirebirdClient.Tests/FirebirdSql.Data.FirebirdClient.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
diff --git a/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj b/src/FirebirdSql.Data.FirebirdClient/FirebirdSql.Data.FirebirdClient.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0</TargetFrameworks>
+		<TargetFrameworks>net48;netstandard2.0;netstandard2.1;net5.0;net6.0</TargetFrameworks>
 		<AssemblyName>FirebirdSql.Data.FirebirdClient</AssemblyName>
 		<RootNamespace>FirebirdSql.Data</RootNamespace>
 		<SignAssembly>true</SignAssembly>
@@ -47,6 +47,8 @@
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)'=='net5.0'">
 	</ItemGroup>
+	<ItemGroup Condition="'$(TargetFramework)'=='net6.0'">
+	</ItemGroup>
 	<ItemGroup>
 	  <PackageReference Include="ConfigureAwaitChecker.Analyzer" Version="5.0.0">
 	    <PrivateAssets>all</PrivateAssets>
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj b/src/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests/FirebirdSql.EntityFrameworkCore.Firebird.FunctionalTests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
diff --git a/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj b/src/FirebirdSql.EntityFrameworkCore.Firebird.Tests/FirebirdSql.EntityFrameworkCore.Firebird.Tests.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<GeneratePackageOnBuild>false</GeneratePackageOnBuild>
 		<SkipSourceLink>true</SkipSourceLink>
diff --git a/src/Perf/Perf.csproj b/src/Perf/Perf.csproj
@@ -1,7 +1,7 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net5.0</TargetFramework>
+		<TargetFramework>net6.0</TargetFramework>
 		<SkipSourceLink>true</SkipSourceLink>
 	</PropertyGroup>
 	<ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -7,5 +7,5 @@ function Check-ExitCode() {`
`7`	`7`	`}`
`8`	`8`
`9`	`9`	`function Get-UsedTargetFramework() {`
`10`		`- return 'net5.0'`
	`10`	`+ return 'net6.0'`
`11`	`11`	`}`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ public abstract class EntityFrameworkTestsBase : FbTestsBase`
`27`	`27`	`{`
`28`	`28`	`static EntityFrameworkTestsBase()`
`29`	`29`	`{`
`30`		`-#if NET5_0`
	`30`	`+#if NET6_0`
`31`	`31`	`System.Data.Common.DbProviderFactories.RegisterFactory(FbProviderServices.ProviderInvariantName, FirebirdClientFactory.Instance);`
`32`	`32`	`#endif`
`33`	`33`	`DbConfiguration.SetConfiguration(new FbTestDbContext.Conf());`