diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-03 13:28:12 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-03 14:01:31 +1000 |
| commit | 057da4cedb151761c4a8cbfe9c1899315c8a3b05 (patch) | |
| tree | 952556c8f23da10ba061111fc7a8a63a38dafdf7 /src | |
| parent | f04bfc15cae6c9e161e20384096961f00e4b6fff (diff) | |
| download | wix-057da4cedb151761c4a8cbfe9c1899315c8a3b05.tar.gz wix-057da4cedb151761c4a8cbfe9c1899315c8a3b05.tar.bz2 wix-057da4cedb151761c4a8cbfe9c1899315c8a3b05.zip | |
Update dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/wixext/NetfxWindowsInstallerBackendExtension.cs | 7 | ||||
| -rw-r--r-- | src/wixlib/netfx.wixproj | 8 | ||||
| -rw-r--r-- | src/wixlib/packages.config | 4 |
3 files changed, 6 insertions, 13 deletions
diff --git a/src/wixext/NetfxWindowsInstallerBackendExtension.cs b/src/wixext/NetfxWindowsInstallerBackendExtension.cs index 1c7ce9b8..7e30d396 100644 --- a/src/wixext/NetfxWindowsInstallerBackendExtension.cs +++ b/src/wixext/NetfxWindowsInstallerBackendExtension.cs | |||
| @@ -3,7 +3,6 @@ | |||
| 3 | namespace WixToolset.Netfx | 3 | namespace WixToolset.Netfx |
| 4 | { | 4 | { |
| 5 | using System.Collections.Generic; | 5 | using System.Collections.Generic; |
| 6 | using WixToolset.Data; | ||
| 7 | using WixToolset.Data.WindowsInstaller; | 6 | using WixToolset.Data.WindowsInstaller; |
| 8 | using WixToolset.Extensibility; | 7 | using WixToolset.Extensibility; |
| 9 | 8 | ||
| @@ -26,11 +25,5 @@ namespace WixToolset.Netfx | |||
| 26 | }; | 25 | }; |
| 27 | 26 | ||
| 28 | public override IEnumerable<TableDefinition> TableDefinitions { get => Tables; } | 27 | public override IEnumerable<TableDefinition> TableDefinitions { get => Tables; } |
| 29 | |||
| 30 | public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) | ||
| 31 | { | ||
| 32 | var columnZeroIsId = tuple.Id != null; | ||
| 33 | return this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitions, columnZeroIsId); | ||
| 34 | } | ||
| 35 | } | 28 | } |
| 36 | } | 29 | } |
diff --git a/src/wixlib/netfx.wixproj b/src/wixlib/netfx.wixproj index 71a6488e..aefce69b 100644 --- a/src/wixlib/netfx.wixproj +++ b/src/wixlib/netfx.wixproj | |||
| @@ -1,7 +1,7 @@ | |||
| 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" InitialTargets="EnsureWixToolsetInstalled" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="15.0"> | 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-0073\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0073\build\WixToolset.MSBuild.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props')" /> |
| 5 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
| 6 | <PropertyGroup> | 6 | <PropertyGroup> |
| 7 | <ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid> | 7 | <ProjectGuid>{45e4a6ac-3190-4e17-83f0-9935ffa5dc2b}</ProjectGuid> |
| @@ -45,9 +45,9 @@ | |||
| 45 | <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> | 45 | <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> |
| 46 | </PropertyGroup> | 46 | </PropertyGroup> |
| 47 | <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'))" /> | 47 | <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'))" /> |
| 48 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0073\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0073\build\WixToolset.MSBuild.props'))" /> | 48 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0082\build\WixToolset.MSBuild.props'))" /> |
| 49 | <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.22\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.22\build\WixToolset.Util.wixext.targets'))" /> | 49 | <Error Condition="!Exists('..\..\packages\WixToolset.Util.wixext.4.0.27\build\WixToolset.Util.wixext.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.Util.wixext.4.0.27\build\WixToolset.Util.wixext.targets'))" /> |
| 50 | </Target> | 50 | </Target> |
| 51 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 51 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> |
| 52 | <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.22\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.22\build\WixToolset.Util.wixext.targets')" /> | 52 | <Import Project="..\..\packages\WixToolset.Util.wixext.4.0.27\build\WixToolset.Util.wixext.targets" Condition="Exists('..\..\packages\WixToolset.Util.wixext.4.0.27\build\WixToolset.Util.wixext.targets')" /> |
| 53 | </Project> \ No newline at end of file | 53 | </Project> \ No newline at end of file |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 01c05df7..a543c00f 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/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="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> |
| 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0073" developmentDependency="true" targetFramework="net40" /> | 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0082" developmentDependency="true" targetFramework="net40" /> |
| 5 | <package id="WixToolset.Util.wixext" version="4.0.22" targetFramework="net40" /> | 5 | <package id="WixToolset.Util.wixext" version="4.0.27" targetFramework="net40" /> |
| 6 | </packages> \ No newline at end of file | 6 | </packages> \ No newline at end of file |