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
1 change: 1 addition & 0 deletions .submit_trigger
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Ready to submit
2 changes: 1 addition & 1 deletion build/scripts/linux/build-avalonia-packages.sh
100644 → 100755
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
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
3 changes: 2 additions & 1 deletion src/GregModmanager.Core/Services/TelemetryService.cs
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,8 @@
var message = payload switch
{
SyncCollectionEvent sync => JsonSerializer.Serialize(sync, AppJsonContext.Default.SyncCollectionEvent),
_ => JsonSerializer.Serialize(payload, payload.GetType(), AppJsonContext.Default.Options)
string str => str,
_ => JsonSerializer.Serialize(payload, typeof(object), AppJsonContext.Default.Options)

Check warning on line 103 in src/GregModmanager.Core/Services/TelemetryService.cs

View workflow job for this annotation

GitHub Actions / Build Linux

Using member 'System.Text.Json.JsonSerializer.Serialize(Object, Type, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.

Check warning on line 103 in src/GregModmanager.Core/Services/TelemetryService.cs

View workflow job for this annotation

GitHub Actions / Build Linux Packages (DEB/RPM/APK/Arch)

Using member 'System.Text.Json.JsonSerializer.Serialize(Object, Type, JsonSerializerOptions)' which has 'RequiresUnreferencedCodeAttribute' can break functionality when trimming application code. JSON serialization and deserialization might require types that cannot be statically analyzed. Use the overload that takes a JsonTypeInfo or JsonSerializerContext, or make sure all of the required types are preserved.
};

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