From 237e213cb84ae8bf78938d44f70ec8d2c253d2a3 Mon Sep 17 00:00:00 2001
From: Andrii Kurdiumov <kant2002@gmail.com>
Date: Tue, 31 Mar 2026 20:57:14 +0200
Subject: [PATCH] Make fixes for full obfuscation tests

If we have specific configuration failing, we can add more tests now. It require create new folder with project setup for building.

Closes #36
---
 .gitignore                                    |  1 +
 .../Confuser.MSBuild.Tasks.csproj             | 23 +++++++++++++------
 .../build/Confuser.MSBuild.Tasks.targets      |  2 +-
 .../TestProjects/HelloWorld/HelloWorld.csproj |  3 ++-
 4 files changed, 20 insertions(+), 9 deletions(-)

diff --git a/.gitignore b/.gitignore
index 1f8a9c523..fc1fa436b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -42,3 +42,4 @@ gh-pages/
 artifacts/
 /Confuser.Protections/runtime
 /Confuser.Protections/runtime
+*.binlog
diff --git a/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj b/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj
index 4a8a7e95a..b06251a9a 100644
--- a/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj
+++ b/Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj
@@ -19,18 +19,18 @@
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <NoPackageAnalysis>true</NoPackageAnalysis>
     <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeConfuserDependencyFiles</TargetsForTfmSpecificContentInPackage>
-    <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
   <ItemGroup Label="Nuget Dependencies">
     <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" PrivateAssets="all" />
+    <PackageReference Include="dnlib" Version="4.5.0" GeneratePathProperty="true" />
   </ItemGroup>
 
   <ItemGroup Label="Project Dependencies">
     <ProjectReference Include="..\Confuser.Core\Confuser.Core.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Confuser.Protections\Confuser.Protections.csproj" PrivateAssets="all" />
     <ProjectReference Include="..\Confuser.Renamer\Confuser.Renamer.csproj" PrivateAssets="all" />
-    <ProjectReference Include="..\Confuser.Runtime\Confuser.Runtime.csproj" Condition="'$(TargetFramework)' == 'net472'" PrivateAssets="all" />
+    <ProjectReference Include="..\Confuser.Runtime\Confuser.Runtime.csproj" PrivateAssets="all" />
   </ItemGroup>
 
   <ItemGroup>
@@ -44,12 +44,20 @@
     </IncludeConfuserDependencyFilesDependsOn>
   </PropertyGroup>
 
+  <ItemGroup>
+    <None Include="$(Pkgdnlib)\lib/net6.0/dnlib.dll" CopyToOutputDirectory="PreserveNewest" />
+  </ItemGroup>
+
   <Target Name="IncludeConfuserDependencyFiles" DependsOnTargets="$(IncludeConfuserDependencyFilesDependsOn)" />
 
   <Target Name="IncludeConfuserDependencyFilesFramework" Condition="'$(TargetFramework)' == 'net472'">
+    <PropertyGroup>
+      <PTEST_11>$(BaseOutputPath)$(ArtifactsPivots)</PTEST_11>
+    </PropertyGroup>
     <ItemGroup>
-      <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)\$(Configuration)\net472\*.dll" />
-      <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)\$(Configuration)\net472\*.pdb" />
+      <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.dll" />
+      <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.pdb" />
+      <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\runtime\*\*.dll" />
     </ItemGroup>
     <CreateItem Include="@(ConfuserNetFrameworkDependencies)" AdditionalMetadata="PackagePath=netframework">
       <Output TaskParameter="Include" ItemName="TfmSpecificPackageFile" />
@@ -58,10 +66,11 @@
 
   <Target Name="IncludeConfuserDependencyFilesStandard" Condition="'$(TargetFramework)' == 'net8.0'">
     <ItemGroup>
-      <ConfuserNetDependencies Include="$(BaseOutputPath)\$(Configuration)\net8.0\*.dll" />
-      <ConfuserNetDependencies Include="$(BaseOutputPath)\$(Configuration)\net8.0\*.pdb" />
+      <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.dll" />
+      <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.pdb" />
+      <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\runtime\*\*.dll" />
     </ItemGroup>
-    <CreateItem Include="@(ConfuserNetStandardDependencies)" AdditionalMetadata="PackagePath=net">
+    <CreateItem Include="@(ConfuserNetDependencies)" AdditionalMetadata="PackagePath=net">
       <Output TaskParameter="Include" ItemName="TfmSpecificPackageFile" />
     </CreateItem>
   </Target>
diff --git a/Confuser.MSBuild.Tasks/build/Confuser.MSBuild.Tasks.targets b/Confuser.MSBuild.Tasks/build/Confuser.MSBuild.Tasks.targets
index e0e38f8ef..97d85204c 100644
--- a/Confuser.MSBuild.Tasks/build/Confuser.MSBuild.Tasks.targets
+++ b/Confuser.MSBuild.Tasks/build/Confuser.MSBuild.Tasks.targets
@@ -6,7 +6,7 @@
 
   <PropertyGroup>
     <ConfuserAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Full'">$(MSBuildThisFileDirectory)\..\netframework\</ConfuserAssemblyPath>
-    <ConfuserAssemblyPath Condition="'$(ConfuserAssemblyPath)' == ''">$(MSBuildThisFileDirectory)\..\netstandard\</ConfuserAssemblyPath>
+    <ConfuserAssemblyPath Condition="'$(ConfuserAssemblyPath)' == ''">$(MSBuildThisFileDirectory)\..\net\</ConfuserAssemblyPath>
   </PropertyGroup>
 
   <UsingTask TaskName="Confuser.MSBuild.Tasks.CreateProjectTask"
diff --git a/Tests/Confuser.MSBuild.Tasks.Tests/TestProjects/HelloWorld/HelloWorld.csproj b/Tests/Confuser.MSBuild.Tasks.Tests/TestProjects/HelloWorld/HelloWorld.csproj
index d77595d9c..22e66b2b0 100644
--- a/Tests/Confuser.MSBuild.Tasks.Tests/TestProjects/HelloWorld/HelloWorld.csproj
+++ b/Tests/Confuser.MSBuild.Tasks.Tests/TestProjects/HelloWorld/HelloWorld.csproj
@@ -5,10 +5,11 @@
     <TargetFramework>net8.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
     <Nullable>enable</Nullable>
+    <Obfuscate>true</Obfuscate>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Confuser.MSBuild" Version="*" />
+    <PackageReference Include="Confuser.MSBuild" Version="1.7.0-*" />
   </ItemGroup>
 
 </Project>