aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-27 01:58:38 -0700
committerRob Mensching <rob@firegiant.com>2020-06-27 02:00:58 -0700
commita58147fcf877d2b21d98f7fc8aae66be8eef7d45 (patch)
treec734f3314b9f81eaef3f08f9914f827349a7e77a
parentd6fe720a1d06030afecef83b9b4a7650b08c8dca (diff)
downloadwix-a58147fcf877d2b21d98f7fc8aae66be8eef7d45.tar.gz
wix-a58147fcf877d2b21d98f7fc8aae66be8eef7d45.tar.bz2
wix-a58147fcf877d2b21d98f7fc8aae66be8eef7d45.zip
Build wixlib with WixToolset.Sdk
Diffstat
-rw-r--r--global.json5
-rw-r--r--src/wixlib/netfx.wixproj92
2 files changed, 19 insertions, 78 deletions
diff --git a/global.json b/global.json
new file mode 100644
index 00000000..7a995d0a
--- /dev/null
+++ b/global.json
@@ -0,0 +1,5 @@
1{
2 "msbuild-sdks": {
3 "WixToolset.Sdk": "4.0.0-build-0143"
4 }
5}
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj
index e0e052d1..143a9fbf 100644
--- a/src/wixlib/netfx.wixproj
+++ b/src/wixlib/netfx.wixproj
@@ -1,89 +1,25 @@
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" InitialTargets="EnsureWixToolsetInstalled" 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-0133\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props')" /> 3
5 <Import Project="..\FindLocalWix.props" />
6 <PropertyGroup> 4 <PropertyGroup>
7 <ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid>
8 <OutputName>netfx</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="NetFxExtension.wxs" /> 10 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM" />
15 <Compile Include="NetFx1.wxs" /> 11 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=ARM64" />
16 <Compile Include="NetFx1.1.wxs" /> 12 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x86" />
17 <Compile Include="NetFx2.wxs" /> 13 <ProjectReference Include="..\ca\netfxca.vcxproj" Properties="Platform=x64" />
18 <Compile Include="NetFx3.wxs" />
19 <Compile Include="NetFx3.5.wxs" />
20 <Compile Include="NetFx4.wxs" />
21 <Compile Include="NetFx4.5.wxs" />
22 <Compile Include="NetFx451.wxs" />
23 <Compile Include="NetFx452.wxs" />
24 <Compile Include="NetFx46.wxs" />
25 <Compile Include="NetFx461.wxs" />
26 <Compile Include="NetFx462.wxs" />
27 <Compile Include="NetFx47.wxs" />
28 <Compile Include="NetFx471.wxs" />
29 <Compile Include="NetFx472.wxs" />
30 <Compile Include="NetFx48.wxs" />
31 <Compile Include="NetFxExtension_arm.wxs" />
32 <Compile Include="NetFxExtension_arm64.wxs" />
33 <Compile Include="NetFxExtension_x64.wxs" />
34 <Compile Include="NetFxExtension_x86.wxs" />
35 <Compile Include="NetCore3.1.0_x64.wxs" />
36 <Compile Include="NetCore3.1.0_x86.wxs" />
37 <Compile Include="NetCore3.1.1_x64.wxs" />
38 <Compile Include="NetCore3.1.1_x86.wxs" />
39 <Compile Include="NetCore3.1.2_x64.wxs" />
40 <Compile Include="NetCore3.1.2_x86.wxs" />
41 <Compile Include="NetCore3.1.3_x64.wxs" />
42 <Compile Include="NetCore3.1.3_x86.wxs" />
43 <Compile Include="NetCore3.1.4_x64.wxs" />
44 <Compile Include="NetCore3.1.4_x86.wxs" />
45 <Compile Include="NetCoreShared.wxs" />
46 </ItemGroup> 14 </ItemGroup>
15
47 <ItemGroup> 16 <ItemGroup>
48 <None Include="packages.config" /> 17 <PackageReference Include="WixToolset.Bal.wixext" Version="4.0.*" />
18 <PackageReference Include="WixToolset.Util.wixext" Version="4.0.*" />
49 </ItemGroup> 19 </ItemGroup>
20
50 <ItemGroup> 21 <ItemGroup>
51 <ProjectReference Include="..\ca\netfxca.vcxproj"> 22 <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
52 <Name>netfxca</Name>
53 <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
54 <Properties>Platform=ARM</Properties>
55 </ProjectReference>
56 <ProjectReference Include="..\ca\netfxca.vcxproj">
57 <Name>netfxca</Name>
58 <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
59 <Properties>Platform=ARM64</Properties>
60 </ProjectReference>
61 <ProjectReference Include="..\ca\netfxca.vcxproj">
62 <Name>netfxca</Name>
63 <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
64 <Properties>Platform=x86</Properties>
65 </ProjectReference>
66 <ProjectReference Include="..\ca\netfxca.vcxproj">
67 <Name>netfxca</Name>
68 <Project>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</Project>
69 <Properties>Platform=x64</Properties>
70 </ProjectReference>
71 </ItemGroup> 23 </ItemGroup>
72 <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " /> 24
73 <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " /> 25</Project>
74 <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
75 <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/." />
76 </Target>
77 <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
78 <PropertyGroup>
79 <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>
80 </PropertyGroup>
81 <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'))" />
82 <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0133\build\WixToolset.MSBuild.props'))" />
83 <Error Condition="!Exists('..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets'))" />
84 <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets'))" />
85 </Target>
86 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
87 <Import Project="..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Bal.wixext.4.0.40\build\WixToolset.Bal.wixext.targets')" />
88 <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.36\build\WixToolset.Util.wixext.targets')" />
89</Project> \ No newline at end of file
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2025-04-01 05:34:00 +0000