Merge pull request #241 from Azure/dotnet-8.0

Add .Net 8.0 Support
Azure · Jan 18, 2024 · 9a646aa · 9a646aa
2 parents dfa76bc + 3ee478a
commit 9a646aa
Show file tree

Hide file tree

Showing 18 changed files with 35 additions and 12 deletions.
diff --git a/Samples/Dapper/ElasticDapper.csproj b/Samples/Dapper/ElasticDapper.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Build.props))\Build.props" />

diff --git a/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj b/Samples/EFCodeFirst/EntityFrameworkCodeFirst.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Build.props))\Build.props" />

diff --git a/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj b/Samples/EFMultiTenant/EntityFrameworkMultiTenant.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Build.props))\Build.props" />

diff --git a/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj b/Samples/ElasticScaleStarterKit/ElasticScaleStarterKit.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Build.props))\Build.props" />

diff --git a/Samples/ShardSqlCmd/ShardSqlCmd.csproj b/Samples/ShardSqlCmd/ShardSqlCmd.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory), Build.props))\Build.props" />

diff --git a/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj b/Src/ElasticScale.Client/Microsoft.Azure.SqlDatabase.ElasticScale.Client.csproj
@@ -7,9 +7,9 @@
     <NeutralLanguage>en-US</NeutralLanguage>
     <Version>2.4.1-preview1</Version>
     <Authors>Microsoft</Authors>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <PackageTags>Microsoft;Elastic;Scale;Azure;SQL;DB;Database;Shard;Sharding;Management;Query;azureofficial</PackageTags>
-    <PackageReleaseNotes>Updated to net6.0 and migrated from System.Data.SqlClient to Microsoft.Data.SqlClient.</PackageReleaseNotes>
+    <PackageReleaseNotes>Added net8.0 support, updated dependent nuget packages to latest (due to CVEs)</PackageReleaseNotes>
     <PackageIcon>Icon.png</PackageIcon>
     <PackageProjectUrl>https://github.com/Azure/elastic-db-tools</PackageProjectUrl>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardAggregateException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardAggregateException.cs
@@ -60,6 +60,7 @@ public MultiShardAggregateException(Exception innerException)
         /// </summary>
         /// <param name="info">The object that holds the serialized object data.</param>
         /// <param name="context">The contextual information about the source or destination.</param>
+        [Obsolete]
         protected MultiShardAggregateException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -113,16 +114,19 @@ public MultiShardAggregateException(string message, IEnumerable<Exception> inner
             _innerExceptions = new ReadOnlyCollection<Exception>(exceptions);
         }
 
-#endregion Additional Constructors
+        #endregion Additional Constructors
 
-#region Serialization Support
+        #region Serialization Support
 
         /// <summary>
         /// Populates a SerializationInfo with the data needed to serialize the target object.
         /// </summary>
         /// <param name="info">The SerializationInfo to populate with data.</param>
         /// <param name="context">The destination (see StreamingContext) for this serialization.</param>
