IngvarX · IngvarX · Dec 2, 2024 · Nov 30, 2024 · Nov 30, 2024 · Nov 30, 2024
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,18 +9,20 @@ jobs:
       matrix:
         os: [ubuntu-latest, macos-latest, windows-latest]
     steps:
-    - uses: actions/checkout@v2
-    - name: Setup .NET 6
-      uses: actions/setup-dotnet@v1
+    - name: Checkout sources
+      uses: actions/checkout@v4
       with:
-        dotnet-version: 6.0.x
+        fetch-depth: 0
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v4
+      with:
+        dotnet-version: 8.0.x
     - name: Install dependencies
       run: dotnet restore
     - name: Build
       run: dotnet build --configuration Release --no-restore
     - name: Test
-      run: dotnet test --configuration Release --no-build --verbosity normal --collect:"XPlat Code Coverage" /p:CoverletOutputFormat=opencover --filter FullyQualifiedName!~Ui.Tests
+      run: dotnet test --configuration Release --no-build --verbosity normal --collect:"XPlat Code Coverage" --logger "GitHubActions" --logger "trx;LogFileName=test-results.trx" /p:CoverletOutputFormat=opencover
     - name: UploadCoverage
       run: bash <(curl -s https://codecov.io/bash)
       if: runner.os == 'Linux'
-
diff --git a/.github/workflows/linux-build-deploy.yml b/.github/workflows/linux-build-deploy.yml
@@ -10,17 +10,17 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Build Linux app
       run: |
         cd src/Camelot
         dotnet publish -c Release -r linux-x64 -p:PublishSingleFile=true -p:PublishReadyToRun=true --self-contained=true
     - name: Archive Artifact
       run: |
-        cd src/Camelot/bin/Release/netcoreapp3.1/linux-x64/publish
+        cd src/Camelot/bin/Release/net8.0/linux-x64/publish
         tar -czvf CamelotLinux.tar.gz camelot camelot.pdb
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -30,5 +30,5 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ./src/Camelot/bin/Release/netcoreapp3.1/linux-x64/publish/CamelotLinux.tar.gz
+        file: ./src/Camelot/bin/Release/net8.0/linux-x64/publish/CamelotLinux.tar.gz
         asset_name: CamelotLinuxSingleExe.tar.gz
diff --git a/.github/workflows/linux-deb-deploy.yml b/.github/workflows/linux-deb-deploy.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dotnet-deb
       run: |
         dotnet tool install --tool-path src/Camelot dotnet-deb
@@ -24,7 +24,7 @@ jobs:
         ./dotnet-deb --configuration Release
     - name: Archive Artifact
       run: |
-        cd src/Camelot/bin/Release/netcoreapp3.1
+        cd src/Camelot/bin/Release/net8.0
         tar -czvf CamelotLinuxDeb.tar.gz camelot*.deb
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -34,5 +34,5 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ./src/Camelot/bin/Release/netcoreapp3.1/CamelotLinuxDeb.tar.gz
+        file: ./src/Camelot/bin/Release/net8.0/CamelotLinuxDeb.tar.gz
         asset_name: CamelotLinuxDeb.tar.gz
diff --git a/.github/workflows/linux-rpm-deploy.yml b/.github/workflows/linux-rpm-deploy.yml
@@ -13,7 +13,7 @@ jobs:
     - name: Setup .NET 6
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Install dotnet-rpm
       run: |
         dotnet tool install --tool-path src/Camelot dotnet-rpm
@@ -24,7 +24,7 @@ jobs:
         ./dotnet-rpm --configuration Release
     - name: Archive Artifact
       run: |
-        cd src/Camelot/bin/Release/netcoreapp3.1
+        cd src/Camelot/bin/Release/net8.0
         tar -czvf CamelotLinuxRpm.tar.gz camelot*.rpm
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -34,5 +34,5 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ./src/Camelot/bin/Release/netcoreapp3.1/CamelotLinuxRpm.tar.gz
+        file: ./src/Camelot/bin/Release/net8.0/CamelotLinuxRpm.tar.gz
         asset_name: CamelotLinuxRpm.tar.gz
diff --git a/.github/workflows/macos-build-deploy.yml b/.github/workflows/macos-build-deploy.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: macos-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Build Macos App
       run: |
         cd src/Camelot
@@ -22,12 +22,12 @@ jobs:
         mkdir Assets/logo.iconset
         cp Assets/logo.png Assets/logo.iconset/icon_512x512.png
         iconutil -c icns Assets/logo.iconset
-        cp Assets/logo.icns bin/Release/netcoreapp3.1/osx-x64/publish/Camelot.app/Contents/Resources/logo.icns
+        cp Assets/logo.icns bin/Release/net8.0/osx-x64/publish/Camelot.app/Contents/Resources/logo.icns
         rm Assets/logo.icns
         rm -rf Assets/logo.iconset
     - name: Archive Artifact
       run: |
-        cd src/Camelot/bin/Release/netcoreapp3.1/osx-x64/publish
+        cd src/Camelot/bin/Release/net8.0/osx-x64/publish
         zip -r CamelotMacos.zip Camelot.app
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -37,5 +37,5 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ./src/Camelot/bin/Release/netcoreapp3.1/osx-x64/publish/CamelotMacos.zip
+        file: ./src/Camelot/bin/Release/net8.0/osx-x64/publish/CamelotMacos.zip
         asset_name: CamelotMacos.zip
diff --git a/.github/workflows/windows-build-deploy.yml b/.github/workflows/windows-build-deploy.yml
@@ -10,17 +10,17 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Build Windows App
       run: |
         cd src/Camelot
         dotnet publish -c Release -r win-x64 -p:PublishSingleFile=true -p:PublishReadyToRun=true --self-contained=true
     - name: Archive Artifact
       run: |
-        cd src/Camelot/bin/Release/netcoreapp3.1/win-x64/publish
+        cd src/Camelot/bin/Release/net8.0/win-x64/publish
         powershell Compress-Archive -LiteralPath camelot.exe,camelot.pdb -DestinationPath CamelotWindowsSingleExe.zip
     - name: Upload Release Asset
       id: upload-release-asset 
@@ -30,5 +30,5 @@ jobs:
       with:
         repo_token: ${{ secrets.GITHUB_TOKEN }}
         tag: ${{ github.ref }}
-        file: ./src/Camelot/bin/Release/netcoreapp3.1/win-x64/publish/CamelotWindowsSingleExe.zip
+        file: ./src/Camelot/bin/Release/net8.0/win-x64/publish/CamelotWindowsSingleExe.zip
         asset_name: CamelotWindowsSingleExe.zip
diff --git a/.github/workflows/windows-installer-deploy.yml b/.github/workflows/windows-installer-deploy.yml
@@ -10,10 +10,10 @@ jobs:
     runs-on: windows-latest
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET 6
+    - name: Setup .NET 8
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: 8.0.x
     - name: Setup MSBuild
       uses: microsoft/[email protected]
     - name: Setup .NET Framework 3.5

diff --git a/.gitignore b/.gitignore
@@ -340,4 +340,3 @@ ASALocalRun/
 
 *.DS_Store*
 *.txt
-*.props
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -6,7 +6,7 @@
             "type": "coreclr",
             "request": "launch",
             "preLaunchTask": "build",
-            "program": "${workspaceFolder}/src/Camelot/bin/Debug/netcoreapp3.1/Camelot.dll",
+            "program": "${workspaceFolder}/src/Camelot/bin/Debug/net8.0/Camelot.dll",
             "args": [],
             "cwd": "${workspaceFolder}/src/Camelot",
             "console": "externalTerminal",

diff --git a/Directory.Build.props b/Directory.Build.props
@@ -0,0 +1,7 @@
+<Project>
+  <PropertyGroup>
+    <TargetFramework>net8.0</TargetFramework>
+    <IsPackable>false</IsPackable>
+    <Version>0.3.0</Version>
+  </PropertyGroup>
+</Project>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -0,0 +1,46 @@
+<Project>
+  <PropertyGroup>
+    <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageVersion Include="Avalonia" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Controls.DataGrid" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Desktop" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Diagnostics" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.Headless" Version="0.10.18" />
+    <PackageVersion Include="Avalonia.ReactiveUI" Version="0.10.18" />
+    <PackageVersion Include="CommandLineParser" Version="2.9.1" />
+    <PackageVersion Include="coverlet.collector" Version="6.0.2" />
+    <PackageVersion Include="Dotnet.Bundle" Version="0.9.13" />
+    <PackageVersion Include="LiteDB" Version="5.0.21" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Binder" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageVersion Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
+    <PackageVersion Include="Moq" Version="4.20.72" />
+    <PackageVersion Include="Moq.AutoMock" Version="3.5.0" />
+    <PackageVersion Include="Packaging.Targets" Version="0.1.226">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageVersion>
+    <PackageVersion Include="ReactiveUI.Fody" Version="18.4.26" />
+    <PackageVersion Include="ReactiveUI.Validation" Version="3.1.7" />
+    <PackageVersion Include="Serilog" Version="4.1.0" />
+    <PackageVersion Include="Serilog.Extensions.Logging" Version="8.0.0" />
+    <PackageVersion Include="Serilog.Sinks.Console" Version="6.0.0" />
+    <PackageVersion Include="Serilog.Sinks.RollingFile" Version="3.3.0" />
+    <PackageVersion Include="SharpCompress" Version="0.32.2" />
+    <PackageVersion Include="System.Drawing.Common" Version="6.0.0" />
+    <PackageVersion Include="xunit" Version="2.9.2" />
+    <PackageVersion Include="xunit.extensibility.core" Version="2.9.2" />
+    <PackageVersion Include="xunit.runner.visualstudio" Version="2.8.2" />
+    <PackageVersion Include="GitHubActionsTestLogger" Version="2.4.1">
+      <PrivateAssets>all</PrivateAssets>
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+    </PackageVersion>
+    <PackageVersion Include="Snapshooter.Xunit" Version="0.14.1" />
+  </ItemGroup>
+</Project>
diff --git a/README.md b/README.md
@@ -22,7 +22,7 @@ For more info check [installation documentation](/docs/INSTALL.md)
 
 ## Build
 
-.NET 6 SDK is required.
+.NET 8 SDK is required.
 
 ```
 git clone https://github.com/IngvarX/Camelot.git

diff --git a/scripts/macos.sh b/scripts/macos.sh
@@ -10,7 +10,7 @@ cd ../src/Camelot
 mkdir Assets/logo.iconset
 cp Assets/logo.png Assets/logo.iconset/icon_512x512.png
 iconutil -c icns Assets/logo.iconset
-cp Assets/logo.icns bin/Release/netcoreapp3.1/osx-x64/publish/Camelot.app/Contents/Resources/logo.icns
+cp Assets/logo.icns bin/Release/net8.0/osx-x64/publish/Camelot.app/Contents/Resources/logo.icns
 rm Assets/logo.icns
 rm -rf Assets/logo.iconset
 

diff --git a/src/Camelot.Avalonia/Camelot.Avalonia.csproj b/src/Camelot.Avalonia/Camelot.Avalonia.csproj
@@ -1,15 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
     <ItemGroup>
-      <PackageReference Include="Avalonia" Version="0.10.18" />
-      <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" Version="1.1.0" />
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
+      <PackageReference Include="Avalonia" />
+      <PackageReference Include="Microsoft.Extensions.PlatformAbstractions" />
     </ItemGroup>
 
 </Project>
diff --git a/src/Camelot.Collections/Camelot.Collections.csproj b/src/Camelot.Collections/Camelot.Collections.csproj
@@ -1,13 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Camelot.DataAccess.LiteDb/Camelot.DataAccess.LiteDb.csproj b/src/Camelot.DataAccess.LiteDb/Camelot.DataAccess.LiteDb.csproj
@@ -1,14 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
     <ItemGroup>
-      <PackageReference Include="LiteDB" Version="5.0.16" />
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
+      <PackageReference Include="LiteDB" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Camelot.DataAccess.Models/Camelot.DataAccess.Models.csproj b/src/Camelot.DataAccess.Models/Camelot.DataAccess.Models.csproj
@@ -1,13 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Camelot.DataAccess/Camelot.DataAccess.csproj b/src/Camelot.DataAccess/Camelot.DataAccess.csproj
@@ -1,13 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Camelot.Extensions/Camelot.Extensions.csproj b/src/Camelot.Extensions/Camelot.Extensions.csproj
@@ -1,14 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
         <Nullable>enable</Nullable>
     </PropertyGroup>
 
-    <ItemGroup>
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
diff --git a/src/Camelot.Factories/Camelot.Factories.csproj b/src/Camelot.Factories/Camelot.Factories.csproj
@@ -1,7 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>netcoreapp3.1</TargetFramework>
-    </PropertyGroup>
-
 </Project>
diff --git a/src/Camelot.Services.Abstractions/Camelot.Services.Abstractions.csproj b/src/Camelot.Services.Abstractions/Camelot.Services.Abstractions.csproj
@@ -1,13 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-    <PropertyGroup>
-        <TargetFramework>net6</TargetFramework>
-    </PropertyGroup>
-
-    <ItemGroup>
-      <PackageReference Update="Packaging.Targets">
-        <Version>0.1.220</Version>
-      </PackageReference>
-    </ItemGroup>
-
 </Project>
Original file line number	Diff line number	Diff line change
Expand Up		@@ -340,4 +340,3 @@ ASALocalRun/

		.DS_Store
		*.txt
		*.props