Skip to content

Commit 08f87b4

Browse files
committed
[lisandro/godot-blackholio]: Revert "[lisandro/godot-blackholio]: use Directory.Build.props for godot output paths"
This reverts commit e609486.
1 parent e609486 commit 08f87b4

2 files changed

Lines changed: 7 additions & 7 deletions

File tree

sdks/csharp/Directory.Build.props

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,4 @@
33
<BaseOutputPath>bin~</BaseOutputPath>
44
<BaseIntermediateOutputPath>obj~</BaseIntermediateOutputPath>
55
</PropertyGroup>
6-
7-
<PropertyGroup Condition="'$(MSBuildProjectName)' == 'SpacetimeDB.ClientSDK.Godot'">
8-
<BaseOutputPath>bin~/</BaseOutputPath>
9-
<BaseIntermediateOutputPath>obj~/godot/</BaseIntermediateOutputPath>
10-
<MSBuildProjectExtensionsPath>obj~/godot/</MSBuildProjectExtensionsPath>
11-
</PropertyGroup>
126
</Project>

tools/regen/src/csharp.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -225,6 +225,9 @@ pub fn regen_dlls() -> Result<()> {
225225
"SpacetimeDB.ClientSDK.Godot.csproj",
226226
"--configfile",
227227
path_arg(&nuget_config_path),
228+
"-p:BaseOutputPath=bin~/",
229+
"-p:BaseIntermediateOutputPath=obj~/godot/",
230+
"-p:MSBuildProjectExtensionsPath=obj~/godot/",
228231
)
229232
.dir(&sdk)
230233
.run()?;
@@ -249,7 +252,10 @@ pub fn regen_dlls() -> Result<()> {
249252
"SpacetimeDB.ClientSDK.Godot.csproj",
250253
"-c",
251254
"Release",
252-
"--no-restore"
255+
"--no-restore",
256+
"-p:BaseOutputPath=bin~/",
257+
"-p:BaseIntermediateOutputPath=obj~/godot/",
258+
"-p:MSBuildProjectExtensionsPath=obj~/godot/"
253259
)
254260
.dir(&sdk)
255261
.run()?;

0 commit comments

Comments
 (0)