aboutsummaryrefslogtreecommitdiff
path: root/src/ext/VisualStudio/wixlib
diff options
context:
space:
mode:
authorBob Arnson <bob@firegiant.com>2023-01-11 20:14:29 -0500
committerBob Arnson <github@bobs.org>2023-01-11 21:29:41 -0500
commit10794363b90e49885ace5729bb45af4da5d0f220 (patch)
treef13aac3990088cdff76885f04bca433fa3c803d0 /src/ext/VisualStudio/wixlib
parentbc4a72752cb199c7a3ba5a24f656b5e1c0aa9958 (diff)
downloadwix-10794363b90e49885ace5729bb45af4da5d0f220.tar.gz
wix-10794363b90e49885ace5729bb45af4da5d0f220.tar.bz2
wix-10794363b90e49885ace5729bb45af4da5d0f220.zip
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.
Diffstat (limited to 'src/ext/VisualStudio/wixlib')
-rw-r--r--src/ext/VisualStudio/wixlib/VS2017.wxs9
-rw-r--r--src/ext/VisualStudio/wixlib/VS2019.wxs9
-rw-r--r--src/ext/VisualStudio/wixlib/VS2022.wxs9
-rw-r--r--src/ext/VisualStudio/wixlib/VSExtension_arm64.wxs8
-rw-r--r--src/ext/VisualStudio/wixlib/vs.wixproj1
5 files changed, 12 insertions, 24 deletions
diff --git a/src/ext/VisualStudio/wixlib/VS2017.wxs b/src/ext/VisualStudio/wixlib/VS2017.wxs
index 46cf8b33..ef852747 100644
--- a/src/ext/VisualStudio/wixlib/VS2017.wxs
+++ b/src/ext/VisualStudio/wixlib/VS2017.wxs
@@ -1,4 +1,4 @@
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. --> 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 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -91,7 +91,6 @@
91 <!-- C# language tools were installed as a part of VS 2017 setup. --> 91 <!-- C# language tools were installed as a part of VS 2017 setup. -->
92 <Fragment> 92 <Fragment>
93 <Property Id="VS2017_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 93 <Property Id="VS2017_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
94 <CustomActionRef Id="VSFindInstances" />
95 </Fragment> 94 </Fragment>
96 95
97 <!-- Indicates whether the Visual Basic project system is installed as a part of --> 96 <!-- Indicates whether the Visual Basic project system is installed as a part of -->
@@ -100,7 +99,6 @@
100 <!-- Basic language tools were installed as a part of VS 2017 setup. --> 99 <!-- Basic language tools were installed as a part of VS 2017 setup. -->
101 <Fragment> 100 <Fragment>
102 <Property Id="VS2017_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 101 <Property Id="VS2017_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" />
103 <CustomActionRef Id="VSFindInstances" />
104 </Fragment> 102 </Fragment>
105 103
106 <!-- Indicates whether the Visual Web Developer project system is installed as a part of --> 104 <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
@@ -109,7 +107,6 @@
109 <!-- Web Developer language tools were installed as a part of VS 2017 setup. --> 107 <!-- Web Developer language tools were installed as a part of VS 2017 setup. -->
110 <Fragment> 108 <Fragment>
111 <Property Id="VS2017_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 109 <Property Id="VS2017_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" />
112 <CustomActionRef Id="VSFindInstances" />
113 </Fragment> 110 </Fragment>
114 111
115 <!-- Indicates whether the Visual C++ project system is installed as a part of --> 112 <!-- Indicates whether the Visual C++ project system is installed as a part of -->
@@ -118,24 +115,20 @@
118 <!-- C++ language tools were installed as a part of VS 2017 setup. --> 115 <!-- C++ language tools were installed as a part of VS 2017 setup. -->
119 <Fragment> 116 <Fragment>
120 <Property Id="VS2017_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 117 <Property Id="VS2017_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" />
121 <CustomActionRef Id="VSFindInstances" />
122 </Fragment> 118 </Fragment>
123 119
124 <!-- Indicates whether the Visual Studio 2017 Team Test project system is installed --> 120 <!-- Indicates whether the Visual Studio 2017 Team Test project system is installed -->
125 <Fragment> 121 <Fragment>
126 <Property Id="VS2017_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" /> 122 <Property Id="VS2017_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" />
127 <CustomActionRef Id="VSFindInstances" />
128 </Fragment> 123 </Fragment>
129 124
130 <!-- Indicates whether the Visual Studio Modeling project system is installed --> 125 <!-- Indicates whether the Visual Studio Modeling project system is installed -->
131 <Fragment> 126 <Fragment>
132 <Property Id="VS2017_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 127 <Property Id="VS2017_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" />
133 <CustomActionRef Id="VSFindInstances" />
134 </Fragment> 128 </Fragment>
135 129
136 <!-- Indicates whether the Visual Studio F# project system is installed --> 130 <!-- Indicates whether the Visual Studio F# project system is installed -->
137 <Fragment> 131 <Fragment>
138 <Property Id="VS2017_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 132 <Property Id="VS2017_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
139 <CustomActionRef Id="VSFindInstances" />
140 </Fragment> 133 </Fragment>
141</Wix> 134</Wix>
diff --git a/src/ext/VisualStudio/wixlib/VS2019.wxs b/src/ext/VisualStudio/wixlib/VS2019.wxs
index 0deef2cc..59b4dcd4 100644
--- a/src/ext/VisualStudio/wixlib/VS2019.wxs
+++ b/src/ext/VisualStudio/wixlib/VS2019.wxs
@@ -1,4 +1,4 @@
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. --> 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 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -91,7 +91,6 @@
91 <!-- C# language tools were installed as a part of VS 2019 setup. --> 91 <!-- C# language tools were installed as a part of VS 2019 setup. -->
92 <Fragment> 92 <Fragment>
93 <Property Id="VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 93 <Property Id="VS2019_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
94 <CustomActionRef Id="VSFindInstances" />
95 </Fragment> 94 </Fragment>
96 95
97 <!-- Indicates whether the Visual Basic project system is installed as a part of --> 96 <!-- Indicates whether the Visual Basic project system is installed as a part of -->
@@ -100,7 +99,6 @@
100 <!-- Basic language tools were installed as a part of VS 2019 setup. --> 99 <!-- Basic language tools were installed as a part of VS 2019 setup. -->
101 <Fragment> 100 <Fragment>
102 <Property Id="VS2019_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 101 <Property Id="VS2019_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" />
103 <CustomActionRef Id="VSFindInstances" />
104 </Fragment> 102 </Fragment>
105 103
106 <!-- Indicates whether the Visual Web Developer project system is installed as a part of --> 104 <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
@@ -109,7 +107,6 @@
109 <!-- Web Developer language tools were installed as a part of VS 2019 setup. --> 107 <!-- Web Developer language tools were installed as a part of VS 2019 setup. -->
110 <Fragment> 108 <Fragment>
111 <Property Id="VS2019_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 109 <Property Id="VS2019_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" />
112 <CustomActionRef Id="VSFindInstances" />
113 </Fragment> 110 </Fragment>
114 111
115 <!-- Indicates whether the Visual C++ project system is installed as a part of --> 112 <!-- Indicates whether the Visual C++ project system is installed as a part of -->
@@ -118,24 +115,20 @@
118 <!-- C++ language tools were installed as a part of VS 2019 setup. --> 115 <!-- C++ language tools were installed as a part of VS 2019 setup. -->
119 <Fragment> 116 <Fragment>
120 <Property Id="VS2019_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 117 <Property Id="VS2019_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" />
121 <CustomActionRef Id="VSFindInstances" />
122 </Fragment> 118 </Fragment>
123 119
124 <!-- Indicates whether the Visual Studio 2019 Team Test project system is installed --> 120 <!-- Indicates whether the Visual Studio 2019 Team Test project system is installed -->
125 <Fragment> 121 <Fragment>
126 <Property Id="VS2019_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" /> 122 <Property Id="VS2019_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" />
127 <CustomActionRef Id="VSFindInstances" />
128 </Fragment> 123 </Fragment>
129 124
130 <!-- Indicates whether the Visual Studio Modeling project system is installed --> 125 <!-- Indicates whether the Visual Studio Modeling project system is installed -->
131 <Fragment> 126 <Fragment>
132 <Property Id="VS2019_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 127 <Property Id="VS2019_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" />
133 <CustomActionRef Id="VSFindInstances" />
134 </Fragment> 128 </Fragment>
135 129
136 <!-- Indicates whether the Visual Studio F# project system is installed --> 130 <!-- Indicates whether the Visual Studio F# project system is installed -->
137 <Fragment> 131 <Fragment>
138 <Property Id="VS2019_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 132 <Property Id="VS2019_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
139 <CustomActionRef Id="VSFindInstances" />
140 </Fragment> 133 </Fragment>
141</Wix> 134</Wix>
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 @@
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. --> 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 2
3 3
4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> 4<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -91,7 +91,6 @@
91 <!-- C# language tools were installed as a part of VS 2019 setup. --> 91 <!-- C# language tools were installed as a part of VS 2019 setup. -->
92 <Fragment> 92 <Fragment>
93 <Property Id="VS2022_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 93 <Property Id="VS2022_IDE_VCSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
94 <CustomActionRef Id="VSFindInstances" />
95 </Fragment> 94 </Fragment>
96 95
97 <!-- Indicates whether the Visual Basic project system is installed as a part of --> 96 <!-- Indicates whether the Visual Basic project system is installed as a part of -->
@@ -100,7 +99,6 @@
100 <!-- Basic language tools were installed as a part of VS 2019 setup. --> 99 <!-- Basic language tools were installed as a part of VS 2019 setup. -->
101 <Fragment> 100 <Fragment>
102 <Property Id="VS2022_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 101 <Property Id="VS2022_IDE_VB_PROJECTSYSTEM_INSTALLED" Secure="yes" />
103 <CustomActionRef Id="VSFindInstances" />
104 </Fragment> 102 </Fragment>
105 103
106 <!-- Indicates whether the Visual Web Developer project system is installed as a part of --> 104 <!-- Indicates whether the Visual Web Developer project system is installed as a part of -->
@@ -109,7 +107,6 @@
109 <!-- Web Developer language tools were installed as a part of VS 2019 setup. --> 107 <!-- Web Developer language tools were installed as a part of VS 2019 setup. -->
110 <Fragment> 108 <Fragment>
111 <Property Id="VS2022_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 109 <Property Id="VS2022_IDE_VWD_PROJECTSYSTEM_INSTALLED" Secure="yes" />
112 <CustomActionRef Id="VSFindInstances" />
113 </Fragment> 110 </Fragment>
114 111
115 <!-- Indicates whether the Visual C++ project system is installed as a part of --> 112 <!-- Indicates whether the Visual C++ project system is installed as a part of -->
@@ -118,24 +115,20 @@
118 <!-- C++ language tools were installed as a part of VS 2019 setup. --> 115 <!-- C++ language tools were installed as a part of VS 2019 setup. -->
119 <Fragment> 116 <Fragment>
120 <Property Id="VS2022_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 117 <Property Id="VS2022_IDE_VC_PROJECTSYSTEM_INSTALLED" Secure="yes" />
121 <CustomActionRef Id="VSFindInstances" />
122 </Fragment> 118 </Fragment>
123 119
124 <!-- Indicates whether the Visual Studio 2019 Team Test project system is installed --> 120 <!-- Indicates whether the Visual Studio 2019 Team Test project system is installed -->
125 <Fragment> 121 <Fragment>
126 <Property Id="VS2022_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" /> 122 <Property Id="VS2022_IDE_VSTS_TESTSYSTEM_INSTALLED" Secure="yes" />
127 <CustomActionRef Id="VSFindInstances" />
128 </Fragment> 123 </Fragment>
129 124
130 <!-- Indicates whether the Visual Studio Modeling project system is installed --> 125 <!-- Indicates whether the Visual Studio Modeling project system is installed -->
131 <Fragment> 126 <Fragment>
132 <Property Id="VS2022_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 127 <Property Id="VS2022_IDE_MODELING_PROJECTSYSTEM_INSTALLED" Secure="yes" />
133 <CustomActionRef Id="VSFindInstances" />
134 </Fragment> 128 </Fragment>
135 129
136 <!-- Indicates whether the Visual Studio F# project system is installed --> 130 <!-- Indicates whether the Visual Studio F# project system is installed -->
137 <Fragment> 131 <Fragment>
138 <Property Id="VS2022_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" /> 132 <Property Id="VS2022_IDE_FSHARP_PROJECTSYSTEM_INSTALLED" Secure="yes" />
139 <CustomActionRef Id="VSFindInstances" />
140 </Fragment> 133 </Fragment>
141</Wix> 134</Wix>
diff --git a/src/ext/VisualStudio/wixlib/VSExtension_arm64.wxs b/src/ext/VisualStudio/wixlib/VSExtension_arm64.wxs
new file mode 100644
index 00000000..02e23e8b
--- /dev/null
+++ b/src/ext/VisualStudio/wixlib/VSExtension_arm64.wxs
@@ -0,0 +1,8 @@
1<?xml version="1.0"?>
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
4
5<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
6 <?define platform=arm64 ?>
7 <?include VSExtension_Platform.wxi ?>
8</Wix>
diff --git a/src/ext/VisualStudio/wixlib/vs.wixproj b/src/ext/VisualStudio/wixlib/vs.wixproj
index 85b9120a..e416c67a 100644
--- a/src/ext/VisualStudio/wixlib/vs.wixproj
+++ b/src/ext/VisualStudio/wixlib/vs.wixproj
@@ -11,6 +11,7 @@
11 <ItemGroup> 11 <ItemGroup>
12 <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" /> 12 <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=x86" ReferenceOutputAssembly="false" />
13 <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" /> 13 <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=x64" ReferenceOutputAssembly="false" />
14 <ProjectReference Include="..\ca\vsca.vcxproj" Properties="Platform=ARM64" ReferenceOutputAssembly="false" />
14 </ItemGroup> 15 </ItemGroup>
15 16
16 <ItemGroup> 17 <ItemGroup>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-06 23:22:10 +0000