aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-27 01:38:54 -0700
committerRob Mensching <rob@firegiant.com>2020-06-27 01:43:10 -0700
commitd3988f982c035585590528829149c734c7f13cca (patch)
treeef1f74af8221cf06f724abdc0c054cd54411e0b9 /src/wixlib
parent59fa31de1eb64809888e218064a97d417060d110 (diff)
downloadwix-d3988f982c035585590528829149c734c7f13cca.tar.gz
wix-d3988f982c035585590528829149c734c7f13cca.tar.bz2
wix-d3988f982c035585590528829149c734c7f13cca.zip
Build wixlib with WixToolset.Sdk
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/bal.wixproj51
-rw-r--r--src/wixlib/packages.config5
2 files changed, 9 insertions, 47 deletions
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
index c23af015..4d35d516 100644
--- a/src/wixlib/bal.wixproj
+++ b/src/wixlib/bal.wixproj
@@ -1,59 +1,26 @@
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. --> 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" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> 2<Project Sdk="WixToolset.Sdk">
4 <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" /> 3
5 <Import Project="..\FindLocalWix.props" />
6 <PropertyGroup> 4 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
8 <OutputName>bal</OutputName>
9 <OutputType>Library</OutputType> 5 <OutputType>Library</OutputType>
10 <BindFiles>true</BindFiles> 6 <BindFiles>true</BindFiles>
11 <Pedantic>true</Pedantic>
12 <Cultures>en-us</Cultures> 7 <Cultures>en-us</Cultures>
13 </PropertyGroup> 8 </PropertyGroup>
14 9
15 <ItemGroup> 10 <ItemGroup>
16 <Compile Include="BalExtension.wxs" /> 11 <BindInputPaths Include="..\wixstdba\Resources\" />
17 <Compile Include="Dnc.wxs" /> 12 <BindInputPaths Include="$(OutputPath)netcoreapp3.0" />
18 <Compile Include="Mba.wxs" /> 13 <BindInputPaths Include="$(OutputPath)" />
19 <Compile Include="wixstdba.wxs" />
20 <Compile Include="wixstdba_x86.wxs" />
21 </ItemGroup>
22
23 <ItemGroup>
24 <None Include="caSuffix.wxi" />
25 <None Include="wixstdba_platform.wxi" />
26 </ItemGroup> 14 </ItemGroup>
27 15
28 <ItemGroup> 16 <ItemGroup>
29 <None Include="packages.config" /> 17 <ProjectReference Include="..\dnchost\dnchost.vcxproj" />
18 <ProjectReference Include="..\mbahost\mbahost.vcxproj" />
19 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" />
30 </ItemGroup> 20 </ItemGroup>
31 21
32 <ItemGroup> 22 <ItemGroup>
33 <BindInputPaths Include="..\wixstdba\Resources\" /> 23 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
34 </ItemGroup> 24 </ItemGroup>
35 25
36 <ItemGroup>
37 <ProjectReference Include="..\dnchost\dnchost.vcxproj">
38 <Name>dnchost</Name>
39 <Project>{B6F70281-6583-4138-BB7F-AABFEBBB3CA2}</Project>
40 </ProjectReference>
41 <ProjectReference Include="..\mbahost\mbahost.vcxproj">
42 <Name>mbahost</Name>
43 <Project>{12C87C77-3547-44F8-8134-29BC915CB19D}</Project>
44 </ProjectReference>
45 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj">
46 <Name>wixstdba</Name>
47 <Project>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</Project>
48 </ProjectReference>
49 </ItemGroup>
50 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
51 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
52 <PropertyGroup>
53 <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>
54 </PropertyGroup>
55 <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'))" />
56 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0139\build\WixToolset.MSBuild.props'))" />
57 </Target>
58 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
59</Project> 26</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
deleted file mode 100644
index f37af421..00000000
--- a/src/wixlib/packages.config
+++ /dev/null
@@ -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-0139" developmentDependency="true" targetFramework="net40" />
5</packages> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-02-19 20:24:59 +0000