Merge d096849 into 26d0696

mkaring · web-flow · commit a117192b1a15 · 2020-07-12T18:25:38.000+02:00
diff --git a/Confuser.Renamer/NameService.cs b/Confuser.Renamer/NameService.cs
@@ -220,9 +220,11 @@ public string ObfuscateName(string name, RenameMode mode) {
 
 			if (mode == RenameMode.Empty)
 				return "";
-			if (mode == RenameMode.Debug)
+			if (mode == RenameMode.Debug || mode == RenameMode.Retain) {
 				// When flattening there are issues, in case there is a . in the name of the assembly.
-				return MakeGenericName("_" + name.Replace('.', '_'), count);
+				newName = MakeGenericName(name.Replace('.', '_'), count);
+				return mode == RenameMode.Debug ? "_" + newName : newName;
+			}
 			if (mode == RenameMode.Reversible) {
 				if (reversibleRenamer == null)
 					throw new ArgumentException("Password not provided for reversible renaming.");
diff --git a/Confuser.Renamer/RenameMode.cs b/Confuser.Renamer/RenameMode.cs
@@ -11,6 +11,10 @@ public enum RenameMode {
 		Sequential = 0x11,
 		Reversible = 0x12,
 
-		Debug = 0x20
+		/// <summary>Add a underscore to the name to mark that it would be renamed.</summary>
+		Debug = 0x20,
+
+		/// <summary>Keep the names as they are.</summary>
+		Retain = Int32.MaxValue
 	}
-}
+}
diff --git a/Tests/123_InheritCustomAttr.Test/InheritCustomAttributeTest.cs b/Tests/123_InheritCustomAttr.Test/InheritCustomAttributeTest.cs
@@ -71,7 +71,7 @@ public async Task InheritCustomAttribute(string renameMode, bool flatten) {
 		}
 
 		public static IEnumerable<object[]> InheritCustomAttributeData() {
-			foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug) })
+			foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug), nameof(RenameMode.Retain) })
 				foreach (var flatten in new bool[] { true, false })
 					yield return new object[] { renameMode, flatten };
 		}
diff --git a/Tests/161_DynamicTypeRename.Test/RenameDynamicMethodTest.cs b/Tests/161_DynamicTypeRename.Test/RenameDynamicMethodTest.cs
@@ -71,7 +71,7 @@ public async Task RenameDynamicType(string renameMode, bool flatten) {
 		}
 
 		public static IEnumerable<object[]> RenameDynamicTypeData() {
-			foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug) })
+			foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug), nameof(RenameMode.Retain) })
 				foreach (var flatten in new bool[] { true, false })
 					yield return new object[] { renameMode, flatten };
 		}

Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public async Task InheritCustomAttribute(string renameMode, bool flatten) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public static IEnumerable<object[]> InheritCustomAttributeData() {`
`74`		`- foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug) })`
	`74`	`+ foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug), nameof(RenameMode.Retain) })`
`75`	`75`	`foreach (var flatten in new bool[] { true, false })`
`76`	`76`	`yield return new object[] { renameMode, flatten };`
`77`	`77`	`}`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public async Task RenameDynamicType(string renameMode, bool flatten) {`
`71`	`71`	`}`
`72`	`72`
`73`	`73`	`public static IEnumerable<object[]> RenameDynamicTypeData() {`
`74`		`- foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug) })`
	`74`	`+ foreach (var renameMode in new string[] { nameof(RenameMode.Unicode), nameof(RenameMode.ASCII), nameof(RenameMode.Letters), nameof(RenameMode.Debug), nameof(RenameMode.Retain) })`
`75`	`75`	`foreach (var flatten in new bool[] { true, false })`
`76`	`76`	`yield return new object[] { renameMode, flatten };`
`77`	`77`	`}`