From e550b63845a90e1a9452060b50a00ca5d9ee8c67 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Fri, 14 Oct 2022 22:58:30 -0700
Subject: Name the bind path item group "BindPath" in MSBuild

Closes 6959
---
 src/ext/Bal/test/examples/Directory.wixproj.targets      |  2 +-
 .../EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj  |  2 +-
 src/ext/Bal/wixlib/bal.wixproj                           | 12 ++++++------
 .../HeatProjectPreSdkStyle.wixproj                       |  2 +-
 .../HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj      |  2 +-
 src/wix/WixToolset.BuildTasks/WixBuild.cs                |  6 +++---
 src/wix/WixToolset.Sdk/tools/wix.targets                 | 16 ++++++----------
 .../WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs     |  2 +-
 .../TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj    |  2 +-
 9 files changed, 21 insertions(+), 25 deletions(-)

diff --git a/src/ext/Bal/test/examples/Directory.wixproj.targets b/src/ext/Bal/test/examples/Directory.wixproj.targets
index 7e6fe9f2..f126c632 100644
--- a/src/ext/Bal/test/examples/Directory.wixproj.targets
+++ b/src/ext/Bal/test/examples/Directory.wixproj.targets
@@ -2,7 +2,7 @@
 <!-- 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. -->
 <Project>
   <ItemGroup>
-    <BindInputPaths Include="$(OutputPath)" />
+    <BindPath Include="$(OutputPath)" />
     <WixExtension Include="$(OutputPath)..\netstandard2.0\WixToolset.Bal.wixext.dll" />
   </ItemGroup>
 </Project>
diff --git a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
index 3f81710e..1179bea7 100644
--- a/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
+++ b/src/ext/Bal/test/examples/EarliestCoreBundleSCD/EarliestCoreBundleSCD.wixproj
@@ -1,7 +1,7 @@
 <!-- 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. -->
 <Project Sdk="WixToolset.Sdk">
     <ItemGroup>
-        <BindInputPaths Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" />
+        <BindPath Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd" />
         <HarvestDirectory Include="$(OutputPath)publish\Example.EarliestCoreMBA\scd">
             <DirectoryRefId>publish.Example.EarliestCoreMBA.scd</DirectoryRefId>
             <Transforms>ba.xslt</Transforms>
diff --git a/src/ext/Bal/wixlib/bal.wixproj b/src/ext/Bal/wixlib/bal.wixproj
index b350dbce..64552f1a 100644
--- a/src/ext/Bal/wixlib/bal.wixproj
+++ b/src/ext/Bal/wixlib/bal.wixproj
@@ -7,12 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <BindInputPaths Include="..\wixstdba\Resources\" />
-    <BindInputPaths Include="$(OutputPath)net6.0" />
-    <BindInputPaths Include="$(OutputPath)net20" />
-    <BindInputPaths Include="$(OutputPath)x86" BindName="x86" />
-    <BindInputPaths Include="$(OutputPath)x64" BindName="x64" />
-    <BindInputPaths Include="$(OutputPath)arm64" BindName="arm64" />
+    <BindPath Include="..\wixstdba\Resources\" />
+    <BindPath Include="$(OutputPath)net6.0" />
+    <BindPath Include="$(OutputPath)net20" />
+    <BindPath Include="$(OutputPath)x86" BindName="x86" />
+    <BindPath Include="$(OutputPath)x64" BindName="x64" />
+    <BindPath Include="$(OutputPath)arm64" BindName="arm64" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
index a05348a5..642b349d 100644
--- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectPreSdkStyle/HeatProjectPreSdkStyle.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
 
   <ItemGroup>
-    <BindInputPaths Include="." />
+    <BindPath Include="." />
   </ItemGroup>
   
   <PropertyGroup>
diff --git a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
index 202921fe..c0048434 100644
--- a/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
+++ b/src/tools/test/WixToolsetTest.HeatTasks/TestData/HeatProject/HeatProjectSdkStyle/HeatProjectSdkStyle.wixproj
@@ -2,7 +2,7 @@
 <Project Sdk="WixToolset.Sdk">
 
   <ItemGroup>
-    <BindInputPaths Include="." />
+    <BindPath Include="." />
   </ItemGroup>
   
   <PropertyGroup>
diff --git a/src/wix/WixToolset.BuildTasks/WixBuild.cs b/src/wix/WixToolset.BuildTasks/WixBuild.cs
index 923567ed..8696230f 100644
--- a/src/wix/WixToolset.BuildTasks/WixBuild.cs
+++ b/src/wix/WixToolset.BuildTasks/WixBuild.cs
@@ -43,7 +43,7 @@ namespace WixToolset.BuildTasks
         [Required]
         public ITaskItem[] SourceFiles { get; set; }
 
-        public ITaskItem[] BindInputPaths { get; set; }
+        public ITaskItem[] BindPaths { get; set; }
 
         public bool BindFiles { get; set; }
 
