Skip to content

Commit 2cabc0e

Browse files
ravibpatelravibpatel
committed
Improved formatting for better readability.
1 parent b5562c7 commit 2cabc0e

File tree

9 files changed

+215
-232
lines changed

9 files changed

+215
-232
lines changed

‎ILRepack.Lib.MSBuild.Task/ILRepack.Config.props‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8" ?>
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<KeyFile>$(ProjectDir)$(TargetName).snk</KeyFile>
5-
</PropertyGroup>
3+
<PropertyGroup>
4+
<KeyFile>$(ProjectDir)$(TargetName).snk</KeyFile>
5+
</PropertyGroup>
66
</Project>

‎ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.csproj‎

Lines changed: 42 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -1,51 +1,51 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<PropertyGroup>
4-
<TargetFramework>net472</TargetFramework>
5-
<Version>2.0.22</Version>
6-
</PropertyGroup>
3+
<PropertyGroup>
4+
<TargetFramework>net472</TargetFramework>
5+
<Version>2.0.22</Version>
6+
</PropertyGroup>
77

8-
<ItemGroup>
9-
<PackageReference Include="ILRepack" Version="2.0.22" GeneratePathProperty="true" />
10-
<PackageReference Include="ILRepack.Lib" Version="2.0.22" />
11-
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.3" />
12-
</ItemGroup>
8+
<ItemGroup>
9+
<PackageReference Include="ILRepack" Version="2.0.22" GeneratePathProperty="true"/>
10+
<PackageReference Include="ILRepack.Lib" Version="2.0.22"/>
11+
<PackageReference Include="Microsoft.Build.Utilities.Core" Version="17.8.3"/>
12+
</ItemGroup>
1313

14-
<ItemGroup>
15-
<None Include="build\ILRepack.Lib.MSBuild.Task.nuspec" />
16-
<None Include="ILRepack.Config.props" />
17-
<None Include="ILRepack.Lib.MSBuild.Task.snk" />
18-
<None Include="ILRepack.Lib.MSBuild.Task.targets" CopyToOutputDirectory="PreserveNewest" />
19-
</ItemGroup>
14+
<ItemGroup>
15+
<None Include="build\ILRepack.Lib.MSBuild.Task.nuspec"/>
16+
<None Include="ILRepack.Config.props"/>
17+
<None Include="ILRepack.Lib.MSBuild.Task.snk"/>
18+
<None Include="ILRepack.Lib.MSBuild.Task.targets" CopyToOutputDirectory="PreserveNewest"/>
19+
</ItemGroup>
2020

21-
<Target Name="Repack" AfterTargets="Build">
22-
<Exec Command="&quot;$(ILRepack)&quot; /out:ILRepack.Lib.MSBuild.Task.dll ILRepack.Lib.MSBuild.Task.dll ILRepack.dll"
23-
WorkingDirectory="$(OutDir)"
24-
ConsoleToMSBuild="True" />
25-
</Target>
21+
<Target Name="Repack" AfterTargets="Build">
22+
<Exec Command="&quot;$(ILRepack)&quot; /out:ILRepack.Lib.MSBuild.Task.dll ILRepack.Lib.MSBuild.Task.dll ILRepack.dll"
23+
WorkingDirectory="$(OutDir)"
24+
ConsoleToMSBuild="True"/>
25+
</Target>
2626

27-
<Target Name="PrepareNupkgInfo">
28-
<PropertyGroup>
29-
<NuspecPath>$(MSBuildThisFileDirectory)build\ILRepack.Lib.MSBuild.Task.nuspec</NuspecPath>
30-
<NupkgPath>$(OutDir)ILRepack.Lib.MSBuild.Task.$(Version).nupkg</NupkgPath>
31-
</PropertyGroup>
32-
</Target>
27+
<Target Name="PrepareNupkgInfo">
28+
<PropertyGroup>
29+
<NuspecPath>$(MSBuildThisFileDirectory)build\ILRepack.Lib.MSBuild.Task.nuspec</NuspecPath>
30+
<NupkgPath>$(OutDir)ILRepack.Lib.MSBuild.Task.$(Version).nupkg</NupkgPath>
31+
</PropertyGroup>
32+
</Target>
3333

34-
<Target Name="CreateNupkg"
35-
Condition="$(Configuration) == 'Release'"
36-
AfterTargets="Build"
37-
DependsOnTargets="Repack;PrepareNupkgInfo"
38-
Inputs="$(NuspecPath);$(TargetPath);$(MSBuildThisFileFullPath)"
39-
Outputs="$(NupkgPath)">
40-
<PackTask
41-
PackItem="$(NuspecPath)"
42-
NuspecFile="$(NuspecPath)"
43-
NuspecProperties="version=$(Version)"
44-
NuspecBasePath="$(OutDir)"
45-
NuspecOutputPath="$(NuspecOutputPath)"
46-
PackageOutputPath="$(OutDir)"
47-
RestoreOutputPath="$(RestoreOutputPath)"
48-
SymbolPackageFormat="snupkg" />
49-
</Target>
34+
<Target Name="CreateNupkg"
35+
Condition="$(Configuration) == 'Release'"
36+
AfterTargets="Build"
37+
DependsOnTargets="Repack;PrepareNupkgInfo"
38+
Inputs="$(NuspecPath);$(TargetPath);$(MSBuildThisFileFullPath)"
39+
Outputs="$(NupkgPath)">
40+
<PackTask
41+
PackItem="$(NuspecPath)"
42+
NuspecFile="$(NuspecPath)"
43+
NuspecProperties="version=$(Version)"
44+
NuspecBasePath="$(OutDir)"
45+
NuspecOutputPath="$(NuspecOutputPath)"
46+
PackageOutputPath="$(OutDir)"
47+
RestoreOutputPath="$(RestoreOutputPath)"
48+
SymbolPackageFormat="snupkg"/>
49+
</Target>
5050

