Skip to content

Fix potential Serilog load error, enable debug logging into msbuild #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lordfirespeed merged 6 commits into from
Jun 22, 2024
Merged

Fix potential Serilog load error, enable debug logging into msbuild #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
6a71099
default to emitting debug logs as they get filtered out on msbuild level
wherget May 20, 2024
c0941c4
try to resolve shared dependency from path before deferring to system
wherget May 20, 2024
cc8e5f6
remove redundant else block after early return
wherget Jun 22, 2024
eb1a778
load shared assembly into Default AssemblyLoadContext
wherget Jun 22, 2024
9512f15
exit early when there are no targets to patch
wherget Jun 22, 2024
31788ba
add a message for each file that is being processed
wherget Jun 22, 2024
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
9 changes: 8 additions & 1 deletion NetcodePatcher.MSBuild.Tasks/NetcodePatchTask.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ public class NetcodePatchTask : Task
public override bool Execute()
{
Serilog.Log.Logger = new LoggerConfiguration()
.MinimumLevel.Information()
.MinimumLevel.Debug()
.WriteTo.MSBuildTask(this)
.CreateLogger();

Expand All @@ -43,6 +43,12 @@ public override bool Execute()
.InformationalVersion;
Serilog.Log.Information("Initializing NetcodePatcher v{Version:l}", toolVersion);

if (Patch.Length < 1)
{
Serilog.Log.Information("No targets specified for Netcode patching. NetcodePatcher done.");
return true;
}

var noOverwrite = false;
if (!string.IsNullOrEmpty(NoOverwrite))
{
Expand Down Expand Up @@ -93,6 +99,7 @@ void RunPatch(ITaskItem patchSpecifier)
outputPath = Path.Combine(outputPath, noOverwrite ? $"{Path.GetFileNameWithoutExtension(pluginAssembly.Name)}_patched{Path.GetExtension(pluginAssembly.Name)}" : pluginAssembly.Name);
}

Serilog.Log.Information("Processing : {input}", inputPath);
patchMethod.Invoke(null, [inputPath, outputPath, ReferenceAssemblyPaths.Select(info => info.ItemSpec).ToArray()]);
}

Expand Down
12 changes: 11 additions & 1 deletion NetcodePatcher.Tools.Common/PatcherLoadContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using System.Linq;
using System.Reflection;
using System.Runtime.Loader;
using Serilog;

namespace NetcodePatcher.Tools.Common;

Expand All @@ -27,7 +28,16 @@ public PatcherLoadContext(string name, PatcherConfiguration configuration) : bas
if (assemblyName.Name is null) return null;

if (SharedDependencyAssemblyNames.Contains(assemblyName.Name))
return Default.LoadFromAssemblyName(assemblyName);
{
string? sharedPath = ResolveAssemblyToPath(assemblyName);
if (sharedPath is null)
{
Log.Debug("Shared dependency {SharedName} not found in {CommonDir} or {SharedDir}, trying to load from system", assemblyName, _configuration.PatcherCommonAssemblyDir, _configuration.PatcherNetcodeSpecificAssemblyDir);
return Default.LoadFromAssemblyName(assemblyName);
}
Log.Debug("Shared Dependency {SharedName} loading from {Directory}", assemblyName, sharedPath);
return Default.LoadFromAssemblyPath(sharedPath);
}

string? assemblyPath = ResolveAssemblyToPath(assemblyName);
if (assemblyPath is null) return null;
Expand Down