@@ -89,9 +89,9 @@ namespace WixToolset.BuildTasks
 
         private IEnumerable<string> CalculateBindPathStrings()
         {
-            if (null != this.BindInputPaths)
+            if (null != this.BindPaths)
             {
-                foreach (var item in this.BindInputPaths)
+                foreach (var item in this.BindPaths)
                 {
                     var path = item.GetMetadata("FullPath");
 
diff --git a/src/wix/WixToolset.Sdk/tools/wix.targets b/src/wix/WixToolset.Sdk/tools/wix.targets
index 8665f05c..a1edaed1 100644
--- a/src/wix/WixToolset.Sdk/tools/wix.targets
+++ b/src/wix/WixToolset.Sdk/tools/wix.targets
@@ -158,21 +158,17 @@
   ***********************************************************************************************
   -->
 
-  <!-- If WixExtension was passed in via the command line, then convert it to an ItemGroup -->
-  <ItemGroup>
-    <WixExtension Include="$(WixExtension)"  Condition=" '$(WixExtension)' != '' " />
-  </ItemGroup>
-
   <!-- Default Compiler properties. -->
   <PropertyGroup>
     <InstallerPlatform Condition=" '$(InstallerPlatform)' == '' and '$(Platform)' != 'AnyCPU' and '$(Platform)' != 'Any CPU' ">$(Platform)</InstallerPlatform>
   </PropertyGroup>
 
-  <!-- If BindInputPaths (or LinkerBindInputPaths) was passed in via the command line, then convert it to an ItemGroup -->
+  <!-- Convert legacy BindInputPaths and LinkerBindInputPaths (in the project or passed in via the command line) into the new BindPath items -->
   <ItemGroup>
     <BindInputPaths Include="$(BindInputPaths)"  Condition=" '$(BindInputPaths)' != '' " />
     <LinkerBindInputPaths Include="$(LinkerBindInputPaths)"  Condition=" '$(LinkerBindInputPaths)' != '' " />
-    <LinkerBindInputPaths Condition=" '@(LinkerBindInputPaths)' == '' " Include="@(BindInputPaths)" />
+    <BindPath Include="$(BindPath)"  Condition=" '$(BindPath)' != '' " />
+    <BindPath Include="@(BindInputPaths);@(LinkerBindInputPaths)" />
   </ItemGroup>
 
   <!--
@@ -308,7 +304,7 @@
 
     [OUT]
     $(ProjectReferenceDefineConstants) - Define constants from project references.
-    @(LinkerBindInputPaths) - Bind paths from project references.
+    @(BindPath) - Bind paths from project references.
     @(WixLibrary) - Target paths from .vcxproj outputs added.
     @(_WixReferencedProjectOutputs) - Copy of _ResolvedProjectReferencePaths for use in up-to-date checks.
     @(_ResolvedProjectReferencePaths) - All resolved reference paths emptied.
@@ -336,7 +332,7 @@
     <CreateProjectReferenceDefineConstantsAndBindPaths
         ResolvedProjectReferences="@(_ResolvedProjectReferencePaths)"
         ProjectConfigurations="$(VSProjectConfigurations)">
-      <Output TaskParameter="BindPaths" ItemName="LinkerBindInputPaths" />
+      <Output TaskParameter="BindPaths" ItemName="BindPath" />
       <Output TaskParameter="DefineConstants" PropertyName="ProjectReferenceDefineConstants" />
     </CreateProjectReferenceDefineConstantsAndBindPaths>
 
@@ -603,7 +599,7 @@
         NoLogo="true"
         Pedantic="$(Pedantic)"
 
-        BindInputPaths="@(LinkerBindInputPaths)"
+        BindPaths="@(BindPath)"
         BindFiles="$(BindFiles)"
         BindTrackingFile="$(IntermediateOutputPath)$(BindTrackingFilePrefix)%(CultureGroup.Identity)$(BindTrackingFileExtension)"
 
diff --git a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index 5271c1bb..92ee441a 100644
--- a/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/wix/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -45,7 +45,7 @@ namespace WixToolsetTest.BuildTasks
                     {
                         new TaskItem(Path.Combine(folder, "Package.en-us.wxl")),
                     },
-                    BindInputPaths = new[]
+                    BindPaths = new[]
                     {
                         new TaskItem(Path.Combine(folder, "data")),
                     },
diff --git a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
index 7c83a339..88dfdc39 100644
--- a/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
+++ b/src/wix/test/WixToolsetTest.Sdk/TestData/Wixlib/SimpleWixlib/SimpleWixlib.wixproj
@@ -36,7 +36,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <BindInputPaths Include="data" />
+    <BindPath Include="data" />
   </ItemGroup>
 
   <Import Project="$(WixTargetsPath)" />
-- 
cgit v1.2.3-55-g6feb