Name the bind path item group "BindPath" in MSBuild
Closes 6959
Rob Mensching committed
Oct 14, 2022 at 22:58 UTC
e550b63845a90e1a9452060b50a00ca5d9ee8c67
9 files changed
+21
-25
src/ext/Bal/test/examples/Directory.wixproj.targets
+1
-1
@@ -2,7 +2,7 @@
2
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
3
<Project>
4
<ItemGroup>
5
- <BindInputPaths Include="$(OutputPath)" />
5
+ <BindPath Include="$(OutputPath)" />
6
<WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.Bal.wixext.dll" />
7
</ItemGroup>
8
</Project>
src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
+1
-1
@@ -1,7 +1,7 @@
1
<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
2
<Project Sdk="WixToolset.Sdk">
3
<ItemGroup>
4
- <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" />
4
+ <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" />
5
<HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd">
6
<DirectoryRefId>publish.Example.EarliestCoreMBA.scd</DirectoryRefId>
7
<Transforms>ba.xslt</Transforms>
src/ext/Bal/wixlib/bal.wixproj
+6
-6
@@ -7,12 +7,12 @@
7
</PropertyGroup>
8
9
<ItemGroup>
10
- <BindInputPaths Include="..\wixstdba\Resources\" />
11
- <BindInputPaths Include="$(OutputPath)net6.0" />
12
- <BindInputPaths Include="$(OutputPath)net20" />
13
- <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
14
- <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
15
- <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
10
+ <BindPath Include="..\wixstdba\Resources\" />
11
+ <BindPath Include="$(OutputPath)net6.0" />
12
+ <BindPath Include="$(OutputPath)net20" />
13
+ <BindPath Include="$(OutputPath)x86" BindName="x86" />
14
+ <BindPath Include="$(OutputPath)x64" BindName="x64" />
15
+ <BindPath Include="$(OutputPath)arm64" BindName="arm64" />
16
</ItemGroup>
17
18
<ItemGroup>
src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
+1
-1
@@ -2,7 +2,7 @@
2
<Project Sdk="WixToolset.Sdk">
3
4
<ItemGroup>
5
- <BindInputPaths Include="." />
5
+ <BindPath Include="." />
6
</ItemGroup>
7
8
<PropertyGroup>
src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
+1
-1
@@ -2,7 +2,7 @@
2
<Project Sdk="WixToolset.Sdk">
3
4
<ItemGroup>
5
- <BindInputPaths Include="." />
5
+ <BindPath Include="." />
6
</ItemGroup>
7
8
<PropertyGroup>
src/wix/WixToolset.BuildTasks/WixBuild.cs
+3
-3
@@ -43,7 +43,7 @@ namespace WixToolset.BuildTasks
43
[Required]
44
public ITaskItem[] SourceFiles { get; set; }
45
46
- public ITaskItem[] BindInputPaths { get; set; }
46
+ public ITaskItem[] BindPaths { get; set; }
47
48
public bool BindFiles { get; set; }
49
@@ -89,9 +89,9 @@ namespace WixToolset.BuildTasks
89
90
private IEnumerable<string> CalculateBindPathStrings()
91
{
92
- if (null != this.BindInputPaths)
92
+ if (null != this.BindPaths)
93
{
94
- foreach (var item in this.BindInputPaths)
94
+ foreach (var item in this.BindPaths)
95
{
96
var path = item.GetMetadata("FullPath");
97
src/wix/WixToolset.Sdk/tools/wix.targets
+6
-10
@@ -158,21 +158,17 @@
158
***********************************************************************************************
159
-->
160
161
- <!-- If WixExtension was passed in via the command line, then convert it to an ItemGroup -->
162
- <ItemGroup>
163
- <WixExtension Include="$(WixExtension)" Condition=" '$(WixExtension)' != '' " />
164
- </ItemGroup>
165
-
161
<!-- Default Compiler properties. -->
162
<PropertyGroup>
163
<InstallerPlatform Condition=" '$(InstallerPlatform)' == '' and '$(Platform)' != 'AnyCPU' and '$(Platform)' != 'Any CPU' ">$(Platform)</InstallerPlatform>
164
</PropertyGroup>
165
171
- <!-- If BindInputPaths (or LinkerBindInputPaths) was passed in via the command line, then convert it to an ItemGroup -->
166
+ <!-- Convert legacy BindInputPaths and LinkerBindInputPaths (in the project or passed in via the command line) into the new BindPath items -->
167
<ItemGroup>
168
<BindInputPaths Include="$(BindInputPaths)" Condition=" '$(BindInputPaths)' != '' " />
169
<LinkerBindInputPaths Include="$(LinkerBindInputPaths)" Condition=" '$(LinkerBindInputPaths)' != '' " />
175
- <LinkerBindInputPaths Condition=" '@(LinkerBindInputPaths)' == '' " Include="@(BindInputPaths)" />
170
+ <BindPath Include="$(BindPath)" Condition=" '$(BindPath)' != '' " />
171
+ <BindPath Include="@(BindInputPaths);@(LinkerBindInputPaths)" />
172
</ItemGroup>
173
174
<!--
@@ -308,7 +304,7 @@
304
305
[OUT]
306
$(ProjectReferenceDefineConstants) - Define constants from project references.
311
- @(LinkerBindInputPaths) - Bind paths from project references.
307
+ @(BindPath) - Bind paths from project references.
308
@(WixLibrary) - Target paths from .vcxproj outputs added.
309
@(_WixReferencedProjectOutputs) - Copy of _ResolvedProjectReferencePaths for use in up-to-date checks.
310
@(_ResolvedProjectReferencePaths) - All resolved reference paths emptied.
@@ -336,7 +332,7 @@
332
<CreateProjectReferenceDefineConstantsAndBindPaths
333
ResolvedProjectReferences="@(_ResolvedProjectReferencePaths)"
334
ProjectConfigurations="$(VSProjectConfigurations)">
339
- <Output TaskParameter="BindPaths" ItemName="LinkerBindInputPaths" />
335
+ <Output TaskParameter="BindPaths" ItemName="BindPath" />
336
<Output TaskParameter="DefineConstants" PropertyName="ProjectReferenceDefineConstants" />
337
</CreateProjectReferenceDefineConstantsAndBindPaths>
338
@@ -603,7 +599,7 @@
599
NoLogo="true"
600
Pedantic="$(Pedantic)"
601
606
- BindInputPaths="@(LinkerBindInputPaths)"
602
+ BindPaths="@(BindPath)"
603
BindFiles="$(BindFiles)"
604
BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)"
605
src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+1
-1
@@ -45,7 +45,7 @@ namespace WixToolsetTest.BuildTasks
45
{
46
new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
47
},
48
- BindInputPaths = new[]
48
+ BindPaths = new[]
49
{
50
new TaskItem(Path.Combine(folder, "data")),
51
},
src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
+1
-1
@@ -36,7 +36,7 @@
36
</ItemGroup>
37
38
<ItemGroup>
39
- <BindInputPaths Include="data" />
39
+ <BindPath Include="data" />
40
</ItemGroup>
41
42
<Import Project="$(WixTargetsPath)" />