upgrade to .net 8, update nugets, added "real-provder" mode example c…

…onfiguration
craigwardman · Feb 5, 2024 · bf204bb · bf204bb
1 parent a556723
commit bf204bb
Show file tree

Hide file tree

Showing 16 changed files with 57 additions and 39 deletions.
diff --git a/src/TestDataDefinitionFramework.Core/TestDataDefinitionFramework.Core.csproj b/src/TestDataDefinitionFramework.Core/TestDataDefinitionFramework.Core.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <Title>TestDataDefinitionFramework.Core</Title>
     <PackageId>TestDataDefinitionFramework.Core</PackageId>
     <PackageDescription>Core package for using the TestDataDefinitionFramework</PackageDescription>
-    <Version>2.0.2</Version>
+    <Version>3.0.0</Version>
     <Authors>Craig Wardman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/craigwardman/TestDataDefinitionFramework</PackageProjectUrl>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/TestDataDefinitionFramework.Docker/TestDataDefinitionFramework.Docker.csproj b/src/TestDataDefinitionFramework.Docker/TestDataDefinitionFramework.Docker.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <Title>TestDataDefinitionFramework.Docker</Title>
     <PackageId>TestDataDefinitionFramework.Docker</PackageId>
     <PackageDescription>Docker client wrapper used by TestDataDefinitionFramework extensions</PackageDescription>
-    <Version>2.0.1</Version>
+    <Version>3.0.0</Version>
     <Authors>Craig Wardman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/craigwardman/TestDataDefinitionFramework</PackageProjectUrl>
@@ -16,6 +16,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Docker.DotNet" Version="3.125.14" />
+    <PackageReference Include="Docker.DotNet" Version="3.125.15" />
   </ItemGroup>
 </Project>
