Skip to content

feature: added step for merging ILLink.*.xml files #339

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
KirillOsenkov merged 2 commits into from
Jan 5, 2024
Merged

feature: added step for merging ILLink.*.xml files #339

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
986c1db
feature: added merge ILLink.*.xml files
deniszykov Jan 4, 2024
15fe6d5
fix: wrong log message for ILLink.Suppressions.xml files merge
deniszykov Jan 4, 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
1 change: 1 addition & 0 deletions ILRepack/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,7 @@ static void Usage()
Console.WriteLine(@" - /target:kind specify target assembly kind (library, exe, winexe supported, default is same as first assembly)");
Console.WriteLine(@" - /targetplatform:P specify target platform (v1, v1.1, v2, v4 supported)");
Console.WriteLine(@" - /skipconfig skips merging config files");
Console.WriteLine(@" - /illink merge IL Linker files");
Console.WriteLine(@" - /xmldocs merges XML documentation as well");
Console.WriteLine(@" - /lib:<path> adds the path to the search directories for referenced assemblies (can be specified multiple times)");
Console.WriteLine(@" - /internalize sets all types but the ones from the first assembly 'internal'");
Expand Down
1 change: 1 addition & 0 deletions ILRepack/ILRepack.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,7 @@ public void Repack()
signingStep,
new ReferencesRepackStep(Logger, this, Options),
new TypesRepackStep(Logger, this, _repackImporter, Options),
new ILLinkFileMergeStep(Logger, this, Options),
new ResourcesRepackStep(Logger, this, Options),
new AttributesRepackStep(Logger, this, _repackImporter, Options),
new ReferencesFixStep(Logger, this, _repackImporter, Options),
Expand Down
2 changes: 2 additions & 0 deletions ILRepack/RepackOptions.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ public string ExcludeFile
public bool UnionMerge { get; set; }
public Version Version { get; set; }
public bool SkipConfigMerge { get; set; }
public bool MergeIlLinkerFiles { get; set; }
public bool XmlDocumentation { get; set; }

// end of ILMerge-similar attributes
Expand Down Expand Up @@ -252,6 +253,7 @@ void Parse()
if (!string.IsNullOrEmpty(version))
Version = new Version(version);
SkipConfigMerge = cmd.Modifier("skipconfig");
MergeIlLinkerFiles = cmd.Modifier("illink");
XmlDocumentation = cmd.Modifier("xmldocs");
NoRepackRes = cmd.Modifier("norepackres");
KeepOtherVersionReferences = cmd.Modifier("keepotherversionreferences");
Expand Down
Loading