DarthAffe/Artemis
1
0
Fork 0
mirror of https://github.com/Artemis-RGB/Artemis synced 2026-02-04 02:43:32 +00:00
Code Issues Releases Wiki Activity

Workshop - Fix misalignment in EntryTypes causing plugins to not load

Browse Source 
Core - Downgrade SkiaSharp back to what Avalonia likes, 2.88.9
This commit is contained in:
Robert 2025-12-23 20:53:39 +01:00
parent 7985cde6a3
commit efd893c209
4 changed files with 479 additions and 383 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Artemis.Core/Constants.cs
View File

@ -41,7 +41,7 @@ public static class Constants
/// The full path to the Artemis data folder /// The full path to the Artemis data folder
/// </summary> /// </summary>
#if DEBUG #if DEBUG
public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis-dev"); public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis");
#else #else
public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis"); public static readonly string DataFolder = Path.Combine(BaseFolder, "Artemis");
#endif #endif

21
src/Artemis.WebClient.Workshop/Models/InstalledEntry.cs
View File

@ -225,7 +225,6 @@ public class InstalledEntry : CorePropertyChanged
IsOfficial = Entity.IsOfficial; IsOfficial = Entity.IsOfficial;
Name = Entity.Name; Name = Entity.Name;
Summary = Entity.Summary; Summary = Entity.Summary;
EntryType = (EntryType) Entity.EntryType;
Downloads = Entity.Downloads; Downloads = Entity.Downloads;
CreatedAt = Entity.CreatedAt; CreatedAt = Entity.CreatedAt;
LatestReleaseId = Entity.LatestReleaseId; LatestReleaseId = Entity.LatestReleaseId;
@ -235,6 +234,15 @@ public class InstalledEntry : CorePropertyChanged
ReleaseVersion = Entity.ReleaseVersion; ReleaseVersion = Entity.ReleaseVersion;
InstalledAt = Entity.InstalledAt; InstalledAt = Entity.InstalledAt;
AutoUpdate = Entity.AutoUpdate; AutoUpdate = Entity.AutoUpdate;
// Avoiding a cast here, the enum has shifted around before as it is generated from the GraphQL schema
EntryType = Entity.EntryType switch
{
0 => EntryType.Plugin,
1 => EntryType.Profile,
2 => EntryType.Layout,
_ => EntryType
};
_metadata = Entity.Metadata != null ? new Dictionary<string, JsonNode>(Entity.Metadata) : []; _metadata = Entity.Metadata != null ? new Dictionary<string, JsonNode>(Entity.Metadata) : [];
} }
@ -242,8 +250,6 @@ public class InstalledEntry : CorePropertyChanged
internal void Save() internal void Save()
{ {
Entity.EntryId = Id; Entity.EntryId = Id;
Entity.EntryType = (int) EntryType;
Entity.Author = Author; Entity.Author = Author;
Entity.IsOfficial = IsOfficial; Entity.IsOfficial = IsOfficial;
Entity.Name = Name; Entity.Name = Name;
@ -257,6 +263,15 @@ public class InstalledEntry : CorePropertyChanged
Entity.ReleaseVersion = ReleaseVersion; Entity.ReleaseVersion = ReleaseVersion;
Entity.InstalledAt = InstalledAt; Entity.InstalledAt = InstalledAt;
Entity.AutoUpdate = AutoUpdate; Entity.AutoUpdate = AutoUpdate;
// Avoiding a cast here, the enum has shifted around before as it is generated from the GraphQL schema
Entity.EntryType = EntryType switch
{
EntryType.Plugin => 0,
EntryType.Profile => 1,
EntryType.Layout => 2,
_ => Entity.EntryType
};
Entity.Metadata = new Dictionary<string, JsonNode>(_metadata); Entity.Metadata = new Dictionary<string, JsonNode>(_metadata);
} }

835
src/Artemis.WebClient.Workshop/schema.graphql
View File

File diff suppressed because it is too large Load Diff

4
src/Directory.Packages.props
View File

@ -59,8 +59,8 @@
<PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" /> <PackageVersion Include="Serilog.Sinks.Console" Version="6.1.1" />
<PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" /> <PackageVersion Include="Serilog.Sinks.Debug" Version="3.0.0" />
<PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" /> <PackageVersion Include="Serilog.Sinks.File" Version="7.0.0" />
<PackageVersion Include="SkiaSharp" Version="3.119.1" /> <PackageVersion Include="SkiaSharp" Version="2.88.9" />
<PackageVersion Include="SkiaSharp.Vulkan.SharpVk" Version="3.119.1" /> <PackageVersion Include="SkiaSharp.Vulkan.SharpVk" Version="2.88.9" />
<PackageVersion Include="Splat.DryIoc" Version="17.1.1" /> <PackageVersion Include="Splat.DryIoc" Version="17.1.1" />
<PackageVersion Include="StrawberryShake.Server" Version="15.1.11" /> <PackageVersion Include="StrawberryShake.Server" Version="15.1.11" />
<PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" /> <PackageVersion Include="System.IdentityModel.Tokens.Jwt" Version="8.15.0" />