Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 03:18 UTC
13601ef88f7ae15655d9de782addcd22178b3a16
4 files changed
+13
-61
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/FindLocalWix.props
deleted
-8
@@ -1,8 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
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
-<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5
- <PropertyGroup>
6
- <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
7
- </PropertyGroup>
8
-</Project>
src/wixlib/packages.config
deleted
-5
@@ -1,5 +0,0 @@
1
-<?xml version="1.0" encoding="utf-8"?>
2
-<packages>
3
- <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
4
- <package id="WixToolset.MSBuild" version="4.0.0-build-0086" developmentDependency="true" targetFramework="net40" />
5
-</packages>
\ No newline at end of file
src/wixlib/vs.wixproj
+8
-48
@@ -1,58 +1,18 @@
1
-<?xml version="1.0" encoding="utf-8"?>
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. -->
3
-<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid>
8
- <OutputName>vs</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
<Cultures>en-us</Cultures>
8
</PropertyGroup>
9
+
10
<ItemGroup>
15
- <Compile Include="HTML_Help_Registration__RTL_X86.wxs" />
16
- <Compile Include="Vs2003.wxs" />
17
- <Compile Include="Vs2005.wxs" />
18
- <Compile Include="Vs2008.wxs" />
19
- <Compile Include="Vs2010.wxs" />
20
- <Compile Include="Vs11.wxs" />
21
- <Compile Include="Vs2012.wxs" />
22
- <Compile Include="Vs2013.wxs" />
23
- <Compile Include="VS14.wxs" />
24
- <Compile Include="VS2015.wxs" />
25
- <Compile Include="VS2017.wxs" />
26
- <Compile Include="VS2019.wxs" />
27
- <Compile Include="VSExtension_x86.wxs" />
28
- <Compile Include="VsixPackage.wxs" />
29
- <Compile Include="vs2005\vs2005_VSIPCC_Collection_Files_RTL.wxs" />
30
- <Compile Include="vs2008\vs2008_VSIPCC_Collection_Files_RTL.wxs" />
11
+ <ProjectReference Include="..\ca\vsca.vcxproj" />
12
</ItemGroup>
13
+
14
<ItemGroup>
33
- <Folder Include="vs2005\" />
34
- <Folder Include="vs2008\" />
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
16
</ItemGroup>
36
- <ItemGroup>
37
- <None Include="packages.config" />
38
- </ItemGroup>
39
- <ItemGroup>
40
- <ProjectReference Include="..\ca\vsca.vcxproj">
41
- <Name>vsca</Name>
42
- <Project>{45308b85-0628-4978-8fc8-6ad9e1ad5949}</Project>
43
- </ProjectReference>
44
- </ItemGroup>
45
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
46
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
47
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
48
- <Error Text="WiX Toolset build tools (v4.0 or later) must be installed to build this project. To download the WiX Toolset, go to http://wixtoolset.org/releases/." />
49
- </Target>
50
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
51
- <PropertyGroup>
52
- <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
53
- </PropertyGroup>
54
- <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
55
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
56
- </Target>
57
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
58
-</Project>
\ No newline at end of file
17
+
18
+</Project>