Remove ILRepack and use ILMerge instead

This commit is contained in:
Peter Van Dender 2021-03-24 14:30:53 +01:00
parent bc5a0056af
commit e35c12c1f2
2 changed files with 6 additions and 4 deletions

View file

@ -32,9 +32,7 @@
<!--Needed for package--> <!--Needed for package-->
<files> <files>
<file src="SMBLibrary\bin\Release\netstandard2.0\SMBLibrary.dll" target="lib\netstandard2.0" /> <file src="SMBLibrary\bin\Release\netstandard2.0\SMBLibrary.dll" target="lib\netstandard2.0" />
<file src="SMBLibrary\bin\Release\netstandard2.0\Utilities.dll" target="lib\netstandard2.0" />
<file src="SMBLibrary\bin\Release\net40\SMBLibrary.dll" target="lib\net40" /> <file src="SMBLibrary\bin\Release\net40\SMBLibrary.dll" target="lib\net40" />
<file src="SMBLibrary\bin\Release\net40\Utilities.dll" target="lib\net40" />
</files> </files>
</package> </package>

View file

@ -16,12 +16,16 @@
<GenerateDocumentationFile>true</GenerateDocumentationFile> <GenerateDocumentationFile>true</GenerateDocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<PackageReference Include="ILMerge" Version="3.0.41" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Utilities\Utilities.csproj" PrivateAssets="All" /> <ProjectReference Include="..\Utilities\Utilities.csproj" PrivateAssets="All" />
</ItemGroup> </ItemGroup>
<Target Name="ILRepack" Condition="'$(Configuration)' == 'Release'" AfterTargets="AfterBuild"> <Target Name="ILMerge" Condition="'$(Configuration)' == 'Release'" AfterTargets="AfterBuild">
<Exec Command="&quot;$(ProgramW6432)\ILRepack\ILRepack.exe&quot; /out=&quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\Utilities.dll&quot;"></Exec> <Exec Command="&quot;$(ILMergeConsolePath)&quot; /out:&quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\SMBLibrary.dll&quot; &quot;$(OutputPath)\Utilities.dll&quot;"></Exec>
</Target> </Target>
</Project> </Project>