Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ permissions:
jobs:
analyze:
name: Analyze
runs-on: windows-2019
runs-on: windows-latest

strategy:
fail-fast: false
Expand Down
2 changes: 1 addition & 1 deletion Confuser.CLI/Confuser.CLI.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net461</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand Down
4 changes: 2 additions & 2 deletions Confuser.Core/Confuser.Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="..\ConfuserEx.Common.props" Condition="Exists('..\ConfuserEx.Common.props')" />

<PropertyGroup Label="Assembly Settings">
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand All @@ -15,7 +15,7 @@
</PropertyGroup>

<ItemGroup Label="Nuget Dependencies">
<PackageReference Include="dnlib" Version="3.5.0" />
<PackageReference Include="dnlib" Version="4.4.0" />
<PackageReference Include="Microsoft.DiaSymReader.Native" Version="1.7.0" />
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="System.Threading" Version="4.3.0" />
Expand Down
1 change: 1 addition & 0 deletions Confuser.Core/ConfuserEngine.cs
Original file line number Diff line number Diff line change
Expand Up @@ -536,6 +536,7 @@ static void PrintEnvironmentInfo(ConfuserContext context) {
if (context.Resolver != null) {
context.Logger.Error("Cached assemblies:");
foreach (AssemblyDef asm in context.InternalResolver.GetCachedAssemblies()) {
if (asm is null) continue;
if (string.IsNullOrEmpty(asm.ManifestModule.Location))
context.Logger.ErrorFormat(" {0}", asm.FullName);
else
Expand Down
2 changes: 1 addition & 1 deletion Confuser.DynCipher/Confuser.DynCipher.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<Import Project="..\ConfuserEx.Common.props" Condition="Exists('..\ConfuserEx.Common.props')" />

<PropertyGroup Label="Assembly Settings">
<TargetFrameworks>net461;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net8.0</TargetFrameworks>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\ConfuserEx.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
Expand Down
3 changes: 2 additions & 1 deletion Confuser.DynCipher/Generation/ExpressionGenerator.cs
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
using Confuser.Core;
using Confuser.Core.Services;
using Confuser.DynCipher.AST;
using UnreachableException = Confuser.Core.UnreachableException;

namespace Confuser.DynCipher.Generation {
internal class ExpressionGenerator {
Expand Down Expand Up @@ -161,4 +162,4 @@ enum ExpressionOps {
Neg
}
}
}
}
1 change: 1 addition & 0 deletions Confuser.Protections/AntiTamper/AntiMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using dnlib.DotNet.Emit;
using dnlib.DotNet.Writer;
using MethodBody = dnlib.DotNet.Writer.MethodBody;
using UnreachableException = Confuser.Core.UnreachableException;

namespace Confuser.Protections.AntiTamper {
internal class AntiMode : IModeHandler {
Expand Down
8 changes: 6 additions & 2 deletions Confuser.Protections/AntiTamper/JITBody.cs
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ public void Serialize(uint token, uint key, byte[] fieldLayout) {
counter ^= (state >> 5) | (state << 27);
}
}
}

public uint CalculateAlignment() => 0;
}

internal class JITMethodBodyWriter : MethodBodyWriterBase {
readonly CilBody body;
Expand Down Expand Up @@ -251,5 +253,7 @@ public void PopulateSection(PESection section) {
offset += entry.Value.GetFileLength();
}
}

public uint CalculateAlignment() => 0;
}
}
}
1 change: 1 addition & 0 deletions Confuser.Protections/AntiTamper/JITMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using dnlib.DotNet.Emit;
using dnlib.DotNet.MD;
using dnlib.DotNet.Writer;
using UnreachableException = Confuser.Core.UnreachableException;

namespace Confuser.Protections.AntiTamper {
internal class JITMode : IModeHandler {
Expand Down
1 change: 1 addition & 0 deletions Confuser.Protections/AntiTamper/NormalMode.cs
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
using dnlib.DotNet.Emit;
using dnlib.DotNet.Writer;
using MethodBody = dnlib.DotNet.Writer.MethodBody;
using UnreachableException = Confuser.Core.UnreachableException;

namespace Confuser.Protections.AntiTamper {
internal class NormalMode : IModeHandler {
Expand Down
Loading
Loading