Skip to content

Commit 7b340a1

Browse files
committed
Revert change to remove IsCoreLib parameter
- Bump version to 2.10. Signed-off-by: José Simões <[email protected]>
1 parent 484bf72 commit 7b340a1

File tree

4 files changed

+21
-7
lines changed

4 files changed

+21
-7
lines changed

source/MetadataProcessor.Console/Program.cs

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,13 +52,14 @@ public void Parse(string fileName)
5252
}
5353

5454
public void Compile(
55-
string fileName)
55+
string fileName,
56+
bool isCoreLibrary)
5657
{
5758
try
5859
{
5960
if (Verbose) System.Console.WriteLine("Compiling assembly...");
6061

61-
_assemblyBuilder = new nanoAssemblyBuilder(_assemblyDefinition, _classNamesToExclude, VerboseMinimize);
62+
_assemblyBuilder = new nanoAssemblyBuilder(_assemblyDefinition, _classNamesToExclude, VerboseMinimize, isCoreLibrary);
6263

6364
using (var stream = File.Open(fileName, FileMode.Create, FileAccess.ReadWrite))
6465
using (var writer = new BinaryWriter(stream))
@@ -222,11 +223,20 @@ public static void Main(string[] args)
222223
{
223224
md.Parse(args[++i]);
224225
}
225-
else if (arg == "-compile" && i + 1 < args.Length)
226+
else if (arg == "-compile" && i + 2 < args.Length)
226227
{
228+
bool isCoreLibrary = false;
229+
230+
if (!bool.TryParse(args[i + 2], out isCoreLibrary))
231+
{
232+
System.Console.Error.WriteLine("Bad parameter for compile. IsCoreLib options has to be 'true' or 'false'.");
233+
234+
Environment.Exit(1);
235+
}
236+
227237
md.PeFileName = args[i + 1];
228238

229-
md.Compile(md.PeFileName);
239+
md.Compile(md.PeFileName, isCoreLibrary);
230240

231241
i += 2;
232242
}

source/MetadataProcessor.Core/Tables/nanoTablesContext.cs

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,8 @@ public nanoTablesContext(
6565
List<string> classNamesToExclude,
6666
ICustomStringSorter stringSorter,
6767
bool applyAttributesCompression,
68-
bool verbose)
68+
bool verbose,
69+
bool isCoreLibrary)
6970
{
7071
AssemblyDefinition = assemblyDefinition;
7172

source/MetadataProcessor.Core/nanoAssemblyBuilder.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ public nanoAssemblyBuilder(
4040
AssemblyDefinition assemblyDefinition,
4141
List<string> classNamesToExclude,
4242
bool verbose,
43+
bool isCoreLibrary = false,
4344
List<string> explicitTypesOrder = null,
4445
ICustomStringSorter stringSorter = null,
4546
bool applyAttributesCompression = false)
@@ -50,9 +51,11 @@ public nanoAssemblyBuilder(
5051
classNamesToExclude,
5152
stringSorter,
5253
applyAttributesCompression,
53-
verbose);
54+
verbose,
55+
isCoreLibrary);
5456

5557
_verbose = verbose;
58+
_isCoreLibrary = isCoreLibrary;
5659
}
5760

5861
/// <summary>

source/version.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"$schema": "https://raw.githubusercontent.com/AArnott/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
3-
"version": "2.9",
3+
"version": "2.10",
44
"assemblyVersion": {
55
"precision": "revision"
66
},

0 commit comments

Comments
 (0)