Skip to content

Commit

Permalink
Added RepackDropAttribute option (#27)
Browse files Browse the repository at this point in the history
  • Loading branch information
ermshiperete authored Nov 6, 2020
1 parent d727d38 commit 5bed4cc
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 9 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,9 @@ bld/
# Visual Studio 2015 cache/options directory
.vs/

# JetBrains Rider
.idea/

# MSTest test Results
[Tt]est[Rr]esult*/
[Bb]uild[Ll]og.*
Expand Down
10 changes: 8 additions & 2 deletions ILRepack.Lib.MSBuild.Task/ILRepack.cs
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,11 @@ public virtual string OutputFile
/// </summary>
public virtual bool Wildcards { get; set; }

/// <summary>
/// Name of an attribute. Members in InputAssemblies marked with this attribute will be
/// dropped during merging.
/// </summary>
public string RepackDropAttribute { get; set; }
#endregion

#region Public methods
Expand Down Expand Up @@ -260,7 +265,8 @@ public override bool Execute()
Parallel = Parallel,
PauseBeforeExit = PauseBeforeExit,
OutputFile = _outputFile,
AllowWildCards = Wildcards
AllowWildCards = Wildcards,
RepackDropAttribute = RepackDropAttribute
};

repackOptions.AllowedDuplicateNameSpaces.AddRange(ParseDuplicateNamespacesOption(AllowedDuplicateNamespaces));
Expand Down Expand Up @@ -423,4 +429,4 @@ public void Dispose()

#endregion
}
}
}
4 changes: 2 additions & 2 deletions ILRepack.Lib.MSBuild.Task/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -31,5 +31,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.18.1")]
[assembly: AssemblyFileVersion("2.0.18.1")]
[assembly: AssemblyVersion("2.0.18.2")]
[assembly: AssemblyFileVersion("2.0.18.2")]
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
<metadata>
<id>ILRepack.Lib.MSBuild.Task</id>
<version>2.0.18.1</version>
<version>2.0.18.2</version>
<title>ILRepack.Lib.MSBuild.Task</title>
<authors>RBSoft</authors>
<owners>rbsoft</owners>
Expand All @@ -16,4 +16,4 @@
<language>en-US</language>
<tags>ILRepack,MSBuild,ILMerge alternative,merge assemblies</tags>
</metadata>
</package>
</package>
11 changes: 10 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -296,4 +296,13 @@ If you are using default targets file then you may notice that it clears Output
Allows (and resolves) file wildcards (e.g. `*`.dll) in input assemblies.
</td>
</tr>
</table>
<tr>
<td>
RepackDropAttribute
</td>
<td>
Name of an attribute (optional). Members in input assemblies marked with this attribute
will be dropped during merging.
</td>
</tr>
</table>
4 changes: 2 additions & 2 deletions appveyor.yml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
version: 2.0.18.{build}
environment:
my_version: 2.0.18.1
my_version: 2.0.18.2
my_secret:
secure: 5qtuEW0UQ/IEO8DRi4/y3EgEBoJDM/HyYpPgzasIlm0=
skip_branch_with_pr: true
Expand Down Expand Up @@ -29,4 +29,4 @@ deploy:
artifact: ILRepack.Lib.MSBuild.Task.%my_version%.nupkg
on:
branch: master # release from master branch only
appveyor_repo_tag: true # deploy on tag push only
appveyor_repo_tag: true # deploy on tag push only

0 comments on commit 5bed4cc

Please sign in to comment.