Update dependencies.
Sean Hall committed
Apr 9, 2020 at 08:41 UTC
608f2f6fd9728a630ee5793bb7f24d5b6efeb5d1
9 files changed
+30
-20
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/fwca.vcxproj
+12
-2
@@ -1,8 +1,10 @@
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. -->
3
+
4
<Project DefaultTargets="Build" ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
4
- <Import Project="..\..\packages\WixToolset.WcaUtil.4.0.8\build\WixToolset.WcaUtil.props" Condition="Exists('..\..\packages\WixToolset.WcaUtil.4.0.8\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">
10
<Configuration>Debug</Configuration>
@@ -13,6 +15,7 @@
15
<Platform>Win32</Platform>
16
</ProjectConfiguration>
17
</ItemGroup>
18
+
19
<PropertyGroup Label="Globals">
20
<ProjectGuid>{F72D34CA-48DA-4DFD-91A9-A0C78BEF6981}</ProjectGuid>
21
<ConfigurationType>DynamicLibrary</ConfigurationType>
@@ -22,27 +25,34 @@
25
<ProjectModuleDefinitionFile>fwca.def</ProjectModuleDefinitionFile>
26
<Description>WiX Toolset Firewall CustomAction</Description>
27
</PropertyGroup>
28
+
29
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
30
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.props" />
31
+
32
<PropertyGroup>
33
<ProjectAdditionalLinkLibraries>msi.lib</ProjectAdditionalLinkLibraries>
34
</PropertyGroup>
35
+
36
<ItemGroup>
37
<ClCompile Include="dllmain.cpp">
38
<PrecompiledHeader>Create</PrecompiledHeader>
39
</ClCompile>
40
<ClCompile Include="firewall.cpp" />
41
</ItemGroup>
42
+
43
<ItemGroup>
44
<ClInclude Include="cost.h" />
45
<ClInclude Include="CustomMsiErrors.h" />
46
<ClInclude Include="precomp.h" />
47
</ItemGroup>
48
+
49
<ItemGroup>
50
<None Include="fwca.def" />
51
<None Include="packages.config" />
52
</ItemGroup>
53
+
54
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
55
+
56
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
57
<PropertyGroup>
58
<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>
@@ -50,4 +60,4 @@
60
<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'))" />
61
<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'))" />
62
</Target>
53
-</Project>
\ No newline at end of file
63
+</Project>
src/test/WixToolsetTest.Firewall/WixToolsetTest.Firewall.csproj
+7
-10
@@ -1,9 +1,9 @@
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. -->
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,10 +23,10 @@
23
</ItemGroup>
24
25
<ItemGroup>
26
- <PackageReference Include="WixToolset.Core" Version="4.0.*" PrivateAssets="all" />
27
- <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" PrivateAssets="all" />
28
- <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" PrivateAssets="all" />
29
- <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>
@@ -36,9 +36,6 @@
36
<ItemGroup>
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">
40
- <PrivateAssets>all</PrivateAssets>
41
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
42
- </PackageReference>
39
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
40
</ItemGroup>
41
</Project>
src/wixext/FirewallWindowsInstallerBackendExtension.cs
+2
-1
@@ -2,6 +2,7 @@
2
3
namespace WixToolset.Firewall
4
{
5
+ using System.Collections.Generic;
6
using System.Linq;
7
using System.Xml;
8
using WixToolset.Data;
@@ -12,7 +13,7 @@ namespace WixToolset.Firewall
13
{
14
private static readonly TableDefinition[] Tables = LoadTables();
15
15
- protected override TableDefinition[] TableDefinitionsForTuples => Tables;
16
+ public override IEnumerable<TableDefinition> TableDefinitions => Tables;
17
18
public override bool TryAddTupleToOutput(IntermediateTuple tuple, WindowsInstallerData output) => this.BackendHelper.TryAddTupleToOutputMatchingTableDefinitions(tuple, output, this.TableDefinitionsForTuples, true);
19
src/wixlib/firewall.wixproj
+2
-2
@@ -1,7 +1,7 @@
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. -->
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-0051\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\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>{1acffefd-505a-41a5-acbf-a02b7b473aa2}</ProjectGuid>
@@ -38,7 +38,7 @@
38
<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>
39
</PropertyGroup>
40
<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'))" />
41
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0051\build\WixToolset.MSBuild.props'))" />
41
+ <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'))" />
42
</Target>
43
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
44
</Project>
\ No newline at end of file
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-0051" 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