Skip to content

Commit 35c0304

Browse files
authored
Remove Idle target workaround (#49964)
1 parent 1ed2f8e commit 35c0304

File tree

2 files changed

+7
-15
lines changed

2 files changed

+7
-15
lines changed

src/Layout/pkg/dotnet-sdk.proj

Lines changed: 7 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -35,17 +35,13 @@
3535
<ProjectReference Include="..\redist\redist.csproj" ReferenceOutputAssembly="false" />
3636
</ItemGroup>
3737

38-
<ItemGroup Condition="'$(OS)' == 'Windows_NT'">
39-
<!-- These project references ensure that package references for WiX extensions are correctly restored. The Idle target is a no-op as the
40-
projects are built later when computed properties are available. These properties do not exist when projects are evaluated. -->
41-
<ProjectReference Include="windows\msis\placeholder\placeholder.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"
42-
Targets="Idle" />
43-
<ProjectReference Include="windows\msis\templates\templates.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"
44-
Targets="Idle" />
45-
<ProjectReference Include="windows\msis\toolset\toolset.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"
46-
Targets="Idle" />
47-
<ProjectReference Include="windows\bundles\sdk\bundle.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true"
48-
Targets="Idle" />
38+
<!-- These P2Ps ensure that package references for WiX extensions are correctly restored. The MSBuildRestoreSessionId condition makes sure that these
39+
projects are only restored. They get built later when computed properties are available. These properties do not exist when projects are evaluated. -->
40+
<ItemGroup Condition="'$(OS)' == 'Windows_NT' and '$(MSBuildRestoreSessionId)' != ''">
41+
<ProjectReference Include="windows\msis\placeholder\placeholder.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
42+
<ProjectReference Include="windows\msis\templates\templates.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
43+
<ProjectReference Include="windows\msis\toolset\toolset.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
44+
<ProjectReference Include="windows\bundles\sdk\bundle.wixproj" ReferenceOutputAssembly="false" SkipGetTargetFrameworkProperties="true" />
4945
</ItemGroup>
5046

5147
<ItemGroup>

src/Layout/pkg/windows/Directory.Build.targets

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,6 @@
3636
</PropertyGroup>
3737
</Target>
3838

39-
<!-- This target does nothing. It's intended to allow ProjectReference items to specify a target that has
40-
no build impact, but allow projects to participate in restore operations. -->
41-
<Target Name="Idle" />
42-
4339
<!-- This target is intended to catch changes that require someone to investigate. -->
4440
<Target Name="ValidateBuild" BeforeTargets="CoreCompile">
4541
<!-- Bundles must target x86 for back compat. -->

0 commit comments

Comments
 (0)