From 68093d84fdf04046a0fd4b5c82ceba39af603f66 Mon Sep 17 00:00:00 2001
From: Shay Rojansky <roji@roji.org>
Date: Mon, 6 Mar 2023 15:23:47 +0100
Subject: [PATCH] Use Npgsql 8.0.0-preview.1

---
 build/dependencies.props                      | 32 +++++++++++++------
 src/Benchmarks/Benchmarks.csproj              | 17 +++++++++-
 .../TechEmpower/Minimal/Minimal.csproj        |  2 +-
 src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj |  4 +--
 .../PlatformBenchmarks.csproj                 |  4 +--
 5 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/build/dependencies.props b/build/dependencies.props
index 5ab6c8800..bf761fdb5 100644
--- a/build/dependencies.props
+++ b/build/dependencies.props
@@ -30,16 +30,19 @@
 
     <NpgsqlVersion50>5.0.5</NpgsqlVersion50>
     <NpgsqlVersion60>6.0.0</NpgsqlVersion60>
+    <NpgsqlVersion80>8.0.0-preview.1</NpgsqlVersion80>
 
     <MicrosoftDataSqlClientVersion60>4.0.0</MicrosoftDataSqlClientVersion60>
+    <MicrosoftDataSqlClientVersion80>5.1.0</MicrosoftDataSqlClientVersion80>
 
     <NpgsqlEntityFrameworkCorePostgreSQLVersion20>2.0.2</NpgsqlEntityFrameworkCorePostgreSQLVersion20>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion21>2.1.2</NpgsqlEntityFrameworkCorePostgreSQLVersion21>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion22>2.2.4</NpgsqlEntityFrameworkCorePostgreSQLVersion22>
     <NpgsqlEntityFrameworkCorePostgreSQLVersion30>3.0.1</NpgsqlEntityFrameworkCorePostgreSQLVersion30>
-    <NpgsqlEntityFrameworkCorePostgreSQLVersion31>3.1.11</NpgsqlEntityFrameworkCorePostgreSQLVersion31>
-    <NpgsqlEntityFrameworkCorePostgreSQLVersion50>5.0.6</NpgsqlEntityFrameworkCorePostgreSQLVersion50>
-    <NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.0</NpgsqlEntityFrameworkCorePostgreSQLVersion60>
+    <NpgsqlEntityFrameworkCorePostgreSQLVersion31>3.1.18</NpgsqlEntityFrameworkCorePostgreSQLVersion31>
+    <NpgsqlEntityFrameworkCorePostgreSQLVersion50>5.0.10</NpgsqlEntityFrameworkCorePostgreSQLVersion50>
+    <NpgsqlEntityFrameworkCorePostgreSQLVersion60>6.0.8</NpgsqlEntityFrameworkCorePostgreSQLVersion60>
+    <NpgsqlEntityFrameworkCorePostgreSQLVersion80>8.0.0-preview.1</NpgsqlEntityFrameworkCorePostgreSQLVersion80>
 
     <PomeloEntityFrameworkCoreMySqlVersion20>2.0.1</PomeloEntityFrameworkCoreMySqlVersion20>
     <PomeloEntityFrameworkCoreMySqlVersion21>2.1.4</PomeloEntityFrameworkCoreMySqlVersion21>
@@ -47,19 +50,22 @@
     <PomeloEntityFrameworkCoreMySqlVersion30>3.0.1</PomeloEntityFrameworkCoreMySqlVersion30>
     <PomeloEntityFrameworkCoreMySqlVersion31>3.1.1</PomeloEntityFrameworkCoreMySqlVersion31>
     <PomeloEntityFrameworkCoreMySqlVersion50>5.0.2</PomeloEntityFrameworkCoreMySqlVersion50>
-    <PomeloEntityFrameworkCoreMySqlVersion60>6.0.0-preview.7</PomeloEntityFrameworkCoreMySqlVersion60>
+    <PomeloEntityFrameworkCoreMySqlVersion60>6.0.2</PomeloEntityFrameworkCoreMySqlVersion60>
+    <PomeloEntityFrameworkCoreMySqlVersion80>7.0.0</PomeloEntityFrameworkCoreMySqlVersion80>
 
     <MicrosoftEntityFrameworkCoreSqlServerVersion30>3.0.3</MicrosoftEntityFrameworkCoreSqlServerVersion30>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion31>3.1.13</MicrosoftEntityFrameworkCoreSqlServerVersion31>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion50>5.0.10</MicrosoftEntityFrameworkCoreSqlServerVersion50>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.0</MicrosoftEntityFrameworkCoreSqlServerVersion60>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion31>3.1.32</MicrosoftEntityFrameworkCoreSqlServerVersion31>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion50>5.0.17</MicrosoftEntityFrameworkCoreSqlServerVersion50>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion60>6.0.14</MicrosoftEntityFrameworkCoreSqlServerVersion60>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion80>8.0.0-preview.1.23111.4</MicrosoftEntityFrameworkCoreSqlServerVersion80>
 
     <MicrosoftEntityFrameworkCoreSqliteVersion21>2.1.14</MicrosoftEntityFrameworkCoreSqliteVersion21>
     <MicrosoftEntityFrameworkCoreSqliteVersion22>2.2.6</MicrosoftEntityFrameworkCoreSqliteVersion22>
     <MicrosoftEntityFrameworkCoreSqliteVersion30>3.0.3</MicrosoftEntityFrameworkCoreSqliteVersion30>
