Skip to content

Commit 9935d48

Browse files
committed
Try another thing
1 parent 159ae13 commit 9935d48

3 files changed

Lines changed: 12 additions & 12 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:_KSPBT_ManagedRelativePath=KSP_x64_Data/Managed ${{ inputs.solution-file-path }} \
79+
-p:KSPBT_ManagedRelativePath=KSP_x64_Data/Managed ${{ inputs.solution-file-path }} \
8080
${{ runner.debug && '-v:detailed' }}

KSPCommon.props

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,10 @@
4242
</ItemDefinitionGroup>
4343

4444
<!--Parse KSP platform-specific paths -->
45-
<PropertyGroup Condition=" '$(_KSPBT_ManagedRelativePath)' == '' ">
46-
<_KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64_Data/Managed</_KSPBT_ManagedRelativePath>
47-
<_KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/Resources/Data/Managed</_KSPBT_ManagedRelativePath>
48-
<_KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP_Data/Managed</_KSPBT_ManagedRelativePath>
45+
<PropertyGroup Condition=" '$(KSPBT_ManagedRelativePath)' == '' ">
46+
<KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Windows')) ">KSP_x64_Data/Managed</KSPBT_ManagedRelativePath>
47+
<KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('OSX')) ">KSP.app/Contents/Resources/Data/Managed</KSPBT_ManagedRelativePath>
48+
<KSPBT_ManagedRelativePath Condition=" $([MSBuild]::IsOsPlatform('Linux')) ">KSP_Data/Managed</KSPBT_ManagedRelativePath>
4949
</PropertyGroup>
5050

5151
<PropertyGroup>
@@ -57,7 +57,7 @@
5757
</PropertyGroup>
5858

5959
<!-- Import the csproj.user file. -->
60-
<!-- This can overwrite _KSPBT_ManagedRelativePath and _KSPBT_GameExecutable,
60+
<!-- This can overwrite KSPBT_ManagedRelativePath and _KSPBT_GameExecutable,
6161
set KSPBT_GameRoot and ReferencePath, and any other user-specific settings -->
6262
<Import Project="$(MSBuildProjectFullPath).user" Condition="Exists('$(MSBuildProjectFullPath).user')"/>
6363

@@ -70,7 +70,7 @@
7070

7171
<!-- Relative path that must exist for a path to be a valid KSP Install-->
7272
<PropertyGroup>
73-
<KSPBT_GameIdentifier>$(_KSPBT_ManagedRelativePath)/Assembly-CSharp.dll</KSPBT_GameIdentifier>
73+
<KSPBT_GameIdentifier>$(KSPBT_ManagedRelativePath)/Assembly-CSharp.dll</KSPBT_GameIdentifier>
7474
<KSPBT_GameRootSource Condition="'$(KSPBT_GameRoot)' != ''">property</KSPBT_GameRootSource>
7575
</PropertyGroup>
7676

@@ -104,11 +104,6 @@
104104
<KSPBT_GameRootSource>steam</KSPBT_GameRootSource>
105105
</PropertyGroup>
106106

107-
<!-- Calculate KSPBT_ManagedPath -->
108-
<PropertyGroup Condition=" '$(KSPBT_ManagedPath)' == ''">
109-
<KSPBT_ManagedPath>$(KSPBT_GameRoot)/$(_KSPBT_ManagedRelativePath)</KSPBT_ManagedPath>
110-
</PropertyGroup>
111-
112107
<!-- set the start action so that you can launch directly from VS -->
113108
<PropertyGroup>
114109
<StartAction>Program</StartAction>

KSPCommon.targets

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,11 @@
22
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Condition=" '$(KSPCommonPropsImported)' == '' And Exists('$(MSBuildThisFileDirectory)KSPCommon.props') " Project="$(MSBuildThisFileDirectory)KSPCommon.props"/>
44

5+
<!-- Calculate KSPBT_ManagedPath -->
6+
<PropertyGroup Condition=" '$(KSPBT_ManagedPath)' == ''">
7+
<KSPBT_ManagedPath>$(KSPBT_GameRoot)/$(KSPBT_ManagedRelativePath)</KSPBT_ManagedPath>
8+
</PropertyGroup>
9+
510
<!-- Import references -->
611
<ItemGroup Condition=" '$(KSPBT_ReferenceSystemAssemblies)' == 'true' ">
712
<Reference Include="$(KSPBT_ManagedPath)/System.dll">

0 commit comments

Comments
 (0)