Skip to content

Commit 3832bef

Browse files
committed
Make it easier to hook into the outer/inner Build/Clean/Publish process.
Closes #69.
1 parent 1661269 commit 3832bef

File tree

3 files changed

+18
-15
lines changed

3 files changed

+18
-15
lines changed

src/sdk/build/Vezel.Zig.Sdk.Build.targets

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,27 @@
11
<Project>
22
<PropertyGroup>
3-
<_InnerOrOuterBuild>_InnerBuild</_InnerOrOuterBuild>
4-
<_InnerOrOuterBuild Condition="'$(IsOuterBuild)' == 'true'">_OuterBuild</_InnerOrOuterBuild>
3+
<_InnerOrOuterBuild>InnerBuild</_InnerOrOuterBuild>
4+
<_InnerOrOuterBuild Condition="'$(IsOuterBuild)' == 'true'">OuterBuild</_InnerOrOuterBuild>
55
</PropertyGroup>
66

77
<Target Name="Build"
88
DependsOnTargets="$(_InnerOrOuterBuild)"
99
Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
1010

11-
<Target Name="_OuterBuild">
11+
<Target Name="OuterBuild"
12+
DependsOnTargets="$(OuterBuildDependsOn)">
1213
<ItemGroup>
1314
<_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
1415
<_InnerProjects Include="$(MSBuildProjectFullPath)"
1516
Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
1617
</ItemGroup>
1718

1819
<MSBuild Projects="@(_InnerProjects)"
19-
Targets="_InnerBuild"
20+
Targets="InnerBuild"
2021
BuildInParallel="$(BuildInParallel)" />
2122
</Target>
2223

23-
<Target Name="_InnerBuild"
24+
<Target Name="InnerBuild"
2425
DependsOnTargets="$(BuildDependsOn)"
2526
Returns="@(TargetPathWithTargetPlatformMoniker)" />
2627

src/sdk/build/Vezel.Zig.Sdk.Clean.targets

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,26 +5,27 @@
55
</ItemGroup>
66

77
<PropertyGroup>
8-
<_InnerOrOuterClean>_InnerClean</_InnerOrOuterClean>
9-
<_InnerOrOuterClean Condition="'$(IsOuterBuild)' == 'true'">_OuterClean</_InnerOrOuterClean>
8+
<_InnerOrOuterClean>InnerClean</_InnerOrOuterClean>
9+
<_InnerOrOuterClean Condition="'$(IsOuterBuild)' == 'true'">OuterClean</_InnerOrOuterClean>
1010
</PropertyGroup>
1111

1212
<Target Name="Clean"
1313
DependsOnTargets="$(_InnerOrOuterClean)"
1414
Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
1515

16-
<Target Name="_OuterClean">
16+
<Target Name="OuterClean"
17+
DependsOnTargets="$(OuterCleanDependsOn)">
1718
<ItemGroup>
1819
<_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
1920
<_InnerProjects Include="$(MSBuildProjectFullPath)"
2021
Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
2122
</ItemGroup>
2223

2324
<MSBuild Projects="@(_InnerProjects)"
24-
Targets="_InnerClean"
25+
Targets="InnerClean"
2526
BuildInParallel="$(BuildInParallel)" />
2627
</Target>
2728

28-
<Target Name="_InnerClean"
29+
<Target Name="InnerClean"
2930
DependsOnTargets="$(CleanDependsOn)" />
3031
</Project>

src/sdk/build/Vezel.Zig.Sdk.Publish.targets

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,23 @@
11
<Project>
22
<PropertyGroup>
3-
<_InnerOrOuterPublish>_InnerPublish</_InnerOrOuterPublish>
4-
<_InnerOrOuterPublish Condition="'$(IsOuterBuild)' == 'true'">_OuterPublish</_InnerOrOuterPublish>
3+
<_InnerOrOuterPublish>InnerPublish</_InnerOrOuterPublish>
4+
<_InnerOrOuterPublish Condition="'$(IsOuterBuild)' == 'true'">OuterPublish</_InnerOrOuterPublish>
55
</PropertyGroup>
66

77
<Target Name="Publish"
88
DependsOnTargets="$(_InnerOrOuterPublish)"
99
Condition="'$(_InvalidConfigurationWarning)' != 'true'" />
1010

11-
<Target Name="_OuterPublish">
11+
<Target Name="OuterPublish"
12+
DependsOnTargets="$(OuterPublishDependsOn)">
1213
<ItemGroup>
1314
<_RuntimeIdentifiers Include="$(RuntimeIdentifiers)" />
1415
<_InnerProjects Include="$(MSBuildProjectFullPath)"
1516
Properties="RuntimeIdentifier=%(_RuntimeIdentifiers.Identity)" />
1617
</ItemGroup>
1718

1819
<MSBuild Projects="@(_InnerProjects)"
19-
Targets="_InnerPublish"
20+
Targets="InnerPublish"
2021
BuildInParallel="$(BuildInParallel)" />
2122
</Target>
2223

@@ -25,7 +26,7 @@
2526
well as the build and clean logic in MSBuild, so we have to duplicate some
2627
of the logic in the default Publish target here.
2728
-->
28-
<Target Name="_InnerPublish"
29+
<Target Name="InnerPublish"
2930
DependsOnTargets="_PublishBuildAlternative; _PublishNoBuildAlternative"
3031
Condition="'$(IsPublishable)' == 'true'">
3132
<Message Text="$(MSBuildProjectName) -> $([System.IO.Path]::GetFullPath('$(PublishDir)'))"

0 commit comments

Comments
 (0)