Skip to content

Commit 1c41d5f

Browse files
drewcassidydrewcassidy
committed
Rename properties to begin with KSPBT
Except the CKAN ones because those are self-evident
1 parent ce6db03 commit 1c41d5f

9 files changed

Lines changed: 121 additions & 109 deletions

File tree

‎.github/actions/compile/action.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,5 +76,5 @@ runs:
7676
working-directory: ${{ inputs.working-directory }}
7777
run: |
7878
dotnet msbuild -p:Configuration=${{ inputs.build-configuration }} \
79-
-p:KSPManagedRelativePath=KSP_x64_Data/Managed ${{ inputs.solution-file-path }} \
79+
-p:KSPBTManagedRelativePath=KSP_x64_Data/Managed ${{ inputs.solution-file-path }} \
8080
${{ runner.debug && '-v:detailed' }}

‎KSPBuildTools.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
<NoWarn>1701;1702;CS0649;CS1591;NU5128</NoWarn>
2525
<AssemblyCopyright>2024 KSPModdingLibs Contributors</AssemblyCopyright>
2626
<AssemblyName>KSPBuildTools</AssemblyName>
27-
<KSPModRoot>$(ProjectDir)</KSPModRoot>
27+
<KSPBTModRoot>$(ProjectDir)</KSPBTModRoot>
2828
<PackageId>KSPBuildTools</PackageId>
2929
<PackageReadmeFile>README.md</PackageReadmeFile>
3030
<Title>KSP Build Tools</Title>

‎KSPCommon.props‎

Lines changed: 56 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -7,53 +7,52 @@
77
<!-- default settings for KSPBT targets and references -->
88
<PropertyGroup>
99
<!-- reference unity and KSP assemblies unless explicitly disabled -->
10-
<ReferenceKSPSystemAssemblies Condition=" '$(ReferenceKSPSystemAssemblies)' == '' ">true</ReferenceKSPSystemAssemblies>
11-
<ReferenceKSPUnityAssemblies Condition=" '$(ReferenceKSPUnityAssemblies)' == '' ">true</ReferenceKSPUnityAssemblies>
12-
<ReferenceKSPGameAssemblies Condition=" '$(ReferenceKSPGameAssemblies)' == '' ">true</ReferenceKSPGameAssemblies>
13-
10+
<KSPBTReferenceSystemAssemblies Condition=" '$(KSPBTReferenceSystemAssemblies)' == '' ">true</KSPBTReferenceSystemAssemblies>
11+
<KSPBTReferenceUnityAssemblies Condition=" '$(KSPBTReferenceUnityAssemblies)' == '' ">true</KSPBTReferenceUnityAssemblies>
12+
<KSPBTReferenceGameAssemblies Condition=" '$(KSPBTReferenceGameAssemblies)' == '' ">true</KSPBTReferenceGameAssemblies>
1413

1514
<!-- Copy DLLs to mod folder -->
16-
<CopyDLLsToPluginFolder Condition=" '$(CopyDLLsToPluginFolder)' == '' ">true</CopyDLLsToPluginFolder>
15+
<KSPBTCopyDLLsToPluginFolder Condition=" '$(KSPBTCopyDLLsToPluginFolder)' == '' ">true</KSPBTCopyDLLsToPluginFolder>
1716

1817

19-
<GenerateKSPAssemblyAttribute Condition=" '$(GenerateKSPAssemblyAttribute)' == '' ">true</GenerateKSPAssemblyAttribute>
18+
<KSPBTGenerateAssemblyAttribute Condition=" '$(KSPBTGenerateAssemblyAttribute)' == '' ">true</KSPBTGenerateAssemblyAttribute>
2019

21-
<GenerateKSPAssemblyDependencyAttributes Condition=" '$(GenerateKSPAssemblyDependencyAttributes)' == '' ">true</GenerateKSPAssemblyDependencyAttributes>
20+
<KSPBTGenerateDependencyAttributes Condition=" '$(KSPBTGenerateDependencyAttributes)' == '' ">true</KSPBTGenerateDependencyAttributes>
2221

