Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 02:56 UTC
d95a3e33daea883bf7b05ef422d1d489270cc0d3
3 files changed
+12
-36
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/wixlib/dependency.wixproj
+7
-31
@@ -1,43 +1,19 @@
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>{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}</ProjectGuid>
8
- <OutputName>dependency</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
12
- <SuppressSpecificWarnings>1086</SuppressSpecificWarnings>
7
+ <!-- <SuppressSpecificWarnings>1086</SuppressSpecificWarnings> -->
8
<Cultures>en-us</Cultures>
9
</PropertyGroup>
10
11
<ItemGroup>
17
- <Compile Include="DependencyExtension.wxs" />
18
- <Compile Include="DependencyExtension_x86.wxs" />
19
- <EmbeddedResource Include="en-us.wxl" />
20
- </ItemGroup>
21
- <ItemGroup>
22
- <None Include="packages.config" />
12
+ <ProjectReference Include="..\ca\dependencyca.vcxproj" />
13
</ItemGroup>
14
+
15
<ItemGroup>
25
- <ProjectReference Include="..\ca\dependencyca.vcxproj">
26
- <Name>dependencyca</Name>
27
- <Project>{B86AF46C-0F90-49CC-923F-A800B088D015}</Project>
28
- </ProjectReference>
16
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
17
</ItemGroup>
30
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
31
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
32
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
33
- <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/." />
34
- </Target>
35
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
36
- <PropertyGroup>
37
- <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>
38
- </PropertyGroup>
39
- <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'))" />
40
- <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'))" />
41
- </Target>
42
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
18
+
19
</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