yck1509 · May 26, 2018 · May 26, 2018 · May 26, 2018 · May 27, 2018 · Jun 1, 2018
diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md
@@ -0,0 +1,28 @@
+---
+name: Bug report
+about: Create a report to help us improve
+
+---
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Screenshots**
+If applicable, add screenshots to help explain your problem.
+
+**File (optional)**
+Either share a link to download the file or e-mail it to me.
+
+
+**Additional context**
+Add any other context about the problem here.
diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,17 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+
+---
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.
diff --git a/.gitignore b/.gitignore
@@ -35,4 +35,13 @@ packages/
 gh-pages/
 GlobalAssemblyInfo.cs
 /Build/*.zip
-!Build/7z.exe
+!Build/7z.exe
+.vs/Confuser2/v15/Server/sqlite3/db.lock
+.vs/Confuser2/v15/Server/sqlite3/storage.ide
+.vs/Confuser2/v15/Server/sqlite3/storage.ide-shm
+.vs/Confuser2/v15/Server/sqlite3/storage.ide-wal
+dbg/dbg.csproj
+dbg/Program.cs
+dbg/app.config
+dbg/Properties/AssemblyInfo.cs
+Confuser2.sln
diff --git a/.vs/Confuser2/DesignTimeBuild/.dtbcache b/.vs/Confuser2/DesignTimeBuild/.dtbcache
diff --git a/Build/UpdateVersion.cs b/Build/UpdateVersion.cs
@@ -39,7 +39,7 @@ public static int Main(string[] args) {
 				Console.WriteLine("error when executing git describe.");
 			}
 		}
-		tag = tag ?? "v" + ver + "-custom";
+		tag = tag ?? "v" + ver;
 
 		string template = Path.Combine(dir, "GlobalAssemblyInfo.Template.cs");
 		string output = Path.Combine(dir, "GlobalAssemblyInfo.cs");

diff --git a/Confuser.CLI/Program.cs b/Confuser.CLI/Program.cs
@@ -13,7 +13,7 @@ static int Main(string[] args) {
 			ConsoleColor original = Console.ForegroundColor;
 			Console.ForegroundColor = ConsoleColor.White;
 			string originalTitle = Console.Title;
-			Console.Title = "ConfuserEx";
+			Console.Title = "Neo-ConfuserEx";
 			try {
 				bool noPause = false;
 				bool debug = false;

diff --git a/Confuser.Core/API/APIStore.cs b/Confuser.Core/API/APIStore.cs
@@ -36,7 +36,7 @@ public void AddPredicate(IOpaquePredicateDescriptor predicate) {
 		public IDataStore GetStore(MethodDef method) {
 			for (int i = dataStores.Count - 1; i >= 0; i--) {
 				var list = dataStores[i];
-				for (int j = list.Count - 1; j >= 0; i--) {
+				for (int j = list.Count - 1; j >= 0; j--) {
 					if (list[j].IsUsable(method))
 						return list[j];
 				}

diff --git a/Confuser.Core/ConfuserEngine.cs b/Confuser.Core/ConfuserEngine.cs
@@ -89,7 +89,7 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token)
 				asmResolver.EnableTypeDefCache = true;
 				asmResolver.DefaultModuleContext = new ModuleContext(asmResolver);
 				context.Resolver = asmResolver;
-				context.BaseDirectory = Path.Combine(Environment.CurrentDirectory, parameters.Project.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
+				context.BaseDirectory = Path.Combine(Environment.CurrentDirectory, parameters.Project.BaseDirectory.TrimEnd(Path.DirectorySeparatorChar) + "." + Path.DirectorySeparatorChar);
 				context.OutputDirectory = Path.Combine(parameters.Project.BaseDirectory, parameters.Project.OutputDirectory.TrimEnd(Path.DirectorySeparatorChar) + Path.DirectorySeparatorChar);
 				foreach (string probePath in parameters.Project.ProbePaths)
 					asmResolver.PostSearchPaths.Insert(0, Path.Combine(context.BaseDirectory, probePath));
@@ -389,7 +389,7 @@ static void WriteModule(ConfuserContext context) {
 
 			MemoryStream pdb = null, output = new MemoryStream();
 
-			if (context.CurrentModule.PdbState != null) {
+            if (context.CurrentModule.PdbState != null) {
 				pdb = new MemoryStream();
 				context.CurrentModuleWriterOptions.WritePdb = true;
 				context.CurrentModuleWriterOptions.PdbFileName = Path.ChangeExtension(Path.GetFileName(context.OutputPaths[context.CurrentModuleIndex]), "pdb");
@@ -535,4 +535,4 @@ static void PrintEnvironmentInfo(ConfuserContext context) {
 			context.Logger.Error("---END DEBUG INFO---");
 		}
 	}
-}
+}