+        [Obsolete]
+#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
+#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member
         {
             base.GetObjectData(info, context);
             info.AddValue("InnerExceptions", _innerExceptions);

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardDataReaderClosedException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardDataReaderClosedException.cs
@@ -63,6 +63,7 @@ public MultiShardDataReaderClosedException()
         /// <param name="context">
         /// The StreamingContext that contains contextual information about the source or destination.
         /// </param>
+        [Obsolete]
         protected MultiShardDataReaderClosedException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardDataReaderInternalException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardDataReaderInternalException.cs
@@ -62,6 +62,7 @@ public MultiShardDataReaderInternalException(string message, Exception innerExce
         /// <param name="context">
         /// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
         /// </param>
+        [Obsolete]
         protected MultiShardDataReaderInternalException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardException.cs
@@ -121,6 +121,7 @@ public MultiShardException()
         /// <param name="context">
         /// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
         /// </param>
+        [Obsolete]
         protected MultiShardException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -136,7 +137,10 @@ protected MultiShardException(SerializationInfo info, StreamingContext context)
         /// </summary>
         /// <param name="info"><see cref="SerializationInfo"/> object to populate with data.</param>
         /// <param name="context">The destination <see cref=" StreamingContext"/> object for this serialization.</param>
+        [Obsolete]
+#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
+#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member
         {
             base.GetObjectData(info, context);
             info.AddValue("ShardLocation", _shardLocation);

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardPartialReadException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardPartialReadException.cs
@@ -79,6 +79,7 @@ public MultiShardPartialReadException()
         /// <param name="context">
         /// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
         /// </param>
+        [Obsolete]
         protected MultiShardPartialReadException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

diff --git a/Src/ElasticScale.Client/Query/Exceptions/MultiShardSchemaMismatchException.cs b/Src/ElasticScale.Client/Query/Exceptions/MultiShardSchemaMismatchException.cs
@@ -71,6 +71,7 @@ public MultiShardSchemaMismatchException()
         /// <param name="context">
         /// The <see cref="StreamingContext"/> that contains contextual information about the source or destination.
         /// </param>
+        [Obsolete]
         protected MultiShardSchemaMismatchException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

diff --git a/Src/ElasticScale.Client/ShardManagement/SchemaInformation/SchemaInfoException.cs b/Src/ElasticScale.Client/ShardManagement/SchemaInformation/SchemaInfoException.cs
@@ -81,6 +81,7 @@ public SchemaInfoException(SchemaInfoErrorCode code, string message, Exception i
         /// </summary>
         /// <param name="info">The object that holds the serialized object data</param>
         /// <param name="context">The contextual information about the source or destination</param>
+        [Obsolete]
         private SchemaInfoException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -92,7 +93,10 @@ private SchemaInfoException(SerializationInfo info, StreamingContext context)
         /// </summary>
         /// <param name="info">The SerializationInfo to populate with data.</param>
         /// <param name="context">The destination (see StreamingContext) for this serialization.</param>
+        [Obsolete]
+#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
+#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member
         {
             if (info != null)
             {

diff --git a/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardManagementException.cs b/Src/ElasticScale.Client/ShardManagement/ShardMapManager/ShardManagementException.cs
@@ -326,6 +326,7 @@ internal ShardManagementException(ShardManagementErrorCategory category, ShardMa
         /// </summary>
         /// <param name="info">The object that holds the serialized object data</param>
         /// <param name="context">The contextual information about the source or destination</param>
+        [Obsolete]
         private ShardManagementException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {
@@ -339,7 +340,10 @@ private ShardManagementException(SerializationInfo info, StreamingContext contex
         /// </summary>
         /// <param name="info">The SerializationInfo to populate with data.</param>
         /// <param name="context">The destination (see StreamingContext) for this serialization.</param>
+        [Obsolete]
+#pragma warning disable CS0809 // Obsolete member overrides non-obsolete member
         public override void GetObjectData(SerializationInfo info, StreamingContext context)
+#pragma warning restore CS0809 // Obsolete member overrides non-obsolete member
         {
             if (info != null)
             {

diff --git a/Src/ElasticScale.Client/ShardManagement/Store/StoreException.cs b/Src/ElasticScale.Client/ShardManagement/Store/StoreException.cs
@@ -71,6 +71,7 @@ internal StoreException(string format, Exception inner, params object[] args)
         /// </summary>
         /// <param name="info">The object that holds the serialized object data</param>
         /// <param name="context">The contextual information about the source or destination</param>
+        [Obsolete]
         private StoreException(SerializationInfo info, StreamingContext context)
             : base(info, context)
         {

diff --git a/...icScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj b/...icScale.ClientTestCommon/Microsoft.Azure.SqlDatabase.ElasticScale.ClientTestCommon.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
     <NoWarn>$(NoWarn);SYSLIB0011;</NoWarn>
   </PropertyGroup>
   <Import Project="$([MSBuild]::GetPathOfFileAbove('build.props'))" />

diff --git a/...sticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj b/...sticScale.Query.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.Query.UnitTests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <IsPackable>false</IsPackable>
     <NoWarn>$(NoWarn);CS8073;</NoWarn>
   </PropertyGroup>

diff --git a/...ement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj b/...ement.UnitTests/Microsoft.Azure.SqlDatabase.ElasticScale.ShardManagement.UnitTests.csproj
@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0</TargetFrameworks>
+    <EnableUnsafeBinaryFormatterSerialization>true</EnableUnsafeBinaryFormatterSerialization>
     <IsPackable>false</IsPackable>
     <NoWarn>0649;$(NoWarn)</NoWarn>
   </PropertyGroup>