Build wixlib with WixToolset.Sdk
Rob Mensching committed
Jun 27, 2020 at 15:02 UTC
2a0da3642381d8e52e841b72d049049009f84a71
4 files changed
+13
-49
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-0086" developmentDependency="true" targetFramework="net40" />
5
-</packages>
\ No newline at end of file
src/wixlib/sql.wixproj
+8
-36
@@ -1,46 +1,18 @@
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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0">
4
- <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" />
5
- <Import Project="..\FindLocalWix.props" />
2
+<Project Sdk="WixToolset.Sdk">
3
+
4
<PropertyGroup>
7
- <ProjectGuid>{9ACF1A20-D801-45CC-A463-F9D13E506AA3}</ProjectGuid>
8
- <OutputName>sql</OutputName>
5
<OutputType>Library</OutputType>
6
<BindFiles>true</BindFiles>
11
- <Pedantic>true</Pedantic>
7
<Cultures>en-us</Cultures>
8
</PropertyGroup>
9
+
10
<ItemGroup>
15
- <Compile Include="SqlExtension.wxs" />
16
- <EmbeddedResource Include="de-de.wxl" />
17
- <EmbeddedResource Include="en-us.wxl" />
18
- <EmbeddedResource Include="es-es.wxl" />
19
- <EmbeddedResource Include="ja-jp.wxl" />
20
- <EmbeddedResource Include="pl-pl.wxl" />
21
- <EmbeddedResource Include="pt-br.wxl" />
22
- <EmbeddedResource Include="pt-pt.wxl" />
11
+ <ProjectReference Include="..\ca\sqlca.vcxproj" />
12
</ItemGroup>
13
+
14
<ItemGroup>
25
- <None Include="packages.config" />
15
+ <PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
16
</ItemGroup>
27
- <ItemGroup>
28
- <ProjectReference Include="..\ca\sqlca.vcxproj">
29
- <Name>sqlca</Name>
30
- <Project>{4DCA6E4B-A1F1-4450-BC2D-94AC20F31935}</Project>
31
- </ProjectReference>
32
- </ItemGroup>
33
- <Import Project="$(WixTargetsPath)" Condition=" '$(WixTargetsPath)' != '' AND Exists('$(WixTargetsPath)') " />
34
- <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets" Condition=" '$(WixTargetsPath)' == '' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\wix.targets') " />
35
- <Target Name="EnsureWixToolsetInstalled" Condition=" '$(WixTargetsImported)' != 'true' ">
36
- <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/." />
37
- </Target>
38
- <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
39
- <PropertyGroup>
40
- <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>
41
- </PropertyGroup>
42
- <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'))" />
43
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0086\build\WixToolset.MSBuild.props'))" />
44
- </Target>
45
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
46
-</Project>
\ No newline at end of file
17
+
18
+</Project>