Skip to content
This repository was archived by the owner on Feb 14, 2025. It is now read-only.

Commit a6b3db0

Browse files
robmenrobmen
committed
Simplify build requirements
1 parent adc9214 commit a6b3db0

File tree

2 files changed

+1
-146
lines changed

2 files changed

+1
-146
lines changed

‎tools/WixBuild.Tools.targets

Lines changed: 1 addition & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -78,44 +78,13 @@
7878

7979
<Error
8080
Code="WIXBUILD002"
81-
Condition=" '$(PlatformSdkBinPath)' == '' or !Exists('$(PlatformSdkBinPath)')"
82-
Text="Error the &quot;Microsoft Windows SDK for Windows 7 and .NET Framework 4&quot; or &quot;Visual Studio 2010&quot; must be installed." />
83-
84-
<Error
85-
Code="WIXBUILD004"
86-
Condition="!Exists('$(HelpCompiler)')"
87-
Text="$(HelpCompiler) does not exist. Please install the HTML Help Workshop that is part of the HTML Help SDK." />
88-
89-
<Error
90-
Code="WIXBUILD05"
9181
Condition=" '$(PleaseSignOutput)'!='' and !Exists('$(SignClientPath)') "
9282
Text="Cannot locate SignClient. Ensure SignClient is present at &quot;$(SignClientPath)&quot;. If not, run the following command from the root of the project: msbuild -t:DotnetToolRestore" />
9383

9484
<Error
95-
Code="WIXBUILD06"
85+
Code="WIXBUILD003"
9686
Condition=" '$(PleaseSignOutput)'!='' and ('$(SignClientUser)'=='' or '$(SignClientSecret)'=='') "
9787
Text="Signing is requested but one or both required properites SignClientUser and SignClientSecret were not specified on the command line or as environment variables." />
98-
99-
<Error
100-
Code="WIXBUILD008"
101-
Condition=" $(VS2013Available) and '12.0'>'$(MSBuildToolsVersion)' "
102-
Text="When Visual Studio 2013 is installed, you must use MSBuild v12.0 to build. MSBuild v12.0 is typically found here: ProgramFiles(x86)\MSBuild\12.0\Bin\MSBuild.exe" />
103-
104-
<Error
105-
Code="WIXBUILD009"
106-
Condition=" $(VS2013Available) and '12.0'>'$(VisualStudioVersion)' "
107-
Text="When Visual Studio 2013 is installed, the VisualStudioVersion environment variable must be set to '12.0' or higher. This should be handled by building with MSBuild v12.0. However, you may also be able to set the environment variable directly or use the 'Developer Command Prompt' provided by Visual Studio 2013 (or newer) to initialize your command prompt." />
108-
109-
<Error
110-
Code="WIXBUILD010"
111-
Condition=" $(VS2012Available) and '11.0'>'$(VisualStudioVersion)' "
112-
Text="When Visual Studio 2012 is installed, the VisualStudioVersion environment variable must be set to '11.0' or higher. Set the environment variable directly or use the 'Developer Command Prompt' provided by Visual Studio 2012 (or newer) to initialize your command prompt." />
113-
114-
<Error
115-
Code="WIXBUILD011"
116-
Condition=" $(VS2015Available) and '14.0'>'$(MSBuildToolsVersion)' "
117-
Text="When Visual Studio 2015 is installed, you must use MSBuild v14.0 to build. MSBuild v14.0 is typically found here: ProgramFiles(x86)\MSBuild\14.0\Bin\MSBuild.exe" />
118-
11988
</Target>
12089

12190
<!--

‎tools/WixBuild.props

Lines changed: 0 additions & 114 deletions
Original file line numberDiff line numberDiff line change
@@ -68,26 +68,6 @@
6868
<BuildSandcastleDocumentation Condition=" '$(BuildSandcastleDocumentation)'=='' ">false</BuildSandcastleDocumentation>
6969
</PropertyGroup>
7070

