From 11ac58c8c9f6bff26ab019ab92cc060d404505a5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20H=C3=A4ni?= Date: Mon, 5 Jan 2015 13:07:05 +0100 Subject: [PATCH 1/2] fixed log message grammar --- Confuser.Renamer/Analyzers/ResourceAnalyzer.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs b/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs index 0374d47ed..d042f08e1 100644 --- a/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs +++ b/Confuser.Renamer/Analyzers/ResourceAnalyzer.cs @@ -21,7 +21,7 @@ public void Analyze(ConfuserContext context, INameService service, IDnlibDef def string nameAsmName = asmName.Substring(0, asmName.Length - ".resources".Length); ModuleDef mainModule = context.Modules.SingleOrDefault(mod => mod.Assembly.Name == nameAsmName); if (mainModule == null) { - context.Logger.ErrorFormat("Could not found main assembly of satellite assembly '{0}'.", module.Assembly.FullName); + context.Logger.ErrorFormat("Could not find main assembly of satellite assembly '{0}'.", module.Assembly.FullName); throw new ConfuserException(null); } @@ -33,7 +33,7 @@ public void Analyze(ConfuserContext context, INameService service, IDnlibDef def string typeName = match.Groups[1].Value; TypeDef type = mainModule.FindReflectionThrow(typeName); if (type == null) { - context.Logger.WarnFormat("Could not found resource type '{0}'.", typeName); + context.Logger.WarnFormat("Could not find resource type '{0}'.", typeName); continue; } service.AddReference(type, new ResourceReference(res, type, format)); @@ -52,7 +52,7 @@ public void Analyze(ConfuserContext context, INameService service, IDnlibDef def TypeDef type = module.FindReflection(typeName); if (type == null) { - context.Logger.WarnFormat("Could not found resource type '{0}'.", typeName); + context.Logger.WarnFormat("Could not find resource type '{0}'.", typeName); continue; } service.AddReference(type, new ResourceReference(res, type, format)); From 7fa0617bb0bdb493c7afaffa19b3e91eff0203c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20H=C3=A4ni?= Date: Mon, 5 Jan 2015 13:28:02 +0100 Subject: [PATCH 2/2] grammar fixes --- Confuser.Core/ConfuserEngine.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Confuser.Core/ConfuserEngine.cs b/Confuser.Core/ConfuserEngine.cs index 33da1a906..fe4fa7390 100644 --- a/Confuser.Core/ConfuserEngine.cs +++ b/Confuser.Core/ConfuserEngine.cs @@ -162,22 +162,22 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token) ok = true; } catch (AssemblyResolveException ex) { - context.Logger.ErrorException("Failed to resolve a assembly, check if all dependencies are of correct version.", ex); + context.Logger.ErrorException("Failed to resolve an assembly, check if all dependencies are present in the correct version.", ex); PrintEnvironmentInfo(context); } catch (TypeResolveException ex) { - context.Logger.ErrorException("Failed to resolve a type, check if all dependencies are of correct version.", ex); + context.Logger.ErrorException("Failed to resolve a type, check if all dependencies are present in the correct version.", ex); PrintEnvironmentInfo(context); } catch (MemberRefResolveException ex) { - context.Logger.ErrorException("Failed to resolve a member, check if all dependencies are of correct version.", ex); + context.Logger.ErrorException("Failed to resolve a member, check if all dependencies are present in the correct version.", ex); PrintEnvironmentInfo(context); } catch (IOException ex) { - context.Logger.ErrorException("An IO error occurred, check if all input/output locations are read/writable.", ex); + context.Logger.ErrorException("An IO error occurred, check if all input/output locations are readable/writable.", ex); } catch (OperationCanceledException) { - context.Logger.Error("Operation is canceled."); + context.Logger.Error("Operation cancelled."); } catch (ConfuserException) { // Exception is already handled/logged, so just ignore and report failure @@ -265,7 +265,7 @@ static void Inspection(ConfuserContext context) { if (snKey == null && module.IsStrongNameSigned) context.Logger.WarnFormat("[{0}] SN Key is not provided for a signed module, the output may not be working.", module.Name); else if (snKey != null && !module.IsStrongNameSigned) - context.Logger.WarnFormat("[{0}] SN Key is provided for a unsigned module, the output may not be working.", module.Name); + context.Logger.WarnFormat("[{0}] SN Key is provided for an unsigned module, the output may not be working.", module.Name); else if (snKey != null && module.IsStrongNameSigned && !module.Assembly.PublicKey.Data.SequenceEqual(snKey.PublicKey)) context.Logger.WarnFormat("[{0}] Provided SN Key and signed module's public key do not match, the output may not be working.", module.Name);