Skip to content

Commit 0b82af6

Browse files
committed
fix ros2cs build in Get_ros2cs target
1 parent 0f25f4d commit 0b82af6

1 file changed

Lines changed: 21 additions & 17 deletions

File tree

src/Directory.Build.targets

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,28 @@
11
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
22

3-
<PropertyGroup>
4-
<GetRos2csPropsDependsOn>
5-
$(GetRos2csPropsDependsOn);Get_ros2cs
6-
</GetRos2csPropsDependsOn>
7-
</PropertyGroup>
8-
9-
<Target Name="Get_ros2cs">
3+
<PropertyGroup>
4+
<GetRos2csPropsDependsOn>
5+
$(GetRos2csPropsDependsOn);Get_ros2cs
6+
</GetRos2csPropsDependsOn>
7+
</PropertyGroup>
108

11-
<MSBuild Projects="$(MSBuildThisFileDirectory)\ros2cs\ros2cs.csproj"
12-
Targets="Publish"
13-
Properties="Configuration=$(Configuration);TargetFramework=$(Ros2csBundleTfm);Version=$(Version)"
14-
/>
9+
<Target Name="Get_ros2cs">
10+
<MSBuild Projects="$(MSBuildThisFileDirectory)\ros2cs\ros2cs.csproj"
11+
Targets="Restore"
12+
RemoveProperties="TargetFramework"
13+
/>
1514

16-
<PropertyGroup>
17-
<Ros2csDir>$(MSBuildThisFileDirectory)\ros2cs\bin\$(Configuration)\$(Ros2csBundleTfm)\publish</Ros2csDir>
18-
<Ros2csExe>&quot;$(Ros2csDir)\ros2cs.dll&quot;</Ros2csExe>
19-
</PropertyGroup>
15+
<MSBuild Projects="$(MSBuildThisFileDirectory)\ros2cs\ros2cs.csproj"
16+
Targets="Publish"
17+
Properties="Configuration=$(Configuration);TargetFramework=$(Ros2csBundleTfm);Version=$(Version)"
18+
/>
2019

21-
<Message Text="[$(MSBuildProjectName), Source Build] Using ros2cs from $(Ros2csExe)"/>
22-
</Target>
20+
<PropertyGroup>
21+
<Ros2csDir>$(MSBuildThisFileDirectory)\ros2cs\bin\$(Configuration)\$(Ros2csBundleTfm)\publish</Ros2csDir>
22+
<Ros2csExe>&quot;$(Ros2csDir)\ros2cs.dll&quot;</Ros2csExe>
23+
</PropertyGroup>
24+
25+
<Message Text="[$(MSBuildProjectName), Source Build] Using ros2cs from $(Ros2csExe)"/>
26+
</Target>
2327

2428
</Project>

0 commit comments

Comments
 (0)