From 3ac59dc82b40e4b0602de76eed01f67664439e65 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:03:15 +0000
Subject: [PATCH 1/8] upgrade to .net 7

---
 DragonFruit.Sakura/DragonFruit.Sakura.csproj | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/DragonFruit.Sakura/DragonFruit.Sakura.csproj b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
index 89b9ac0..f3661cd 100644
--- a/DragonFruit.Sakura/DragonFruit.Sakura.csproj
+++ b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
     <PropertyGroup>
-        <TargetFramework>net6.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
@@ -10,9 +10,9 @@
         <PackageReference Include="DragonFruit.Data" Version="2022.916.0" />
         <PackageReference Include="DragonFruit.Data.Serializers.SystemJson" Version="2022.916.0" />
         <PackageReference Include="Markdig" Version="0.30.3" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.9" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="6.0.9" />
-        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.9" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
         <PackageReference Include="MudBlazor" Version="6.0.15" />
         <PackageReference Include="Sentry.Serilog" Version="3.21.0" />
         <PackageReference Include="Serilog" Version="2.12.0" />

From f745d5c4316ec4a858d45653d8cfc362ec13c5bd Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:03:31 +0000
Subject: [PATCH 2/8] enable AOT compilation (release only)

---
 DragonFruit.Sakura/DragonFruit.Sakura.csproj | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/DragonFruit.Sakura/DragonFruit.Sakura.csproj b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
index f3661cd..2d60e54 100644
--- a/DragonFruit.Sakura/DragonFruit.Sakura.csproj
+++ b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
@@ -5,6 +5,11 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
+    
+    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
+        <Optimize>true</Optimize>
+        <RunAOTCompilation>true</RunAOTCompilation>
+    </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="DragonFruit.Data" Version="2022.916.0" />

From dc067a629583a5aff9ede9c8dc0564774c713225 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:03:42 +0000
Subject: [PATCH 3/8] update remaining dependencies

---
 DragonFruit.Sakura/DragonFruit.Sakura.csproj | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DragonFruit.Sakura/DragonFruit.Sakura.csproj b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
index 2d60e54..0ec3d9b 100644
--- a/DragonFruit.Sakura/DragonFruit.Sakura.csproj
+++ b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
@@ -14,12 +14,12 @@
     <ItemGroup>
         <PackageReference Include="DragonFruit.Data" Version="2022.916.0" />
         <PackageReference Include="DragonFruit.Data.Serializers.SystemJson" Version="2022.916.0" />
-        <PackageReference Include="Markdig" Version="0.30.3" />
+        <PackageReference Include="Markdig" Version="0.30.4" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="7.0.0" />
         <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="7.0.0" PrivateAssets="all" />
-        <PackageReference Include="MudBlazor" Version="6.0.15" />
-        <PackageReference Include="Sentry.Serilog" Version="3.21.0" />
+        <PackageReference Include="MudBlazor" Version="6.0.18" />
+        <PackageReference Include="Sentry.Serilog" Version="3.23.1" />
         <PackageReference Include="Serilog" Version="2.12.0" />
         <PackageReference Include="Serilog.Extensions.Logging" Version="3.1.0" />
         <PackageReference Include="Serilog.Sinks.BrowserConsole" Version="1.0.0" />

From db3d69c92a657522458af51bdeefd5ff5e278c41 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:06:24 +0000
Subject: [PATCH 4/8] Revert "enable AOT compilation (release only)"

This reverts commit f745d5c4316ec4a858d45653d8cfc362ec13c5bd.
---
 DragonFruit.Sakura/DragonFruit.Sakura.csproj | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/DragonFruit.Sakura/DragonFruit.Sakura.csproj b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
index 0ec3d9b..660222a 100644
--- a/DragonFruit.Sakura/DragonFruit.Sakura.csproj
+++ b/DragonFruit.Sakura/DragonFruit.Sakura.csproj
@@ -5,11 +5,6 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <LangVersion>10</LangVersion>
     </PropertyGroup>
-    
-    <PropertyGroup Condition="'$(Configuration)' == 'Release'">
-        <Optimize>true</Optimize>
-        <RunAOTCompilation>true</RunAOTCompilation>
-    </PropertyGroup>
 
     <ItemGroup>
         <PackageReference Include="DragonFruit.Data" Version="2022.916.0" />

From b9036ac0336d7694bd98752a76a2d7f46606e9c7 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:09:24 +0000
Subject: [PATCH 5/8] update workflows to use .net7

---
 .github/workflows/codequality.yaml | 2 +-
 .github/workflows/deploy.yml       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codequality.yaml b/.github/workflows/codequality.yaml
index 48c5800..0655689 100644
--- a/.github/workflows/codequality.yaml
+++ b/.github/workflows/codequality.yaml
@@ -15,7 +15,7 @@ jobs:
       - name: Install .NET 6.0.x
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "6.0.x"
+          dotnet-version: "7.0.x"
 
       - name: Restore Tools
         run: dotnet tool restore
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 973a660..234b827 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -32,7 +32,7 @@ jobs:
       - name: Setup .NET 6
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: '6.0.x'
+          dotnet-version: '7.0.x'
         
       - name: Restore NuGet Packages
         run: dotnet restore

From 54a2ea80500035aa6e3567700cfd652a58f2cb08 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:10:07 +0000
Subject: [PATCH 6/8] remove version from step name

---
 .github/workflows/deploy.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 234b827..b2702f8 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -29,7 +29,7 @@ jobs:
         with:
           fetch-depth: 0
 
-      - name: Setup .NET 6
+      - name: Setup .NET
         uses: actions/setup-dotnet@v2
         with:
           dotnet-version: '7.0.x'

From d98d7c35d3c4faba35e2f6ae891488e7e9a86c4e Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:10:24 +0000
Subject: [PATCH 7/8] apply changes to code quality

---
 .github/workflows/codequality.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codequality.yaml b/.github/workflows/codequality.yaml
index 0655689..12d3a2f 100644
--- a/.github/workflows/codequality.yaml
+++ b/.github/workflows/codequality.yaml
@@ -12,7 +12,7 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v2
             
-      - name: Install .NET 6.0.x
+      - name: Install .NET
         uses: actions/setup-dotnet@v1
         with:
           dotnet-version: "7.0.x"

From 93062c64eba626104ac1c5f0e318991cd1450516 Mon Sep 17 00:00:00 2001
From: Albie <albion@dragonfruit.network>
Date: Wed, 9 Nov 2022 20:15:15 +0000
Subject: [PATCH 8/8] install both .net 6 and .net 7 for code quality checks

---
 .github/workflows/codequality.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/codequality.yaml b/.github/workflows/codequality.yaml
index 12d3a2f..8e80d6a 100644
--- a/.github/workflows/codequality.yaml
+++ b/.github/workflows/codequality.yaml
@@ -15,7 +15,9 @@ jobs:
       - name: Install .NET
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "7.0.x"
+          dotnet-version: |
+            6.0.x
+            7.0.x
 
       - name: Restore Tools
         run: dotnet tool restore