VSExtension cleanup:

- Add ARM64-specific custom action.
- Remove "naked" `CustomActionRef`s.
- Clean up `wix convert` behavior:
  - Remove `PropertyRef`s for properties CA always sets.

Fixes https://github.com/wixtoolset/issues/issues/7100.
Fixes https://github.com/wixtoolset/issues/issues/7153.

1 files changed, 1 insertions, 8 deletions

diff --git a/src/ext/VisualStudio/wixlib/VS2022.wxs b/src/ext/VisualStudio/wixlib/VS2022.wxs
index cad25441..acb683e9 100644
--- a/src/ext/VisualStudio/wixlib/VS2022.wxs
+++ b/src/ext/VisualStudio/wixlib/VS2022.wxs
@@ -1,4 +1,4 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -91,7 +91,6 @@
     <!-- C# language tools were installed as a part of VS 2019 setup.              -->
     <Fragment>
         <Property Id="VS2022_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual Basic project system is installed as a part of -->
@@ -100,7 +99,6 @@
     <!-- Basic language tools were installed as a part of VS 2019 setup.             -->
     <Fragment>
         <Property Id="VS2022_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
@@ -109,7 +107,6 @@
     <!-- Web Developer language tools were installed as a part of VS 2019 setup.             -->
     <Fragment>
         <Property Id="VS2022_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual C++ project system is installed as a part of -->
@@ -118,24 +115,20 @@
     <!-- C++ language tools were installed as a part of VS 2019 setup.             -->
     <Fragment>
         <Property Id="VS2022_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual Studio 2019 Team Test project system is installed -->
     <Fragment>
         <Property Id="VS2022_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual Studio Modeling project system is installed -->
     <Fragment>
         <Property Id="VS2022_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 
     <!-- Indicates whether the Visual Studio F# project system is installed -->
     <Fragment>
         <Property Id="VS2022_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
-        <CustomActionRef Id="VSFindInstances" />
     </Fragment>
 </Wix>