23-
<GenerateKSPVersionFile Condition=" '$(GenerateKSPVersionFile)' == '' ">true</GenerateKSPVersionFile>
22+
<KSPBTGenerateVersionFile Condition=" '$(KSPBTGenerateVersionFile)' == '' ">true</KSPBTGenerateVersionFile>
2423

2524
<!-- default CKAN compatibility versions -->
2625
<CKANCompatibleVersions Condition=" '$(CKANCompatibleVersions)' == '' ">1.12 1.11 1.10 1.9 1.8</CKANCompatibleVersions>
2726
</PropertyGroup>
2827

2928
<!--Parse KSP platform-specific paths -->
3029
<!-- These can be overwritten by user and props files -->
31-
<PropertyGroup Condition=" '$(KSPManagedRelativePath)' == '' ">
32-
<KSPManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64_Data/Managed</KSPManagedRelativePath>
33-
<KSPManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/Resources/Data/Managed</KSPManagedRelativePath>
34-
<KSPManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP_Data/Managed</KSPManagedRelativePath>
30+
<PropertyGroup Condition=" '$(KSPBTManagedRelativePath)' == '' ">
31+
<KSPBTManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64_Data/Managed</KSPBTManagedRelativePath>
32+
<KSPBTManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/Resources/Data/Managed</KSPBTManagedRelativePath>
33+
<KSPBTManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP_Data/Managed</KSPBTManagedRelativePath>
3534
</PropertyGroup>
3635

3736
<PropertyGroup>
38-
<KSPExecutable Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64.exe</KSPExecutable>
39-
<KSPExecutable Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/MacOS/KSP</KSPExecutable>
40-
<KSPExecutable Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP.x86_64</KSPExecutable>
41-
<SteamKSPRoot Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program</SteamKSPRoot>
42-
<SteamKSPRoot Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">$(HOME)/Library/Application Support/Steam/steamapps/common/Kerbal Space Program</SteamKSPRoot>
37+
<KSPBTGameExecutable Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64.exe</KSPBTGameExecutable>
38+
<KSPBTGameExecutable Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/MacOS/KSP</KSPBTGameExecutable>
39+
<KSPBTGameExecutable Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP.x86_64</KSPBTGameExecutable>
40+
<KSPBTSteamGameRoot Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">C:\Program Files (x86)\Steam\steamapps\common\Kerbal Space Program</KSPBTSteamGameRoot>
41+
<KSPBTSteamGameRoot Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">$(HOME)/Library/Application Support/Steam/steamapps/common/Kerbal Space Program</KSPBTSteamGameRoot>
4342
</PropertyGroup>
4443

4544
<!-- Calculate mod paths -->
4645
<!-- These can be overwritten by user, csproj, and props files -->
4746
<PropertyGroup>
4847
<!-- The root directory of the mod, the folder that gets placed in GameData -->
49-
<KSPModRoot Condition=" '$(KSPModRoot)' == '' ">$(MSBuildProjectDirectory)/../GameData/$(MSBuildProjectName)/</KSPModRoot>
50-
<!-- The folder to place resulting DLLs into, relative to KSPModRoot -->
51-
<KSPModPluginFolder Condition=" '$(KSPModPluginFolder)' == '' "/>
48+
<KSPBTModRoot Condition=" '$(KSPBTModRoot)' == '' ">$(MSBuildProjectDirectory)/../GameData/$(MSBuildProjectName)/</KSPBTModRoot>
49+
<!-- The folder to place resulting DLLs into, relative to KSPBTModRoot -->
50+
<KSPBTModPluginFolder Condition=" '$(KSPBTModPluginFolder)' == '' "/>
5251
</PropertyGroup>
5352

