70be1d50 · joebigelow/wix · siGit Code & Deploy

appveyor.yml

+1 -1

@@ -8,7 +8,7 @@ branches:

8 - master

9 - develop

10

11 -image: Visual Studio 2017

11 +image: Visual Studio 2019

12

13 version: 0.0.0.{build}

14 configuration: Release

src/Cpp.Build.props

+1 -1

@@ -10,7 +10,7 @@

10 <OutDir>$(OutputPath)$(NormalizedPlatform)\</OutDir>

11 </PropertyGroup>

12

13 - <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'=='15.0'">

13 + <PropertyGroup Condition="'$(WindowsTargetPlatformVersion)'=='' AND '$(VisualStudioVersion)'>='15.0'">

14 <WindowsTargetPlatformVersion>$([Microsoft.Build.Utilities.ToolLocationHelper]::GetLatestSDKTargetPlatformVersion('Windows', '10.0'))</WindowsTargetPlatformVersion>

15 </PropertyGroup>

16

src/FindLocalWix.props

+1 -1

@@ -3,6 +3,6 @@

3

4 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

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>

8 </Project>

src/ca/complusca.vcxproj

+4 -4

@@ -2,8 +2,8 @@

3

4 <Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

5 - <Import Project="..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" />

6 - <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" />

5 + <Import Project="..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" />

6 + <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" />

7

8 <ItemGroup Label="ProjectConfigurations">

9 <ProjectConfiguration Include="Debug|Win32">

@@ -93,7 +93,7 @@

93 <PropertyGroup>

94 <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>

95 </PropertyGroup>

96 - <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.16\build\WixToolset.DUtil.props'))" />

97 - <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.2\build\WixToolset.WcaUtil.props'))" />

96 + <Error Condition="!Exists('..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.DUtil.4.0.18\build\WixToolset.DUtil.props'))" />

97 + <Error Condition="!Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props'))" />

98 </Target>

99 </Project>

src/ca/packages.config

+2 -2

@@ -1,5 +1,5 @@

1 <?xml version="1.0" encoding="utf-8"?>

2 <packages>

3 - <package id="WixToolset.DUtil" version="4.0.16" targetFramework="native" />

4 - <package id="WixToolset.WcaUtil" version="4.0.2" targetFramework="native" />

3 + <package id="WixToolset.DUtil" version="4.0.18" targetFramework="native" />

4 + <package id="WixToolset.WcaUtil" version="4.0.8" targetFramework="native" />

5 </packages>

\ No newline at end of file

src/test/WixToolsetTest.ComPlus/WixToolsetTest.ComPlus.csproj

+9 -6

@@ -1,9 +1,9 @@

1 -<?xml version="1.0" encoding="utf-8"?>

1 +<?xml version="1.0" encoding="utf-8"?>

3

4 <Project Sdk="Microsoft.NET.Sdk">

5 <PropertyGroup>

6 - <TargetFramework>netcoreapp2.1</TargetFramework>

6 + <TargetFramework>netcoreapp3.1</TargetFramework>

7 <IsPackable>false</IsPackable>

8 </PropertyGroup>

9

@@ -23,7 +23,10 @@

23 </ItemGroup>

24

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.*" />

30 </ItemGroup>

31

32 <ItemGroup>

@@ -31,8 +34,8 @@

34 </ItemGroup>

35

36 <ItemGroup>

34 - <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.8.0" />

35 - <PackageReference Include="xunit" Version="2.4.0" />

36 - <PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />

37 + <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />

38 + <PackageReference Include="xunit" Version="2.4.1" />

39 + <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />

40 </ItemGroup>

41 </Project>

src/wixext/ComPlusWindowsInstallerBackendBinderExtension.cs

+2 -1

@@ -2,6 +2,7 @@

2

3 namespace WixToolset.ComPlus

4 {

5 + using System.Collections.Generic;

6 using System.Linq;

7 using System.Xml;

8 using WixToolset.Data.WindowsInstaller;

@@ -11,7 +12,7 @@ namespace WixToolset.ComPlus

12 {

13 private static readonly TableDefinition[] Tables = LoadTables();

14

14 - protected override TableDefinition[] TableDefinitionsForTuples => Tables;

15 + public override IEnumerable<TableDefinition> TableDefinitions => Tables;

16

17 private static TableDefinition[] LoadTables()

18 {

src/wixlib/complus.wixproj

+2 -2

@@ -1,7 +1,7 @@

1 <?xml version="1.0" encoding="utf-8" ?>

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-0042\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0042\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" />

6 <PropertyGroup>

7 <ProjectGuid>{E191E61E-E098-4F71-888F-51A79F952022}</ProjectGuid>

@@ -30,7 +30,7 @@

30 <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>

31 </PropertyGroup>

32 <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'))" />

33 - <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0042\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0042\build\WixToolset.MSBuild.props'))" />

33 + <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'))" />

34 </Target>

35 <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />

36 </Project>

src/wixlib/packages.config

+1 -1

@@ -1,5 +1,5 @@

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-0042" 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

Update dependencies.