Release/0.9.9 (#409)

* Upgraded nuget packages, added support and retargeted internal projects to net8.0.
dbExpression-team · Mar 24, 2024 · 1f2e51d · 1f2e51d
1 parent 97b27ce
commit 1f2e51d
Show file tree

Hide file tree

Showing 32 changed files with 161 additions and 122 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <Project>
 	<PropertyGroup>
-		<VersionPrefix>0.9.8</VersionPrefix>
-		<PackageReleaseNotes>See release notes at https://github.com/HatTrickLabs/dbExpression/releases/tag/v0.9.8</PackageReleaseNotes>	
+		<VersionPrefix>0.9.9</VersionPrefix>
+		<PackageReleaseNotes>See release notes at https://github.com/HatTrickLabs/dbExpression/releases/tag/v0.9.9</PackageReleaseNotes>	
 	</PropertyGroup>
 
 	<PropertyGroup>

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -29,12 +29,12 @@ parameters:
     default:
       # tfm, docker tag, pipeline name
       - [ 'net48', '4.8.1', 'net48' ]
-      - [ 'net7.0', '7.0', 'net7' ]
+      - [ 'net8.0', '8.0', 'net8' ]
   - name: integrationTestMatrix
     type: object
     default:
       # tfm, docker tag, pipeline name
-      - [ 'net7.0', '7.0', 'net7' ]
+      - [ 'net8.0', '8.0', 'net8' ]
   - name: mssqlVersions
     type: object
     default:
@@ -52,12 +52,12 @@ stages:
       displayName: 'Build and Package'
       steps:
       - task: UseDotNet@2
-        displayName: 'Install .NET 7 SDK'
+        displayName: 'Install .NET 8 SDK'
         inputs:
          packageType: 'sdk'
          # see: https://github.com/dotnet/sdk/pull/29065
          # Microsoft introduced a breaking change with 7.0.200 where nuget pack pointing to a sln breaks if --output is specified.  Pinning to SDK (not 7.0.*) to mitigate until MS provides documentation
-         version: '7.0.102' 
+         # version: '7.0.102' 
       - task: PowerShell@2
         displayName: 'Build and Package Solution'
         inputs:

diff --git a/benchmark/Benchmark.MsSql/Benchmark.MsSql.csproj b/benchmark/Benchmark.MsSql/Benchmark.MsSql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>disable</ImplicitUsings>
 		<Nullable>disable</Nullable>
@@ -18,19 +18,20 @@
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="BenchmarkDotNet" Version="0.13.5" />
-		<PackageReference Include="Dapper" Version="2.0.123" />
-		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.5.0" />
-		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.3" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.3">
+		<PackageReference Include="BenchmarkDotNet" Version="0.13.12" />
+		<PackageReference Include="Dapper" Version="2.1.35" />
+		<PackageReference Include="Microsoft.CodeAnalysis.Common" Version="4.9.2" />
+		<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="4.9.2" />
+		<PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
 			<PrivateAssets>all</PrivateAssets>
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="7.0.3" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.3" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/benchmark/Benchmark.MsSql/dbExpression/_dbExpression.Generated/DbExDataService.generated.cs b/benchmark/Benchmark.MsSql/dbExpression/_dbExpression.Generated/DbExDataService.generated.cs
@@ -2264,12 +2264,12 @@ public ISqlConnection GetConnection()
 
         public void ValidateRuntimeCompatibility(string runtimeVersion)
         {
-            string[] compatibleRuntimeVersions = new string[] { "0.9.8" };
+            string[] compatibleRuntimeVersions = new string[] { "0.9.8", "0.9.9" };
 
             if (!compatibleRuntimeVersions.Contains(runtimeVersion))
                 DbExpressionConfigurationException.ThrowUnsupportedRuntimeVersion(
                     runtimeVersion,
-                    templateVersion: "0.9.8",
+                    templateVersion: "0.9.9",
                     compatibleRuntimeVersions
             );
         }

diff --git a/benchmark/Profiling.MsSql/Generated/DbExDataService.generated.cs b/benchmark/Profiling.MsSql/Generated/DbExDataService.generated.cs
@@ -2264,12 +2264,12 @@ public ISqlConnection GetConnection()
 
         public void ValidateRuntimeCompatibility(string runtimeVersion)
         {
-            string[] compatibleRuntimeVersions = new string[] { "0.9.8" };
+            string[] compatibleRuntimeVersions = new string[] { "0.9.8", "0.9.9" };
 
             if (!compatibleRuntimeVersions.Contains(runtimeVersion))
                 DbExpressionConfigurationException.ThrowUnsupportedRuntimeVersion(
                     runtimeVersion,
-                    templateVersion: "0.9.8",
+                    templateVersion: "0.9.9",
                     compatibleRuntimeVersions
             );
         }

diff --git a/benchmark/Profiling.MsSql/Profiling.MsSql.csproj b/benchmark/Profiling.MsSql/Profiling.MsSql.csproj
@@ -2,21 +2,21 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="JetBrains.Profiler.SelfApi" Version="2.4.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+		<PackageReference Include="JetBrains.Profiler.SelfApi" Version="2.5.2" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/changelog.md b/changelog.md
@@ -1,5 +1,21 @@
 # Changelog
 
+## [0.9.9] - 2024-03-23
+
+### Added
+
+- .NET8 TFM support
+
+### Changed
+
+- Deprecated direct support for .NET6 TFM
+
+### Fixed
+
+- Updated Microsoft.Data.SqlClient to new version (Microsoft published a security update on previous version)
+
+### Breaking Changes
+
 ## [0.9.8] - 2023-07-19
 
 ### Added

diff --git a/docs/mssql/DocumentationExamples/DocumentationExamples.csproj b/docs/mssql/DocumentationExamples/DocumentationExamples.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>net7.0;net8.0</TargetFrameworks>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
@@ -14,10 +14,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/docs/mssql/DocumentationExamples/_Generated/DbExDataService.generated.cs b/docs/mssql/DocumentationExamples/_Generated/DbExDataService.generated.cs
@@ -2324,12 +2324,12 @@ public ISqlConnection GetConnection()
 
         public void ValidateRuntimeCompatibility(string runtimeVersion)
         {
-            string[] compatibleRuntimeVersions = new string[] { "0.9.8" };
+            string[] compatibleRuntimeVersions = new string[] { "0.9.8", "0.9.9" };
 
             if (!compatibleRuntimeVersions.Contains(runtimeVersion))
                 DbExpressionConfigurationException.ThrowUnsupportedRuntimeVersion(
                     runtimeVersion,
-                    templateVersion: "0.9.8",
+                    templateVersion: "0.9.9",
                     compatibleRuntimeVersions
             );
         }

diff --git a/samples/mssql/NetCoreConsoleApp/Data/_Generated/DbExDataService.generated.cs b/samples/mssql/NetCoreConsoleApp/Data/_Generated/DbExDataService.generated.cs
@@ -2264,12 +2264,12 @@ public ISqlConnection GetConnection()
 
         public void ValidateRuntimeCompatibility(string runtimeVersion)
         {
-            string[] compatibleRuntimeVersions = new string[] { "0.9.8" };
+            string[] compatibleRuntimeVersions = new string[] { "0.9.8", "0.9.9" };
 
             if (!compatibleRuntimeVersions.Contains(runtimeVersion))
                 DbExpressionConfigurationException.ThrowUnsupportedRuntimeVersion(
                     runtimeVersion,
-                    templateVersion: "0.9.8",
+                    templateVersion: "0.9.9",
                     compatibleRuntimeVersions
             );
         }

diff --git a/samples/mssql/NetCoreConsoleApp/NetCoreConsoleApp.csproj b/samples/mssql/NetCoreConsoleApp/NetCoreConsoleApp.csproj
@@ -2,16 +2,16 @@
 
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFrameworks>net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
 		<IsPackable>false</IsPackable>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
 	</ItemGroup>
 
 	<ItemGroup>

diff --git a/samples/mssql/ServerSideBlazorApp/Data/_Generated/DbExDataService.generated.cs b/samples/mssql/ServerSideBlazorApp/Data/_Generated/DbExDataService.generated.cs
@@ -2263,12 +2263,12 @@ public ISqlConnection GetConnection()
 
         public void ValidateRuntimeCompatibility(string runtimeVersion)
         {
-            string[] compatibleRuntimeVersions = new string[] { "0.9.8" };
+            string[] compatibleRuntimeVersions = new string[] { "0.9.8", "0.9.9" };
 
             if (!compatibleRuntimeVersions.Contains(runtimeVersion))
                 DbExpressionConfigurationException.ThrowUnsupportedRuntimeVersion(
                     runtimeVersion,
-                    templateVersion: "0.9.8",
+                    templateVersion: "0.9.9",
                     compatibleRuntimeVersions
             );
         }

diff --git a/samples/mssql/ServerSideBlazorApp/ServerSideBlazorApp.csproj b/samples/mssql/ServerSideBlazorApp/ServerSideBlazorApp.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0</TargetFrameworks>
+		<TargetFrameworks>net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<IsPackable>false</IsPackable>
@@ -27,13 +27,13 @@
 	</ItemGroup>
 
 	<ItemGroup>
-		<PackageReference Include="Blazorise.Charts" Version="1.2.1" />
-		<PackageReference Include="Blazorise.Components" Version="1.2.1" />
-		<PackageReference Include="Blazorise.DataGrid" Version="1.2.1" />
-		<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.2.1" />
-		<PackageReference Include="Blazorise.Icons.Material" Version="1.2.1" />
-		<PackageReference Include="Blazorise.Material" Version="1.2.1" />
-		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.4" />
+		<PackageReference Include="Blazorise.Charts" Version="1.5.0" />
+		<PackageReference Include="Blazorise.Components" Version="1.5.0" />
+		<PackageReference Include="Blazorise.DataGrid" Version="1.5.0" />
+		<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.5.0" />
+		<PackageReference Include="Blazorise.Icons.Material" Version="1.5.0" />
+		<PackageReference Include="Blazorise.Material" Version="1.5.0" />
+		<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="8.0.2" />
 	</ItemGroup>
 
 </Project>
diff --git a/....Extensions.DependencyInjection/HatTrick.DbEx.MsSql.Extensions.DependencyInjection.csproj b/....Extensions.DependencyInjection/HatTrick.DbEx.MsSql.Extensions.DependencyInjection.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <RootNamespace>Microsoft.Extensions.DependencyInjection</RootNamespace>
@@ -13,14 +13,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.1.0" />
+        <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
         <PackageReference Include="Microsoft.AspNetCore.Http.Abstractions" Version="2.2.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\HatTrick.DbEx.MsSql\HatTrick.DbEx.MsSql.csproj" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     </ItemGroup>
 
 </Project>
diff --git a/src/HatTrick.DbEx.MsSql/HatTrick.DbEx.MsSql.csproj b/src/HatTrick.DbEx.MsSql/HatTrick.DbEx.MsSql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+        <TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
         <LangVersion>latest</LangVersion>
         <Nullable>enable</Nullable>
         <IsPackable>true</IsPackable>
@@ -24,10 +24,10 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.1.0" />
-        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.2.0" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
         <ProjectReference Include="..\HatTrick.DbEx.Sql\HatTrick.DbEx.Sql.csproj" />
     </ItemGroup>
 

diff --git a/src/HatTrick.DbEx.Sql/HatTrick.DbEx.Sql.csproj b/src/HatTrick.DbEx.Sql/HatTrick.DbEx.Sql.csproj
@@ -1,21 +1,21 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>netstandard2.0;net6.0;net7.0</TargetFrameworks>
+		<TargetFrameworks>netstandard2.0;net7.0;net8.0</TargetFrameworks>
 		<LangVersion>latest</LangVersion>
 		<Nullable>enable</Nullable>
 		<IsPackable>true</IsPackable>
 		<Description>dbExpression is a database connector that enables fluent composition and execution of type safe SQL queries directly from Microsoft .NET.  This package is an abstract package not meant for direct references.  To use dbExpression, reference platform specific packages (i.e. HatTrick.DbEx.MsSql).</Description>
 	</PropertyGroup>
 
 	<ItemGroup>
-		<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.1.0" />
+		<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
 		<PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
         <!-- Keep this reference.  While not needed, any consumer of dbExpression will need it.  Save them the task of referencing -->
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
-        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.1" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.1" />
+		<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
 	</ItemGroup>
 
 	<ItemGroup>