5453
<!-- Import the csproj.user file. -->
55-
<!-- This can overwrite KSPManagedRelativePath and KSPExecutable,
56-
set KSPRoot and ReferencePath, and any other user-specific settings -->
54+
<!-- This can overwrite KSPBTManagedRelativePath and KSPBTGameExecutable,
55+
set KSPBTGameRoot and ReferencePath, and any other user-specific settings -->
5756
<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
5857

5958
<!-- Import a props.user file -->
@@ -65,98 +64,98 @@
6564

6665
<!-- Relative path that must exist for a path to be a valid KSP Install-->
6766
<PropertyGroup>
68-
<KSPRootIdentifier>$(KSPManagedRelativePath)/Assembly-CSharp.dll</KSPRootIdentifier>
69-
<KSPRootSource Condition="'$(KSPRoot)' != ''">property</KSPRootSource>
67+
<KSPBTGameIdentifier>$(KSPBTManagedRelativePath)/Assembly-CSharp.dll</KSPBTGameIdentifier>
68+
<KSPBTGameRootSource Condition="'$(KSPBTGameRoot)' != ''">property</KSPBTGameRootSource>
7069
</PropertyGroup>
7170

72-
<!-- Default KSPRoot to the "KSP_ROOT" environment variable if it exists -->
71+
<!-- Default KSPBTGameRoot to the "KSP_ROOT" environment variable if it exists -->
7372
<!-- Doing this skips any checks for a valid KSP install so be careful! -->
74-
<PropertyGroup Condition=" '$(KSPRoot)' == '' And '$(KSP_ROOT)' != '' ">
75-
<KSPRoot>$(KSP_ROOT)</KSPRoot>
76-
<KSPRootSource>environment variable</KSPRootSource>
73+
<PropertyGroup Condition=" '$(KSPBTGameRoot)' == '' And '$(KSP_ROOT)' != '' ">
74+
<KSPBTGameRoot>$(KSP_ROOT)</KSPBTGameRoot>
75+
<KSPBTGameRootSource>environment variable</KSPBTGameRootSource>
7776
</PropertyGroup>
7877
<ItemGroup>
79-
<KSPRootCandidate Include="$(SolutionDir)KSP" source="solution directory"/>
80-
<KSPRootCandidate Include="$(ReferencePath)" source="reference path"/>
81-
<KSPRootCandidate Include="$(SteamKSPRoot)" source="steam"/>
78+
<KSPBTGameRootCandidate Include="$(SolutionDir)KSP" source="solution directory"/>
79+
<KSPBTGameRootCandidate Include="$(ReferencePath)" source="reference path"/>
80+
<KSPBTGameRootCandidate Include="$(KSPBTSteamGameRoot)" source="steam"/>
8281
</ItemGroup>
8382

8483
<!-- Look for KSP install in Solution dir -->
85-
<PropertyGroup Condition=" '$(KSPRoot)' == '' And Exists('$(SolutionDir)KSP/$(KSPRootIdentifier)') ">
86-
<KSPRoot>$(SolutionDir)KSP</KSPRoot>
87-
<KSPRootSource>solution directory</KSPRootSource>
84+
<PropertyGroup Condition=" '$(KSPBTGameRoot)' == '' And Exists('$(SolutionDir)KSP/$(KSPBTGameIdentifier)') ">
85+
<KSPBTGameRoot>$(SolutionDir)KSP</KSPBTGameRoot>
86+
<KSPBTGameRootSource>solution directory</KSPBTGameRootSource>
8887
</PropertyGroup>
8988

9089
<!-- Look for KSP install in ReferencePath -->
91-
<PropertyGroup Condition=" '$(KSPRoot)' == '' And Exists('$(ReferencePath)/$(KSPRootIdentifier)') ">
92-
<KSPRoot>$(ReferencePath)</KSPRoot>
93-
<KSPRootSource>reference path</KSPRootSource>
90+
<PropertyGroup Condition=" '$(KSPBTGameRoot)' == '' And Exists('$(ReferencePath)/$(KSPBTGameIdentifier)') ">
91+
<KSPBTGameRoot>$(ReferencePath)</KSPBTGameRoot>
92+
<KSPBTGameRootSource>reference path</KSPBTGameRootSource>
9493
</PropertyGroup>
9594

