Skip to content

Commit

Permalink
Build wixlib with WixToolset.Sdk
Browse files Browse the repository at this point in the history
  • Loading branch information
robmen committed Jun 27, 2020
1 parent 5756dd9 commit d95a3e3
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 36 deletions.
5 changes: 5 additions & 0 deletions global.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
{
"msbuild-sdks": {
"WixToolset.Sdk": "4.0.0-build-0143"
}
}
38 changes: 7 additions & 31 deletions src/wixlib/dependency.wixproj
Original file line number Diff line number Diff line change
@@ -1,43 +1,19 @@
<?xml version="1.0" encoding="utf-8" ?>
<!-- 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. -->
<Project DefaultTargets="Build" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
<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')" />
<Import Project="..\FindLocalWix.props" />
<Project Sdk="WixToolset.Sdk">

<PropertyGroup>
<ProjectGuid>{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}</ProjectGuid>
<OutputName>dependency</OutputName>
<OutputType>Library</OutputType>
<BindFiles>true</BindFiles>
<Pedantic>true</Pedantic>
<SuppressSpecificWarnings>1086</SuppressSpecificWarnings>
<!-- <SuppressSpecificWarnings>1086</SuppressSpecificWarnings> -->
<Cultures>en-us</Cultures>
</PropertyGroup>

<ItemGroup>
<Compile Include="DependencyExtension.wxs" />
<Compile Include="DependencyExtension_x86.wxs" />
<EmbeddedResource Include="en-us.wxl" />
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<ProjectReference Include="..\ca\dependencyca.vcxproj" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\ca\dependencyca.vcxproj">
<Name>dependencyca</Name>
<Project>{B86AF46C-0F90-49CC-923F-A800B088D015}</Project>
</ProjectReference>
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
</ItemGroup>
<Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
<Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
<Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
<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/." />
</Target>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<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'))" />
<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'))" />
</Target>
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />

</Project>
5 changes: 0 additions & 5 deletions src/wixlib/packages.config

This file was deleted.

0 comments on commit d95a3e3

Please sign in to comment.