diff --git a/Console/Obfuscar.Console.csproj b/Console/Obfuscar.Console.csproj
index b3c4c741..0ca2f7b9 100644
--- a/Console/Obfuscar.Console.csproj
+++ b/Console/Obfuscar.Console.csproj
@@ -1,15 +1,11 @@
-
-
-
+
-
-
-
+
@@ -17,7 +13,7 @@
{275B3EED-7E70-4460-950F-96EDCA099BD4}
Exe
Obfuscar
- net48
+ net8.0-windows
publish\
@@ -37,6 +33,7 @@
true
..\Raindropmemory-Legendora-Potion.ico
false
+ Minimum
full
@@ -53,9 +50,6 @@
Obfuscar.Program
-
-
-
@@ -67,8 +61,11 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+
diff --git a/Console/Program.cs b/Console/Program.cs
index 0829403b..e9f0965f 100644
--- a/Console/Program.cs
+++ b/Console/Program.cs
@@ -29,7 +29,6 @@
using System.Diagnostics.CodeAnalysis;
using System.Reflection;
using System.Threading.Tasks;
-using System.Windows.Forms;
using Mono.Options;
using Rollbar;
using Rollbar.DTOs;
@@ -136,22 +135,16 @@ private static void RegisterRollbar()
Console.WriteLine("Note that Rollbar API is enabled by default to collect crashes. If you want to opt out, please run with -s switch");
var version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
RollbarLocator.RollbarInstance.Configure(
- new RollbarConfig("1dd3cf880c5a46eeb4338dbea73f9620")
+ new RollbarLoggerConfig("1dd3cf880c5a46eeb4338dbea73f9620", "production")
+ {
+ RollbarPayloadAdditionOptions =
{
- Environment = "production",
- Transform = payload =>
+ Person = new Person(version)
{
- payload.Data.Person = new Person(version)
- {
- UserName = $"{version}"
- };
+ UserName = version,
}
- });
-
- Application.ThreadException += (sender, args) =>
- {
- RollbarLocator.RollbarInstance.Error(args.Exception);
- };
+ }
+ });
AppDomain.CurrentDomain.UnhandledException += (sender, args) =>
{
diff --git a/GlobalTools/GlobalTools.csproj b/GlobalTools/GlobalTools.csproj
index e5d14ff1..be2399e3 100644
--- a/GlobalTools/GlobalTools.csproj
+++ b/GlobalTools/GlobalTools.csproj
@@ -2,7 +2,7 @@
Exe
- net60-windows
+ net6.0-windows;net8.0-windows
true
obfuscar.console
diff --git a/GlobalTools/Program.cs b/GlobalTools/Program.cs
index 0c48bc58..9d41c465 100644
--- a/GlobalTools/Program.cs
+++ b/GlobalTools/Program.cs
@@ -135,15 +135,14 @@ private static void RegisterRollbar()
Console.WriteLine("Note that Rollbar API is enabled by default to collect crashes. If you want to opt out, please run with -s switch");
var version = Assembly.GetExecutingAssembly().GetName().Version.ToString();
RollbarLocator.RollbarInstance.Configure(
- new RollbarConfig("1dd3cf880c5a46eeb4338dbea73f9620")
+ new RollbarLoggerConfig("1dd3cf880c5a46eeb4338dbea73f9620", "production")
{
- Environment = "production",
- Transform = payload =>
+ RollbarPayloadAdditionOptions =
{
- payload.Data.Person = new Person(version)
+ Person = new Person(version)
{
- UserName = $"{version}"
- };
+ UserName = version,
+ }
}
});
diff --git a/Obfuscar/Obfuscar.csproj b/Obfuscar/Obfuscar.csproj
index c858725f..a0062a3b 100644
--- a/Obfuscar/Obfuscar.csproj
+++ b/Obfuscar/Obfuscar.csproj
@@ -1,8 +1,9 @@
- net60-windows;net48
+ net6.0-windows;net8.0-windows;net48
false
+ latest
@@ -14,9 +15,21 @@
all
runtime; build; native; contentfiles; analyzers; buildtransitive
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj
index 51286046..66a988e8 100644
--- a/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj
+++ b/ObfuscarTest.FluentAssertions/ObfuscarTest.FluentAssertions.csproj
@@ -1,7 +1,7 @@
- net60-windows;net48
+ net6.0-windows;net8.0-windows;net48
@@ -16,7 +16,7 @@
-
+
diff --git a/ObfuscarTest/ObfuscarTest.csproj b/ObfuscarTest/ObfuscarTest.csproj
index 18cb9bef..29ff7646 100644
--- a/ObfuscarTest/ObfuscarTest.csproj
+++ b/ObfuscarTest/ObfuscarTest.csproj
@@ -44,13 +44,13 @@
-
-
-
-
+
+
+
+
all
-
+
all
diff --git a/ObfuscarTest/TestHelper.cs b/ObfuscarTest/TestHelper.cs
index 3925f0ef..cedb982b 100644
--- a/ObfuscarTest/TestHelper.cs
+++ b/ObfuscarTest/TestHelper.cs
@@ -49,8 +49,8 @@ public static void CleanInput()
// clean out inputPath
try
{
- //foreach (string file in Directory.GetFiles(InputPath, "*.dll"))
- //File.Delete(file);
+ foreach (string file in Directory.GetFiles(InputPath, "*.dll"))
+ File.Delete(file);
}
catch
{
diff --git a/ObfuscarTestNet/CollectionExpressionTest.cs b/ObfuscarTestNet/CollectionExpressionTest.cs
index 5170d152..f6f9e660 100644
--- a/ObfuscarTestNet/CollectionExpressionTest.cs
+++ b/ObfuscarTestNet/CollectionExpressionTest.cs
@@ -29,7 +29,10 @@ public void CheckCollectionExpression()
var assembly2 = Assembly.LoadFrom(Path.GetFullPath(Path.Combine(outputPath, "AssemblyWithCollectionExpression.dll")));
var obfuscatedClass = output.Mapping.ClassMap.First(c => c.Key.Name == "ObfuscarTestNet.Input.AssemblyWithCollectionExpression");
var obfuscatedClassName = obfuscatedClass.Value.StatusText;
+#if NET6_0_OR_GREATER
obfuscatedClassName = obfuscatedClassName[(obfuscatedClassName.IndexOf(']') + 1)..];
+#endif
+ obfuscatedClassName = obfuscatedClassName.Substring(obfuscatedClassName.IndexOf(']') + 1);
var type = assembly2.GetType(obfuscatedClassName) ?? throw new Exception($"Test class {obfuscatedClassName} not found");
var instance = Activator.CreateInstance(type);
diff --git a/ObfuscarTestNet/ObfuscarTestNet.csproj b/ObfuscarTestNet/ObfuscarTestNet.csproj
index a32a662f..051f84db 100644
--- a/ObfuscarTestNet/ObfuscarTestNet.csproj
+++ b/ObfuscarTestNet/ObfuscarTestNet.csproj
@@ -1,11 +1,10 @@
- net6.0-windows
- enable
-
+ net6.0-windows;net8.0-windows;net48
false
true
+ latest
@@ -13,11 +12,12 @@
-
-
-
-
-
+
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
+
+
+