From 22904bff4af5e50a1d6e429559552bda8a122c16 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Thu, 18 Jan 2024 11:15:45 +0100 Subject: [PATCH 1/7] Add explicit version for major .NET version dependencies --- .../src/Microsoft.Data.SqlClient.csproj | 32 ++++++++++++------- ....Data.SqlClient.ManualTesting.Tests.csproj | 2 -- ...oft.Data.SqlClient.PerformanceTests.csproj | 1 - tools/props/Versions.props | 2 ++ tools/specs/Microsoft.Data.SqlClient.nuspec | 12 +++---- 5 files changed, 27 insertions(+), 22 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 371c7124c5..3510c1536a 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -985,28 +985,38 @@ Microsoft.Data.SqlClient.SqlMetaData.xml - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - + diff --git a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj index 52223a7bb4..6d567bcdb4 100644 --- a/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTesting.Tests.csproj @@ -338,8 +338,6 @@ - - diff --git a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj index 119f98e1c8..07e16ee318 100644 --- a/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj +++ b/src/Microsoft.Data.SqlClient/tests/PerformanceTests/Microsoft.Data.SqlClient.PerformanceTests.csproj @@ -21,7 +21,6 @@ - diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 2865446903..0b30291bf3 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -40,9 +40,11 @@ 5.0.0 5.2.0-preview1.23340.1 6.0.1 + 8.0.0 1.0.0 6.0.1 6.0.0 + 8.0.0 5.0.0 6.0.0 5.0.0 diff --git a/tools/specs/Microsoft.Data.SqlClient.nuspec b/tools/specs/Microsoft.Data.SqlClient.nuspec index eb1751e6f5..7891d5a8ee 100644 --- a/tools/specs/Microsoft.Data.SqlClient.nuspec +++ b/tools/specs/Microsoft.Data.SqlClient.nuspec @@ -45,11 +45,9 @@ When using NuGet 3.x this package requires at least version 3.4. - - - - - + + + @@ -60,12 +58,10 @@ When using NuGet 3.x this package requires at least version 3.4. - - - + From d5caea67e9a192e60470fac6776308fac77f3cbb Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 20 Jan 2024 11:18:59 +0100 Subject: [PATCH 2/7] Address review comments --- .../netcore/src/Microsoft.Data.SqlClient.csproj | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 3510c1536a..26af96aa3e 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -11,6 +11,7 @@ false netcoreapp netstandard + net8 Debug;Release; AnyCPU;x64;x86 $(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\ @@ -1002,7 +1003,7 @@ - + From 0e42388d6397c721323faea8e714e098a244f16c Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 20 Jan 2024 11:25:30 +0100 Subject: [PATCH 3/7] revert target group addition --- .../netcore/src/Microsoft.Data.SqlClient.csproj | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 26af96aa3e..3510c1536a 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -11,7 +11,6 @@ false netcoreapp netstandard - net8 Debug;Release; AnyCPU;x64;x86 $(ObjFolder)$(Configuration).$(Platform)\$(AssemblyName)\netcore\ @@ -1003,7 +1002,7 @@ - + From 89524fb80af8cbcd6be78255ca5de8b4956b0a92 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 20 Jan 2024 11:34:52 +0100 Subject: [PATCH 4/7] Make condition forward compatible --- .../netcore/src/Microsoft.Data.SqlClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 3510c1536a..6cdb9e1d31 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -1002,7 +1002,7 @@ - + From 9b45bc6f7552dabf4bbc1930b6e05f62f397dad1 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 20 Jan 2024 13:24:14 +0100 Subject: [PATCH 5/7] use special version.props file instead --- src/Directory.Build.props | 1 + .../netcore/src/Microsoft.Data.SqlClient.csproj | 6 +----- tools/props/Versions.props | 2 -- tools/props/VersionsNet8.props | 8 ++++++++ 4 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 tools/props/VersionsNet8.props diff --git a/src/Directory.Build.props b/src/Directory.Build.props index b686f9fe8f..ad26408745 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -73,6 +73,7 @@ + diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 6cdb9e1d31..2f93823be8 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -998,14 +998,10 @@ - + - - - - diff --git a/tools/props/Versions.props b/tools/props/Versions.props index 0b30291bf3..2865446903 100644 --- a/tools/props/Versions.props +++ b/tools/props/Versions.props @@ -40,11 +40,9 @@ 5.0.0 5.2.0-preview1.23340.1 6.0.1 - 8.0.0 1.0.0 6.0.1 6.0.0 - 8.0.0 5.0.0 6.0.0 5.0.0 diff --git a/tools/props/VersionsNet8.props b/tools/props/VersionsNet8.props new file mode 100644 index 0000000000..cbc10bb875 --- /dev/null +++ b/tools/props/VersionsNet8.props @@ -0,0 +1,8 @@ + + + + + 8.0.0 + 8.0.0 + + From 3d7e0186576c766d047258974192eaa7175d5335 Mon Sep 17 00:00:00 2001 From: DavoudEshtehari <61173489+DavoudEshtehari@users.noreply.github.com> Date: Mon, 22 Jan 2024 11:53:31 -0800 Subject: [PATCH 6/7] Update src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj --- .../netcore/src/Microsoft.Data.SqlClient.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj index 2f93823be8..57e72c2239 100644 --- a/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj +++ b/src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj @@ -1012,7 +1012,7 @@ - + From 34a118bcda1000b7e07c4f9b91d5c7f257d6bbae Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Tue, 23 Jan 2024 07:37:28 +0100 Subject: [PATCH 7/7] rename .props file --- src/Directory.Build.props | 2 +- tools/props/{VersionsNet8.props => VersionsNet8OrLater.props} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename tools/props/{VersionsNet8.props => VersionsNet8OrLater.props} (100%) diff --git a/src/Directory.Build.props b/src/Directory.Build.props index ad26408745..342937a1ca 100644 --- a/src/Directory.Build.props +++ b/src/Directory.Build.props @@ -73,7 +73,7 @@ - + diff --git a/tools/props/VersionsNet8.props b/tools/props/VersionsNet8OrLater.props similarity index 100% rename from tools/props/VersionsNet8.props rename to tools/props/VersionsNet8OrLater.props