File tree Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Expand file tree Collapse file tree 2 files changed +7
-15
lines changed Original file line number Diff line number Diff line change 35
35
<ProjectReference Include =" ..\redist\redist.csproj" ReferenceOutputAssembly =" false" />
36
36
</ItemGroup >
37
37
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" />
49
45
</ItemGroup >
50
46
51
47
<ItemGroup >
Original file line number Diff line number Diff line change 36
36
</PropertyGroup >
37
37
</Target >
38
38
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
-
43
39
<!-- This target is intended to catch changes that require someone to investigate. -->
44
40
<Target Name =" ValidateBuild" BeforeTargets =" CoreCompile" >
45
41
<!-- Bundles must target x86 for back compat. -->
You can’t perform that action at this time.
0 commit comments