|
19 | 19 | <GeneratePackageOnBuild>true</GeneratePackageOnBuild> |
20 | 20 | <NoPackageAnalysis>true</NoPackageAnalysis> |
21 | 21 | <TargetsForTfmSpecificContentInPackage>$(TargetsForTfmSpecificContentInPackage);IncludeConfuserDependencyFiles</TargetsForTfmSpecificContentInPackage> |
22 | | - <IncludeBuildOutput>false</IncludeBuildOutput> |
23 | 22 | </PropertyGroup> |
24 | 23 |
|
25 | 24 | <ItemGroup Label="Nuget Dependencies"> |
26 | 25 | <PackageReference Include="Microsoft.Build.Tasks.Core" Version="17.11.48" PrivateAssets="all" /> |
| 26 | + <PackageReference Include="dnlib" Version="4.5.0" GeneratePathProperty="true" /> |
27 | 27 | </ItemGroup> |
28 | 28 |
|
29 | 29 | <ItemGroup Label="Project Dependencies"> |
30 | 30 | <ProjectReference Include="..\Confuser.Core\Confuser.Core.csproj" PrivateAssets="all" /> |
31 | 31 | <ProjectReference Include="..\Confuser.Protections\Confuser.Protections.csproj" PrivateAssets="all" /> |
32 | 32 | <ProjectReference Include="..\Confuser.Renamer\Confuser.Renamer.csproj" PrivateAssets="all" /> |
33 | | - <ProjectReference Include="..\Confuser.Runtime\Confuser.Runtime.csproj" Condition="'$(TargetFramework)' == 'net472'" PrivateAssets="all" /> |
| 33 | + <ProjectReference Include="..\Confuser.Runtime\Confuser.Runtime.csproj" PrivateAssets="all" /> |
34 | 34 | </ItemGroup> |
35 | 35 |
|
36 | 36 | <ItemGroup> |
|
44 | 44 | </IncludeConfuserDependencyFilesDependsOn> |
45 | 45 | </PropertyGroup> |
46 | 46 |
|
| 47 | + <ItemGroup> |
| 48 | + <None Include="$(Pkgdnlib)\lib/net6.0/dnlib.dll" CopyToOutputDirectory="PreserveNewest" /> |
| 49 | + </ItemGroup> |
| 50 | + |
47 | 51 | <Target Name="IncludeConfuserDependencyFiles" DependsOnTargets="$(IncludeConfuserDependencyFilesDependsOn)" /> |
48 | 52 |
|
49 | 53 | <Target Name="IncludeConfuserDependencyFilesFramework" Condition="'$(TargetFramework)' == 'net472'"> |
| 54 | + <PropertyGroup> |
| 55 | + <PTEST_11>$(BaseOutputPath)$(ArtifactsPivots)</PTEST_11> |
| 56 | + </PropertyGroup> |
50 | 57 | <ItemGroup> |
51 | | - <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)\$(Configuration)\net472\*.dll" /> |
52 | | - <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)\$(Configuration)\net472\*.pdb" /> |
| 58 | + <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.dll" /> |
| 59 | + <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.pdb" /> |
| 60 | + <ConfuserNetFrameworkDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\runtime\*\*.dll" /> |
53 | 61 | </ItemGroup> |
54 | 62 | <CreateItem Include="@(ConfuserNetFrameworkDependencies)" AdditionalMetadata="PackagePath=netframework"> |
55 | 63 | <Output TaskParameter="Include" ItemName="TfmSpecificPackageFile" /> |
|
58 | 66 |
|
59 | 67 | <Target Name="IncludeConfuserDependencyFilesStandard" Condition="'$(TargetFramework)' == 'net8.0'"> |
60 | 68 | <ItemGroup> |
61 | | - <ConfuserNetDependencies Include="$(BaseOutputPath)\$(Configuration)\net8.0\*.dll" /> |
62 | | - <ConfuserNetDependencies Include="$(BaseOutputPath)\$(Configuration)\net8.0\*.pdb" /> |
| 69 | + <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.dll" /> |
| 70 | + <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\*.pdb" /> |
| 71 | + <ConfuserNetDependencies Include="$(BaseOutputPath)$(ArtifactsPivots)\runtime\*\*.dll" /> |
63 | 72 | </ItemGroup> |
64 | | - <CreateItem Include="@(ConfuserNetStandardDependencies)" AdditionalMetadata="PackagePath=net"> |
| 73 | + <CreateItem Include="@(ConfuserNetDependencies)" AdditionalMetadata="PackagePath=net"> |
65 | 74 | <Output TaskParameter="Include" ItemName="TfmSpecificPackageFile" /> |
66 | 75 | </CreateItem> |
67 | 76 | </Target> |
|
0 commit comments