9695
<!-- Look for KSP steam install-->
97-
<PropertyGroup Condition=" '$(KSPRoot)' == '' And Exists('$(SteamKSPRoot)/$(KSPRootIdentifier)') ">
98-
<KSPRoot>$(SteamKSPRoot)</KSPRoot>
99-
<KSPRootSource>steam</KSPRootSource>
96+
<PropertyGroup Condition=" '$(KSPBTGameRoot)' == '' And Exists('$(KSPBTSteamGameRoot)/$(KSPBTGameIdentifier)') ">
97+
<KSPBTGameRoot>$(KSPBTSteamGameRoot)</KSPBTGameRoot>
98+
<KSPBTGameRootSource>steam</KSPBTGameRootSource>
10099
</PropertyGroup>
101100

102-
<!-- Calculate ManagedPath -->
103-
<PropertyGroup Condition=" '$(ManagedPath)' == ''">
104-
<ManagedPath>$(KSPRoot)/$(KSPManagedRelativePath)</ManagedPath>
101+
<!-- Calculate KSPBTManagedPath -->
102+
<PropertyGroup Condition=" '$(KSPBTManagedPath)' == ''">
103+
<KSPBTManagedPath>$(KSPBTGameRoot)/$(KSPBTManagedRelativePath)</KSPBTManagedPath>
105104
</PropertyGroup>
106105

107106
<!-- set the start action so that you can launch directly from VS -->
108107
<PropertyGroup>
109108
<StartAction>Program</StartAction>
110-
<StartProgram>$(KSPRoot)/$(KSPExecutable)</StartProgram>
111-
<StartWorkingDirectory>$(KSPRoot)</StartWorkingDirectory>
109+
<StartProgram>$(KSPBTGameRoot)/$(KSPBTGameExecutable)</StartProgram>
110+
<StartWorkingDirectory>$(KSPBTGameRoot)</StartWorkingDirectory>
112111
<DebugType>portable</DebugType>
113112
</PropertyGroup>
114113

115114
<!-- Prevent the compiler from acquiring or referencing any external reference assemblies -->
116-
<PropertyGroup Condition=" '$(ReferenceKSPSystemAssemblies)' == 'true' ">
115+
<PropertyGroup Condition=" '$(KSPBTReferenceSystemAssemblies)' == 'true' ">
117116
<!-- Do not download the .NET Framework Target Pack NuGet package automatically -->
118117
<DisableTransitiveFrameworkReferenceDownloads>true</DisableTransitiveFrameworkReferenceDownloads>
119118
<!-- Instruct the compiler to not automatically reference mscorlib -->
120119
<NoStandardLib>true</NoStandardLib>
121120
<!-- Prevent the GetReferenceAssemblyPaths task in Microsoft.Common.CurrentVersion.targets
122121
from attempting to locate an external copy of the reference assemblies. -->
123122
<AutomaticallyUseReferenceAssemblyPackages>false</AutomaticallyUseReferenceAssemblyPackages>
124-
<FrameworkPathOverride>$(ManagedPath)</FrameworkPathOverride>
123+
<FrameworkPathOverride>$(KSPBTManagedPath)</FrameworkPathOverride>
125124
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
126125
</PropertyGroup>
127126

128127

