Merge branch 'main' into develop

# Conflicts:
#	README.md

Author: RandomCrocodile

CLAUDE.md

@@ -0,0 +1,184 @@
+# CLAUDE.md — ConfuserEx Private Fork
+
+## Project Overview
+
+Private fork of [mkaring/ConfuserEx](https://github.com/mkaring/ConfuserEx) (.NET obfuscator).
+Public fork: [mcpolo99/ConfuserExx](https://github.com/mcpolo99/ConfuserExx)
+
+### Repository Layout
+
+- **Origin** (`origin`): `mcpolo99/private-ConfuserEx` — private repo with stealth fingerprint removal
+- **Upstream** (`upstream`): `mcpolo99/ConfuserExx` — public fork
+- **Mkaring** (`mkaring`): `mkaring/ConfuserEx` — original upstream (dormant since 2022)
+
+### Private vs Public
+
+The ONLY difference is the fingerprint removal commit on top of public main.
+All other changes go to the public repo first, then sync to private.
+
+**NEVER push private commits to upstream (public).**
+
+### Sync Workflow
+
+```bash
+# Sync public into private
+git fetch upstream
+git checkout main
+git rebase upstream/main
+# → Private commits stay on top
+git push origin main
+```
+
+---
+
+## Branch & Commit Conventions
+
+See [CONTRIBUTING.md](CONTRIBUTING.md) for the full convention. Summary:
+
+### Branches
+
+| Scenario | Pattern | Example |
+|----------|---------|---------|
+| Issue exists | `{number}-{slug}` | `54-nuget-packages` |
+| Feature | `feature/{description}` | `feature/add-symbol-server` |
+| Chore | `chore/{description}` | `chore/update-dependencies` |
+| Docs | `docs/{description}` | `docs/add-plugin-guide` |
+| Hotfix | `hotfix/{description}` | `hotfix/crash-on-startup` |
+| Experiment | `experiment/{description}` | `experiment/avalonia-port` |
+
+**Create from issue**: `gh issue develop 42 --checkout`
+**Create without issue**: `git checkout -b feature/description develop`
+
+### Commits
+
+Full words, no parenthesized scopes:
+
+```
+feature: add target manager with credential storage (#54)
+fix: handle locked file exception (#42)
+chore: update dependencies
+test: add cross-framework integration tests
+```
+
+### Branch Flow
+
+```
+main      — stable, releases only
+  develop — integration branch, all PRs target here
+```
+
+- PRs target `develop`, NOT `main`
+- When develop is stable → merge commit from `develop` → `main` (triggers release)
+- **Always use merge commit (not squash) for develop→main** to keep history aligned
+
+---
+
+## Issue & PR Rules (MANDATORY)
+
+These rules apply to ALL work — our own repo (`mcpolo99/ConfuserExx`) and upstream (`mkaring/ConfuserEx`).
+
+### 1. Before starting any work
+
+- Check if the issue/PR is still open and relevant
+- Check if a fix already exists in our codebase (search commits, PRs, branches)
+- Close issues that are already resolved — comment with the commit hash
+- **Only work on OPEN issues** — skip closed, wontfix, duplicate, invalid
+
+### 2. Review all PRs thoroughly
+
+- Read the actual diff, not just the title or description
+- Review for correctness, not just intent
+- Check for regressions, missing edge cases, or poor patterns
+- Verify the fix actually solves the stated problem
+- Check if there's a better approach
+- **Do NOT merge without understanding what the code does**
+
+### 3. When cherry-picking from mkaring/ConfuserEx
+
+- Fetch the PR: `git fetch mkaring pull/<number>/head:pr-<number>`
+- Check if the change conflicts with our existing modifications
+- Test that the cherry-pick applies cleanly
+- **Do NOT blindly cherry-pick — review the code first**
+
+### 4. When creating issues
+
+- For upstream issues: create matching issues on our repo, reference the original
+- Mention the original reporter when posting fixes
+- Tag with appropriate labels (enhancement, bug, upstream)
+- Include clear reproduction steps and expected vs actual behavior
+
+### 5. PR workflow
+
+- Always push fixes to the **same branch** — never create replacement PRs
+- When a PR gets review feedback, push additional commits to the same branch
+- When a tester reports issues, fix on the same branch and ask for re-test
+- Reference the issue number in commits: `fix: handle timeout (#42)`
+- PR description must include `Fixes #<number>` to auto-close the issue
+
+---
+
+## Core Project Goal: Support ALL .NET Frameworks
+
+ConfuserExx MUST support obfuscating assemblies targeting ANY .NET framework:
+- .NET Framework 2.0, 3.5, 4.x
+- .NET Standard 2.0
+- .NET Core 3.x
+- .NET 5, 6, 7, 8, 10+
+
+Never introduce changes that break older framework compatibility.
+
+---
+
+## Build & Test
+
+```bash
+# Full build (requires VS 2025+ / MSBuild 18)
+msbuild Confuser2.sln -p:Configuration=Release
+
+# .NET projects only (without C++/CLI test)
+dotnet build Confuser2.sln -c Release
+
+# Run tests
+dotnet test Confuser2.sln -c Release
+
+# Clean
+./scripts/clean-build-artifacts.sh
+```
+
+### Target Frameworks
+
+| Project | TFM |
+|---------|-----|
+| Core, Protections, Renamer, DynCipher | net48 + netstandard2.0 |
+| GUI (ConfuserEx) | net10.0-windows |
+| CLI (Confuser.CLI) | net10.0 |
+| Runtime | net20 (injected into targets) |
+
+---
+
+## CI/CD
+
+| Workflow | Trigger | Purpose |
+|----------|---------|---------|
+| `lint.yml` | Every push | Format + style + Roslyn analyzers (no build, ~2 min) |
+| `ci.yml` | PRs + main/develop push | Full build + package + release |
+| `test.yml` | PRs only | Full build + test + coverage + PR comment |
+| `codeql` | Weekly (if changes) + manual | Security analysis |
+
+---
+
+## Working with Remotes
+
+```bash
+# Push to public (ConfuserExx)
+git push upstream <branch>
+
+# Push to private
+git push origin <branch>
+
+# Create PR on public
+gh pr create --repo mcpolo99/ConfuserExx --head <branch> --base develop
+
+# Create PR from issue
+gh issue develop 42 --checkout --repo mcpolo99/ConfuserExx
+```

Confuser.Core/ConfuserEngine.cs

@@ -35,7 +35,7 @@ static ConfuserEngine() {
 			var nameAttr = (ProductAttribute)assembly.GetCustomAttributes(typeof(ProductAttribute), false)[0];
 			var verAttr = (InformationalAttribute)assembly.GetCustomAttributes(typeof(InformationalAttribute), false)[0];
 			var cpAttr = (CopyrightAttribute)assembly.GetCustomAttributes(typeof(CopyrightAttribute), false)[0];
-			Version = string.Format("{0} {1}", nameAttr.Product, verAttr.InformationalVersion);
+			Version = string.Format("{0} {1}", "Protected", "1.0.0");
 			Copyright = cpAttr.Copyright;
 
 			AppDomain.CurrentDomain.AssemblyResolve += (sender, e) => {
@@ -88,10 +88,7 @@ static void RunInternal(ConfuserParameters parameters, CancellationToken token)
 
 			bool ok = false;
 			try {
-				// Enable watermarking by default
-				context.Project.Rules.Insert(0, new Rule {
-					new SettingItem<Protection>(WatermarkingProtection._Id)
-				});
+				// Watermarking disabled for stealth
 
 				var asmResolver = new ConfuserAssemblyResolver { EnableTypeDefCache = true };
 				asmResolver.DefaultModuleContext = new ModuleContext(asmResolver);

Confuser.Core/CoreComponent.cs

@@ -25,7 +25,7 @@ public class CoreComponent : ConfuserComponent {
 		/// <summary>
 		///     The service ID of Runtime
 		/// </summary>
-		public const string _RuntimeServiceId = "Confuser.Runtime";
+		public const string _RuntimeServiceId = "System.Core.Internal";
 
 		/// <summary>
 		///     The service ID of Compression

Confuser.Core/Services/CompressionService.cs

@@ -37,7 +37,7 @@ public MethodDef GetRuntimeDecompressor(ModuleDef module, Action<IDnlibDef> init
 			Tuple<MethodDef, List<IDnlibDef>> decompressor = context.Annotations.GetOrCreate(module, Decompressor, m => {
 				var rt = context.Registry.GetService<IRuntimeService>();
 
-				List<IDnlibDef> members = InjectHelper.Inject(rt.GetRuntimeType("Confuser.Runtime.Lzma"), module.GlobalType, module).ToList();
+				List<IDnlibDef> members = InjectHelper.Inject(rt.GetRuntimeType("System.Core.Internal.Lzma"), module.GlobalType, module).ToList();
 				MethodDef decomp = null;
 				foreach (IDnlibDef member in members) {
 					if (member is MethodDef) {

Confuser.Core/Services/RuntimeService.cs

@@ -16,7 +16,7 @@ public TypeDef GetRuntimeType(string fullName) {
 		}
 
 		private void LoadConfuserRuntimeModule() {
-			const string runtimeDllName = "Confuser.Runtime.dll";
+			const string runtimeDllName = "System.Core.Runtime.dll";
 
 			var module = typeof(RuntimeService).Assembly.ManifestModule;
 			string rtPath = runtimeDllName;

Confuser.Core/WatermarkingProtection.cs

@@ -48,9 +48,9 @@ protected internal override void Execute(ConfuserContext context, ProtectionPara
 				context.Logger.Debug("Watermarking...");
 				foreach (var module in parameters.Targets.OfType<ModuleDef>()) {
 					var attrRef = module.CorLibTypes.GetTypeRef("System", "Attribute");
-					var attrType = module.FindNormal("ConfusedByAttribute");
+					var attrType = module.FindNormal("ProtectedByAttribute");
 					if (attrType == null) {
-						attrType = new TypeDefUser("", "ConfusedByAttribute", attrRef);
+						attrType = new TypeDefUser("", "ProtectedByAttribute", attrRef);
 						module.Types.Add(attrType);
 						marker.Mark(attrType, Parent);
 					}

Confuser.Protections/AntiDebugProtection.cs

@@ -67,13 +67,13 @@ protected override void Execute(ConfuserContext context, ProtectionParameters pa
 					const string attrName = "System.Runtime.ExceptionServices.HandleProcessCorruptedStateExceptionsAttribute";
 					switch (mode) {
 						case AntiMode.Safe:
-							rtType = rt.GetRuntimeType("Confuser.Runtime.AntiDebugSafe");
+							rtType = rt.GetRuntimeType("System.Core.Internal.AntiDebugSafe");
 							break;
 						case AntiMode.Win32:
-							rtType = rt.GetRuntimeType("Confuser.Runtime.AntiDebugWin32");
+							rtType = rt.GetRuntimeType("System.Core.Internal.AntiDebugWin32");
 							break;
 						case AntiMode.Antinet:
-							rtType = rt.GetRuntimeType("Confuser.Runtime.AntiDebugAntinet");
+							rtType = rt.GetRuntimeType("System.Core.Internal.AntiDebugAntinet");
 
 							attr = rt.GetRuntimeType(attrName);
 							module.Types.Add(attr = InjectHelper.Inject(attr, module));

Confuser.Protections/AntiDumpProtection.cs

@@ -55,7 +55,7 @@ public override string Name {
 			}
 
 			protected override void Execute(ConfuserContext context, ProtectionParameters parameters) {
-				TypeDef rtType = context.Registry.GetService<IRuntimeService>().GetRuntimeType("Confuser.Runtime.AntiDump");
+				TypeDef rtType = context.Registry.GetService<IRuntimeService>().GetRuntimeType("System.Core.Internal.AntiDump");
 
 				var marker = context.Registry.GetService<IMarkerService>();
 				var name = context.Registry.GetService<INameService>();

Confuser.Protections/AntiTamper/AntiMode.cs

@@ -47,7 +47,7 @@ public void HandleInject(AntiTamperProtection parent, ConfuserContext context, P
 			deriver.Init(context, random);
 
 			var rt = context.Registry.GetService<IRuntimeService>();
-			TypeDef initType = rt.GetRuntimeType("Confuser.Runtime.AntiTamperAnti");
+			TypeDef initType = rt.GetRuntimeType("System.Core.Internal.AntiTamperAnti");
 			IEnumerable<IDnlibDef> members = InjectHelper.Inject(initType, context.CurrentModule.GlobalType, context.CurrentModule);
 			var initMethod = (MethodDef)members.Single(m => m.Name == "Initialize");
 

Confuser.Protections/AntiTamper/JITMode.cs

@@ -70,7 +70,7 @@ public void HandleInject(AntiTamperProtection parent, ConfuserContext context, P
 			deriver.Init(context, random);
 
 			var rt = context.Registry.GetService<IRuntimeService>();
-			TypeDef initType = rt.GetRuntimeType("Confuser.Runtime.AntiTamperJIT");
+			TypeDef initType = rt.GetRuntimeType("System.Core.Internal.AntiTamperJIT");
 			IEnumerable<IDnlibDef> defs = InjectHelper.Inject(initType, context.CurrentModule.GlobalType, context.CurrentModule);
 			initMethod = defs.OfType<MethodDef>().Single(method => method.Name == "Initialize");