40d38600 · joebigelow/wix-1 · 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

@@ -8,7 +8,7 @@

8 <OutDir>$(OutputPath)$(Platform)\</OutDir>

9 </PropertyGroup>

10

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

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

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

13 </PropertyGroup>

14

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

@@ -55,7 +55,7 @@

55 <PropertyGroup>

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

57 </PropertyGroup>

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

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

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

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

60 </Target>

61 </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.Dependency/WixToolsetTest.Dependency.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/DependencyCompiler.cs

+8 -5

@@ -125,10 +125,10 @@ namespace WixToolset.Dependency

125 /// <param name="element">Element to process.</param>

126 /// <param name="context">Extra information about the context in which this element is being parsed.</param>

127 /// <returns>The component key path type if set.</returns>

128 - public override ComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)

128 + public override IComponentKeyPath ParsePossibleKeyPathElement(Intermediate intermediate, IntermediateSection section, XElement parentElement, XElement element, IDictionary<string, string> context)

129 {

130 SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(parentElement);

131 - ComponentKeyPath keyPath = null;

131 + IComponentKeyPath keyPath = null;

132

133 switch (parentElement.Name.LocalName)

134 {

@@ -223,10 +223,10 @@ namespace WixToolset.Dependency

223 /// <param name="keyPath">Explicit key path.</param>

224 /// <param name="parentId">The identifier of the parent component or package.</param>

225 /// <returns>The type of key path if set.</returns>

226 - private ComponentKeyPath ParseProvidesElement(Intermediate intermediate, IntermediateSection section, XElement node, PackageType packageType, string parentId)

226 + private IComponentKeyPath ParseProvidesElement(Intermediate intermediate, IntermediateSection section, XElement node, PackageType packageType, string parentId)

227 {

228 SourceLineNumber sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(node);

229 - ComponentKeyPath keyPath = null;

229 + IComponentKeyPath keyPath = null;

230 Identifier id = null;

231 string key = null;

232 string version = null;

@@ -387,7 +387,10 @@ namespace WixToolset.Dependency

387

388 // Use the Version registry value and use that as a potential key path.

389 Identifier idVersion = this.ParseHelper.CreateIdentifier("reg", id.Id, "Version");

390 - keyPath = new ComponentKeyPath() { Id = idVersion.Id, Explicit = false, Type = ComponentKeyPathType.Registry };

390 + keyPath = this.CreateComponentKeyPath();

391 + keyPath.Id = idVersion.Id;

392 + keyPath.Explicit = false;

393 + keyPath.Type = PossibleKeyPathType.Registry;

394

395 row = this.ParseHelper.CreateRow(section, sourceLineNumbers, "Registry", idVersion);

396 row.Set(1, -1);

src/wixext/DependencyWindowsInstallerBackendBinderExtension.cs

+2 -1

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

2

3 namespace WixToolset.Dependency

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.Dependency

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/dependency.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-0005\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0005\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>{58ED0EC8-73F8-4EE1-8664-A53486D38EC8}</ProjectGuid>

@@ -37,7 +37,7 @@

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

38 </PropertyGroup>

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

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

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

41 </Target>

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

43 </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-0005" 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.