129128
<!-- Import references -->
130-
<ItemGroup Condition=" '$(ReferenceKSPSystemAssemblies)' == 'true' ">
131-
<Reference Include="$(ManagedPath)/System.dll">
129+
<ItemGroup Condition=" '$(KSPBTReferenceSystemAssemblies)' == 'true' ">
130+
<Reference Include="$(KSPBTManagedPath)/System.dll">
132131
<Name>System (KSP/Mono)</Name>
133132
<Private>False</Private>
134133
</Reference>
135-
<Reference Include="$(ManagedPath)/System.Core.dll">
134+
<Reference Include="$(KSPBTManagedPath)/System.Core.dll">
136135
<Name>System (KSP/Mono)</Name>
137136
<Private>False</Private>
138137
</Reference>
139-
<Reference Include="$(ManagedPath)/mscorlib.dll">
138+
<Reference Include="$(KSPBTManagedPath)/mscorlib.dll">
140139
<Name>System.Core (KSP/Mono)</Name>
141140
<Private>False</Private>
142141
</Reference>
143-
<Reference Include="$(ManagedPath)/System.Xml.dll">
142+
<Reference Include="$(KSPBTManagedPath)/System.Xml.dll">
144143
<Name>System.Xml (KSP/Mono)</Name>
145144
<Private>False</Private>
146145
</Reference>
147146
</ItemGroup>
148-
<ItemGroup Condition=" '$(ReferenceKSPUnityAssemblies)' == 'true' ">
149-
<Reference Include="$(ManagedPath)/UnityEngine*.dll">
147+
<ItemGroup Condition=" '$(KSPBTReferenceUnityAssemblies)' == 'true' ">
148+
<Reference Include="$(KSPBTManagedPath)/UnityEngine*.dll">
150149
<Name>UnityEngine</Name>
151150
<Private>False</Private>
152151
</Reference>
153152
</ItemGroup>
154-
<ItemGroup Condition=" '$(ReferenceKSPGameAssemblies)' == 'true' ">
155-
<Reference Include="$(ManagedPath)/Assembly-CSharp.dll">
153+
<ItemGroup Condition=" '$(KSPBTReferenceGameAssemblies)' == 'true' ">
154+
<Reference Include="$(KSPBTManagedPath)/Assembly-CSharp.dll">
156155
<Name>Assembly-CSharp</Name>
157156
<Private>False</Private>
158157
</Reference>
159-
<Reference Include="$(ManagedPath)/Assembly-CSharp-firstpass.dll">
158+
<Reference Include="$(KSPBTManagedPath)/Assembly-CSharp-firstpass.dll">
160159
<Name>Assembly-CSharp-firstpass</Name>
161160
<Private>False</Private>
162161
</Reference>

‎KSPCommon.targets‎

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -4,33 +4,33 @@
44

55
<!-- NuGet dependencies -->
66
<ItemGroup>
7-
<!-- For GenerateKSPVersionFile -->
7+
<!-- For KSPBTGenerateVersionFile -->
88
<PackageReference Include="JsonPoke" Version="1.2.0" Condition="'@(KSPVersionFile)' != ''"/>
99
</ItemGroup>
1010
<!--Custom Targets-->
11-
<Target Name="CheckForKSPRoot" BeforeTargets="ResolveReferences">
12-
<Error Text="KSPBuildTools was unable to find a KSP installation. Please set the ReferencePath or KSPRoot property
11+
<Target Name="KSPBTCheckForGameRoot" BeforeTargets="ResolveReferences">
12+
<Error Text="KSPBuildTools was unable to find a KSP installation. Please set the ReferencePath or KSPBTGameRoot property
1313
in your csproj.user file to a valid KSP installation directory (the one with GameData in it)
1414
1515
See https://kspbuildtools.readthedocs.io/en/latest/msbuild/getting-started.html#locating-your-ksp-install for more information"
16-
Condition="'$(KSPRoot)' == ''"/>
16+
Condition="'$(KSPBTGameRoot)' == ''"/>
1717
<ItemGroup>
18-
<_KSPRootMessage Include="KSPRoot Candidates:"/>
19-
<_KSPRootMessage Include="Candidate: %(KSPRootCandidate.source) from %(KSPRootCandidate.identity)"/>
20-
<_KSPRootMessage Include="Chosen KSPRoot: $(KSPRoot) in $(KSPRootSource)" Condition="'$(KSPRoot)' != ''"/>
18+
<_GameRootMessage Include="KSPBTGameRoot Candidates:"/>
19+
<_GameRootMessage Include="Candidate: %(KSPBTGameRootCandidate.source) from %(KSPBTGameRootCandidate.identity)"/>
20+
<_GameRootMessage Include="Chosen KSPBTGameRoot: $(KSPBTGameRoot) in $(KSPBTGameRootSource)" Condition="'$(KSPBTGameRoot)' != ''"/>
2121
</ItemGroup>
22-
<Message Text="@(_KSPRootMessage, '%0a')" Importance="normal"/>
22+
<Message Text="@(_GameRootMessage, '%0a')" Importance="normal"/>
2323
</Target>
2424

