From aeb5520c6cbf3879d295635f4984f3f4e9bd6779 Mon Sep 17 00:00:00 2001
From: Oskar Dudycz <oskar.dudycz@gmail.com>
Date: Sun, 23 Jul 2023 12:44:44 +0200
Subject: [PATCH] Added support for .NET 6 Bumped to 0.7.0 Bumped packages
 version

---
 .github/workflows/build.dotnet.yml              |  7 ++++++-
 .../Ogooreck.Sample.Api.Tests.csproj            | 12 ++++++------
 ...eck.Sample.BusinessLogic.FSharp.Tests.fsproj | 11 ++++++-----
 .../Ogooreck.Sample.BusinessLogic.Tests.csproj  |  6 +++---
 src/Ogooreck/Ogooreck.csproj                    | 17 ++++++++++++-----
 5 files changed, 33 insertions(+), 20 deletions(-)

diff --git a/.github/workflows/build.dotnet.yml b/.github/workflows/build.dotnet.yml
index fa6a727..9e5546c 100644
--- a/.github/workflows/build.dotnet.yml
+++ b/.github/workflows/build.dotnet.yml
@@ -14,7 +14,12 @@ jobs:
             - name: Check Out Repo
               uses: actions/checkout@v3
 
-            - name: Install .NET
+            - name: Install .NET 6
+              uses: actions/setup-dotnet@v3
+              with:
+                  dotnet-version: "6.0.x"
+
+            - name: Install .NET 7
               uses: actions/setup-dotnet@v3
               with:
                   dotnet-version: "7.0.x"
diff --git a/src/Ogooreck.Sample.Api.Tests/Ogooreck.Sample.Api.Tests.csproj b/src/Ogooreck.Sample.Api.Tests/Ogooreck.Sample.Api.Tests.csproj
index 5271065..a7d1bb0 100644
--- a/src/Ogooreck.Sample.Api.Tests/Ogooreck.Sample.Api.Tests.csproj
+++ b/src/Ogooreck.Sample.Api.Tests/Ogooreck.Sample.Api.Tests.csproj
@@ -5,11 +5,11 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="FluentAssertions" Version="6.8.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.0" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
+        <PackageReference Include="FluentAssertions" Version="6.11.0" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="Microsoft.AspNetCore.TestHost" Version="7.0.9" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
@@ -22,7 +22,7 @@
 
 
     <ItemGroup>
-        <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.5.0">
+        <PackageReference Include="MarkdownSnippets.MsBuild" Version="24.5.1">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
diff --git a/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Ogooreck.Sample.BusinessLogic.FSharp.Tests.fsproj b/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Ogooreck.Sample.BusinessLogic.FSharp.Tests.fsproj
index 63f8361..e72770a 100644
--- a/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Ogooreck.Sample.BusinessLogic.FSharp.Tests.fsproj
+++ b/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Ogooreck.Sample.BusinessLogic.FSharp.Tests.fsproj
@@ -12,12 +12,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="FsCheck" Version="2.16.5" />
-        <PackageReference Include="FsCheck.Xunit" Version="2.16.5" />
+        <PackageReference Include="FsCheck" Version="2.16.6" />
+        <PackageReference Include="FsCheck.Xunit" Version="2.16.6" />
         <PackageReference Include="FSharp.UMX" Version="1.1.0" />
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
@@ -25,6 +25,7 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
+        <PackageReference Update="FSharp.Core" Version="7.0.300" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Ogooreck.Sample.BusinessLogic.Tests/Ogooreck.Sample.BusinessLogic.Tests.csproj b/src/Ogooreck.Sample.BusinessLogic.Tests/Ogooreck.Sample.BusinessLogic.Tests.csproj
index fd2f750..b37dbe7 100644
--- a/src/Ogooreck.Sample.BusinessLogic.Tests/Ogooreck.Sample.BusinessLogic.Tests.csproj
+++ b/src/Ogooreck.Sample.BusinessLogic.Tests/Ogooreck.Sample.BusinessLogic.Tests.csproj
@@ -9,9 +9,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
-        <PackageReference Include="xunit" Version="2.4.2" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.6.3" />
+        <PackageReference Include="xunit" Version="2.5.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.0">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
diff --git a/src/Ogooreck/Ogooreck.csproj b/src/Ogooreck/Ogooreck.csproj
index 0ea7d01..ab3dd9d 100644
--- a/src/Ogooreck/Ogooreck.csproj
+++ b/src/Ogooreck/Ogooreck.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <VersionPrefix>0.6.0</VersionPrefix>
-        <TargetFramework>net7.0</TargetFramework>
+        <VersionPrefix>0.7.0</VersionPrefix>
+        <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
         <GenerateAssemblyTitleAttribute>true</GenerateAssemblyTitleAttribute>
         <GenerateAssemblyDescriptionAttribute>true</GenerateAssemblyDescriptionAttribute>
         <GenerateAssemblyProductAttribute>true</GenerateAssemblyProductAttribute>
@@ -26,9 +26,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.0" />
-        <PackageReference Include="FluentAssertions" Version="6.8.0" />
-        <PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
+        <PackageReference Include="FluentAssertions" Version="6.11.0" />
+        <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="6.0.20" />
+    </ItemGroup>
+
+    <ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
+        <PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="7.0.9" />
     </ItemGroup>
 
 </Project>