Skip to content

Make fixes for full obfuscation tests #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kant2002 merged 1 commit into from
Mar 31, 2026
Merged

Make fixes for full obfuscation tests #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,3 +42,4 @@ gh-pages/
artifacts/
/Confuser.Protections/runtime
/Confuser.Protections/runtime
*.binlog
23 changes: 16 additions & 7 deletions Confuser.MSBuild.Tasks/Confuser.MSBuild.Tasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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" />
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Confuser.MSBuild.Tasks/build/Confuser.MSBuild.Tasks.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
3 changes: 2 additions & 1 deletion Tests/Confuser.MSBuild.Tasks.Tests/TestProjects/HelloWorld/HelloWorld.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Loading