Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 14:36 UTC
b8c2c14a4dcd499efbc1a4740eb0bb786d1f8c60
3 files changed
+11
-35
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/wixlib/http.wixproj
+6
-30
@@ -1,42 +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>{055C1517-4CED-4199-BCDE-A383E5C4EF78}</ProjectGuid>
8
- <OutputName>http</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
<Cultures>en-us</Cultures>
8
</PropertyGroup>
9
10
<ItemGroup>
16
- <Compile Include="HttpExtension.wxs" />
17
- <Compile Include="HttpExtension_x86.wxs" />
18
- <EmbeddedResource Include="en-us.wxl" />
19
- </ItemGroup>
20
- <ItemGroup>
21
- <None Include="packages.config" />
11
+ <ProjectReference Include="..\ca\httpca.vcxproj" />
12
</ItemGroup>
13
+
14
<ItemGroup>
24
- <ProjectReference Include="..\ca\httpca.vcxproj">
25
- <Name>httpca</Name>
26
- <Project>{90743805-C043-47C7-B5FF-8F5EE5C8A2DE}</Project>
27
- </ProjectReference>
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
16
</ItemGroup>
29
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
30
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
31
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
32
- <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/." />
33
- </Target>
34
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
35
- <PropertyGroup>
36
- <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>
37
- </PropertyGroup>
38
- <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'))" />
39
- <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'))" />
40
- </Target>
41
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
17
+
18
</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