|
153 | 153 |
|
154 | 154 | <!-- |
155 | 155 | |
156 | | - GetTargetItem |
| 156 | + GetOutputItem |
157 | 157 | |
158 | 158 | Externally callable target that returns information about the native target being built. |
159 | 159 | |
160 | 160 | --> |
161 | 161 |
|
162 | | - <Target Name="GetTargetItem" Returns="@(GetTargetItem)"> |
| 162 | + <Target Name="GetOutputItem" Returns="@(GetOutputItem)"> |
163 | 163 | <ItemGroup> |
164 | | - <GetTargetItem Include="$([System.IO.Path]::GetFullPath('$(OutputPath)$(TargetPathName)$(TargetFileName)'))"> |
| 164 | + <GetOutputItem Include="$([System.IO.Path]::GetFullPath('$(MSBuildProjectFile)'))"> |
165 | 165 | <TargetIdentifier>$(TargetIdentifier)</TargetIdentifier> |
166 | 166 | <TargetName>$(TargetName)</TargetName> |
167 | 167 | <TargetTriple>$(TargetTriple)</TargetTriple> |
|
171 | 171 | <HeadersPath Condition=" '$(HeadersIntermediateOutputPath)' != '' ">$([System.IO.Path]::GetFullPath('$(HeadersIntermediateOutputPath)'))</HeadersPath> |
172 | 172 | <Version>$(Version)</Version> |
173 | 173 | <CopyUpToDateMarker>@(CopyUpToDateMarker)</CopyUpToDateMarker> |
174 | | - </GetTargetItem> |
| 174 | + </GetOutputItem> |
175 | 175 | </ItemGroup> |
176 | 176 | </Target> |
177 | 177 |
|
178 | 178 | <!-- |
179 | 179 | |
180 | | - GetProjectReferenceTargetItems |
| 180 | + GetProjectReferenceOutputItems |
181 | 181 | |
182 | 182 | Externally callable target that returns information about the native target being built and the same for any dependent project references. |
183 | 183 | |
184 | 184 | --> |
185 | 185 |
|
186 | | - <Target Name="GetProjectReferenceTargetItems" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetProjectReferenceTargetItems)"> |
| 186 | + <Target Name="GetProjectReferenceOutputItems" DependsOnTargets="AssignProjectConfiguration" Returns="@(GetProjectReferenceOutputItems)"> |
187 | 187 | <MSBuild |
188 | 188 | Projects="@(ProjectReferenceWithConfiguration)" |
189 | | - Targets="GetTargetItem" |
| 189 | + Targets="GetOutputItem" |
190 | 190 | SkipNonexistentTargets="true" |
191 | 191 | BuildInParallel="$(BuildInParallel)" |
192 | 192 | Properties="%(ProjectReferenceWithConfiguration.SetConfiguration);%(ProjectReferenceWithConfiguration.SetPlatform);%(ProjectReferenceWithConfiguration.SetTargetIdentifier);" |
193 | 193 | Condition="'%(ProjectReferenceWithConfiguration.BuildReference)' == 'true' And '@(ProjectReferenceWithConfiguration)' != '' And ('$(BuildingInsideVisualStudio)' == 'true' Or '$(BuildProjectReferences)' != 'true') And '$(VisualStudioVersion)' != '10.0' And '@(ProjectReferenceWithConfiguration)' != ''" |
194 | 194 | ContinueOnError="false" |
195 | 195 | RemoveProperties="%(ProjectReferenceWithConfiguration.GlobalPropertiesToRemove)$(_GlobalPropertiesToRemoveFromProjectReferences)" |
196 | 196 | RebaseOutputs="false"> |
197 | | - <Output TaskParameter="TargetOutputs" ItemName="_GetProjectReferenceTargetItems" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceTargetItems)' == 'true' "/> |
| 197 | + <Output TaskParameter="TargetOutputs" ItemName="_GetProjectReferenceOutputItems" Condition=" '%(ProjectReferenceWithConfiguration.ReferenceTargetItems)' == 'true' "/> |
198 | 198 | </MSBuild> |
199 | | - <RemoveDuplicates Inputs="@(_GetProjectReferenceTargetItems)"> |
200 | | - <Output TaskParameter="Filtered" ItemName="__GetProjectReferenceTargetItems"/> |
| 199 | + <RemoveDuplicates Inputs="@(_GetProjectReferenceOutputItems)"> |
| 200 | + <Output TaskParameter="Filtered" ItemName="__GetProjectReferenceOutputItems"/> |
201 | 201 | </RemoveDuplicates> |
202 | 202 | <ItemGroup> |
203 | | - <GetProjectReferenceTargetItems Include="@(__GetProjectReferenceTargetItems)" /> |
| 203 | + <GetProjectReferenceOutputItems Include="@(__GetProjectReferenceOutputItems)" /> |
204 | 204 | </ItemGroup> |
205 | 205 | </Target> |
206 | 206 |
|
|
215 | 215 | <ImportProjectReferenceItemsDependsOn> |
216 | 216 | $(ImportProjectReferenceItemsDependsOn); |
217 | 217 | AssignProjectConfiguration; |
218 | | - GetProjectReferenceTargetItems; |
| 218 | + GetProjectReferenceOutputItems; |
219 | 219 | </ImportProjectReferenceItemsDependsOn> |
220 | 220 | </PropertyGroup> |
221 | 221 |
|
222 | 222 | <Target Name="ImportProjectReferenceItems" DependsOnTargets="$(ImportProjectReferenceItemsDependsOn)"> |
223 | 223 | <ItemGroup> |
224 | | - <IncludeDirectories Include="@(GetProjectReferenceTargetItems->'%(HeadersPath)')" /> |
| 224 | + <IncludeDirectories Include="@(GetProjectReferenceOutputItems->'%(HeadersPath)')" /> |
225 | 225 | <_LibraryDirectories Remove="@(_LibraryDirectories)" /> |
226 | | - <_LibraryDirectories Include="@(GetProjectReferenceTargetItems->'%(LibraryPath)')" /> |
| 226 | + <_LibraryDirectories Include="@(GetProjectReferenceOutputItems->'%(LibraryPath)')" /> |
227 | 227 | <LibraryDirectories Include="@(_LibraryDirectories->'%(RootDir)%(Directory)')" /> |
228 | | - <Dependencies Include="@(GetProjectReferenceTargetItems->'%(TargetName)')" /> |
| 228 | + <Dependencies Include="@(GetProjectReferenceOutputItems->'%(TargetName)')" /> |
229 | 229 | </ItemGroup> |
230 | 230 | </Target> |
231 | 231 |
|
|
561 | 561 | <PropertyGroup> |
562 | 562 | <GetCopyToOutputDirectoryItemsDependsOn> |
563 | 563 | $(GetCopyToOutputDirectoryItemsDependsOn); |
564 | | - GetProjectReferenceTargetItems; |
| 564 | + GetProjectReferenceOutputItems; |
565 | 565 | </GetCopyToOutputDirectoryItemsDependsOn> |
566 | 566 | </PropertyGroup> |
567 | 567 |
|
|
0 commit comments