From 0ccda17406b7fb8c85d4c4280997d83d252e6918 Mon Sep 17 00:00:00 2001
From: Quackster <quacksterr.15@gmail.com>
Date: Sun, 11 Feb 2024 11:26:56 +1000
Subject: [PATCH] Update Minerva to .NET 8 and use NuGet references instead of
 git modules

---
 .github/workflows/pre-release.yml |  4 ++--
 .gitmodules                       |  6 ------
 Avatara                           |  1 -
 Badger                            |  1 -
 Minerva.sln                       | 12 ------------
 Minerva/Minerva.csproj            |  6 +++---
 README.md                         |  2 ++
 7 files changed, 7 insertions(+), 25 deletions(-)
 delete mode 100644 .gitmodules
 delete mode 160000 Avatara
 delete mode 160000 Badger

diff --git a/.github/workflows/pre-release.yml b/.github/workflows/pre-release.yml
index bbb41de..1011e43 100644
--- a/.github/workflows/pre-release.yml
+++ b/.github/workflows/pre-release.yml
@@ -18,10 +18,10 @@ jobs:
         with:
           submodules: recursive
       
-      - name: Setup .NET 6
+      - name: Setup .NET 8
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: 6.0.x
+          dotnet-version: 8.0.x
           
       - id: sha-short
         name: Get short SHA
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index f6b83e0..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,6 +0,0 @@
-[submodule "Avatara"]
-	path = Avatara
-	url = https://github.com/Quackster/Avatara
-[submodule "Badger"]
-	path = Badger
-	url = https://github.com/Quackster/Badger
diff --git a/Avatara b/Avatara
deleted file mode 160000
index 280186c..0000000
--- a/Avatara
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 280186cb07715c6e8da7281789bedeffe9b4599b
diff --git a/Badger b/Badger
deleted file mode 160000
index ebf7d26..0000000
--- a/Badger
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit ebf7d26cbca80cdc1a6cea5aa6e67a83bbb7b224
diff --git a/Minerva.sln b/Minerva.sln
index 980762e..9b624f1 100644
--- a/Minerva.sln
+++ b/Minerva.sln
@@ -5,10 +5,6 @@ VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Minerva", "Minerva\Minerva.csproj", "{0ECF7BA5-A20C-4C69-ABD1-0B19CE39F854}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Avatara", "Avatara\Avatara\Avatara.csproj", "{3F38BBE8-5269-437E-AE11-0F23649168B1}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Badger", "Badger\Badger\Badger.csproj", "{E48C13EC-9975-46C2-A041-9B24568DED03}"
-EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -19,14 +15,6 @@ Global
 		{0ECF7BA5-A20C-4C69-ABD1-0B19CE39F854}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0ECF7BA5-A20C-4C69-ABD1-0B19CE39F854}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0ECF7BA5-A20C-4C69-ABD1-0B19CE39F854}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3F38BBE8-5269-437E-AE11-0F23649168B1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3F38BBE8-5269-437E-AE11-0F23649168B1}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3F38BBE8-5269-437E-AE11-0F23649168B1}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3F38BBE8-5269-437E-AE11-0F23649168B1}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E48C13EC-9975-46C2-A041-9B24568DED03}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E48C13EC-9975-46C2-A041-9B24568DED03}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E48C13EC-9975-46C2-A041-9B24568DED03}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E48C13EC-9975-46C2-A041-9B24568DED03}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/Minerva/Minerva.csproj b/Minerva/Minerva.csproj
index eb17648..602b5bf 100644
--- a/Minerva/Minerva.csproj
+++ b/Minerva/Minerva.csproj
@@ -1,14 +1,14 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
-    <TargetFramework>net6.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\Avatara\Avatara\Avatara.csproj" />
-    <ProjectReference Include="..\Badger\Badger\Badger.csproj" />
+    <PackageReference Include="Avatara-Imager" Version="1.0.0" />
+    <PackageReference Include="Badger-Imager" Version="1.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/README.md b/README.md
index 48fca8c..4e52cba 100644
--- a/README.md
+++ b/README.md
@@ -23,6 +23,8 @@ The latest builds for Linux and Windows are found on the [latest](https://github
 | Linux (64-bit) | [Minerva-linux-x64.zip](https://github.com/Quackster/Minerva/releases/download/latest/Minerva-linux-x64.zip) |
 | Windows (64-bit) | [Minerva-win-x64.zip](https://github.com/Quackster/Minerva/releases/download/latest/Minerva-win-x64.zip) |
 
+This project is using both [Avatara](https://github.com/Quackster/Avatara) and [Badger](https://github.com/Quackster/Badger) as dependencies.
+
 ## Setup
 
 To run Minerva, you need to install .NET 6 [runtime](https://dotnet.microsoft.com/en-us/download/dotnet/6.0) for your operating system.