Skip to content
This repository was archived by the owner on Jan 23, 2023. It is now read-only.

[release/3.0] Fix PlatformManifestProjectReference ordering to fix flakiness #7436

Merged
dagood merged 1 commit into from
Jul 27, 2019
Merged

[release/3.0] Fix PlatformManifestProjectReference ordering to fix flakiness #7436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/pkg/packaging-tools/framework.dependency.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -468,7 +468,8 @@
DependsOnTargets="ResolveReferences"
Returns="@(ReferenceCopyLocalPaths -> '%(Filename)')" />

<Target Name="BuildDependencyProjectReferences">
<Target Name="BuildDependencyProjectReferences"
DependsOnTargets="GetDefaultOrderProjectReferences">
<MSBuild Projects="@(OrderProjectReference)" Targets="Build" />
</Target>

Expand Down
3 changes: 2 additions & 1 deletion src/pkg/packaging-tools/framework.packaging.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,8 @@
(
'$(BuildRidSpecificPacks)' == 'true' or
('$(FrameworkPackType)' == '' and '$(BuildRuntimePackages)' == 'true')
)">
)"
DependsOnTargets="GetDefaultOrderProjectReferences">
<!--
Ensure all project references are built to make sure dependencies (e.g. native build and
depproj's crossgen) runs first. The global properties mean we can't let the inner build handle
Expand Down
3 changes: 2 additions & 1 deletion src/pkg/packaging-tools/framework.sharedfx.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -234,7 +234,8 @@
we're using its nupkg directly. In the future, this will be handled in shared tooling to
generate shared frameworks in the Arcade SDK.
-->
<Target Name="BuildPkgProjectReferences">
<Target Name="BuildPkgProjectReferences"
DependsOnTargets="GetDefaultOrderProjectReferences">
<MSBuild
Projects="
$(RepoRoot)signing\SignBinaries.proj;
Expand Down
5 changes: 0 additions & 5 deletions src/pkg/packaging-tools/packaging-tools.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,9 +81,4 @@
<OutputName>$(InstallerFileNameWithoutExtension)</OutputName>
</PropertyGroup>

<ItemGroup>
<!-- Ensure depproj has had a chance to build the platform manifest. -->
<OrderProjectReference Include="@(PlatformManifestProjectReference)" />
</ItemGroup>

</Project>
7 changes: 7 additions & 0 deletions src/pkg/packaging-tools/packaging-tools.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,13 @@
</ItemGroup>
</Target>

<Target Name="GetDefaultOrderProjectReferences">
<ItemGroup>
<!-- Ensure depproj has had a chance to build the platform manifest. -->
<OrderProjectReference Include="@(PlatformManifestProjectReference)" />
</ItemGroup>
</Target>

<Target Name="ResolvePlatformManifestProjectReferences"
Condition="'@(PlatformManifestProjectReference)' != ''"
BeforeTargets="ResolveProjectReferences">
Expand Down