From 2ec6fbded929ae6e8714f232616d4a152393a5a2 Mon Sep 17 00:00:00 2001 From: dcsync Date: Mon, 12 Nov 2018 23:17:57 +0000 Subject: [PATCH 1/2] Pass through the CommandLineApplication return code Before applying this change SharpGen was always returning 0 on my system. --- src/SharpGen.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/SharpGen.cs b/src/SharpGen.cs index f00ffff..4b3f154 100644 --- a/src/SharpGen.cs +++ b/src/SharpGen.cs @@ -20,7 +20,7 @@ namespace SharpGen { class SharpGen { - static void Main(string[] args) + static int Main(string[] args) { CommandLineApplication app = new CommandLineApplication(); app.HelpOption("-? | -h | --help"); @@ -192,7 +192,7 @@ static void Main(string[] args) } return 0; }); - app.Execute(args); + return app.Execute(args); } private static bool SetRequestDirectories(ref Compiler.CompilationRequest request) From 742517edc4399b651c36a023f28eecd1744c4e3c Mon Sep 17 00:00:00 2001 From: dcsync Date: Sun, 21 Apr 2019 01:19:11 +0000 Subject: [PATCH 2/2] fix line endings in SharpGen.cs --- src/SharpGen.cs | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/src/SharpGen.cs b/src/SharpGen.cs index 4b3f154..7fa2a47 100644 --- a/src/SharpGen.cs +++ b/src/SharpGen.cs @@ -14,8 +14,8 @@ using Confuser.Core; using Confuser.Core.Project; -using YamlDotNet.Serialization; - +using YamlDotNet.Serialization; + namespace SharpGen { class SharpGen @@ -84,7 +84,7 @@ static int Main(string[] args) ).Accepts(v => v.ExistingFile()); app.OnExecute(() => - { + { Compiler.CompilationRequest request = new Compiler.CompilationRequest(); // Compilation options if (!SetRequestDirectories(ref request)) @@ -201,16 +201,16 @@ private static bool SetRequestDirectories(ref Compiler.CompilationRequest reques request.ReferenceDirectory = Common.SharpGenReferencesDirectory; request.ResourceDirectory = Common.SharpGenResourcesDirectory; return true; - } - + } + private static bool SetRequestDotNetVersion(CommandOption DotNetVersionOption, ref Compiler.CompilationRequest request) - { + { request.TargetDotNetVersion = DotNetVersionOption.HasValue() ? DotNetVersionOption.ParsedValue : Compiler.DotNetVersion.Net35; - return true; - } + return true; + } private static bool SetRequestOutputKind(CommandOption OutputKindOption, CommandOption OutputFileOption, ref Compiler.CompilationRequest request) - { + { if (OutputKindOption.HasValue()) { if (OutputKindOption.Value().Contains("console", StringComparison.OrdinalIgnoreCase) || OutputKindOption.Value().Contains("exe", StringComparison.OrdinalIgnoreCase)) @@ -272,8 +272,8 @@ private static bool SetRequestOptimization(CommandOption NoOptimizationOption, r { request.Optimize = !NoOptimizationOption.HasValue(); return true; - } - + } + private static bool SetRequestAssemblyName(CommandOption AssemblyNameOption, ref Compiler.CompilationRequest request) { if (AssemblyNameOption.HasValue()) { request.AssemblyName = AssemblyNameOption.Value(); } @@ -281,7 +281,7 @@ private static bool SetRequestAssemblyName(CommandOption AssemblyNameOption, ref } private static bool SetRequestReferences(ref Compiler.CompilationRequest request) - { + { using (TextReader reader = File.OpenText(Common.SharpGenReferencesConfig)) { var deserializer = new DeserializerBuilder().Build(); @@ -299,7 +299,7 @@ private static bool SetRequestEmbeddedResources(ref Compiler.CompilationRequest } return true; } - + private static bool SetRequestSource(CommandOption SourceFileOption, CommandOption ClassNameOption, List RemainingArguments, ref Compiler.CompilationRequest request) { string className = RandomString(); @@ -362,7 +362,7 @@ public ValidationResult GetValidationResult(CommandOption option, ValidationCont } return ValidationResult.Success; - } + } } private class MustBeDotNetVersionValidator : IOptionValidator @@ -421,7 +421,7 @@ private static string RandomString() return alphachars[random.Next(alphachars.Length)] + new string(Enumerable.Repeat(chars, random.Next(10, 30)).Select(s => s[random.Next(s.Length)]).ToArray()); } - private static string WrapperFunctionFormat = + private static string WrapperFunctionFormat = @"using System; using System.IO; using System.Text;