Update to use NuGetPackageRoot

README.md

@@ -24,7 +24,7 @@ Property Name | Default Value | Description
 `ILRepackDeleteEnabled`| `true` | Enable / Disable delete dependencies repacked from output.
 `ILRepackImportance` | `Low` | Log importance to show in the console. (`Low` or `High`)
 `ILRepackCommandImportance` | `Low` | Log importance from the `ILRepack.exe` to show in the console. (`Low` or `High`)
-`ILRepackCommandExtra` | `` | Extra command to be used in the `ILRepack.exe`.
+`ILRepackCommandExtra` |  | Extra command to be used in the `ILRepack.exe`.
 
 ```xml
 <PropertyGroup>

ricaun.ILRepack/ricaun.ILRepack.csproj

@@ -31,7 +31,7 @@
 
   <PropertyGroup>
     <PackageId>ricaun.ILRepack</PackageId>
-    <Version>1.0.0-alpha.1</Version>
+    <Version>1.0.0-alpha.2</Version>
   </PropertyGroup>
 
   <PropertyGroup>
@@ -98,7 +98,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="ILRepack" Version="2.0.34" GeneratePathProperty="true"/>
+    <PackageReference Include="ILRepack" Version="2.0.34" />
   </ItemGroup>
 
   <Target Name="CopyPackFiles" AfterTargets="Pack">

ricaun.ILRepack/ricaun.ILRepack.targets

@@ -1,31 +1,16 @@
 <Project>
 
-  <!--
   <PropertyGroup>
-    <ILRepackImportance>low</ILRepackImportance>
-    <ILRepackCommandImportance>low</ILRepackCommandImportance>
-    <ILRepackCommandExtra></ILRepackCommandExtra>
+    <ILRepackVersion>2.0.34</ILRepackVersion>
+    <ILRepack Condition="'$(ILRepack)' == ''">$(NuGetPackageRoot)ilrepack\$(ILRepackVersion)\tools\ILRepack.exe</ILRepack>
   </PropertyGroup>
-  -->
 
   <PropertyGroup>
     <ILRepackEnabled Condition="'$(ILRepackEnabled)' == ''">true</ILRepackEnabled>
     <ILRepackDeleteEnabled Condition="'$(ILRepackDeleteEnabled)' == ''">true</ILRepackDeleteEnabled>
     <ILRepackImportance Condition="'$(ILRepackImportance)' == ''">Low</ILRepackImportance>
   </PropertyGroup>
 
-  <!--<ItemGroup Condition="$(ILRepackEnabled)">
-    <PackageReference Include="ILRepack" Version="2.0.34" GeneratePathProperty="true">
-      <PrivateAssets>all</PrivateAssets>
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-    </PackageReference>
-  </ItemGroup>-->
-
-  <PropertyGroup>
-    <ILRepackFilePathExec>ilrepack\2.0.34\tools\ILRepack.exe</ILRepackFilePathExec>
-    <ILRepack Condition="'$(ILRepack)' == ''">$([System.IO.Path]::GetFullPath('$(MSBuildThisFileDirectory)..\..\..\$(ILRepackFilePathExec)'))</ILRepack>
-  </PropertyGroup>
-
   <Target Name="ILRepackTarget" AfterTargets="CopyFilesToOutputDirectory" Condition="$(ILRepackEnabled)">
 
     <PropertyGroup>
@@ -77,8 +62,7 @@
       <ILRepackFullCommand> &quot;$(ILRepack)&quot; $(ILRepackCommandExtra) $(ILRepackCommandLibFolder) $(ILRepackCommandOutput) $(ILRepackCommandInputAssemblies) </ILRepackFullCommand>
     </PropertyGroup>
 
-    <Message Text="ILRepack Exec: '$(ILRepackFullCommand)'" Importance="$(ILRepackImportance)" />
-    <Error Condition="'$(ILRepack)' == ''" Text="Unable to locate 'ILRepack.exe'" />
+    <!--<Message Text="ILRepack Exec: '$(ILRepackFullCommand)'" Importance="$(ILRepackImportance)" />-->
     <Error Condition="!Exists('$(ILRepack)')" Text="Unable to locate '$(ILRepack)'" />
 
     <Exec Command="$(ILRepackFullCommand)"