Try to generate and clean part x

egorozh · Jul 2, 2021 · 45b049d · 45b049d
1 parent 29da2c9
commit 45b049d
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/MahApps.Metro/MahApps.Metro.csproj b/src/MahApps.Metro/MahApps.Metro.csproj
@@ -47,19 +47,19 @@
     </ItemGroup>
 
     <!-- Generate theme files -->
-    <Target Name="GenerateXamlFiles" BeforeTargets="DispatchToInnerBuilds;PrepareForBuild" Condition=" '$(IsBuildingWpfTempProj)' != 'true' and '$(IsCrossTargetingBuild)' == 'true' ">
+    <Target Name="GenerateXamlFiles" BeforeTargets="DispatchToInnerBuilds;PrepareForBuild" Condition=" '$(IsBuildingWpfTempProj)' != 'true' and '$(XamlColorSchemeGeneratorExecutable)' != '' ">
 	    <Message Text="Generating XAML Color Scheme files... $(XamlColorSchemeGeneratorExecutable)" Importance="high" />
 	    <Exec Command="&quot;$(XamlColorSchemeGeneratorExecutable)&quot;" WorkingDirectory="$(MSBuildProjectDirectory)/Styles/Themes" />
     </Target>
 
     <!-- Delete generated XAML files when user explicitly executes Clean build. -->
-    <Target Name="CleanGenerateXamlFiles" AfterTargets="Clean" Condition=" '$(IsCrossTargetingBuild)' == 'true' ">
+    <Target Name="CleanGenerateXamlFiles" AfterTargets="Clean">
 	    <ItemGroup>
 		    <ThemeFiles Include="$(MSBuildProjectDirectory)/Styles/Themes/Dark.*.xaml" />
 		    <ThemeFiles Include="$(MSBuildProjectDirectory)/Styles/Themes/Light.*.xaml" />
 	    </ItemGroup>
 	    <Message Text="Deleting XAML Color Scheme files..." Importance="high" />
-	    <Delete Files="$(ThemeFiles)" ContinueOnError="true" />
+	    <Delete Files="@(ThemeFiles)" ContinueOnError="true" />
     </Target>
 
 </Project>