Skip to content

Commit dcf256a

Browse files
authored
Fix condition for BuildAfterTargetingPack (#60147)
* Fix condition for BuildAfterTargetingPack * Enforce build order explicitly
1 parent 53e9559 commit dcf256a

File tree

3 files changed

+19
-7
lines changed

3 files changed

+19
-7
lines changed

Diff for: src/BuildAfterTargetingPack/BuildAfterTargetingPack.csproj

+7-7
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
<!-- Cannot build in source-build because that does not create an App.Ref layout. -->
4242
<Target Name="BuildDelayedProjects"
4343
BeforeTargets="Build"
44-
Condition=" '$(DotNetBuild)' != 'true' "
44+
Condition=" '$(DotNetBuildSourceOnly)' != 'true' "
4545
Returns="@(TargetPathWithTargetPlatformMoniker)">
4646
<MSBuild Projects="@(RequiresDelayedBuild)"
4747
BuildInParallel="$(BuildInParallel)"
@@ -52,13 +52,13 @@
5252
</MSBuild>
5353
</Target>
5454

55-
<Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuild)' != 'true' ">
55+
<Target Name="CleanDelayedProjects" BeforeTargets="Clean" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
5656
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Clean" />
5757
</Target>
5858

5959
<Target Name="CreateHelixPayloadDelayedProjects"
6060
BeforeTargets="CreateHelixPayload"
61-
Condition=" '$(DotNetBuild)' != 'true' "
61+
Condition=" '$(DotNetBuildSourceOnly)' != 'true' "
6262
Returns="@(HelixWorkItem)">
6363
<MSBuild Projects="@(RequiresDelayedBuild)"
6464
BuildInParallel="$(BuildInParallel)"
@@ -76,19 +76,19 @@
7676
</MSBuild>
7777
</Target>
7878

79-
<Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuild)' != 'true' ">
79+
<Target Name="PackDelayedProjects" BeforeTargets="Pack" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
8080
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Pack" />
8181
</Target>
8282

83-
<Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuild)' != 'true' ">
83+
<Target Name="PublishDelayedProjects" BeforeTargets="Publish" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
8484
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Publish" />
8585
</Target>
8686

87-
<Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuild)' != 'true' ">
87+
<Target Name="TestDelayedProjects" BeforeTargets="Test" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
8888
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="Test" />
8989
</Target>
9090

91-
<Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuild)' != 'true' ">
91+
<Target Name="VSTestDelayedProjects" BeforeTargets="VSTest" Condition=" '$(DotNetBuildSourceOnly)' != 'true' ">
9292
<MSBuild Projects="@(RequiresDelayedBuild)" BuildInParallel="$(BuildInParallel)" Targets="VSTest" />
9393
</Target>
9494

Diff for: src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.JsonTranscoding/Microsoft.AspNetCore.Grpc.JsonTranscoding.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,12 @@
3131
<Reference Include="Google.Protobuf" />
3232
<Reference Include="Grpc.AspNetCore.Server" />
3333

34+
<!-- Enforce build order. -->
35+
<ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
36+
Private="false"
37+
ReferenceOutputAssembly="false"
38+
SkipGetTargetFrameworkProperties="true" />
39+
3440
<None Update="protos\google\api\*.proto">
3541
<Pack>true</Pack>
3642
<PackagePath>content</PackagePath>

Diff for: src/Grpc/JsonTranscoding/src/Microsoft.AspNetCore.Grpc.Swagger/Microsoft.AspNetCore.Grpc.Swagger.csproj

+6
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,11 @@
1717

1818
<Reference Include="Microsoft.AspNetCore.Grpc.JsonTranscoding" />
1919
<Reference Include="Swashbuckle.AspNetCore" />
20+
21+
<!-- Enforce build order. -->
22+
<ProjectReference Include="$(RepoRoot)\src\Framework\App.Ref\src\Microsoft.AspNetCore.App.Ref.sfxproj"
23+
Private="false"
24+
ReferenceOutputAssembly="false"
25+
SkipGetTargetFrameworkProperties="true" />
2026
</ItemGroup>
2127
</Project>

0 commit comments

Comments
 (0)