-    <MicrosoftEntityFrameworkCoreSqliteVersion31>3.1.13</MicrosoftEntityFrameworkCoreSqliteVersion31>
-    <MicrosoftEntityFrameworkCoreSqliteVersion50>5.0.10</MicrosoftEntityFrameworkCoreSqliteVersion50>
-    <MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.0</MicrosoftEntityFrameworkCoreSqliteVersion60>
+    <MicrosoftEntityFrameworkCoreSqliteVersion31>3.1.32</MicrosoftEntityFrameworkCoreSqliteVersion31>
+    <MicrosoftEntityFrameworkCoreSqliteVersion50>5.0.17</MicrosoftEntityFrameworkCoreSqliteVersion50>
+    <MicrosoftEntityFrameworkCoreSqliteVersion60>6.0.14</MicrosoftEntityFrameworkCoreSqliteVersion60>
+    <MicrosoftEntityFrameworkCoreSqliteVersion80>8.0.0-preview.1.23111.4</MicrosoftEntityFrameworkCoreSqliteVersion80>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(TargetFramework) == 'netcoreapp2.1'">
@@ -74,4 +80,10 @@
   <PropertyGroup Condition="$(TargetFramework) == 'netcoreapp3.1'">
     <MicrosoftAspNetCoreAppPackageVersion>3.1.0</MicrosoftAspNetCoreAppPackageVersion>
   </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework) == 'net6.0'">
+    <MicrosoftAspNetCoreAppPackageVersion>6.0.14</MicrosoftAspNetCoreAppPackageVersion>
+  </PropertyGroup>
+  <PropertyGroup Condition="$(TargetFramework) == 'net8.0'">
+    <MicrosoftAspNetCoreAppPackageVersion>8.0.0-preview.1.23112.2</MicrosoftAspNetCoreAppPackageVersion>
+  </PropertyGroup>
 </Project>
diff --git a/src/Benchmarks/Benchmarks.csproj b/src/Benchmarks/Benchmarks.csproj
index 46b67804d..ce1b5f498 100644
--- a/src/Benchmarks/Benchmarks.csproj
+++ b/src/Benchmarks/Benchmarks.csproj
@@ -116,7 +116,7 @@
     <!--PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion50)" /-->
   </ItemGroup>
 
-  <ItemGroup Condition="$(TargetFramework) == 'net6.0' or $(TargetFramework) == 'net7.0' or $(TargetFramework) == 'net8.0' ">
+  <ItemGroup Condition="$(TargetFramework) == 'net6.0' or $(TargetFramework) == 'net7.0' ">
     <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
 
     <!-- Pinning version as the feeds don't include this anymore as of 4/25/2020 -->
@@ -131,6 +131,21 @@
     <!--PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion60)" /-->
   </ItemGroup>
 
+  <ItemGroup Condition="$(TargetFramework) == 'net8.0' ">
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(MicrosoftAspNetCoreAppPackageVersion)" />
+
+    <!-- Pinning version as the feeds don't include this anymore as of 4/25/2020 -->
+    <!-- <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="$(MicrosoftAspNetCoreAppPackageVersion)" /> -->
+    <!-- <PackageReference Include="Microsoft.AspNetCore.Server.IntegrationTesting.IIS" Version="5.0.0-preview.6.20303.1" /> -->
+
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="$(NpgsqlEntityFrameworkCorePostgreSQLVersion80)" />
+    <PackageReference Include="Npgsql" Version="$(NpgsqlVersion80)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="$(MicrosoftEntityFrameworkCoreSqlServerVersion80)" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="$(MicrosoftDataSqlClientVersion80)" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="$(MicrosoftEntityFrameworkCoreSqliteVersion80)" />
+    <!--PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="$(PomeloEntityFrameworkCoreMySqlVersion80)" /-->
+  </ItemGroup>
+
   <ItemGroup>
     <None Update="testCert.pfx">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
diff --git a/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj b/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj
index 0e0a1a318..74ecbd232 100644
--- a/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj
+++ b/src/BenchmarksApps/TechEmpower/Minimal/Minimal.csproj
@@ -8,7 +8,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Npgsql" Version="7.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.0-preview.1" />
     <PackageReference Include="Dapper" Version="2.0.123" />
   </ItemGroup>
 
diff --git a/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj b/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj
index 868bccbd7..ef4b8142c 100644
--- a/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj
+++ b/src/BenchmarksApps/TechEmpower/Mvc/Mvc.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
-    <PackageReference Include="Npgsql" Version="7.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.0-preview.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.1" />
   </ItemGroup>
 </Project>
diff --git a/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj b/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj
index d3fb12fd9..090ef4615 100644
--- a/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj
+++ b/src/BenchmarksApps/TechEmpower/PlatformBenchmarks/PlatformBenchmarks.csproj
@@ -43,8 +43,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="$(TargetFramework) == 'net8.0'">
-    <PackageReference Include="Npgsql" Version="7.0.1" />
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
+    <PackageReference Include="Npgsql" Version="8.0.0-preview.1" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.0-preview.1" />
   </ItemGroup>
 
 </Project>