diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-08 14:06:02 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-08 14:27:11 +1000 |
| commit | 7132f1882ebcfeb0113730bd722fa3587bc5e5f4 (patch) | |
| tree | d75590c6795e35423b37e180261b11e7003504a2 | |
| parent | 704139b787d2016e43b6a87dbfc41555dac8326a (diff) | |
| download | wix-7132f1882ebcfeb0113730bd722fa3587bc5e5f4.tar.gz wix-7132f1882ebcfeb0113730bd722fa3587bc5e5f4.tar.bz2 wix-7132f1882ebcfeb0113730bd722fa3587bc5e5f4.zip | |
Update dependencies.
| -rw-r--r-- | appveyor.yml | 2 | ||||
| -rw-r--r-- | src/FindLocalWix.props | 2 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj | 13 | ||||
| -rw-r--r-- | src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs | 3 | ||||
| -rw-r--r-- | src/wixlib/difxapp.wixproj | 4 | ||||
| -rw-r--r-- | src/wixlib/packages.config | 2 |
6 files changed, 15 insertions, 11 deletions
diff --git a/appveyor.yml b/appveyor.yml index 8d80c6af..522e5af3 100644 --- a/appveyor.yml +++ b/appveyor.yml | |||
| @@ -8,7 +8,7 @@ branches: | |||
| 8 | - master | 8 | - master |
| 9 | - develop | 9 | - develop |
| 10 | 10 | ||
| 11 | image: Visual Studio 2017 | 11 | image: Visual Studio 2019 |
| 12 | 12 | ||
| 13 | version: 0.0.0.{build} | 13 | version: 0.0.0.{build} |
| 14 | configuration: Release | 14 | configuration: Release |
diff --git a/src/FindLocalWix.props b/src/FindLocalWix.props index a784e352..1666e4fe 100644 --- a/src/FindLocalWix.props +++ b/src/FindLocalWix.props | |||
| @@ -3,6 +3,6 @@ | |||
| 3 | 3 | ||
| 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> | 4 | <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <WixTargetsPath Condition=" '$(Configuration)' == 'Debug' And Exists('$(MSBuildThisFileDirectory)..\..\Tools\README.md') ">$(MSBuildThisFileDirectory)..\..\Tools\build\Debug\net461\wix.targets</WixTargetsPath> | 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> | 7 | </PropertyGroup> |
| 8 | </Project> | 8 | </Project> |
diff --git a/src/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj b/src/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj index d2d0de50..e205d24a 100644 --- a/src/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj +++ b/src/test/WixToolsetTest.DifxApp/WixToolsetTest.DifxApp.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp2.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| @@ -23,7 +23,10 @@ | |||
| 23 | </ItemGroup> | 23 | </ItemGroup> |
| 24 | 24 | ||
| 25 | <ItemGroup> | 25 | <ItemGroup> |
| 26 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" PrivateAssets="all" /> | 26 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 27 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> | ||
| 28 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> | ||
| 29 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> | ||
| 27 | </ItemGroup> | 30 | </ItemGroup> |
| 28 | 31 | ||
| 29 | <ItemGroup> | 32 | <ItemGroup> |
| @@ -31,8 +34,8 @@ | |||
| 31 | </ItemGroup> | 34 | </ItemGroup> |
| 32 | 35 | ||
| 33 | <ItemGroup> | 36 | <ItemGroup> |
| 34 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" /> | 37 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> |
| 35 | <PackageReference Include="xunit" Version="2.4.0" /> | 38 | <PackageReference Include="xunit" Version="2.4.1" /> |
| 36 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" /> | 39 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> |
| 37 | </ItemGroup> | 40 | </ItemGroup> |
| 38 | </Project> | 41 | </Project> |
diff --git a/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs b/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs index 4d81c134..c87a661b 100644 --- a/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs +++ b/src/wixext/DifxAppWindowsInstallerBackendBinderExtension.cs | |||
| @@ -2,6 +2,7 @@ | |||
| 2 | 2 | ||
| 3 | namespace WixToolset.DifxApp | 3 | namespace WixToolset.DifxApp |
| 4 | { | 4 | { |
| 5 | using System.Collections.Generic; | ||
| 5 | using System.Linq; | 6 | using System.Linq; |
| 6 | using System.Xml; | 7 | using System.Xml; |
| 7 | using WixToolset.Data.WindowsInstaller; | 8 | using WixToolset.Data.WindowsInstaller; |
| @@ -11,7 +12,7 @@ namespace WixToolset.DifxApp | |||
| 11 | { | 12 | { |
| 12 | private static readonly TableDefinition[] Tables = LoadTables(); | 13 | private static readonly TableDefinition[] Tables = LoadTables(); |
| 13 | 14 | ||
| 14 | protected override TableDefinition[] TableDefinitionsForTuples => Tables; | 15 | public override IEnumerable<TableDefinition> TableDefinitions => Tables; |
| 15 | 16 | ||
| 16 | private static TableDefinition[] LoadTables() | 17 | private static TableDefinition[] LoadTables() |
| 17 | { | 18 | { |
diff --git a/src/wixlib/difxapp.wixproj b/src/wixlib/difxapp.wixproj index 9b414afd..a7f60ea5 100644 --- a/src/wixlib/difxapp.wixproj +++ b/src/wixlib/difxapp.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-0035\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" /> | 4 | <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props')" /> |
| 5 | <Import Project="..\FindLocalWix.props" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
| 6 | <PropertyGroup> | 6 | <PropertyGroup> |
| 7 | <ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid> | 7 | <ProjectGuid>{5066EB93-D8F7-4FAE-B687-024D7A81BD95}</ProjectGuid> |
| @@ -33,7 +33,7 @@ | |||
| 33 | <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> | 33 | <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> |
| 34 | </PropertyGroup> | 34 | </PropertyGroup> |
| 35 | <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'))" /> | 35 | <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'))" /> |
| 36 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0035\build\WixToolset.MSBuild.props'))" /> | 36 | <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0084\build\WixToolset.MSBuild.props'))" /> |
| 37 | </Target> | 37 | </Target> |
| 38 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | 38 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> |
| 39 | </Project> | 39 | </Project> |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 7964daed..e1b601f6 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
| @@ -1,5 +1,5 @@ | |||
| 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-0035" developmentDependency="true" targetFramework="net40" /> | 4 | <package id="WixToolset.MSBuild" version="4.0.0-build-0084" developmentDependency="true" targetFramework="net40" /> |
| 5 | </packages> \ No newline at end of file | 5 | </packages> \ No newline at end of file |