From 5c1470107117ea6672efb9bf25f05d35ce1be456 Mon Sep 17 00:00:00 2001 From: Michael Vinther Date: Wed, 14 Jan 2026 15:00:22 +0100 Subject: [PATCH 1/5] Target .net 10 --- Console/Obfuscar.Console.csproj | 2 +- GlobalTools/GlobalTools.csproj | 2 +- Obfuscar/AssemblyInfo.cs | 1 + Obfuscar/Obfuscar.csproj | 10 +++------- .../ObfuscarTest.FluentAssertions.csproj | 2 +- ObfuscarTestNet/ObfuscarTestNet.csproj | 2 +- 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj index 242531e2..bcf7e832 100644 --- a/Console/Obfuscar.Console.csproj +++ b/Console/Obfuscar.Console.csproj @@ -4,7 +4,7 @@ {275B3EED-7E70-4460-950F-96EDCA099BD4} Exe Obfuscar - net8.0-windows + net10.0-windows publish\ diff --git a/GlobalTools/GlobalTools.csproj b/GlobalTools/GlobalTools.csproj index be2399e3..16ff436c 100644 --- a/GlobalTools/GlobalTools.csproj +++ b/GlobalTools/GlobalTools.csproj @@ -2,7 +2,7 @@ Exe - net6.0-windows;net8.0-windows + net10.0-windows true obfuscar.console diff --git a/Obfuscar/AssemblyInfo.cs b/Obfuscar/AssemblyInfo.cs index 9cb4df3e..437187af 100644 --- a/Obfuscar/AssemblyInfo.cs +++ b/Obfuscar/AssemblyInfo.cs @@ -90,6 +90,7 @@ public static AssemblyInfo FromXml(Project project, XElement reader, Variables v string val = Helper.GetAttribute(reader, "file", vars); if (val.Length > 0) { + Console.WriteLine("Loading " + val); info.LoadAssembly(val); } else diff --git a/Obfuscar/Obfuscar.csproj b/Obfuscar/Obfuscar.csproj index de337a2d..4b7e16ed 100644 --- a/Obfuscar/Obfuscar.csproj +++ b/Obfuscar/Obfuscar.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 false true Minimum @@ -26,12 +26,8 @@ - - - - - - + + diff --git a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj index ac1f53bc..e69ef052 100644 --- a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj +++ b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 diff --git a/ObfuscarTestNet/ObfuscarTestNet.csproj b/ObfuscarTestNet/ObfuscarTestNet.csproj index 1c42f851..f795b24e 100644 --- a/ObfuscarTestNet/ObfuscarTestNet.csproj +++ b/ObfuscarTestNet/ObfuscarTestNet.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 false true latest From 1f4f2b491e075cfa44b7589fedcdc525b107a80c Mon Sep 17 00:00:00 2001 From: Michael Vinther Date: Wed, 14 Jan 2026 15:28:36 +0100 Subject: [PATCH 2/5] Revert "Target .net 10" This reverts commit 5c1470107117ea6672efb9bf25f05d35ce1be456. --- Console/Obfuscar.Console.csproj | 2 +- GlobalTools/GlobalTools.csproj | 2 +- Obfuscar/Obfuscar.csproj | 10 +++++++--- .../ObfuscarTest.FluentAssertions.csproj | 2 +- ObfuscarTestNet/ObfuscarTestNet.csproj | 2 +- 5 files changed, 11 insertions(+), 7 deletions(-) diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj index bcf7e832..242531e2 100644 --- a/Console/Obfuscar.Console.csproj +++ b/Console/Obfuscar.Console.csproj @@ -4,7 +4,7 @@ {275B3EED-7E70-4460-950F-96EDCA099BD4} Exe Obfuscar - net10.0-windows + net8.0-windows publish\ diff --git a/GlobalTools/GlobalTools.csproj b/GlobalTools/GlobalTools.csproj index 16ff436c..be2399e3 100644 --- a/GlobalTools/GlobalTools.csproj +++ b/GlobalTools/GlobalTools.csproj @@ -2,7 +2,7 @@ Exe - net10.0-windows + net6.0-windows;net8.0-windows true obfuscar.console diff --git a/Obfuscar/Obfuscar.csproj b/Obfuscar/Obfuscar.csproj index 4b7e16ed..de337a2d 100644 --- a/Obfuscar/Obfuscar.csproj +++ b/Obfuscar/Obfuscar.csproj @@ -1,7 +1,7 @@  - net10.0;net48 + net6.0;net8.0;net48 false true Minimum @@ -26,8 +26,12 @@ - - + + + + + + diff --git a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj index e69ef052..ac1f53bc 100644 --- a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj +++ b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj @@ -1,7 +1,7 @@  - net10.0;net48 + net6.0;net8.0;net48 diff --git a/ObfuscarTestNet/ObfuscarTestNet.csproj b/ObfuscarTestNet/ObfuscarTestNet.csproj index f795b24e..1c42f851 100644 --- a/ObfuscarTestNet/ObfuscarTestNet.csproj +++ b/ObfuscarTestNet/ObfuscarTestNet.csproj @@ -1,7 +1,7 @@  - net10.0;net48 + net6.0;net8.0;net48 false true latest From a1bef0cd369cde93182115a58cd3ba7cac15f53d Mon Sep 17 00:00:00 2001 From: Michael Vinther Date: Thu, 15 Jan 2026 09:05:51 +0100 Subject: [PATCH 3/5] Update readme --- readme.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/readme.md b/readme.md index 99d3035a..d9abdd75 100644 --- a/readme.md +++ b/readme.md @@ -40,5 +40,4 @@ If you want to donate to my efforts on this project, please use the following li /Master - Not to be changed in 3Shape - should be kept in sync with the fork origin. -Build Link: https://github.com/3shape/obfuscar/actions -Release link: https://github.com/3ShapeInternal/ThreeShape.Obfuscar.Release +To release the nuget, please see this repo: https://github.com/3ShapeInternal/ThreeShape.Obfuscar.Release From 7d8846d091f7a08a7e024e946aa78b016bc3b32d Mon Sep 17 00:00:00 2001 From: Michael Vinther Date: Thu, 15 Jan 2026 09:06:06 +0100 Subject: [PATCH 4/5] Reapply "Target .net 10" This reverts commit 1f4f2b491e075cfa44b7589fedcdc525b107a80c. --- Console/Obfuscar.Console.csproj | 2 +- GlobalTools/GlobalTools.csproj | 2 +- Obfuscar/Obfuscar.csproj | 10 +++------- .../ObfuscarTest.FluentAssertions.csproj | 2 +- ObfuscarTestNet/ObfuscarTestNet.csproj | 2 +- 5 files changed, 7 insertions(+), 11 deletions(-) diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj index 242531e2..bcf7e832 100644 --- a/Console/Obfuscar.Console.csproj +++ b/Console/Obfuscar.Console.csproj @@ -4,7 +4,7 @@ {275B3EED-7E70-4460-950F-96EDCA099BD4} Exe Obfuscar - net8.0-windows + net10.0-windows publish\ diff --git a/GlobalTools/GlobalTools.csproj b/GlobalTools/GlobalTools.csproj index be2399e3..16ff436c 100644 --- a/GlobalTools/GlobalTools.csproj +++ b/GlobalTools/GlobalTools.csproj @@ -2,7 +2,7 @@ Exe - net6.0-windows;net8.0-windows + net10.0-windows true obfuscar.console diff --git a/Obfuscar/Obfuscar.csproj b/Obfuscar/Obfuscar.csproj index de337a2d..4b7e16ed 100644 --- a/Obfuscar/Obfuscar.csproj +++ b/Obfuscar/Obfuscar.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 false true Minimum @@ -26,12 +26,8 @@ - - - - - - + + diff --git a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj index ac1f53bc..e69ef052 100644 --- a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj +++ b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 diff --git a/ObfuscarTestNet/ObfuscarTestNet.csproj b/ObfuscarTestNet/ObfuscarTestNet.csproj index 1c42f851..f795b24e 100644 --- a/ObfuscarTestNet/ObfuscarTestNet.csproj +++ b/ObfuscarTestNet/ObfuscarTestNet.csproj @@ -1,7 +1,7 @@  - net6.0;net8.0;net48 + net10.0;net48 false true latest From 5f9a782d2fe12a0c99aec45b4c1f813a25f1e172 Mon Sep 17 00:00:00 2001 From: Michael Vinther Date: Thu, 15 Jan 2026 09:35:17 +0100 Subject: [PATCH 5/5] Update nuspec --- Obfuscar.nuspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Obfuscar.nuspec b/Obfuscar.nuspec index cb0c3e40..6b612291 100644 --- a/Obfuscar.nuspec +++ b/Obfuscar.nuspec @@ -21,6 +21,6 @@ - +