2525
<!-- Copy DLLs to mod GameData folder-->
26-
<Target Name="CopyDLLsToPluginFolder" AfterTargets="CopyFilesToOutputDirectory"
27-
Condition="'$(CopyDLLsToPluginFolder)' == 'true'">
26+
<Target Name="KSPBTCopyDLLsToPluginFolder" AfterTargets="CopyFilesToOutputDirectory"
27+
Condition="'$(KSPBTCopyDLLsToPluginFolder)' == 'true'">
2828
<ItemGroup>
29-
<BinariesToCopy Include="$(TargetDir)/**/*.dll"/>
30-
<BinariesToCopy Include="$(TargetDir)/**/*.pdb" Condition="'$(Condition)' == 'Debug'"/>
29+
<_BinariesToCopy Include="$(TargetDir)/**/*.dll"/>
30+
<_BinariesToCopy Include="$(TargetDir)/**/*.pdb" Condition="'$(Condition)' == 'Debug'"/>
3131
</ItemGroup>
32-
<MakeDir Directories="$(KSPModRoot)/$(KSPModPluginFolder)"/>
33-
<Copy SourceFiles="@(BinariesToCopy)" DestinationFolder="$(KSPModRoot)/$(KSPModPluginFolder)/%(RecursiveDir)"/>
32+
<MakeDir Directories="$(KSPBTModRoot)/$(KSPBTModPluginFolder)"/>
33+
<Copy SourceFiles="@(_BinariesToCopy)" DestinationFolder="$(KSPBTModRoot)/$(KSPBTModPluginFolder)/%(RecursiveDir)"/>
3434
</Target>
3535

3636
<!-- Use CKAN to install mods for any references tagged with a CKAN Identifier -->
@@ -45,14 +45,14 @@
4545
<_CKANDependency Include="@(CKANDependency)"/>
4646
</ItemGroup>
4747
<PropertyGroup>
48-
<CKANDependencyList>@(_CKANDependency, ' ')</CKANDependencyList>
48+
<_CKANDependencyList>@(_CKANDependency, ' ')</_CKANDependencyList>
4949
</PropertyGroup>
5050
<ItemGroup>
5151
<!-- Not using `ckan compat set` because as of 2024-08-16 it is still only available in the dev branch -->
52-
<_CKANCommands Include="compat add --gamedir &quot;$(KSPROOT)&quot; %(_CKANCompatibleVersionItems.Identity)"
52+
<_CKANCommands Include="compat add --gamedir &quot;$(KSPBTGameRoot)&quot; %(_CKANCompatibleVersionItems.Identity)"
5353
Condition=" '$(CKANCompatibleVersions)' != '' "/>
5454