diff --git a/src/TestDataDefinitionFramework.MongoDB/MongoBackingStore.cs b/src/TestDataDefinitionFramework.MongoDB/MongoBackingStore.cs
@@ -46,7 +46,7 @@ public async Task InitializeAsync()
             {
                 if (string.IsNullOrEmpty(ConnectionString))
                 {
-                    await DockerRunner.EnsureContainerIsRunningAsync("tddf-mongo", "mongo:4.0-xenial", 27017);
+                    await DockerRunner.EnsureContainerIsRunningAsync("tddf-mongo", "mongo:latest", 27017);
                     ConnectionString = "mongodb://localhost:27017";
                 }
 

diff --git a/src/TestDataDefinitionFramework.MongoDB/TestDataDefinitionFramework.MongoDB.csproj b/src/TestDataDefinitionFramework.MongoDB/TestDataDefinitionFramework.MongoDB.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <Title>TestDataDefinitionFramework.MongoDB</Title>
     <PackageId>TestDataDefinitionFramework.MongoDB</PackageId>
     <PackageDescription>MongoDB backing store extension for TestDataDefinitionFramework</PackageDescription>
-    <Version>2.0.1</Version>
+    <Version>3.0.0</Version>
     <Authors>Craig Wardman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/craigwardman/TestDataDefinitionFramework</PackageProjectUrl>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TestDataDefinitionFramework.Redis/RedisBackingStore.cs b/src/TestDataDefinitionFramework.Redis/RedisBackingStore.cs
@@ -48,7 +48,7 @@ public async Task InitializeAsync()
             {
                 if (string.IsNullOrEmpty(ConnectionString))
                 {
-                    await DockerRunner.EnsureContainerIsRunningAsync("tddf-redis", "redis:7.0.8-alpine", 6379);
+                    await DockerRunner.EnsureContainerIsRunningAsync("tddf-redis", "redis:alpine", 6379);
                     ConnectionString = "localhost";
                 }
 

diff --git a/src/TestDataDefinitionFramework.Redis/TestDataDefinitionFramework.Redis.csproj b/src/TestDataDefinitionFramework.Redis/TestDataDefinitionFramework.Redis.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <Title>TestDataDefinitionFramework.Redis</Title>
     <PackageId>TestDataDefinitionFramework.Redis</PackageId>
     <PackageDescription>Redis backing store extension for TestDataDefinitionFramework</PackageDescription>
-    <Version>1.0.1</Version>
+    <Version>2.0.0</Version>
     <Authors>Craig Wardman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/craigwardman/TestDataDefinitionFramework</PackageProjectUrl>
@@ -16,7 +16,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="StackExchange.Redis" Version="2.6.111" />
+    <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/TestDataDefinitionFramework.Sql/TestDataDefinitionFramework.Sql.csproj b/src/TestDataDefinitionFramework.Sql/TestDataDefinitionFramework.Sql.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <Title>TestDataDefinitionFramework.Sql</Title>
     <PackageId>TestDataDefinitionFramework.Sql</PackageId>
     <PackageDescription>Sql backing store extension for TestDataDefinitionFramework</PackageDescription>
-    <Version>2.0.1</Version>
+    <Version>3.0.0</Version>
     <Authors>Craig Wardman</Authors>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/craigwardman/TestDataDefinitionFramework</PackageProjectUrl>
@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
+    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
   </ItemGroup>
 
 </Project>
diff --git a/...xampleSut.Abstractions/TestDataDefinitionFramework.Testing.ExampleSut.Abstractions.csproj b/...xampleSut.Abstractions/TestDataDefinitionFramework.Testing.ExampleSut.Abstractions.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/....Testing.ExampleSut.MongoDB/TestDataDefinitionFramework.Testing.ExampleSut.MongoDB.csproj b/....Testing.ExampleSut.MongoDB/TestDataDefinitionFramework.Testing.ExampleSut.MongoDB.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
-    <PackageReference Include="MongoDB.Driver" Version="2.19.1" />
+    <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
+    <PackageReference Include="MongoDB.Driver" Version="2.23.1" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...work.Testing.ExampleSut.Redis/TestDataDefinitionFramework.Testing.ExampleSut.Redis.csproj b/...work.Testing.ExampleSut.Redis/TestDataDefinitionFramework.Testing.ExampleSut.Redis.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -10,9 +10,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-      <PackageReference Include="StackExchange.Redis" Version="2.6.111" />
+      <PackageReference Include="StackExchange.Redis" Version="2.7.17" />
     </ItemGroup>
 
 </Project>
diff --git a/...ramework.Testing.ExampleSut.Sql/TestDataDefinitionFramework.Testing.ExampleSut.Sql.csproj b/...ramework.Testing.ExampleSut.Sql/TestDataDefinitionFramework.Testing.ExampleSut.Sql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
@@ -10,9 +10,9 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Dapper" Version="2.0.123" />
-      <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="7.0.0" />
+      <PackageReference Include="Dapper" Version="2.1.28" />
+      <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.5" />
+      <PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="8.0.0" />
     </ItemGroup>
 
 </Project>
diff --git a/src/TestDataDefinitionFramework.Testing.ExampleSut/Infrastructure/SqlDataStoreConfig.cs b/src/TestDataDefinitionFramework.Testing.ExampleSut/Infrastructure/SqlDataStoreConfig.cs
@@ -7,7 +7,7 @@ public class SqlDataStoreConfig : ISqlDataStoreConfig
     {
         public SqlDataStoreConfig(IConfiguration configuration)
         {
-            ConnectionString = configuration.GetConnectionString("SqlServer");
+            ConnectionString = configuration.GetConnectionString("SqlServer") ?? string.Empty;
         }
 
         public string ConnectionString { get; set; }

diff --git a/...initionFramework.Testing.ExampleSut/TestDataDefinitionFramework.Testing.ExampleSut.csproj b/...initionFramework.Testing.ExampleSut/TestDataDefinitionFramework.Testing.ExampleSut.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
   </PropertyGroup>
 

diff --git a/...ionFramework.Testing.ExampleTests/TestDataDefinitionFramework.Testing.ExampleTests.csproj b/...ionFramework.Testing.ExampleTests/TestDataDefinitionFramework.Testing.ExampleTests.csproj
@@ -1,25 +1,35 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
 
     <IsPackable>false</IsPackable>
 
     <Nullable>enable</Nullable>
+
+    <Configurations>Debug;Release;Debug-RealProviderMode</Configurations>
+
+    <Platforms>AnyCPU</Platforms>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+    <DefineConstants></DefineConstants>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Debug-RealProviderMode' ">
     <DefineConstants>UseRealProvider</DefineConstants>
+    <DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
+    <Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="FluentAssertions" Version="6.11.0" />
-    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.9" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.13" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.5.0" />
-    <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.4.2" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0">
+    <PackageReference Include="FluentAssertions" Version="6.12.0" />
+    <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="6.0.0" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="8.0.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
+    <PackageReference Include="NUnit" Version="4.0.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>

diff --git a/src/global.json b/src/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.0",
+    "version": "8.0.0",
     "rollForward": "latestMajor",
     "allowPrerelease": false
   }

diff --git a/src/makefile b/src/makefile
@@ -0,0 +1,8 @@
+.PHONY: test
+.PHONY: test-real
+
+test:
+	dotnet test TestDataDefinitionFramework.Testing.ExampleTests/TestDataDefinitionFramework.Testing.ExampleTests.csproj
+
+test-real:
+	dotnet test TestDataDefinitionFramework.Testing.ExampleTests/TestDataDefinitionFramework.Testing.ExampleTests.csproj -c=Debug-RealProviderMode