From 42fe00a348a8f26947b3a35a5f95cebb16254ed9 Mon Sep 17 00:00:00 2001
From: Andrew Cassidy <drewcassidy@me.com>
Date: Sun, 8 Sep 2024 21:47:39 -0700
Subject: [PATCH] projectname instead of solutionname

---
 KSPCommon.targets | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

diff --git a/KSPCommon.targets b/KSPCommon.targets
index 5e1f3a7..a2ec94e 100644
--- a/KSPCommon.targets
+++ b/KSPCommon.targets
@@ -117,7 +117,6 @@
 
   <ItemDefinitionGroup>
     <KSPVersionFile>
-      <Name>$(SolutionName)</Name>
       <KSP_Version>1.12</KSP_Version>
       <KSP_Version_Min>1.8</KSP_Version_Min>
       <KSP_Version_Max>1.12</KSP_Version_Max>
@@ -126,7 +125,13 @@
 
   <!-- Target to generate the KSP version json file for AVC/CKAN etc-->
   <Target Name="GenerateKSPVersionFile" AfterTargets="Build" Inputs="@(KSPVersionFile);$(FileVersion)" Outputs="%(KSPVersionFile.destination)">
-    <ReadLinesFromFile File="@(KSPVersionFile)" Condition="Exists('@(KSPVersionFile)')">
+    <ItemGroup>
+      <KSPVersionFile Update="@(KSPVersionFile)">
+        <Name Condition="%(KSPVersionFile.Version) == '$(ProjectName)'">$(ProjectName)</Name>
+        <Version Condition="%(KSPVersionFile.Version) == ''">$(FileVersion.Split(`.`)[0]).$(FileVersion.Split(`.`)[1]).$(FileVersion.Split(`.`)[2])</Version>
+      </KSPVersionFile>
+    </ItemGroup>
+    <ReadLinesFromFile File="%(KSPVersionFile.identity)" Condition="Exists('@(KSPVersionFile)')">
       <Output TaskParameter="Lines" ItemName="_JSONLines"/>
     </ReadLinesFromFile>
     <PropertyGroup>
@@ -136,14 +141,7 @@
     <JsonPoke Content="$(_JSON)" Query="$.NAME" RawValue="'%(KSPVersionFile.Name)'">
       <Output TaskParameter="Content" PropertyName="_JSON"/>
     </JsonPoke>
-    <JsonPoke Content="$(_JSON)" Query="$.VERSION"
-              RawValue="'%(KSPVersionFile.Version)'"
-              Condition="%(KSPVersionFile.Version) != ''">
-      <Output TaskParameter="Content" PropertyName="_JSON"/>
-    </JsonPoke>
-    <JsonPoke Content="$(_JSON)" Query="$.VERSION"
-              RawValue="'$(FileVersion.Split(`.`)[0]).$(FileVersion.Split(`.`)[1]).$(FileVersion.Split(`.`)[2])'"
-              Condition="%(KSPVersionFile.Version) == ''">
+    <JsonPoke Content="$(_JSON)" Query="$.VERSION" RawValue="'%(KSPVersionFile.Version)'">
       <Output TaskParameter="Content" PropertyName="_JSON"/>
     </JsonPoke>
     <JsonPoke Content="$(_JSON)" Query="$.URL" RawValue="'%(KSPVersionFile.URL)'" Condition="%(KSPVersionFile.URL) != ''">