Updated build scripts to support .NET 8

oskardudycz · May 3, 2024 · 2d07f6e · 2d07f6e
1 parent 498510e
commit 2d07f6e
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/.github/workflows/build.dotnet.yml b/.github/workflows/build.dotnet.yml
@@ -15,14 +15,19 @@ jobs:
               uses: actions/checkout@v3
 
             - name: Install .NET 6
-              uses: actions/setup-dotnet@v3
+              uses: actions/setup-dotnet@v4
               with:
                   dotnet-version: "6.0.x"
 
             - name: Install .NET 7
-              uses: actions/setup-dotnet@v3
+              uses: actions/setup-dotnet@v4
               with:
                   dotnet-version: "7.0.x"
 
-            - name: Restore NuGet packages
+            - name: Install .NET 8
+              uses: actions/setup-dotnet@v4
+              with:
+                  dotnet-version: "8.0.x"
+
+            - name: Build and Test
               run: ./build.sh test
diff --git a/.github/workflows/publish-nuget.yml b/.github/workflows/publish-nuget.yml
@@ -17,7 +17,7 @@ jobs:
               uses: actions/checkout@v3
 
             - name: Install .NET
-              uses: actions/setup-dotnet@v3
+              uses: actions/setup-dotnet@v4
               with:
                   dotnet-version: ${{ env.dotnet_core_version }}
 

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
-![Github Actions](https://github.com/oskardudycz/Ogooreck/actions/workflows/build.dotnet.yml/badge.svg?branch=main) [![blog](https://img.shields.io/badge/blog-event--driven.io-brightgreen)](https://event-driven.io/?utm_source=event_sourcing_net) [![blog](https://img.shields.io/badge/%F0%9F%9A%80-Architecture%20Weekly-important)](https://www.architecture-weekly.com/?utm_source=event_sourcing_net)
+[![Twitter Follow](https://img.shields.io/twitter/follow/oskar_at_net?style=social)](https://twitter.com/oskar_at_net) ![Github Actions](https://github.com/oskardudycz/Ogooreck/actions/workflows/build.dotnet.yml/badge.svg?branch=main) [![blog](https://img.shields.io/badge/blog-event--driven.io-brightgreen)](https://event-driven.io/?utm_source=event_sourcing_net) [![blog](https://img.shields.io/badge/%F0%9F%9A%80-Architecture%20Weekly-important)](https://www.architecture-weekly.com/?utm_source=event_sourcing_net)
 [![Nuget Package](https://badgen.net/nuget/v/ogooreck)](https://www.nuget.org/packages/Ogooreck/)
-[![Nuget](https://img.shields.io/nuget/dt/ogooreck)](https://www.nuget.org/packages/Ogooreck/) [![LinkedIn](https://img.shields.io/badge/LinkedIn-0077B5?style=for-the-badge&logo=linkedin&logoColor=white)](https://www.linkedin.com/in/oskardudycz/) 
+[![Nuget](https://img.shields.io/nuget/dt/ogooreck)](https://www.nuget.org/packages/Ogooreck/)
 
 # 🥒 Ogooreck
 

diff --git a/build.sh b/build.sh
@@ -2,10 +2,10 @@
 set -euo pipefail
 
 version="$(dotnet --version)"
-if [[ $version = 7.* ]]; then
-  target_framework="net7.0"
+if [[ $version = 8.* ]]; then
+  target_framework="net8.0"
 else
-  echo "BUILD FAILURE: .NET 7 SDK required to run build"
+  echo "BUILD FAILURE: .NET 8 SDK required to run build"
   exit 1
 fi
 

diff --git a/src/Ogooreck.Build/Ogooreck.Build.csproj b/src/Ogooreck.Build/Ogooreck.Build.csproj
@@ -2,13 +2,13 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net7.0</TargetFramework>
+        <TargetFramework>net8.0</TargetFramework>
         <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Bullseye" Version="4.2.0" />
-        <PackageReference Include="SimpleExec" Version="11.0.0" />
+        <PackageReference Include="Bullseye" Version="5.0.0" />
+        <PackageReference Include="SimpleExec" Version="12.0.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Deciders/BankAccount.fs b/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Deciders/BankAccount.fs
@@ -47,7 +47,7 @@ type BankAccount =
 
 let evolve bankAccount bankAccountEvent : BankAccount =
     match bankAccount, bankAccountEvent with
-    | Initial _, BankAccountOpened event ->
+    | Initial, BankAccountOpened event ->
         Open
             {| Id = event.BankAccountId
                Balance = 0M

diff --git a/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Deciders/BankAccountDecider.fs b/src/Ogooreck.Sample.BusinessLogic.FSharp.Tests/Deciders/BankAccountDecider.fs
@@ -33,7 +33,7 @@ let openBankAccount (command: OpenBankAccount) bankAccount : Event =
     match bankAccount with
     | Open _ -> invalidOp "Account is already opened!"
     | Closed _ -> invalidOp "Account is already closed!"
-    | Initial _ ->
+    | Initial ->
         BankAccountOpened
             { BankAccountId = command.BankAccountId
               AccountNumber = command.AccountNumber
@@ -44,7 +44,7 @@ let openBankAccount (command: OpenBankAccount) bankAccount : Event =
 
 let recordDeposit (command: RecordDeposit) bankAccount : Event =
     match bankAccount with
-    | Initial _ -> invalidOp "Account is not opened!"
+    | Initial -> invalidOp "Account is not opened!"
     | Closed _ -> invalidOp "Account is closed!"
     | Open state ->
         DepositRecorded
@@ -56,7 +56,7 @@ let recordDeposit (command: RecordDeposit) bankAccount : Event =
 
 let withdrawCashFromAtm (command: WithdrawCashFromAtm) bankAccount : Event =
     match bankAccount with
-    | Initial _ -> invalidOp "Account is not opened!"
+    | Initial -> invalidOp "Account is not opened!"
     | Closed _ -> invalidOp "Account is closed!"
     | Open state ->
         if (state.Balance < command.Amount) then
@@ -71,7 +71,7 @@ let withdrawCashFromAtm (command: WithdrawCashFromAtm) bankAccount : Event =
 
 let closeBankAccount (command: CloseBankAccount) bankAccount : Event =
     match bankAccount with
-    | Initial _ -> invalidOp "Account is not opened!"
+    | Initial -> invalidOp "Account is not opened!"
     | Closed _ -> invalidOp "Account is already closed!"
     | Open state ->
         BankAccountClosed