55-
<_CKANCommands Include="install --no-recommends --gamedir &quot;$(KSPROOT)&quot; $(CKANDependencyList)" Condition="'$(CKANDependencyList)' != ''"/>
55+
<_CKANCommands Include="install --no-recommends --gamedir &quot;$(KSPBTGameRoot)&quot; $(_CKANDependencyList)" Condition="'$(CKANDependencyList)' != ''"/>
5656
</ItemGroup>
5757
<Message Text="Writing CKAN commands to $(CKANCommandFile)"/>
5858
<Message Text="@(_CKANCommands, '%0a')" Importance="Low"/>
@@ -64,7 +64,7 @@
6464
</ItemGroup>
6565

6666
<!-- Execute generated CKAN command list -->
67-
<Target Name="CKANInstall" DependsOnTargets="CKANInstallScriptGen" BeforeTargets="_GenerateRestoreProjectSpec;Restore;ResolveAssemblyReferences" Inputs="$(CKANCommandFile)" Outputs="$(KSPRoot)/CKAN/registry.json">
67+
<Target Name="CKANInstall" DependsOnTargets="CKANInstallScriptGen" BeforeTargets="_GenerateRestoreProjectSpec;Restore;ResolveAssemblyReferences" Inputs="$(CKANCommandFile)" Outputs="$(KSPBTGameRoot)/CKAN/registry.json">
6868
<Exec Command="ckan prompt --headless &lt; '$(CKANCommandFile)'" Condition="'$(CKANDependencyList)' != ''"/>
6969
</Target>
7070

@@ -82,8 +82,8 @@
8282
</Target>
8383

8484
<!-- Generate the KSPAssembly attribute based on the FileVersion property -->
85-
<Target Name="GenerateKSPAssemblyAttribute" BeforeTargets="CoreGenerateAssemblyInfo"
86-
Condition="'$(GenerateKSPAssemblyAttribute)' == 'true'">
85+
<Target Name="KSPBTGenerateAssemblyAttribute" BeforeTargets="CoreGenerateAssemblyInfo"
86+
Condition="'$(KSPBTGenerateAssemblyAttribute)' == 'true'">
8787
<ItemGroup>
8888
<AssemblyAttribute Include="KSPAssembly">
8989
<_Parameter1>$(AssemblyName)</_Parameter1>
@@ -106,8 +106,8 @@
106106
Otherwise CKANVersion is used.
107107
Otherwise 0.0 is used (no minimum version)
108108
-->
109-
<Target Name="GenerateKSPAssemblyDependencyAttributes" BeforeTargets="CoreGenerateAssemblyInfo"
110-
Condition=" '$(GenerateKSPAssemblyDependencyAttributes)' == 'true' ">
109+
<Target Name="KSPBTGenerateDependencyAttributes" BeforeTargets="CoreGenerateAssemblyInfo"
110+
Condition=" '$(KSPBTGenerateDependencyAttributes)' == 'true' ">
111111
<ItemGroup>
112112
<Reference Update="%(Reference.identity)" Condition="'%(Reference.CKANIdentifier)%(Reference.KSPAssemblyName)' != ''">
113113
<KSPAssemblyName Condition="'%(Reference.KSPAssemblyName)' == ''">$([System.String]::Copy('%(Reference.identity)').Split(',')[0])</KSPAssemblyName>
@@ -153,9 +153,9 @@
153153
</ItemDefinitionGroup>
154154

155155
<!-- Target to generate the KSP version json file for AVC/CKAN etc-->
156-
<Target Name="GenerateKSPVersionFile" AfterTargets="Build"
156+
<Target Name="KSPBTGenerateVersionFile" AfterTargets="Build"
157157
Inputs="@(KSPVersionFile);$(FileVersion)" Outputs="%(KSPVersionFile.destination)"
158-
Condition= " '$(GenerateKSPVersionFile)' == 'true' ">
158+
Condition= " '$(KSPBTGenerateVersionFile)' == 'true' ">
159159
<ItemGroup>
160160
<KSPVersionFile Update="@(KSPVersionFile)">
161161
<Name Condition="'%(KSPVersionFile.Name)' == ''">$(ProjectName)</Name>

0 commit comments

Comments
 (0)