Update dependencies.
Sean Hall committed
Apr 6, 2020 at 10:10 UTC
89815d0f075f86bac29db6fab15e5c27291fbfc5
5 files changed
+11
-14
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/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj
+5
-8
@@ -21,10 +21,10 @@
21
22
<ItemGroup>
23
<PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" />
24
- <PackageReference Include="WixToolset.Core" Version="4.0.*" PrivateAssets="all" />
25
- <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" PrivateAssets="all" />
26
- <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" PrivateAssets="all" />
27
- <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" PrivateAssets="all" />
24
+ <PackageReference Include="WixToolset.Core" Version="4.0.*" />
25
+ <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" />
26
+ <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" />
27
+ <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" />
28
</ItemGroup>
29
30
<ItemGroup>
@@ -34,9 +34,6 @@
34
<ItemGroup>
35
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
36
<PackageReference Include="xunit" Version="2.4.1" />
37
- <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
38
- <PrivateAssets>all</PrivateAssets>
39
- <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
40
- </PackageReference>
37
+ <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
38
</ItemGroup>
39
</Project>
src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj
+2
-2
@@ -3,7 +3,7 @@
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
@@ -24,7 +24,7 @@
24
</ItemGroup>
25
26
<ItemGroup>
27
- <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.5.0" />
27
+ <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
28
<PackageReference Include="xunit" Version="2.4.1" />
29
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" />
30
</ItemGroup>
src/wixlib/bal.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-0080\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" />
4
+ <Import Project="..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props" Condition="Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" />
5
<Import Project="..\FindLocalWix.props" />
6
<PropertyGroup>
7
<ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid>
@@ -59,7 +59,7 @@
59
<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>
60
</PropertyGroup>
61
<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'))" />
62
- <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0080\build\WixToolset.MSBuild.props'))" />
62
+ <Error Condition="!Exists('..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\WixToolset.MSBuild.4.0.0-build-0083\build\WixToolset.MSBuild.props'))" />
63
</Target>
64
<Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
65
</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-0080" developmentDependency="true" targetFramework="net40" />
4
+ <package id="WixToolset.MSBuild" version="4.0.0-build-0083" developmentDependency="true" targetFramework="net40" />
5
</packages>
\ No newline at end of file