71-
<PropertyGroup>
72-
<PlatformSdkInstallPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Windows Kits\Installed Roots', 'KitsRoot81', null, RegistryView.Registry64, RegistryView.Registry32))</PlatformSdkInstallPath>
73-
<PlatformSdkRegistryVersion Condition=" '$(PlatformSdkInstallPath)'!='' ">v8.1</PlatformSdkRegistryVersion>
74-
</PropertyGroup>
75-
76-
<PropertyGroup Condition=" '$(PlatformSdkInstallPath)'=='' ">
77-
<PlatformSdkInstallPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v8.0', 'InstallationFolder', null, RegistryView.Registry64, RegistryView.Registry32))</PlatformSdkInstallPath>
78-
<PlatformSdkRegistryVersion Condition=" '$(PlatformSdkInstallPath)'!='' ">v8.0</PlatformSdkRegistryVersion>
79-
</PropertyGroup>
80-
81-
<PropertyGroup Condition=" '$(PlatformSdkInstallPath)'=='' ">
82-
<PlatformSdkInstallPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.1A', 'InstallationFolder', null, RegistryView.Registry64, RegistryView.Registry32))</PlatformSdkInstallPath>
83-
<PlatformSdkRegistryVersion Condition=" '$(PlatformSdkInstallPath)'!='' ">v7.1A</PlatformSdkRegistryVersion>
84-
</PropertyGroup>
85-
86-
<PropertyGroup Condition=" '$(PlatformSdkInstallPath)'=='' ">
87-
<PlatformSdkInstallPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SDKs\Windows\v7.0A', 'InstallationFolder', null, RegistryView.Registry64, RegistryView.Registry32))</PlatformSdkInstallPath>
88-
<PlatformSdkRegistryVersion Condition=" '$(PlatformSdkInstallPath)'!='' ">v7.0A</PlatformSdkRegistryVersion>
89-
</PropertyGroup>
90-
9171
<PropertyGroup>
9272
<PlatformSdkInstallPath Condition="!HasTrailingSlash('$(PlatformSdkInstallPath)')">$(PlatformSdkInstallPath)\</PlatformSdkInstallPath>
9373

@@ -98,100 +78,6 @@
9878
<PlatformSdkBinPath Condition=" Exists('$(PlatformSdkBinPath)x86') ">$(PlatformSdkBinPath)\x86\</PlatformSdkBinPath>
9979
</PropertyGroup>
10080

