aboutsummaryrefslogtreecommitdiff
path: root/src/wixlib
diff options
context:
space:
mode:
authorSean Hall <r.sean.hall@gmail.com>2018-12-31 23:57:35 -0600
committerSean Hall <r.sean.hall@gmail.com>2018-12-31 23:58:29 -0600
commitea864b56d115e4f7a7205827ecaaba0e1db81d41 (patch)
tree2dc92ce2a53295a99f482e1226398ffd97f7b5d2 /src/wixlib
parent2c568de11510b453f499827919964badef22304e (diff)
downloadwix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.tar.gz
wix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.tar.bz2
wix-ea864b56d115e4f7a7205827ecaaba0e1db81d41.zip
Integrate into latest v4.
Diffstat (limited to 'src/wixlib')
-rw-r--r--src/wixlib/BalExtension.wixproj39
-rw-r--r--src/wixlib/bal.wixproj62
-rw-r--r--src/wixlib/packages.config5
3 files changed, 67 insertions, 39 deletions
diff --git a/src/wixlib/BalExtension.wixproj b/src/wixlib/BalExtension.wixproj
deleted file mode 100644
index e2898e83..00000000
--- a/src/wixlib/BalExtension.wixproj
+++ /dev/null
@@ -1,39 +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
5<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
6 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
8 <OutputName>bal</OutputName>
9 <OutputType>Library</OutputType>
10 <BindFiles>true</BindFiles>
11 <Pedantic>true</Pedantic>
12 <Cultures>en-us</Cultures>
13 </PropertyGroup>
14
15 <ItemGroup>
16 <Compile Include="BalExtension.wxs" />
17 <Compile Include="Mba.wxs" />
18 <Compile Include="NetFx4AsPrereq.wxs" />
19 <Compile Include="NetFx45AsPrereq.wxs" />
20 <Compile Include="NetFx451AsPrereq.wxs" />
21 <Compile Include="NetFx452AsPrereq.wxs" />
22 <Compile Include="NetFx46AsPrereq.wxs" />
23 <Compile Include="NetFx461AsPrereq.wxs" />
24 <Compile Include="NetFx462AsPrereq.wxs" />
25 <Compile Include="wixstdba.wxs" />
26 <Compile Include="wixstdba_x86.wxs" />
27 </ItemGroup>
28
29 <ItemGroup>
30 <BindInputPaths Include="$(OutputPath)WixstdbaResources\" />
31 </ItemGroup>
32
33 <ItemGroup>
34 <ProjectReference Include="..\mba\host\host.vcxproj" />
35 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj" />
36 </ItemGroup>
37
38 <Import Project="$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildProjectDirectory), wix.proj))\tools\WixBuild.targets" />
39</Project>
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj
new file mode 100644
index 00000000..be15229b
--- /dev/null
+++ b/src/wixlib/bal.wixproj
@@ -0,0 +1,62 @@
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<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-0035\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" />
5 <Import Project="..\FindLocalWix.props" />
6 <PropertyGroup>
7 <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
8 <OutputName>bal</OutputName>
9 <OutputType>Library</OutputType>
10 <BindFiles>true</BindFiles>
11 <Pedantic>true</Pedantic>
12 <Cultures>en-us</Cultures>
13 </PropertyGroup>
14
15 <ItemGroup>
16 <Compile Include="BalExtension.wxs" />
17 <!-- TODO: Reenable when compiling Bundle elements is supported
18 <Compile Include="Mba.wxs" />
19 <Compile Include="NetFx4AsPrereq.wxs" />
20 <Compile Include="NetFx45AsPrereq.wxs" />
21 <Compile Include="NetFx451AsPrereq.wxs" />
22 <Compile Include="NetFx452AsPrereq.wxs" />
23 <Compile Include="NetFx46AsPrereq.wxs" />
24 <Compile Include="NetFx461AsPrereq.wxs" />
25 <Compile Include="NetFx462AsPrereq.wxs" />
26 <Compile Include="wixstdba.wxs" />
27 <Compile Include="wixstdba_x86.wxs" />
28 -->
29 </ItemGroup>
30
31 <ItemGroup>
32 <None Include="packages.config" />
33 </ItemGroup>
34
35 <ItemGroup>
36 <BindInputPaths Include="$(OutputPath)WixstdbaResources\" />
37 </ItemGroup>
38
39 <ItemGroup>
40 <ProjectReference Include="..\mbahost\mbahost.vcxproj">
41 <Name>mbahost</Name>
42 <Project>{12C87C77-3547-44F8-8134-29BC915CB19D}</Project>
43 </ProjectReference>
44 <ProjectReference Include="..\wixstdba\wixstdba.vcxproj">
45 <Name>wixstdba</Name>
46 <Project>{41085A22-E6AA-4E8B-AB1B-DDEE0DC89DFA}</Project>
47 </ProjectReference>
48 </ItemGroup>
49 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
50 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
51 <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
52 <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/." />
53 </Target>
54 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
55 <PropertyGroup>
56 <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>
57 </PropertyGroup>
58 <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'))" />
59 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props'))" />
60 </Target>
61 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
62</Project>
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config
new file mode 100644
index 00000000..7964daed
--- /dev/null
+++ b/src/wixlib/packages.config
@@ -0,0 +1,5 @@
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-0035" 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-01-08 07:57:07 +0000