Skip to content

Commit b7d6a48

Browse files
committed
Fix tests
1 parent 31852ae commit b7d6a48

5 files changed

Lines changed: 4 additions & 11 deletions

File tree

KSPCommon.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@
4747
<PropertyGroup>
4848
<!-- The root directory of the mod, the folder that gets placed in GameData -->
4949
<KSPModRoot Condition=" '$(KSPModRoot)' == '' ">$(ProjectDir)/../GameData/$(ProjectName)/</KSPModRoot>
50-
<KSPModPluginFolder Condition=" '$(KSPModPluginFolder)' == '' ">$(KSPModGameData)/Plugins/</KSPModPluginFolder>
50+
<!-- The folder to place resulting DLLs into, relative to KSPModRoot -->
51+
<KSPModPluginFolder Condition=" '$(KSPModPluginFolder)' == '' "/>
5152
</PropertyGroup>
5253

5354
<!-- Import the csproj.user file. -->

KSPCommon.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<BinariesToCopy Include="$(TargetDir)/**/*.dll"/>
3030
<BinariesToCopy Include="$(TargetDir)/**/*.pdb" Condition="'$(Condition)' == 'Debug'"/>
3131
</ItemGroup>
32-
<MakeDir Directories="$(KSPModPluginFolder)"/>
33-
<Copy SourceFiles="@(BinariesToCopy)" DestinationFolder="$(KSPModPluginFolder)/%(RecursiveDir)"/>
32+
<MakeDir Directories="$(KSPModRoot)/$(KSPModPluginFolder)"/>
33+
<Copy SourceFiles="@(BinariesToCopy)" DestinationFolder="$(KSPModRoot)/$(KSPModPluginFolder)/%(RecursiveDir)"/>
3434
</Target>
3535

3636
<!-- Use CKAN to install mods for any references tagged with a CKAN Identifier -->

tests/plugin-mod-legacy/PluginModLegacy/plugin-mod-legacy.csproj

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -50,10 +50,6 @@
5050
<ErrorReport>prompt</ErrorReport>
5151
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
5252
</PropertyGroup>
53-
<PropertyGroup>
54-
<RepoRootPath>$(MSBuildThisFileDirectory)../</RepoRootPath>
55-
<BinariesOutputRelativePath>GameData/plugin-mod-legacy</BinariesOutputRelativePath>
56-
</PropertyGroup>
5753
<Import Project="$(MSBuildExtensionsPath)/$(MSBuildToolsVersion)\Microsoft.Common.props" />
5854
<Import Project="$(MSBuildThisFileDirectory)../../../KSPCommon.targets" />
5955
<Import Project="$(MSBuildBinPath)/Microsoft.CSharp.targets" />

tests/plugin-mod-nuget/plugin-mod.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,6 @@
2222
<NoWarn>1701;1702;CS0649;CS1591;</NoWarn>
2323
<AssemblyCopyright>2024 KSPModdingLibs Contributors</AssemblyCopyright>
2424
<AssemblyName>PluginModNuget</AssemblyName>
25-
<KSPModRoot>$(MSBuildThisFileDirectory)GameData/plugin-mod-nuget/</KSPModRoot>
26-
<KSPModPluginFolder>$(KSPModRoot)/</KSPModPluginFolder>
2725
</PropertyGroup>
2826

2927
<!-- DLL Dependencies-->

tests/plugin-mod/plugin-mod.csproj

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@
1717
<NoWarn>1701;1702;CS0649;CS1591;</NoWarn>
1818
<AssemblyCopyright>2024 KSPModdingLibs Contributors</AssemblyCopyright>
1919
<AssemblyName>PluginMod</AssemblyName>
20-
<KSPModRoot>$(MSBuildThisFileDirectory)GameData/plugin-mod/</KSPModRoot>
21-
<KSPModPluginFolder>$(KSPModRoot)/</KSPModPluginFolder>
2220
</PropertyGroup>
2321

2422
<!-- DLL Dependencies-->

0 commit comments

Comments
 (0)