Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 26, 2020 at 11:57 UTC
c95213afde7af57af4b2bbaa2d29344accbebf01
6 files changed
+28
-99
Util.wixext.sln
+2
-2
@@ -1,7 +1,7 @@
1
2
Microsoft Visual Studio Solution File, Format Version 12.00
3
-# Visual Studio 15
4
-VisualStudioVersion = 15.0.27130.2003
3
+# Visual Studio Version 16
4
+VisualStudioVersion = 16.0.30204.135
5
MinimumVisualStudioVersion = 15.0.26124.0
6
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "utilbe", "src\be\utilbe.vcxproj", "{630C1EE7-2517-4A8C-83E3-DA1150308B58}"
7
EndProject
appveyor.cmd
+6
-6
@@ -1,14 +1,14 @@
1
@setlocal
2
@pushd %~dp0
3
4
-nuget restore
4
+nuget restore || exit /b
5
6
-msbuild -p:Configuration=Release -t:Restore
6
+msbuild -p:Configuration=Release -t:Restore || exit /b
7
8
-msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj
9
-dotnet test -c Release --no-build src\test\WixToolsetTest.Util
8
+msbuild -p:Configuration=Release src\test\WixToolsetTest.Util\WixToolsetTest.Util.csproj || exit /b
9
+dotnet test -c Release --no-build src\test\WixToolsetTest.Util || exit /b
10
11
-msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj
11
+msbuild -p:Configuration=Release -t:Pack src\wixext\WixToolset.Util.wixext.csproj || exit /b
12
13
@popd
14
-@endlocal
\ No newline at end of file
14
+@endlocal
global.json
new
+5
@@ -0,0 +1,5 @@
1
+{
2
+ "msbuild-sdks": {
3
+ "WixToolset.Sdk": "4.0.0-build-0143"
4
+ }
5
+}
src/FindLocalWix.props
deleted
-8
@@ -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>
src/wixlib/packages.config
deleted
-5
@@ -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
src/wixlib/util.wixproj
+15
-78
@@ -1,91 +1,28 @@
1
-<?xml version="1.0" encoding="utf-8"?>
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">
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')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{1ACFFEFD-505A-41A5-ACBF-A02B7B473AA2}</ProjectGuid>
8
- <OutputName>util</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
</PropertyGroup>
8
+
9
<ItemGroup>
14
- <Compile Include="UtilExtension.wxs" />
15
- <Compile Include="UtilExtension_x86.wxs" />
16
- <Compile Include="UtilExtension_x64.wxs" />
17
- <Compile Include="UtilExtension_arm.wxs" />
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>
10
+ <BindInputPaths Include="$(OutputPath)Win32" BindName='x86' />
11
+ <BindInputPaths Include="$(OutputPath)x64)" BindName='x64' />
12
+ <BindInputPaths Include="$(OutputPath)arm)" BindName='arm' />
13
+ <BindInputPaths Include="$(OutputPath)arm64)" BindName='arm64' />
14
</ItemGroup>
15
16
<ItemGroup>
48
- <ProjectReference Include="..\be\utilbe.vcxproj">
49
- <Name>utilbe</Name>
50
- <Project>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</Project>
51
- </ProjectReference>
52
- <ProjectReference Include="..\ca\utilca.vcxproj">
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>
17
+ <ProjectReference Include="..\be\utilbe.vcxproj" />
18
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM" />
19
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=ARM64" />
20
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x86" />
21
+ <ProjectReference Include="..\ca\utilca.vcxproj" Properties="Platform=x64" />
22
</ItemGroup>
73
-
23
+
24
<ItemGroup>
75
- <None Include="caerr.wxi" />
76
- <None Include="caDecor.wxi" />
77
- <None Include="UtilExtension_Platform.wxi" />
25
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
26
</ItemGroup>
79
-
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')" />
27
+
28
</Project>