Merge pull request #201 from DHancock/dev

Coalesce property groups
DHancock · Oct 6, 2024 · 55131f4 · 55131f4
2 parents 145d39b + c57735b
commit 55131f4
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 25 deletions.
diff --git a/SourceGenerator/SourceGenerator.csproj b/SourceGenerator/SourceGenerator.csproj
@@ -1,19 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-    <Nullable>enable</Nullable>
-  </PropertyGroup>
-
 	<PropertyGroup>
-		<GeneratedFilePath>$(SolutionDir)Countdown\Models\PostfixMap.g.cs</GeneratedFilePath>
-	</PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+		<Nullable>enable</Nullable>
 
-	<PropertyGroup Condition="!exists('$(GeneratedFilePath)')">
-		<!-- always trigger a rebuild and post build event -->
-		<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
+		<GeneratedFilePath>$(SolutionDir)Countdown\Models\PostfixMap.g.cs</GeneratedFilePath>
+		<DisableFastUpToDateCheck Condition="!exists('$(GeneratedFilePath)')">true</DisableFastUpToDateCheck>
 	</PropertyGroup>
 
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">

diff --git a/WordListGenerator/WordListGenerator.csproj b/WordListGenerator/WordListGenerator.csproj
@@ -1,23 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <OutputType>Exe</OutputType>
-    <TargetFramework>net8.0-windows</TargetFramework>
-    <RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
-	<Nullable>enable</Nullable>
-  </PropertyGroup>
-
 	<PropertyGroup>
+		<OutputType>Exe</OutputType>
+		<TargetFramework>net8.0-windows</TargetFramework>
+		<RunPostBuildEvent>OnBuildSuccess</RunPostBuildEvent>
+		<Nullable>enable</Nullable>
+
 		<GeneratedFilePath>$(SolutionDir)Countdown\Resources\wordlist.dat</GeneratedFilePath>
+		<DisableFastUpToDateCheck Condition="!exists('$(GeneratedFilePath)')">true</DisableFastUpToDateCheck>
 	</PropertyGroup>
 
-	<PropertyGroup Condition="!exists('$(GeneratedFilePath)')">
-		<!-- always trigger a rebuild and post build event -->
-		<DisableFastUpToDateCheck>true</DisableFastUpToDateCheck>
-	</PropertyGroup>
-
 	<Target Name="PostBuild" AfterTargets="PostBuildEvent">
 		<Exec Command="start /wait /b &quot;&quot; &quot;$(TargetDir)$(TargetName).exe&quot; &quot;$(ProjectDir)Input&quot; &quot;$(GeneratedFilePath)&quot;" />
 	</Target>
-
 </Project>