Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 01:58 UTC
a58147fcf877d2b21d98f7fc8aae66be8eef7d45
2 files changed
+19
-78
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/wixlib/netfx.wixproj
+14
-78
@@ -1,89 +1,25 @@
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-0133\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid>
8
- <OutputName>netfx</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
</PropertyGroup>
8
+
9
<ItemGroup>
14
- <Compile Include="NetFxExtension.wxs" />
15
- <Compile Include="NetFx1.wxs" />
16
- <Compile Include="NetFx1.1.wxs" />
17
- <Compile Include="NetFx2.wxs" />
18
- <Compile Include="NetFx3.wxs" />
19
- <Compile Include="NetFx3.5.wxs" />
20
- <Compile Include="NetFx4.wxs" />
21
- <Compile Include="NetFx4.5.wxs" />
22
- <Compile Include="NetFx451.wxs" />
23
- <Compile Include="NetFx452.wxs" />
24
- <Compile Include="NetFx46.wxs" />
25
- <Compile Include="NetFx461.wxs" />
26
- <Compile Include="NetFx462.wxs" />
27
- <Compile Include="NetFx47.wxs" />
28
- <Compile Include="NetFx471.wxs" />
29
- <Compile Include="NetFx472.wxs" />
30
- <Compile Include="NetFx48.wxs" />
31
- <Compile Include="NetFxExtension_arm.wxs" />
32
- <Compile Include="NetFxExtension_arm64.wxs" />
33
- <Compile Include="NetFxExtension_x64.wxs" />
34
- <Compile Include="NetFxExtension_x86.wxs" />
35
- <Compile Include="NetCore3.1.0_x64.wxs" />
36
- <Compile Include="NetCore3.1.0_x86.wxs" />
37
- <Compile Include="NetCore3.1.1_x64.wxs" />
38
- <Compile Include="NetCore3.1.1_x86.wxs" />
39
- <Compile Include="NetCore3.1.2_x64.wxs" />
40
- <Compile Include="NetCore3.1.2_x86.wxs" />
41
- <Compile Include="NetCore3.1.3_x64.wxs" />
42
- <Compile Include="NetCore3.1.3_x86.wxs" />
43
- <Compile Include="NetCore3.1.4_x64.wxs" />
44
- <Compile Include="NetCore3.1.4_x86.wxs" />
45
- <Compile Include="NetCoreShared.wxs" />
10
+ <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM" />
11
+ <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
12
+ <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
13
+ <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />
14
</ItemGroup>
15
+
16
<ItemGroup>
48
- <None Include="packages.config" />
17
+ <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
18
+ <PackageReference Include="WixToolset.Util.wixext" Version="4.0.*" />
19
</ItemGroup>
20
+
21
<ItemGroup>
51
- <ProjectReference Include="..\ca\netfxca.vcxproj">
52
- <Name>netfxca</Name>
53
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
54
- <Properties>Platform=ARM</Properties>
55
- </ProjectReference>
56
- <ProjectReference Include="..\ca\netfxca.vcxproj">
57
- <Name>netfxca</Name>
58
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
59
- <Properties>Platform=ARM64</Properties>
60
- </ProjectReference>
61
- <ProjectReference Include="..\ca\netfxca.vcxproj">
62
- <Name>netfxca</Name>
63
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
64
- <Properties>Platform=x86</Properties>
65
- </ProjectReference>
66
- <ProjectReference Include="..\ca\netfxca.vcxproj">
67
- <Name>netfxca</Name>
68
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
69
- <Properties>Platform=x64</Properties>
70
- </ProjectReference>
22
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
23
</ItemGroup>
72
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
73
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
74
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
75
- <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/." />
76
- </Target>
77
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
78
- <PropertyGroup>
79
- <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>
80
- </PropertyGroup>
81
- <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'))" />
82
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props'))" />
83
- <Error Condition="!Exists('..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets'))" />
84
- <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets'))" />
85
- </Target>
86
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
87
- <Import Project="..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets')" />
88
- <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets')" />
89
-</Project>
\ No newline at end of file
24
+
25
+</Project>