diff options
author | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 19:25:31 +1000 |
---|---|---|
committer | Sean Hall <r.sean.hall@gmail.com> | 2020-06-24 21:03:13 +1000 |
commit | cc4ec6c316ca6c318e1605bc6a6315794830486d (patch) | |
tree | 0520b5bbb7971529920b79d21faf6e1555fbeb03 /src/be | |
parent | e6819014f41294ea2e465338a821014080e265d1 (diff) | |
download | wix-cc4ec6c316ca6c318e1605bc6a6315794830486d.tar.gz wix-cc4ec6c316ca6c318e1605bc6a6315794830486d.tar.bz2 wix-cc4ec6c316ca6c318e1605bc6a6315794830486d.zip |
Update dependencies.
Run tests before packing and don't build twice.
Diffstat (limited to 'src/be')
-rw-r--r-- | src/be/packages.config | 4 | ||||
-rw-r--r-- | src/be/utilbe.vcxproj | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/src/be/packages.config b/src/be/packages.config index af520a6d..e488c85c 100644 --- a/src/be/packages.config +++ b/src/be/packages.config | |||
@@ -1,6 +1,6 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
2 | <packages> | 2 | <packages> |
3 | <package id="WixToolset.BextUtil" version="4.0.22" targetFramework="native" /> | 3 | <package id="WixToolset.BextUtil" version="4.0.31" targetFramework="native" /> |
4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> | 4 | <package id="WixToolset.BootstrapperCore.Native" version="4.0.16" targetFramework="native" /> |
5 | <package id="WixToolset.DUtil" version="4.0.24" targetFramework="native" /> | 5 | <package id="WixToolset.DUtil" version="4.0.30" targetFramework="native" /> |
6 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |
diff --git a/src/be/utilbe.vcxproj b/src/be/utilbe.vcxproj index 2c447196..2680fe0f 100644 --- a/src/be/utilbe.vcxproj +++ b/src/be/utilbe.vcxproj | |||
@@ -1,9 +1,9 @@ | |||
1 | <?xml version="1.0" encoding="utf-8"?> | 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. --> | 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" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 3 | <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
4 | <Import Project="..\..\packages\WixToolset.BextUtil.4.0.22\build\WixToolset.BextUtil.props" Condition="Exists('..\..\packages\WixToolset.BextUtil.4.0.22\build\WixToolset.BextUtil.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.BextUtil.4.0.31\build\WixToolset.BextUtil.props" Condition="Exists('..\..\packages\WixToolset.BextUtil.4.0.31\build\WixToolset.BextUtil.props')" /> |
5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> | 5 | <Import Project="..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props" Condition="Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" /> |
6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.24\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.24\build\WixToolset.DUtil.props')" /> | 6 | <Import Project="..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" /> |
7 | <ItemGroup Label="ProjectConfigurations"> | 7 | <ItemGroup Label="ProjectConfigurations"> |
8 | <ProjectConfiguration Include="Debug|Win32"> | 8 | <ProjectConfiguration Include="Debug|Win32"> |
9 | <Configuration>Debug</Configuration> | 9 | <Configuration>Debug</Configuration> |
@@ -18,7 +18,7 @@ | |||
18 | <ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid> | 18 | <ProjectGuid>{630C1EE7-2517-4A8C-83E3-DA1150308B58}</ProjectGuid> |
19 | <ConfigurationType>DynamicLibrary</ConfigurationType> | 19 | <ConfigurationType>DynamicLibrary</ConfigurationType> |
20 | <TargetName>utilbe</TargetName> | 20 | <TargetName>utilbe</TargetName> |
21 | <PlatformToolset>v141</PlatformToolset> | 21 | <PlatformToolset>v142</PlatformToolset> |
22 | <CharacterSet>Unicode</CharacterSet> | 22 | <CharacterSet>Unicode</CharacterSet> |
23 | <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile> | 23 | <ProjectModuleDefinitionFile>utilbe.def</ProjectModuleDefinitionFile> |
24 | <Description>WiX Toolset Util BundleExtension</Description> | 24 | <Description>WiX Toolset Util BundleExtension</Description> |
@@ -52,8 +52,8 @@ | |||
52 | <PropertyGroup> | 52 | <PropertyGroup> |
53 | <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> | 53 | <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> |
54 | </PropertyGroup> | 54 | </PropertyGroup> |
55 | <Error Condition="!Exists('..\..\packages\WixToolset.BextUtil.4.0.22\build\WixToolset.BextUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BextUtil.4.0.22\build\WixToolset.BextUtil.props'))" /> | 55 | <Error Condition="!Exists('..\..\packages\WixToolset.BextUtil.4.0.31\build\WixToolset.BextUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BextUtil.4.0.31\build\WixToolset.BextUtil.props'))" /> |
56 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> | 56 | <Error Condition="!Exists('..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.BootstrapperCore.Native.4.0.16\build\WixToolset.BootstrapperCore.Native.props'))" /> |
57 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.24\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.24\build\WixToolset.DUtil.props'))" /> | 57 | <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.30\build\WixToolset.DUtil.props'))" /> |
58 | </Target> | 58 | </Target> |
59 | </Project> \ No newline at end of file | 59 | </Project> \ No newline at end of file |