AllowIcon File to be in sub folder

Author: alex-tomin

Sources/Tomin.TotalCmd.AzureBlob/os-windows-multi-size.ico renamed to Sources/Tomin.TotalCmd.AzureBlob/Resources/os-windows-multi-size.ico

@@ -55,7 +55,7 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
-    <ApplicationIcon>os-windows-multi-size.ico</ApplicationIcon>
+    <ApplicationIcon>Resources\os-windows-multi-size.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Microsoft.Data.Edm, Version=5.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -130,7 +130,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="os-windows-multi-size.ico" />
+    <Content Include="Resources\os-windows-multi-size.ico" />
     <Content Include="pluginst.inf">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
@@ -146,20 +146,16 @@
     <MSBuildCommunityTasksPath>$(MSBuildProjectDirectory)\..\..\Lib\MSBuild</MSBuildCommunityTasksPath>
   </PropertyGroup>
   <Import Project="$(MSBuildCommunityTasksPath)\MSBuild.Community.Tasks.targets" />
- 
- <Target Name="GenerateWfxPlugin"  BeforeTargets="PostBuildEvent">
+  <Target Name="GenerateWfxPlugin" BeforeTargets="PostBuildEvent">
     <CallTarget Targets="GenerateTotalCommanderWfxPlugin" />
   </Target>
- 
   <PropertyGroup>
     <PostBuildEvent>xcopy "$(TargetDir)*" "C:\Program Files\TotalComander\Plugins\wfx\AzureBlob\" /Y /S</PostBuildEvent>
   </PropertyGroup>
-  
-   <Target Name="CreateZip" AfterTargets="GenerateWfxPlugin">
+  <Target Name="CreateZip" AfterTargets="GenerateWfxPlugin">
     <ItemGroup>
       <Binaries Include="$(TargetDir)\**\*.*" Exclude="$(TargetDir)\*.zip" />
     </ItemGroup>
     <Zip Files="@(Binaries)" WorkingDirectory="$(TargetDir)" ZipFileName="$(MSBuildProjectDirectory)\..\..\Build\$(TargetName).zip" />
   </Target>
-  
 </Project>

Sources/Tomin.TotalCmd.AzureBlob/Tomin.TotalCmd.AzureBlob.csproj

@@ -15,8 +15,13 @@
 
     <DllExport Source="$(OutputIL)" />
 
+		
+		<ItemGroup>
+			<IconFile Include="$(ApplicationIcon)" />
+		</ItemGroup>
+		
     <Copy SourceFiles="$(ApplicationIcon)" DestinationFolder="$(TargetDir)" Condition=" '$(ApplicationIcon)' != '' "/>
-    <WriteLinesToFile File="$(TargetDir)$(TargetName).rc" Lines='1 ICON "$(ApplicationIcon)"' Overwrite="true" Condition=" '$(ApplicationIcon)' != '' "/>
+    <WriteLinesToFile File="$(TargetDir)$(TargetName).rc" Lines="@(IconFile ->'1 ICON &quot;%(filename)%(extension)&quot;')" Overwrite="true" Condition=" '$(ApplicationIcon)' != '' "/>
     <RC ToolPath="$(MSBuildProjectDirectory)\..\..\Lib\Tools" 
 				Source="$(TargetDir)$(TargetName).rc" Condition=" '$(ApplicationIcon)' != '' ">
       <Output TaskParameter="Output" PropertyName="OutputRes"/>
@@ -27,10 +32,12 @@
     <ILAsm ToolPath="$(TargetedFrameworkDir)"
 			Source="$(OutputIL)" Platform="x64" Resource="$(OutputRes)" Output="$(TargetDir)$(TargetName).wfx64"/>
 
-    <Delete Files="$(TargetDir)$(ApplicationIcon);$(TargetDir)TotalCommander.Plugin.Exports.il;$(TargetDir)TotalCommander.Plugin.Exports.res;$(TargetDir)$(TargetName).rc;$(TargetDir)$(TargetName).res" ContinueOnError="true"/>
+    <Delete Files="@(IconFile ->'$(TargetDir)%(filename)%(extension)');$(TargetDir)TotalCommander.Plugin.Exports.il;$(TargetDir)TotalCommander.Plugin.Exports.res;$(TargetDir)$(TargetName).rc;$(TargetDir)$(TargetName).res" ContinueOnError="true"/>
   </Target>
 
-  <Target Name="GenerateTotalCommanderWcxPlugin">
+	
+	<!--Modify to make similar to above-->
+  <!--<Target Name="GenerateTotalCommanderWcxPlugin">
     <ILDasm Source="TotalCommander.Plugin.Exports.dll" OutputIL="$(TargetDir)TotalCommander.Plugin.Exports.il">
       <Output TaskParameter="OutputIL" PropertyName="OutputIL"/>
     </ILDasm>
@@ -47,4 +54,4 @@
 
     <Delete Files="$(TargetDir)$(ApplicationIcon);$(TargetDir)TotalCommander.Plugin.Exports.il;$(TargetDir)TotalCommander.Plugin.Exports.res;$(TargetDir)$(TargetName).rc;$(TargetDir)$(TargetName).res" ContinueOnError="true"/>
   </Target>
-</Project>
+</Project>-->