6dd0c57a · joebigelow/wix · siGit Code & Deploy

appveyor.yml

+1 -1

@@ -3,7 +3,7 @@

3 # Do NOT modify this file. Update the canonical version in Home\repo-template\src\appveyor.yml

4 # then update all of the repos.

5

6 -image: Visual Studio 2017

6 +image: Visual Studio 2019

7

8 version: 0.0.0.{build}

9 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/Directory.Build.props

+3 -1

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

8 <PropertyGroup>

9 <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>

10 <EnableSourceLink Condition=" '$(NCrunch)' == '1' ">false</EnableSourceLink>

11 + <MSBuildWarningsAsMessages>MSB3246</MSBuildWarningsAsMessages>

12

13 <ProjectName Condition=" '$(ProjectName)' == '' ">$(MSBuildProjectName)</ProjectName>

14 <BaseOutputPath>$([System.IO.Path]::GetFullPath($(MSBuildThisFileDirectory)..\build\))</BaseOutputPath>

@@ -21,6 +22,7 @@

22 <Product>WiX Toolset</Product>

23 </PropertyGroup>

24

24 - <Import Project="Cpp.Build.props" Condition=" '$(MSBuildProjectExtension)'=='.vcxproj' " />

25 + <Import Project="Cpp.Build.props" Condition=" Exists('Cpp.Build.props') And '$(MSBuildProjectExtension)'=='.vcxproj' " />

26 + <Import Project="Wix.Build.props" Condition=" Exists('Wix.Build.props') And '$(MSBuildProjectExtension)'=='.wixproj' " />

27 <Import Project="Custom.Build.props" Condition=" Exists('Custom.Build.props') " />

28 </Project>

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/packages.config

+2 -2

@@ -1,6 +1,6 @@

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

2 <packages>

3 <package id="Microsoft.VisualStudio.Setup.Configuration.Native" version="1.14.114" targetFramework="native" developmentDependency="true" />

4 - <package id="WixToolset.DUtil" version="4.0.6" targetFramework="native" />

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

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

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

6 </packages>

\ No newline at end of file

src/ca/vsca.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.6\build\WixToolset.DUtil.props" Condition="Exists('..\..\packages\WixToolset.DUtil.4.0.6\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">

@@ -63,7 +63,7 @@

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

64 </PropertyGroup>

65 <Error Condition="!Exists('..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Microsoft.VisualStudio.Setup.Configuration.Native.1.14.114\build\native\Microsoft.VisualStudio.Setup.Configuration.Native.targets'))" />

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

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

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

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

68 </Target>

69 </Project>

src/test/WixToolsetTest.VisualStudio/WixToolsetTest.VisualStudio.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/VSCompiler.cs

+1

@@ -6,6 +6,7 @@ namespace WixToolset.VisualStudio

6 using System.Collections.Generic;

7 using System.Xml.Linq;

8 using WixToolset.Data;

9 + using WixToolset.Data.WindowsInstaller;

10 using WixToolset.Extensibility;

11

12 /// <summary>

src/wixext/VSWindowsInstallerBackendExtension.cs

+2 -1

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

2

3 namespace WixToolset.VisualStudio

4 {

5 + using System.Collections.Generic;

6 using WixToolset.Data.WindowsInstaller;

7 using WixToolset.Extensibility;

8

@@ -70,6 +71,6 @@ namespace WixToolset.VisualStudio

71 ),

72 };

73

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

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

75 }

76 }

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

src/wixlib/vs.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>{14345C9D-8AF8-435A-BB1B-E067CE7EB321}</ProjectGuid>

@@ -52,7 +52,7 @@

52 <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 </PropertyGroup>

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

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

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

56 </Target>

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

58 </Project>

\ No newline at end of file

Update Dependencies.