From 3f70514c31bde2b9586989a98ecdce3fb14094f0 Mon Sep 17 00:00:00 2001
From: Sfurti-yb <sfurtisarah@gmail.com>
Date: Fri, 12 Jul 2024 13:32:24 +0530
Subject: [PATCH 1/2] Changed PackageIDs and AssemblyName for Nuget publish

---
 Directory.Packages.props                                    | 2 +-
 .../Npgsql.DependencyInjection.csproj                       | 4 +++-
 src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj  | 4 +++-
 src/Npgsql.NodaTime/Npgsql.NodaTime.csproj                  | 6 ++++--
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Directory.Packages.props b/Directory.Packages.props
index 2c3d303907..39f2ddb06f 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -12,7 +12,7 @@
     <!-- Compatibility -->
     <PackageVersion Include="System.Threading.Channels" Version="$(SystemVersion)" />
     <PackageVersion Include="System.Collections.Immutable" Version="$(SystemVersion)" />
-    <PackageVersion Include="System.Text.Json" Version="$(SystemVersion)" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.4" />
     <PackageVersion Include="System.Diagnostics.DiagnosticSource" Version="$(SystemVersion) " />
     <PackageVersion Include="Microsoft.Bcl.HashCode" Version="1.1.1" />
     <PackageVersion Include="System.Runtime.CompilerServices.Unsafe" Version="6.0.0" />
diff --git a/src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj b/src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj
index b3b92f69c6..fe9ad8ad9d 100644
--- a/src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj
+++ b/src/Npgsql.DependencyInjection/Npgsql.DependencyInjection.csproj
@@ -1,11 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
+        <PackageId>YBNpgsql.DependencyInjection</PackageId>
         <Authors>Shay Rojansky</Authors>
+        <AssemblyName>YBNpgsql.DependencyInjection</AssemblyName>
         <!-- DbDataSource was introduced to .NET in net7.0. Before that Npgsql has its own built-in copy. -->
         <TargetFrameworks Condition="'$(DeveloperBuild)' != 'True'">netstandard2.0;net7.0</TargetFrameworks>
         <TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFrameworks>
-        <PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;di;dependency injection</PackageTags>
+        <PackageTags>npgsql;postgresql;postgres;ado;ado.net;database;sql;di;dependency injection;yugabyte</PackageTags>
         <PackageReadmeFile>README.md</PackageReadmeFile>
     </PropertyGroup>
 
diff --git a/src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj b/src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj
index 2e9451a0d1..cdd5010a94 100644
--- a/src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj
+++ b/src/Npgsql.NetTopologySuite/Npgsql.NetTopologySuite.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <PackageId>YBNpgsql.NetTopologySuite</PackageId>
     <Authors>Shay Rojansky;Yoh Deadfall</Authors>
     <Description>NetTopologySuite plugin for Npgsql, allowing mapping of PostGIS geometry types to NetTopologySuite types.</Description>
-    <PackageTags>npgsql;postgresql;postgres;postgis;spatial;nettopologysuite;nts;ado;ado.net;database;sql</PackageTags>
+    <PackageTags>npgsql;postgresql;postgres;postgis;spatial;nettopologysuite;nts;ado;ado.net;database;sql;yugabyte</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <AssemblyName>YBNpgsql.NetTopologySuite</AssemblyName>
     <TargetFramework>netstandard2.0</TargetFramework>
     <TargetFramework Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFramework>
     <NoWarn>$(NoWarn);NU5104</NoWarn>
diff --git a/src/Npgsql.NodaTime/Npgsql.NodaTime.csproj b/src/Npgsql.NodaTime/Npgsql.NodaTime.csproj
index b4ce274125..7a7604aafb 100644
--- a/src/Npgsql.NodaTime/Npgsql.NodaTime.csproj
+++ b/src/Npgsql.NodaTime/Npgsql.NodaTime.csproj
@@ -1,9 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
+    <PackageId>YBNpgsql.NodaTime</PackageId>
     <Authors>Shay Rojansky</Authors>
-    <Description>NodaTime plugin for Npgsql, allowing mapping of PostgreSQL date/time types to NodaTime types.</Description>
-    <PackageTags>npgsql;postgresql;postgres;nodatime;date;time;ado;ado;net;database;sql</PackageTags>
+    <Description>NodaTime plugin for NpgsqlYugabyteDB, allowing mapping of YugabyteDB date/time types to NodaTime types.</Description>
+    <PackageTags>npgsql;postgresql;postgres;nodatime;date;time;ado;ado;net;database;sql;yugabytedb</PackageTags>
     <PackageReadmeFile>README.md</PackageReadmeFile>
+    <AssemblyName>YBNpgsql.NodaTime</AssemblyName>
     <TargetFrameworks Condition="'$(DeveloperBuild)' != 'True'">netstandard2.0;net6.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(DeveloperBuild)' == 'True'">net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);NPG9001</NoWarn> <!-- Converter-related APIs are experimental -->

From 2e50a7885f79ae5db052910db2614ff4530f3c62 Mon Sep 17 00:00:00 2001
From: Sfurti-yb <sfurtisarah@gmail.com>
Date: Fri, 12 Jul 2024 17:12:57 +0530
Subject: [PATCH 2/2] Setting allow preRelease to false

---
 global.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/global.json b/global.json
index 34fe4d4308..72d38cd273 100644
--- a/global.json
+++ b/global.json
@@ -2,6 +2,6 @@
   "sdk": {
     "version": "8.0.100",
     "rollForward": "latestMajor",
-    "allowPrerelease": true
+    "allowPrerelease": false
   }
 }
\ No newline at end of file