5151
</Project>

‎ILRepack.Lib.MSBuild.Task/ILRepack.Lib.MSBuild.Task.targets‎

Lines changed: 34 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,39 @@
11
<Project>
2-
<Import Project="$(ProjectDir)ILRepack.Config.props" Condition="Exists('$(ProjectDir)ILRepack.Config.props')" />
2+
<Import Project="$(ProjectDir)ILRepack.Config.props" Condition="Exists('$(ProjectDir)ILRepack.Config.props')"/>
33

4-
<PropertyGroup>
5-
<ILRepackTargetsFile Condition="$(ILRepackTargetsFile) == ''">$(ProjectDir)ILRepack.targets</ILRepackTargetsFile>
6-
</PropertyGroup>
4+
<PropertyGroup>
5+
<ILRepackTargetsFile Condition="$(ILRepackTargetsFile) == ''">$(ProjectDir)ILRepack.targets</ILRepackTargetsFile>
6+
</PropertyGroup>
77

8-
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)ILRepack.Lib.MSBuild.Task.dll" TaskName="ILRepack" />
9-
<Import Project="$(ILRepackTargetsFile)" Condition="Exists('$(ILRepackTargetsFile)')" />
10-
<Target Name="ILRepack" AfterTargets="Build" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)')">
11-
<ItemGroup>
12-
<InputAssemblies Include="$(OutputPath)$(TargetName)$(TargetExt)"/>
13-
<InputAssemblies Include="$(OutputPath)*.dll" Exclude="$(OutputPath)$(TargetName)$(TargetExt)"/>
14-
</ItemGroup>
8+
<UsingTask AssemblyFile="$(MSBuildThisFileDirectory)ILRepack.Lib.MSBuild.Task.dll" TaskName="ILRepack"/>
9+
<Import Project="$(ILRepackTargetsFile)" Condition="Exists('$(ILRepackTargetsFile)')"/>
10+
<Target Name="ILRepack" AfterTargets="Build" Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)')">
11+
<ItemGroup>
12+
<InputAssemblies Include="$(OutputPath)$(TargetName)$(TargetExt)"/>
13+
<InputAssemblies Include="$(OutputPath)*.dll" Exclude="$(OutputPath)$(TargetName)$(TargetExt)"/>
14+
</ItemGroup>
1515

16-
<ILRepack
17-
Parallel="true"
18-
DebugInfo="true"
19-
AllowDuplicateResources="false"
20-
InputAssemblies="@(InputAssemblies)"
21-
TargetKind="SameAsPrimaryAssembly"
22-
KeyFile="$(KeyFile)"
23-
OutputFile="$(OutputPath)$(TargetName)$(TargetExt)"
24-
/>
25-
</Target>
26-
<Target
27-
AfterTargets="ILRepack"
28-
Name="CleanReferenceCopyLocalPaths"
29-
Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)') and '$(ClearOutputDirectory)' != 'False'">
30-
<Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')" />
31-
<ItemGroup>
32-
<Directories Include="$([System.IO.Directory]::GetDirectories('$(OutDir)%(DestinationSubDirectory)', '*', System.IO.SearchOption.AllDirectories))" />
33-
<Directories>
34-
<Files>$([System.IO.Directory]::GetFiles("%(Directories.Identity)", "*", System.IO.SearchOption.AllDirectories).get_Length())</Files>
35-
</Directories>
36-
</ItemGroup>
37-
<RemoveDir Directories="@(Directories)" Condition="%(Files)=='0'" />
38-
</Target>
16+
<ILRepack
17+
Parallel="true"
18+
DebugInfo="true"
19+
AllowDuplicateResources="false"
20+
InputAssemblies="@(InputAssemblies)"
21+
TargetKind="SameAsPrimaryAssembly"
22+
KeyFile="$(KeyFile)"
23+
OutputFile="$(OutputPath)$(TargetName)$(TargetExt)"
24+
/>
25+
</Target>
26+
<Target
27+
AfterTargets="ILRepack"
28+
Name="CleanReferenceCopyLocalPaths"
29+
Condition="$(Configuration.Contains('Release')) and !Exists('$(ILRepackTargetsFile)') and '$(ClearOutputDirectory)' != 'False'">
30+
<Delete Files="@(ReferenceCopyLocalPaths->'$(OutDir)%(DestinationSubDirectory)%(Filename)%(Extension)')"/>
31+
<ItemGroup>
32+
<Directories Include="$([System.IO.Directory]::GetDirectories('$(OutDir)%(DestinationSubDirectory)', '*', System.IO.SearchOption.AllDirectories))"/>
33+
<Directories>
34+
<Files>$([System.IO.Directory]::GetFiles("%(Directories.Identity)", "*", System.IO.SearchOption.AllDirectories).get_Length())</Files>
35+
</Directories>
36+
</ItemGroup>
37+
<RemoveDir Directories="@(Directories)" Condition="%(Files)=='0'"/>
38+
</Target>
3939
</Project>

0 commit comments

Comments
 (0)