aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-26 11:57:56 -0700
committerRob Mensching <rob@firegiant.com>2020-06-26 11:57:56 -0700
commitc95213afde7af57af4b2bbaa2d29344accbebf01 (patch)
tree2f44c29e508bb7b1a69645b8bf26c8176ce0615a /src
parent851a26c4af0b2da5c9cf22bc4be0ac3895cb11a8 (diff)
downloadwix-c95213afde7af57af4b2bbaa2d29344accbebf01.tar.gz
wix-c95213afde7af57af4b2bbaa2d29344accbebf01.tar.bz2
wix-c95213afde7af57af4b2bbaa2d29344accbebf01.zip
Build wixlib with WixToolset.Sdk
Diffstat (limited to 'src')
-rw-r--r--src/FindLocalWix.props8
-rw-r--r--src/wixlib/packages.config5
-rw-r--r--src/wixlib/util.wixproj93
3 files changed, 15 insertions, 91 deletions
diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props
deleted file mode 100644
index 1666e4fe..00000000
--- a/src/FindLocalWix.props
+++ /dev/null
@@ -1,8 +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<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
5 <PropertyGroup>
6 <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') And Exists('$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath>
7 </PropertyGroup>
8</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
diff --git a/src/wixlib/util.wixproj b/src/wixlib/util.wixproj
index be62632b..82b06c00 100644
--- a/src/wixlib/util.wixproj
+++ b/src/wixlib/util.wixproj
@@ -1,91 +1,28 @@
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>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
8 <OutputName>util</OutputName>
9 <OutputType>Library</OutputType> 5 <OutputType>Library</OutputType>
10 <BindFiles>true</BindFiles> 6 <BindFiles>true</BindFiles>
11 <Pedantic>true</Pedantic>
12 </PropertyGroup> 7 </PropertyGroup>
8
13 <ItemGroup> 9 <ItemGroup>
14 <Compile Include="UtilExtension.wxs" /> 10 <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
15 <Compile Include="UtilExtension_x86.wxs" /> 11 <BindInputPaths Include="$(OutputPath)x64)" BindName='x64' />
16 <Compile Include="UtilExtension_x64.wxs" /> 12 <BindInputPaths Include="$(OutputPath)arm)" BindName='arm' />
17 <Compile Include="UtilExtension_arm.wxs" /> 13 <BindInputPaths Include="$(OutputPath)arm64)" BindName='arm64' />
18 <Compile Include="UtilExtension_arm64.wxs" />
19 <EmbeddedResource Include="en-us.wxl" />
20 <EmbeddedResource Include="de-de.wxl" />
21 <EmbeddedResource Include="es-es.wxl" />
22 <EmbeddedResource Include="fr-fr.wxl" />
23 <EmbeddedResource Include="ja-jp.wxl" />
24 <EmbeddedResource Include="pt-br.wxl" />
25 <EmbeddedResource Include="it-it.wxl" />
26 </ItemGroup>
27
28 <ItemGroup>
29 <None Include="packages.config" />
30 </ItemGroup>
31
32 <ItemGroup>
33 <BindInputPaths Include="$(OutputPath)Win32">
34 <BindName>x86</BindName>
35 </BindInputPaths>
36 <BindInputPaths Include="$(OutputPath)x64)">
37 <BindName>x64</BindName>
38 </BindInputPaths>
39 <BindInputPaths Include="$(OutputPath)arm)">
40 <BindName>arm</BindName>
41 </BindInputPaths>
42 <BindInputPaths Include="$(OutputPath)arm64)">
43 <BindName>arm64</BindName>
44 </BindInputPaths>
45 </ItemGroup> 14 </ItemGroup>
46 15
47 <ItemGroup> 16 <ItemGroup>
48 <ProjectReference Include="..\be\utilbe.vcxproj"> 17 <ProjectReference Include="..\be\utilbe.vcxproj" />
49 <Name>utilbe</Name> 18 <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM" />
50 <Project>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</Project> 19 <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
51 </ProjectReference> 20 <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
52 <ProjectReference Include="..\ca\utilca.vcxproj"> 21 <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />
53 <Name>utilca</Name>
54 <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
55 <Properties>Platform=ARM</Properties>
56 </ProjectReference>
57 <ProjectReference Include="..\ca\utilca.vcxproj">
58 <Name>utilca</Name>
59 <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
60 <Properties>Platform=ARM64</Properties>
61 </ProjectReference>
62 <ProjectReference Include="..\ca\utilca.vcxproj">
63 <Name>utilca</Name>
64 <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
65 <Properties>Platform=x86</Properties>
66 </ProjectReference>
67 <ProjectReference Include="..\ca\utilca.vcxproj">
68 <Name>utilca</Name>
69 <Project>{076018F7-19BD-423A-ABBF-229273DA08D8}</Project>
70 <Properties>Platform=x64</Properties>
71 </ProjectReference>
72 </ItemGroup> 22 </ItemGroup>
73 23
74 <ItemGroup> 24 <ItemGroup>
75 <None Include="caerr.wxi" /> 25 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
76 <None Include="caDecor.wxi" />
77 <None Include="UtilExtension_Platform.wxi" />
78 </ItemGroup> 26 </ItemGroup>
79 27
80 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
81
82 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
83 <PropertyGroup>
84 <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>
85 </PropertyGroup>
86 <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'))" />
87 <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'))" />
88 </Target>
89
90 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
91</Project> 28</Project>
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-23 19:52:17 +0000