Skip to content

Drop JsonPoke requirement for version-file generation #52

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Drop JsonPoke requirement for version-file generation #52

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7e06df5
wip
Twinki14 Apr 14, 2025
62f38b3
drop nuget ref
Twinki14 Apr 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions KSPBuildTools.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,6 @@
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
<PackageReference Include="JsonPoke" Version="1.2.0">
<PrivateAssets>None</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
</PackageReference>
</ItemGroup>

<PropertyGroup>
Expand Down
74 changes: 35 additions & 39 deletions KSPCommon.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Condition=" '$(KSPCommonPropsImported)' == '' And Exists('$(MSBuildThisFileDirectory)KSPCommon.props') " Project="$(MSBuildThisFileDirectory)KSPCommon.props"/>

<!-- NuGet dependencies -->
<ItemGroup>
<!-- For GenerateKSPVersionFile -->
<PackageReference Include="JsonPoke" Version="1.2.0" Condition="@(KSPVersionFile) != ''"/>
</ItemGroup>

<!--Custom Targets-->

<Target Name="CheckForKSPRoot" BeforeTargets="ResolveReferences">
Expand Down Expand Up @@ -132,53 +126,55 @@
</ItemGroup>
</Target>

<!-- Version file configuration -->
<ItemDefinitionGroup>
<KSPVersionFile>
<Name/>
<URL/>
<Download/>
<KSP_Version>1.12</KSP_Version>
<KSP_Version_Min>1.8</KSP_Version_Min>
<KSP_Version_Max>1.12</KSP_Version_Max>
<Destination/>
</KSPVersionFile>
</ItemDefinitionGroup>

<!-- Target to generate the KSP version json file for AVC/CKAN etc-->
<Target Name="GenerateKSPVersionFile" AfterTargets="Build" Inputs="@(KSPVersionFile);$(FileVersion)" Outputs="%(KSPVersionFile.destination)">
<Target Name="GenerateKSPVersionFile" AfterTargets="Build" Inputs="@(KSPVersionFile);$(FileVersion)" Outputs="%(KSPVersionFile.Destination)">
<ItemGroup>
<KSPVersionFile Update="@(KSPVersionFile)">
<Name Condition="%(KSPVersionFile.Name) == ''">$(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>
<_JSON>@(_JSONLines, '%0a')</_JSON>
<_JSON Condition="@(_JSONLines) == ''">{}</_JSON>
</PropertyGroup>
<JsonPoke Content="$(_JSON)" Query="$.NAME" RawValue="'%(KSPVersionFile.Name)'">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<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) != ''">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<JsonPoke Content="$(_JSON)" Query="$.DOWNLOAD" RawValue="'%(KSPVersionFile.Download)'" Condition="%(KSPVersionFile.Download) != ''">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<JsonPoke Content="$(_JSON)" Query="$.KSP_VERSION" RawValue="'%(KSPVersionFile.KSP_Version)'" Condition="%(KSPVersionFile.KSP_Version) != ''">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<JsonPoke Content="$(_JSON)" Query="$.KSP_VERSION_MIN" RawValue="'%(KSPVersionFile.KSP_Version_Min)'" Condition="%(KSPVersionFile.KSP_Version_Min) != ''">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<JsonPoke Content="$(_JSON)" Query="$.KSP_VERSION_MAX" Value="'%(KSPVersionFile.KSP_Version_Max)'" Condition="%(KSPVersionFile.KSP_Version_Max) != ''">
<Output TaskParameter="Content" PropertyName="_JSON"/>
</JsonPoke>
<WriteLinesToFile File="%(KSPVersionFile.Destination)" Lines="$(_JSON)" Overwrite="true"/>

<Message Text="Writing JSON version file to %(KSPVersionFile.Destination)"/>
<Message Text="Contents:%0a$(_JSON)" Importance="low"/>

<!-- List of JSON lines to write. MSBuild doesn't play well with spaces, an Indent property is used to handle per-line indention -->
<ItemGroup>
<JsonLine Include="{"/>
<JsonLine Include="&quot;NAME&quot;: &quot;%(KSPVersionFile.Name)&quot;," Indent=" "/>
<JsonLine Include="&quot;VERSION&quot;: &quot;%(KSPVersionFile.Version)&quot;," Indent=" "/>
<JsonLine Include="&quot;URL&quot;: &quot;%(KSPVersionFile.URL)&quot;," Indent=" " Condition="%(KSPVersionFile.URL) != ''" />
<JsonLine Include="&quot;DOWNLOAD&quot;: &quot;%(KSPVersionFile.Download)&quot;," Indent=" " Condition="%(KSPVersionFile.Download) != ''" />
<JsonLine Include="&quot;KSP_VERSION&quot;: &quot;%(KSPVersionFile.KSP_Version)&quot;," Indent=" "/>
<JsonLine Include="&quot;KSP_VERSION_MIN&quot;: &quot;%(KSPVersionFile.KSP_Version_Min)&quot;," Indent=" "/>
<JsonLine Include="&quot;KSP_VERSION_MAX&quot;: &quot;%(KSPVersionFile.KSP_Version_Max)&quot;" Indent=" "/>
<JsonLine Include="}"/>
</ItemGroup>

<!-- Indent lines by their indention property -->
<ItemGroup>
<JsonFinal Include="@(JsonLine)">
<Line>$([System.String]::Concat('%(JsonLine.Indent)', '%(JsonLine.Identity)'))</Line>
</JsonFinal>
</ItemGroup>

<!-- Write lines out to file -->
<WriteLinesToFile
File="%(KSPVersionFile.Destination)"
Lines="@(JsonFinal->'%(Line)')"
Overwrite="true"
Encoding="UTF-8" />

<Message Text="Writing KSP JSON version file to %(KSPVersionFile.Destination)"/>
</Target>
</Project>