Skip to content

Release 1.0.15 #32

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
dassjosh merged 1 commit into from
Feb 7, 2026
Merged

Release 1.0.15 #32

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 12 additions & 15 deletions src/PluginMerge/Creator/FileCreator.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,10 +83,16 @@ public bool Create()
WriteNamespaceUsings();
if (IsMergeFrameworkMode) _writer.WriteFramework();
StartPluginClass();
WritePluginFiles();
if (IsPluginMode || IsFrameworkMode) WriteDataFiles();
if (IsPluginMode || IsFrameworkMode)
{
WriteFiles(_pluginFiles.Concat(_dataFiles).OrderBy(f => f.Order), "Plugin & Data");
}
else
{
WriteFiles(_pluginFiles, "Plugin");
}
EndPluginClass();
if (IsMergeFrameworkMode) WriteDataFiles();
if (IsMergeFrameworkMode) WriteFiles(_dataFiles, "Data");
WriteFrameworks();
if (hasExtensionMethods)
{
Expand Down Expand Up @@ -343,20 +349,11 @@ private void Write(FileHandler file)
_writer.WriteLine();
}

private void WritePluginFiles()
{
foreach (FileHandler file in _pluginFiles)
{
_logger.LogDebug("Writing plugin file: {Path}", file.FilePath);
Write(file);
}
}

private void WriteDataFiles()
private void WriteFiles(IEnumerable<FileHandler> files, string type)
{
foreach (FileHandler file in _dataFiles)
foreach (FileHandler file in files)
{
_logger.LogDebug("Writing data file: {Path}", file.FilePath);
_logger.LogDebug("Writing {Type} file: {Path}", type, file.FilePath);
Write(file);
}
}
Expand Down