Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion build/scripts/linux/build-avalonia-packages.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
#!/usr/bin/env bash
set -euo pipefail

REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../.." && pwd)"
REPO_ROOT="$(cd "$(dirname "${BASH_SOURCE[0]}")/../../.." && pwd)"
PROJECT_PATH="$REPO_ROOT/src/GregModmanager.Avalonia/GregModmanager.Avalonia.csproj"
OUTPUT_ROOT="${1:-$REPO_ROOT/artifacts/avalonia-linux}"
VERSION="${2:-1.1.0}"
Expand Down
1 change: 1 addition & 0 deletions src/GregModmanager.Core/Models/AppJsonContext.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ namespace GregModmanager.Models;
[JsonSerializable(typeof(int))]
[JsonSerializable(typeof(RalphTaskStatus))]
[JsonSerializable(typeof(AssetModMetadata))]
[JsonSerializable(typeof(object))]
public partial class AppJsonContext : JsonSerializerContext
{
}
4 changes: 2 additions & 2 deletions src/GregModmanager.Core/Services/ModsFolderSyncService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -148,13 +148,13 @@ public bool RemoveItem(ulong publishedFileId, string gameRoot)

private static void CopyDirectoryRecursive(string sourceDir, string destDir)
{
foreach (var dir in Directory.GetDirectories(sourceDir, "*", SearchOption.AllDirectories))
foreach (var dir in Directory.EnumerateDirectories(sourceDir, "*", SearchOption.AllDirectories))
{
var relative = Path.GetRelativePath(sourceDir, dir);
Directory.CreateDirectory(Path.Combine(destDir, relative));
}

foreach (var file in Directory.GetFiles(sourceDir, "*", SearchOption.AllDirectories))
foreach (var file in Directory.EnumerateFiles(sourceDir, "*", SearchOption.AllDirectories))
{
var relative = Path.GetRelativePath(sourceDir, file);
File.Copy(file, Path.Combine(destDir, relative), overwrite: true);
Expand Down
2 changes: 1 addition & 1 deletion src/GregModmanager.Core/Services/TelemetryService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@ public async Task TrackEventAsync(string eventName, object payload, Dictionary<s
var message = payload switch
{
SyncCollectionEvent sync => JsonSerializer.Serialize(sync, AppJsonContext.Default.SyncCollectionEvent),
_ => JsonSerializer.Serialize(payload, payload.GetType(), AppJsonContext.Default.Options)
_ => JsonSerializer.Serialize(payload, AppJsonContext.Default.Object)
};

await PushToLokiAsync(eventName, message, labels);
Expand Down
Loading