101-
<PropertyGroup>
102-
<SqlCESdkInstallPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server Compact Edition\v4.0', 'InstallDir', null, RegistryView.Registry32))</SqlCESdkInstallPath>
103-
<SqlCESdkInstallPath Condition=" '$(SqlCESdkInstallPath)'=='' or !Exists('$(SqlCESdkInstallPath)include') ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\Microsoft SQL Server Compact Edition\v3.5', 'InstallDir', null, RegistryView.Registry32))</SqlCESdkInstallPath>
104-
<SqlCESdkInstallPath Condition="!HasTrailingSlash('$(SqlCESdkInstallPath)')">$(SqlCESdkInstallPath)\</SqlCESdkInstallPath>
105-
106-
<SqlCESdkIncludePath>$(SqlCESdkInstallPath)include\</SqlCESdkIncludePath>
107-
</PropertyGroup>
108-
109-
<PropertyGroup>
110-
<VS2010Path Condition=" '$(VS2010Path)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2010Path>
111-
<VS2010SdkPath Condition=" '$(VS2010SdkPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\10.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2010SdkPath>
112-
<VS2010SdkTargetsPath Condition=" '$(VS2010SdkTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets</VS2010SdkTargetsPath>
113-
<VS2010SdkTargetsPath Condition=" '$(VS2010SdkTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v10.0\VSSDK\Microsoft.VsSDK.targets</VS2010SdkTargetsPath>
114-
115-
<VS2010Available Condition=" '$(DisableVS2010)'!='true' and '$(VS2010Path)'!='' and Exists('$(VS2010Path)')">true</VS2010Available>
116-
<VS2010Available Condition=" '$(VS2010Available)'=='' ">false</VS2010Available>
117-
<VS2010SdkAvailable Condition=" $(VS2010Available) and '$(VS2010SdkPath)'!='' and Exists('$(VS2010SdkTargetsPath)')">true</VS2010SdkAvailable>
118-
<VS2010SdkAvailable Condition=" '$(VS2010SdkAvailable)'=='' ">false</VS2010SdkAvailable>
119-
120-
<VS2010Path Condition=" $(VS2010Available) and !HasTrailingSlash('$(VS2010Path)')">$(VS2010Path)\</VS2010Path>
121-
<VS2010SdkPath Condition=" $(VS2010SdkAvailable) and !HasTrailingSlash('$(VS2010SdkPath)')">$(VS2010SdkPath)\</VS2010SdkPath>
122-
123-
<VS2010PublicAssembliesPath>$(VS2010Path)PublicAssemblies\</VS2010PublicAssembliesPath>
124-
<VS2010SdkVisualStudioIntegrationAssembliesPath>$(VS2010SdkPath)VisualStudioIntegration\Common\Assemblies\</VS2010SdkVisualStudioIntegrationAssembliesPath>
125-
<VS2010SdkVisualStudioIntegrationAssembliesPath20>$(VS2010SdkVisualStudioIntegrationAssembliesPath)v2.0\</VS2010SdkVisualStudioIntegrationAssembliesPath20>
126-
<VS2010SdkVisualStudioIntegrationAssembliesPath40>$(VS2010SdkVisualStudioIntegrationAssembliesPath)v4.0\</VS2010SdkVisualStudioIntegrationAssembliesPath40>
127-
</PropertyGroup>
128-
129-
<PropertyGroup>
130-
<VS2012Path Condition=" '$(VS2012Path)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\11.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2012Path>
131-
<VS2012SdkPath Condition=" '$(VS2012SdkPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\11.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2012SdkPath>
132-
<VS2012SdkTargetsPath Condition=" '$(VS2012SdkTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v11.0\VSSDK\Microsoft.VsSDK.targets</VS2012SdkTargetsPath>
133-
<VS2012SdkTargetsPath Condition=" '$(VS2012SdkTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v11.0\VSSDK\Microsoft.VsSDK.targets</VS2012SdkTargetsPath>
134-
135-
<VS2012Available Condition=" '$(DisableVS2012)'!='true' and '$(VS2012Path)'!='' and Exists('$(VS2012Path)')">true</VS2012Available>
136-
<VS2012Available Condition=" '$(VS2012Available)'=='' ">false</VS2012Available>
137-
<VS2012SdkAvailable Condition=" $(VS2012Available) and '$(VS2012SdkPath)'!='' and Exists('$(VS2012SdkTargetsPath)')">true</VS2012SdkAvailable>
138-
<VS2012SdkAvailable Condition=" '$(VS2012SdkAvailable)'=='' ">false</VS2012SdkAvailable>
139-
140-
<VS2012Path Condition=" $(VS2012Available) and !HasTrailingSlash('$(VS2012Path)')">$(VS2012Path)\</VS2012Path>
141-
<VS2012SdkPath Condition=" $(VS2012SdkAvailable) and !HasTrailingSlash('$(VS2012SdkPath)')">$(VS2012SdkPath)\</VS2012SdkPath>
142-
143-
<VS2012PublicAssembliesPath>$(VS2012Path)PublicAssemblies\</VS2012PublicAssembliesPath>
144-
<VS2012SdkVisualStudioIntegrationAssembliesPath>$(VS2012SdkPath)VisualStudioIntegration\Common\Assemblies\v4.0\</VS2012SdkVisualStudioIntegrationAssembliesPath>
145-
</PropertyGroup>
146-
147-
<PropertyGroup>
148-
<VS2013Path Condition=" '$(VS2013Path)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2013Path>
149-
<VS2013SdkPath Condition=" '$(VS2013SdkPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\12.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2013SdkPath>
150-
<VS2013SdkTargetsPath Condition=" '$(VS2013SdkTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v12.0\VSSDK\Microsoft.VsSDK.targets</VS2013SdkTargetsPath>
151-
<VS2013SdkTargetsPath Condition=" '$(VS2013SdkTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v12.0\VSSDK\Microsoft.VsSDK.targets</VS2013SdkTargetsPath>
152-
153-
<VS2013Available Condition=" '$(DisableVS2013)'!='true' and '$(VS2013Path)'!='' and Exists('$(VS2013Path)')">true</VS2013Available>
154-
<VS2013Available Condition=" '$(VS2013Available)'=='' ">false</VS2013Available>
155-
<VS2013SdkAvailable Condition=" $(VS2013Available) and '$(VS2013SdkPath)'!='' and Exists('$(VS2013SdkTargetsPath)')">true</VS2013SdkAvailable>
156-
<VS2013SdkAvailable Condition=" '$(VS2013SdkAvailable)'=='' ">false</VS2013SdkAvailable>
157-
158-
<VS2013Path Condition=" $(VS2013Available) and !HasTrailingSlash('$(VS2013Path)')">$(VS2013Path)\</VS2013Path>
159-
<VS2013SdkPath Condition=" $(VS2013SdkAvailable) and !HasTrailingSlash('$(VS2013SdkPath)')">$(VS2013SdkPath)\</VS2013SdkPath>
160-
161-
<VS2013PublicAssembliesPath>$(VS2013Path)PublicAssemblies\</VS2013PublicAssembliesPath>
162-
<VS2013SdkVisualStudioIntegrationAssembliesPath>$(VS2013SdkPath)VisualStudioIntegration\Common\Assemblies\v4.0\</VS2013SdkVisualStudioIntegrationAssembliesPath>
163-
</PropertyGroup>
164-
165-
<PropertyGroup>
166-
<VS2015Path Condition=" '$(VS2015Path)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2015Path>
167-
<VS2015Path Condition=" '$(VS2015Path)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\WDExpress\14.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2015Path>
168-
<VS2015SdkPath Condition=" '$(VS2015SdkPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\VSIP\14.0', 'InstallDir', null, RegistryView.Registry64, RegistryView.Registry32))</VS2015SdkPath>
169-
<VS2015SdkTargetsPath Condition=" '$(VS2015SdkTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v14.0\VSSDK\Microsoft.VsSDK.targets</VS2015SdkTargetsPath>
170-
<VS2015SdkTargetsPath Condition=" '$(VS2015SdkTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v14.0\VSSDK\Microsoft.VsSDK.targets</VS2015SdkTargetsPath>
171-
172-
<VS2015Available Condition=" '$(DisableVS2015)'!='true' and '$(VS2015Path)'!='' and Exists('$(VS2015Path)')">true</VS2015Available>
173-
<VS2015Available Condition=" '$(VS2015Available)'=='' ">false</VS2015Available>
174-
<VS2015SdkAvailable Condition=" $(VS2015Available) and '$(VS2015SdkPath)'!='' and Exists('$(VS2015SdkTargetsPath)')">true</VS2015SdkAvailable>
175-
<VS2015SdkAvailable Condition=" '$(VS2015SdkAvailable)'=='' ">false</VS2015SdkAvailable>
176-
177-
<VS2015Path Condition=" $(VS2015Available) and !HasTrailingSlash('$(VS2015Path)')">$(VS2015Path)\</VS2015Path>
178-
<VS2015SdkPath Condition=" $(VS2015SdkAvailable) and !HasTrailingSlash('$(VS2015SdkPath)')">$(VS2015SdkPath)\</VS2015SdkPath>
179-
180-
<VS2015PublicAssembliesPath>$(VS2015Path)PublicAssemblies\</VS2015PublicAssembliesPath>
181-
<VS2015SdkVisualStudioIntegrationAssembliesPath>$(VS2015SdkPath)VisualStudioIntegration\Common\Assemblies\v4.0\</VS2015SdkVisualStudioIntegrationAssembliesPath>
182-
</PropertyGroup>
183-
184-
<PropertyGroup>
185-
<VCPath>$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\14.0\Setup\VC', 'ProductDir', null, RegistryView.Registry64, RegistryView.Registry32))</VCPath>
186-
<VCPath Condition=" '$(VCPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\12.0\Setup\VC', 'ProductDir', null, RegistryView.Registry64, RegistryView.Registry32))</VCPath>
187-
<VCPath Condition=" '$(VCPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\11.0\Setup\VC', 'ProductDir', null, RegistryView.Registry64, RegistryView.Registry32))</VCPath>
188-
<VCPath Condition=" '$(VCPath)'=='' ">$([MSBuild]::GetRegistryValueFromView('HKEY_LOCAL_MACHINE\SOFTWARE\Microsoft\VisualStudio\10.0\Setup\VC', 'ProductDir', null, RegistryView.Registry64, RegistryView.Registry32))</VCPath>
189-
<VCPath Condition="!HasTrailingSlash('$(VCPath)')">$(VCPath)\</VCPath>
190-
191-
<VCIncludePath>$(VCPath)include</VCIncludePath>
192-
<VCBinPath>$(VCPath)bin\</VCBinPath>
193-
</PropertyGroup>
194-
19581
<PropertyGroup>
19682
<BuildARM>$(WindowsSDKDesktopARMSupport)</BuildARM>
19783
<BuildARM Condition=" '$(BuildARM)'!='true' ">false</BuildARM>

0 commit comments

Comments
 (0)