Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 13:45 UTC
5b85ba2b9823f4b6db4f5c4bff96a27cd41d39f8
4 files changed
+14
-80
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/firewall.wixproj
+9
-67
@@ -1,79 +1,21 @@
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-0102\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0102\build\WixToolset.MSBuild.props')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{1acffefd-505a-41a5-acbf-a02b7b473aa2}</ProjectGuid>
8
- <OutputName>firewall</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
<Cultures>en-us</Cultures>
8
</PropertyGroup>
14
- <ItemGroup>
15
- <Compile Include="FirewallExtension.wxs" />
16
- <Compile Include="FirewallExtension_arm.wxs" />
17
- <Compile Include="FirewallExtension_arm64.wxs" />
18
- <Compile Include="FirewallExtension_x64.wxs" />
19
- <Compile Include="FirewallExtension_x86.wxs" />
20
- <EmbeddedResource Include="en-us.wxl" />
21
- <EmbeddedResource Include="es-es.wxl" />
22
- <EmbeddedResource Include="ja-jp.wxl" />
23
- <EmbeddedResource Include="pl-pl.wxl" />
24
- </ItemGroup>
9
10
<ItemGroup>
27
- <BindInputPaths Include="$(OutputPath)Win32">
28
- <BindName>x86</BindName>
29
- </BindInputPaths>
30
- <BindInputPaths Include="$(OutputPath)x64)">
31
- <BindName>x64</BindName>
32
- </BindInputPaths>
33
- <BindInputPaths Include="$(OutputPath)arm)">
34
- <BindName>arm</BindName>
35
- </BindInputPaths>
36
- <BindInputPaths Include="$(OutputPath)arm64)">
37
- <BindName>arm64</BindName>
38
- </BindInputPaths>
11
+ <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM" />
12
+ <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=ARM64" />
13
+ <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x86" />
14
+ <ProjectReference Include="..\ca\fwca.vcxproj" Properties="Platform=x64" />
15
</ItemGroup>
16
17
<ItemGroup>
42
- <None Include="packages.config" />
18
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
19
</ItemGroup>
44
- <ItemGroup>
45
- <ProjectReference Include="..\ca\fwca.vcxproj">
46
- <Name>fwca</Name>
47
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
48
- <Properties>Platform=ARM</Properties>
49
- </ProjectReference>
50
- <ProjectReference Include="..\ca\fwca.vcxproj">
51
- <Name>fwca</Name>
52
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
53
- <Properties>Platform=ARM64</Properties>
54
- </ProjectReference>
55
- <ProjectReference Include="..\ca\fwca.vcxproj">
56
- <Name>fwca</Name>
57
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
58
- <Properties>Platform=x86</Properties>
59
- </ProjectReference>
60
- <ProjectReference Include="..\ca\fwca.vcxproj">
61
- <Name>fwca</Name>
62
- <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
63
- <Properties>Platform=x64</Properties>
64
- </ProjectReference>
65
- </ItemGroup>
66
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
67
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
68
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
69
- <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/." />
70
- </Target>
71
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
72
- <PropertyGroup>
73
- <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>
74
- </PropertyGroup>
75
- <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'))" />
76
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0102\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0102\build\WixToolset.MSBuild.props'))" />
77
- </Target>
78
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
79
-</Project>
\ No newline at end of file
20
+
21
+</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-0102" developmentDependency="true" targetFramework="net40" />
5
-</packages>
\ No newline at end of file