Skip to content

Commit 5bed4cc

Browse files
authored
Added RepackDropAttribute option (#27)
1 parent d727d38 commit 5bed4cc

6 files changed

Lines changed: 27 additions & 9 deletions

File tree

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,9 @@ bld/
2525
# Visual Studio 2015 cache/options directory
2626
.vs/
2727

28+
# JetBrains Rider
29+
.idea/
30+
2831
# MSTest test Results
2932
[Tt]est[Rr]esult*/
3033
[Bb]uild[Ll]og.*

ILRepack.Lib.MSBuild.Task/ILRepack.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,11 @@ public virtual string OutputFile
227227
/// </summary>
228228
public virtual bool Wildcards { get; set; }
229229

230+
/// <summary>
231+
/// Name of an attribute. Members in InputAssemblies marked with this attribute will be
232+
/// dropped during merging.
233+
/// </summary>
234+
public string RepackDropAttribute { get; set; }
230235
#endregion
231236

232237
#region Public methods
@@ -260,7 +265,8 @@ public override bool Execute()
260265
Parallel = Parallel,
261266
PauseBeforeExit = PauseBeforeExit,
262267
OutputFile = _outputFile,
263-
AllowWildCards = Wildcards
268+
AllowWildCards = Wildcards,
269+
RepackDropAttribute = RepackDropAttribute
264270
};
265271

266272
repackOptions.AllowedDuplicateNameSpaces.AddRange(ParseDuplicateNamespacesOption(AllowedDuplicateNamespaces));
@@ -423,4 +429,4 @@ public void Dispose()
423429

424430
#endregion
425431
}
426-
}
432+
}

ILRepack.Lib.MSBuild.Task/Properties/AssemblyInfo.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,5 +31,5 @@
3131
// You can specify all the values or you can default the Build and Revision Numbers
3232
// by using the '*' as shown below:
3333
// [assembly: AssemblyVersion("1.0.*")]
34-
[assembly: AssemblyVersion("2.0.18.1")]
35-
[assembly: AssemblyFileVersion("2.0.18.1")]
34+
[assembly: AssemblyVersion("2.0.18.2")]
35+
[assembly: AssemblyFileVersion("2.0.18.2")]

ILRepack.Lib.MSBuild.Task/build/ILRepack.Lib.MSBuild.Task.nuspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
33
<metadata>
44
<id>ILRepack.Lib.MSBuild.Task</id>
5-
<version>2.0.18.1</version>
5+
<version>2.0.18.2</version>
66
<title>ILRepack.Lib.MSBuild.Task</title>
77
<authors>RBSoft</authors>
88
<owners>rbsoft</owners>
@@ -16,4 +16,4 @@
1616
<language>en-US</language>
1717
<tags>ILRepack,MSBuild,ILMerge alternative,merge assemblies</tags>
1818
</metadata>
19-
</package>
19+
</package>

README.md

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -296,4 +296,13 @@ If you are using default targets file then you may notice that it clears Output
296296
Allows (and resolves) file wildcards (e.g. `*`.dll) in input assemblies.
297297
</td>
298298
</tr>
299-
</table>
299+
<tr>
300+
<td>
301+
RepackDropAttribute
302+
</td>
303+
<td>
304+
Name of an attribute (optional). Members in input assemblies marked with this attribute
305+
will be dropped during merging.
306+
</td>
307+
</tr>
308+
</table>

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
version: 2.0.18.{build}
22
environment:
3-
my_version: 2.0.18.1
3+
my_version: 2.0.18.2
44
my_secret:
55
secure: 5qtuEW0UQ/IEO8DRi4/y3EgEBoJDM/HyYpPgzasIlm0=
66
skip_branch_with_pr: true
@@ -29,4 +29,4 @@ deploy:
2929
artifact: ILRepack.Lib.MSBuild.Task.%my_version%.nupkg
3030
on:
3131
branch: master # release from master branch only
32-
appveyor_repo_tag: true # deploy on tag push only
32+
appveyor_repo_tag: true # deploy on tag push only

0 commit comments

Comments
 (0)