From eb427baae1d67d24e1a44ca408185d8cce8bc84e Mon Sep 17 00:00:00 2001
From: Jeremy Knight <492328+jeremyknight-me@users.noreply.github.com>
Date: Thu, 29 Feb 2024 19:31:35 -0600
Subject: [PATCH] package upgrades (#108)
* added directory.build.props file
* upgraded nuget packages in test projects
* upgraded efcore sql server; removed support for .net standard in efcore sql server library
* upgraded nuget packages in ef core library and removed .net standard 2.0 support
* upgraded data.sql library nuget packages
---
src/Directory.Build.props | 11 +++++++++++
.../JK.Common.Abstractions.csproj | 6 ------
.../JK.Common.Data.Sql.Tests.csproj | 9 ++++-----
src/JK.Common.Data.Sql/CHANGELOG.md | 6 ++++++
.../JK.Common.Data.Sql.csproj | 5 +----
.../CHANGELOG.md | 10 ++++++++++
....Common.EntityFrameworkCore.SqlServer.csproj | 14 +++-----------
.../JK.Common.EntityFrameworkCore.Tests.csproj | 17 ++++++++---------
src/JK.Common.EntityFrameworkCore/CHANGELOG.md | 10 ++++++++++
.../JK.Common.EntityFrameworkCore.csproj | 15 ++++-----------
.../JK.Common.FluentValidation.Tests.csproj | 9 ++++-----
.../JK.Common.FluentValidation.csproj | 4 ----
src/JK.Common.Tests/JK.Common.Tests.csproj | 7 +++----
src/JK.Common.sln | 3 ++-
src/JK.Common/Data/ScalarOperationBase.cs | 8 ++++----
src/JK.Common/JK.Common.csproj | 6 ------
16 files changed, 70 insertions(+), 70 deletions(-)
create mode 100644 src/Directory.Build.props
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
new file mode 100644
index 0000000..a76a443
--- /dev/null
+++ b/src/Directory.Build.props
@@ -0,0 +1,11 @@
+
+
+ 12.0
+ disable
+ disable
+
+ Jeremy Knight
+ Jeremy Knight
+ Copyright Jeremy Knight. All rights reserved.
+
+
\ No newline at end of file
diff --git a/src/JK.Common.Abstractions/JK.Common.Abstractions.csproj b/src/JK.Common.Abstractions/JK.Common.Abstractions.csproj
index f52c6d4..4d90b0a 100644
--- a/src/JK.Common.Abstractions/JK.Common.Abstractions.csproj
+++ b/src/JK.Common.Abstractions/JK.Common.Abstractions.csproj
@@ -1,17 +1,11 @@
- 11.0
netstandard2.0;net6.0;net7.0;net8.0
- disable
- disable
true
False
- Copyright Jeremy Knight. All rights reserved.
1.1.0
Abstractions used in utility libraries which allows for less dependencies to be shared across projects.
-
- Jeremy Knight
https://github.com/jeremyknight-me/JK.Common
https://github.com/jeremyknight-me/JK.Common
diff --git a/src/JK.Common.Data.Sql.Tests/JK.Common.Data.Sql.Tests.csproj b/src/JK.Common.Data.Sql.Tests/JK.Common.Data.Sql.Tests.csproj
index 0c12120..f929b3c 100644
--- a/src/JK.Common.Data.Sql.Tests/JK.Common.Data.Sql.Tests.csproj
+++ b/src/JK.Common.Data.Sql.Tests/JK.Common.Data.Sql.Tests.csproj
@@ -1,19 +1,18 @@
- 12.0
net48;net6.0;net7.0;net8.0
false
-
-
-
+
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/JK.Common.Data.Sql/CHANGELOG.md b/src/JK.Common.Data.Sql/CHANGELOG.md
index b69ee4b..f2e5d2a 100644
--- a/src/JK.Common.Data.Sql/CHANGELOG.md
+++ b/src/JK.Common.Data.Sql/CHANGELOG.md
@@ -7,6 +7,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Unless otherwise noted, all changes made by [@jeremyknight-me](https://github.com/jeremyknight-me).
+## Unreleased
+
+### Changed
+
+- Upgraded `Microsoft.Data.SqlClient` to v5.2.0
+
## 5.2.0
### Added
diff --git a/src/JK.Common.Data.Sql/JK.Common.Data.Sql.csproj b/src/JK.Common.Data.Sql/JK.Common.Data.Sql.csproj
index 32c30c1..cf8bea3 100644
--- a/src/JK.Common.Data.Sql/JK.Common.Data.Sql.csproj
+++ b/src/JK.Common.Data.Sql/JK.Common.Data.Sql.csproj
@@ -1,11 +1,8 @@
- 12.0
netstandard2.0;net6.0;net7.0;net8.0
- Jeremy Knight
5.2.0
- Copyright Jeremy Knight. All rights reserved.
A utility library containing extensions to System.Data.SqlClient
LICENSE
https://github.com/jeremyknight-me/JK.Common
@@ -14,7 +11,7 @@
-
+
diff --git a/src/JK.Common.EntityFrameworkCore.SqlServer/CHANGELOG.md b/src/JK.Common.EntityFrameworkCore.SqlServer/CHANGELOG.md
index 51ba516..af8bdf5 100644
--- a/src/JK.Common.EntityFrameworkCore.SqlServer/CHANGELOG.md
+++ b/src/JK.Common.EntityFrameworkCore.SqlServer/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Unless otherwise noted, all changes made by [@jeremyknight-me](https://github.com/jeremyknight-me).
+## Unreleased
+
+### Changed
+
+- Updated `Microsoft.EntityFrameworkCore.SqlServer`
+
+### Removed
+
+- Support for .NET Standard 2.0
+
## 3.2.0
### Added
diff --git a/src/JK.Common.EntityFrameworkCore.SqlServer/JK.Common.EntityFrameworkCore.SqlServer.csproj b/src/JK.Common.EntityFrameworkCore.SqlServer/JK.Common.EntityFrameworkCore.SqlServer.csproj
index 7c7b1d0..ef179b0 100644
--- a/src/JK.Common.EntityFrameworkCore.SqlServer/JK.Common.EntityFrameworkCore.SqlServer.csproj
+++ b/src/JK.Common.EntityFrameworkCore.SqlServer/JK.Common.EntityFrameworkCore.SqlServer.csproj
@@ -1,30 +1,22 @@
- 12.0
- netstandard2.0;net6.0;net7.0;net8.0
+ net6.0;net7.0;net8.0
true
false
3.2.0
- Jeremy Knight
- Jeremy Knight
A utility library containing extensions to Microsoft.EntityFrameworkCore.SqlServer
- Copyright Jeremy Knight. All rights reserved.
LICENSE
https://github.com/jeremyknight-me/JK.Common
https://github.com/jeremyknight-me/JK.Common
-
+
-
-
-
-
-
+
diff --git a/src/JK.Common.EntityFrameworkCore.Tests/JK.Common.EntityFrameworkCore.Tests.csproj b/src/JK.Common.EntityFrameworkCore.Tests/JK.Common.EntityFrameworkCore.Tests.csproj
index f391f7e..b0e069e 100644
--- a/src/JK.Common.EntityFrameworkCore.Tests/JK.Common.EntityFrameworkCore.Tests.csproj
+++ b/src/JK.Common.EntityFrameworkCore.Tests/JK.Common.EntityFrameworkCore.Tests.csproj
@@ -1,32 +1,31 @@
- 12.0
net6.0;net7.0;net8.0
false
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
+
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
+
+
-
-
+
+
diff --git a/src/JK.Common.EntityFrameworkCore/CHANGELOG.md b/src/JK.Common.EntityFrameworkCore/CHANGELOG.md
index 7e225b8..5d94de8 100644
--- a/src/JK.Common.EntityFrameworkCore/CHANGELOG.md
+++ b/src/JK.Common.EntityFrameworkCore/CHANGELOG.md
@@ -7,6 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
Unless otherwise noted, all changes made by [@jeremyknight-me](https://github.com/jeremyknight-me).
+## Unreleased
+
+### Changed
+
+- Updated `Microsoft.EntityFrameworkCore.SqlServer`
+
+### Removed
+
+- Support for .NET Standard 2.0
+
## 4.1.0
### Added
diff --git a/src/JK.Common.EntityFrameworkCore/JK.Common.EntityFrameworkCore.csproj b/src/JK.Common.EntityFrameworkCore/JK.Common.EntityFrameworkCore.csproj
index 4f14c42..e2df612 100644
--- a/src/JK.Common.EntityFrameworkCore/JK.Common.EntityFrameworkCore.csproj
+++ b/src/JK.Common.EntityFrameworkCore/JK.Common.EntityFrameworkCore.csproj
@@ -1,34 +1,27 @@
- 12.0
- netstandard2.0;net6.0;net7.0;net8.0
+ net6.0;net7.0;net8.0
true
false
A utility library containing extensions to Microsoft.EntityFrameworkCore
https://github.com/jeremyknight-me/JK.Common
4.1.0.0
4.1.0
- Jeremy Knight
LICENSE
- Copyright Jeremy Knight. All rights reserved.
https://github.com/jeremyknight-me/JK.Common
-
+
-
+
-
-
-
-
-
+
diff --git a/src/JK.Common.FluentValidation.Tests/JK.Common.FluentValidation.Tests.csproj b/src/JK.Common.FluentValidation.Tests/JK.Common.FluentValidation.Tests.csproj
index 6616f8d..81403c6 100644
--- a/src/JK.Common.FluentValidation.Tests/JK.Common.FluentValidation.Tests.csproj
+++ b/src/JK.Common.FluentValidation.Tests/JK.Common.FluentValidation.Tests.csproj
@@ -2,21 +2,20 @@
net6.0;net7.0;net8.0
- enable
false
-
+
-
-
+
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
-
+
runtime; build; native; contentfiles; analyzers; buildtransitive
all
diff --git a/src/JK.Common.FluentValidation/JK.Common.FluentValidation.csproj b/src/JK.Common.FluentValidation/JK.Common.FluentValidation.csproj
index fcac812..dbbb748 100644
--- a/src/JK.Common.FluentValidation/JK.Common.FluentValidation.csproj
+++ b/src/JK.Common.FluentValidation/JK.Common.FluentValidation.csproj
@@ -1,16 +1,12 @@
- 12.0
netstandard2.0;net6.0;net7.0;net8.0
true
false
3.1.0
LICENSE
A utility library containing extensions to FluentValidation
- Jeremy Knight
- Jeremy Knight
- Copyright Jeremy Knight. All rights reserved.
https://github.com/jeremyknight-me/JK.Common
https://github.com/jeremyknight-me/JK.Common
diff --git a/src/JK.Common.Tests/JK.Common.Tests.csproj b/src/JK.Common.Tests/JK.Common.Tests.csproj
index 22444d0..2f6871b 100644
--- a/src/JK.Common.Tests/JK.Common.Tests.csproj
+++ b/src/JK.Common.Tests/JK.Common.Tests.csproj
@@ -1,16 +1,15 @@
- 11.0
net48;net6.0;net7.0;net8.0
true
false
-
-
-
+
+
+
all
runtime; build; native; contentfiles; analyzers
diff --git a/src/JK.Common.sln b/src/JK.Common.sln
index 548af06..eafef97 100644
--- a/src/JK.Common.sln
+++ b/src/JK.Common.sln
@@ -6,6 +6,7 @@ MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{A59DA4E8-21AA-4D88-A452-6C8152C9FE07}"
ProjectSection(SolutionItems) = preProject
.editorconfig = .editorconfig
+ Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JK.Common", "JK.Common\JK.Common.csproj", "{AC77BD4A-BA38-449D-8647-F0B780CEF220}"
@@ -36,7 +37,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Common.EntityFrameworkCore.
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JK.Common.EntityFrameworkCore.SqlServer", "JK.Common.EntityFrameworkCore.SqlServer\JK.Common.EntityFrameworkCore.SqlServer.csproj", "{AC8AFA29-6989-4F3C-B1C8-4520DCF11A3C}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JK.Common.Abstractions", "JK.Common.Abstractions\JK.Common.Abstractions.csproj", "{BA8F0E82-64D4-4CBF-9675-7BB87582519B}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JK.Common.Abstractions", "JK.Common.Abstractions\JK.Common.Abstractions.csproj", "{BA8F0E82-64D4-4CBF-9675-7BB87582519B}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/src/JK.Common/Data/ScalarOperationBase.cs b/src/JK.Common/Data/ScalarOperationBase.cs
index a80b0a9..906d696 100644
--- a/src/JK.Common/Data/ScalarOperationBase.cs
+++ b/src/JK.Common/Data/ScalarOperationBase.cs
@@ -7,12 +7,12 @@ protected ScalarOperationBase(IAdoConnectionFactory connectionFactory)
{
}
- public TValue? Execute(TParameterModel parameterModel)
+ public TValue Execute(TParameterModel parameterModel)
{
using var command = this.MakeCommand(parameterModel);
this.OpenConnection();
var scalar = command.ExecuteScalar();
- return (TValue?)(scalar is null ? null : scalar);
+ return (TValue)(scalar is null ? null : scalar);
}
}
@@ -23,11 +23,11 @@ protected ScalarOperationBase(IAdoConnectionFactory connectionFactory)
{
}
- public TValue? Execute()
+ public TValue Execute()
{
using var command = this.MakeCommand();
this.OpenConnection();
var scalar = command.ExecuteScalar();
- return (TValue?)(scalar is null ? null : scalar);
+ return (TValue)(scalar is null ? null : scalar);
}
}
diff --git a/src/JK.Common/JK.Common.csproj b/src/JK.Common/JK.Common.csproj
index ef71de6..3f4b1c0 100644
--- a/src/JK.Common/JK.Common.csproj
+++ b/src/JK.Common/JK.Common.csproj
@@ -1,17 +1,11 @@
- 11.0
netstandard2.0;net6.0;net7.0;net8.0
- disable
- disable
true
False
- Copyright Jeremy Knight. All rights reserved.
5.2.0
A utility library containing boilerplate code, extension methods, new classes, and/or improvements to existing classes.
-
- Jeremy Knight
https://github.com/jeremyknight-me/JK.Common
https://github.com/jeremyknight-me/JK.Common