From d9377bc8e278fb5456ed908e8d017d6fa77e14c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20Bartha?= <barthamark@gmail.com>
Date: Mon, 11 Sep 2023 10:01:05 +0200
Subject: [PATCH 1/2] Adding BeforeMediaThemeDeployment target as a dependency

---
 .../Lombiq.Hosting.MediaTheme.Targets.targets  | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets b/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
index 6fa1c11..c081055 100644
--- a/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
+++ b/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
@@ -1,36 +1,38 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <!-- Empty target that can be used to hook into the build or to override it to change its dependencies. -->
+  <Target Name="BeforeMediaThemeDeployment" BeforeTargets="BeforeBuild" />
 
-  <Target Name="CheckFile" BeforeTargets="BeforeBuild">
+  <Target Name="CheckFile" BeforeTargets="BeforeMediaThemeDeployment">
     <Error Condition="Exists('$(MSBuildThisFileDirectory)\.config\dotnet-tools.json')"
            Text="A dotnet-tools.json file should exists, read the documentation for more information." />
   </Target>
 
-  <Target Name="RestoreDotnetTool" BeforeTargets="BeforeBuild">
+  <Target Name="RestoreDotnetTool" BeforeTargets="BeforeMediaThemeDeployment">
     <Exec Command="dotnet tool restore"/>
   </Target>
 
-  <Target Name="DeleteTempMediaThemeFolderBefore" BeforeTargets="BeforeBuild">
+  <Target Name="DeleteTempMediaThemeFolderBefore" BeforeTargets="BeforeMediaThemeDeployment">
     <Message Text="Deleting already existing $(DeploymentFolder) folder."/>
     <RemoveDir Directories="$(DeploymentFolder)"/>
   </Target>
 
-  <Target Name="RunMediaThemeDeployer" BeforeTargets="BeforeBuild">
+  <Target Name="RunMediaThemeDeployer" BeforeTargets="BeforeMediaThemeDeployment">
     <Exec Command="dotnet media-theme-deploy --path . --base-id $(MediaThemeBaseId) --clear true --deployment-path $(DeploymentFolder) --deployment-file-name $(MediaThemeRecipeFileName)"/>
   </Target>
 
-  <Target Name="UnzipMediaTheme" BeforeTargets="BeforeBuild">
+  <Target Name="UnzipMediaTheme" BeforeTargets="BeforeMediaThemeDeployment">
     <Unzip SourceFiles="$(DeploymentFolder)\$(MediaThemeRecipeFileName).zip"
            DestinationFolder="$(DeploymentFolder)" />
   </Target>
 
-  <Target Name="MoveAndRenameRecipe" BeforeTargets="BeforeBuild">
+  <Target Name="MoveAndRenameRecipe" BeforeTargets="BeforeMediaThemeDeployment">
     <Message Text="Moving Files $(RecipeToMove)"/>
     <Move SourceFiles="$(RecipeToMove)"
           OverwriteReadOnlyFiles="true"
           DestinationFiles="Recipes\$(MediaThemeRecipeFileName).recipe.json"/>
   </Target>
 
-  <Target Name="CopyMediaThemeFiles" BeforeTargets="BeforeBuild">
+  <Target Name="CopyMediaThemeFiles" BeforeTargets="BeforeMediaThemeDeployment">
     <ItemGroup>
       <MySourceFiles Include="Deployment\_MediaTheme\**\*.*"/>
     </ItemGroup>
@@ -38,7 +40,7 @@
           DestinationFiles="Recipes\_MediaTheme\%(RecursiveDir)%(Filename)%(Extension)"/>
   </Target>
 
-  <Target Name="DeleteTempMediaThemeFolderAfter" BeforeTargets="BeforeBuild">
+  <Target Name="DeleteTempMediaThemeFolderAfter" BeforeTargets="BeforeMediaThemeDeployment">
     <Message Text="Deleting leftover $(DeploymentFolder) folder."/>
     <RemoveDir Directories="$(DeploymentFolder)"/>
   </Target>

From 73bcb512ee8436d2581389a0c10f09b0199b1a76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A1rk=20Bartha?= <barthamark@gmail.com>
Date: Fri, 22 Sep 2023 09:09:20 +0200
Subject: [PATCH 2/2] Adding before and after targets

---
 .../Lombiq.Hosting.MediaTheme.Targets.targets | 19 ++++++++++---------
 1 file changed, 10 insertions(+), 9 deletions(-)

diff --git a/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets b/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
index c081055..2fab35f 100644
--- a/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
+++ b/Lombiq.Hosting.MediaTheme.Targets/Lombiq.Hosting.MediaTheme.Targets.targets
@@ -1,38 +1,39 @@
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <!-- Empty target that can be used to hook into the build or to override it to change its dependencies. -->
-  <Target Name="BeforeMediaThemeDeployment" BeforeTargets="BeforeBuild" />
+  <Target Name="MediaThemeDeploymentBeforeTargets" BeforeTargets="BeforeBuild" />
+  <Target Name="MediaThemeDeploymentAfterTargets" />
 
-  <Target Name="CheckFile" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="CheckFile" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Error Condition="Exists('$(MSBuildThisFileDirectory)\.config\dotnet-tools.json')"
            Text="A dotnet-tools.json file should exists, read the documentation for more information." />
   </Target>
 
-  <Target Name="RestoreDotnetTool" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="RestoreDotnetTool" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Exec Command="dotnet tool restore"/>
   </Target>
 
-  <Target Name="DeleteTempMediaThemeFolderBefore" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="DeleteTempMediaThemeFolderBefore" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Message Text="Deleting already existing $(DeploymentFolder) folder."/>
     <RemoveDir Directories="$(DeploymentFolder)"/>
   </Target>
 
-  <Target Name="RunMediaThemeDeployer" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="RunMediaThemeDeployer" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Exec Command="dotnet media-theme-deploy --path . --base-id $(MediaThemeBaseId) --clear true --deployment-path $(DeploymentFolder) --deployment-file-name $(MediaThemeRecipeFileName)"/>
   </Target>
 
-  <Target Name="UnzipMediaTheme" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="UnzipMediaTheme" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Unzip SourceFiles="$(DeploymentFolder)\$(MediaThemeRecipeFileName).zip"
            DestinationFolder="$(DeploymentFolder)" />
   </Target>
 
-  <Target Name="MoveAndRenameRecipe" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="MoveAndRenameRecipe" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Message Text="Moving Files $(RecipeToMove)"/>
     <Move SourceFiles="$(RecipeToMove)"
           OverwriteReadOnlyFiles="true"
           DestinationFiles="Recipes\$(MediaThemeRecipeFileName).recipe.json"/>
   </Target>
 
-  <Target Name="CopyMediaThemeFiles" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="CopyMediaThemeFiles" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <ItemGroup>
       <MySourceFiles Include="Deployment\_MediaTheme\**\*.*"/>
     </ItemGroup>
@@ -40,7 +41,7 @@
           DestinationFiles="Recipes\_MediaTheme\%(RecursiveDir)%(Filename)%(Extension)"/>
   </Target>
 
-  <Target Name="DeleteTempMediaThemeFolderAfter" BeforeTargets="BeforeMediaThemeDeployment">
+  <Target Name="DeleteTempMediaThemeFolderAfter" BeforeTargets="MediaThemeDeploymentBeforeTargets" AfterTargets="MediaThemeDeploymentAfterTargets">
     <Message Text="Deleting leftover $(DeploymentFolder) folder."/>
     <RemoveDir Directories="$(DeploymentFolder)"/>
   </Target>