diff options
| author | Sean Hall <r.sean.hall@gmail.com> | 2020-04-06 10:10:28 +1000 |
|---|---|---|
| committer | Sean Hall <r.sean.hall@gmail.com> | 2020-04-06 14:23:09 +1000 |
| commit | 89815d0f075f86bac29db6fab15e5c27291fbfc5 (patch) | |
| tree | 6c6abce6b2c5e8a4116cc132b1799976bf3b2d4b /src | |
| parent | d5b89ecb2ba931cd5429e00a78b9457f8a63c6d2 (diff) | |
| download | wix-89815d0f075f86bac29db6fab15e5c27291fbfc5.tar.gz wix-89815d0f075f86bac29db6fab15e5c27291fbfc5.tar.bz2 wix-89815d0f075f86bac29db6fab15e5c27291fbfc5.zip | |
Update dependencies.
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | 13 | ||||
| -rw-r--r-- | src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | 4 | ||||
| -rw-r--r-- | src/wixlib/bal.wixproj | 4 | ||||
| -rw-r--r-- | src/wixlib/packages.config | 2 |
4 files changed, 10 insertions, 13 deletions
diff --git a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj index 4523346c..84a38e56 100644 --- a/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj +++ b/src/test/WixToolsetTest.Bal/WixToolsetTest.Bal.csproj | |||
| @@ -21,10 +21,10 @@ | |||
| 21 | 21 | ||
| 22 | <ItemGroup> | 22 | <ItemGroup> |
| 23 | <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" /> | 23 | <PackageReference Include="runtime.win.WixToolset.Burn" Version="4.0.*" /> |
| 24 | <PackageReference Include="WixToolset.Core" Version="4.0.*" PrivateAssets="all" /> | 24 | <PackageReference Include="WixToolset.Core" Version="4.0.*" /> |
| 25 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" PrivateAssets="all" /> | 25 | <PackageReference Include="WixToolset.Core.Burn" Version="4.0.*" /> |
| 26 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" PrivateAssets="all" /> | 26 | <PackageReference Include="WixToolset.Core.WindowsInstaller" Version="4.0.*" /> |
| 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" PrivateAssets="all" /> | 27 | <PackageReference Include="WixToolset.Core.TestPackage" Version="4.0.*" /> |
| 28 | </ItemGroup> | 28 | </ItemGroup> |
| 29 | 29 | ||
| 30 | <ItemGroup> | 30 | <ItemGroup> |
| @@ -34,9 +34,6 @@ | |||
| 34 | <ItemGroup> | 34 | <ItemGroup> |
| 35 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> | 35 | <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" /> |
| 36 | <PackageReference Include="xunit" Version="2.4.1" /> | 36 | <PackageReference Include="xunit" Version="2.4.1" /> |
| 37 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1"> | 37 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> |
| 38 | <PrivateAssets>all</PrivateAssets> | ||
| 39 | <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets> | ||
| 40 | </PackageReference> | ||
| 41 | </ItemGroup> | 38 | </ItemGroup> |
| 42 | </Project> | 39 | </Project> |
diff --git a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj index cb1d1c78..02b0b109 100644 --- a/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj +++ b/src/test/WixToolsetTest.ManagedHost/WixToolsetTest.ManagedHost.csproj | |||
| @@ -3,7 +3,7 @@ | |||
| 3 | 3 | ||
| 4 | <Project Sdk="Microsoft.NET.Sdk"> | 4 | <Project Sdk="Microsoft.NET.Sdk"> |
| 5 | <PropertyGroup> | 5 | <PropertyGroup> |
| 6 | <TargetFramework>netcoreapp2.1</TargetFramework> | 6 | <TargetFramework>netcoreapp3.1</TargetFramework> |
| 7 | <IsPackable>false</IsPackable> | 7 | <IsPackable>false</IsPackable> |
| 8 | </PropertyGroup> | 8 | </PropertyGroup> |
| 9 | 9 | ||
| @@ -24,7 +24,7 @@ | |||
| 24 | </ItemGroup> | 24 | </ItemGroup> |
| 25 | 25 | ||
| 26 | <ItemGroup> | 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" /> | 28 | <PackageReference Include="xunit" Version="2.4.1" /> |
| 29 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> | 29 | <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1" PrivateAssets="All" /> |
| 30 | </ItemGroup> | 30 | </ItemGroup> |
diff --git a/src/wixlib/bal.wixproj b/src/wixlib/bal.wixproj index 8594c9e7..2e6217cc 100644 --- a/src/wixlib/bal.wixproj +++ b/src/wixlib/bal.wixproj | |||
| @@ -1,7 +1,7 @@ | |||
| 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. --> | 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"> | 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" /> | 5 | <Import Project="..\FindLocalWix.props" /> |
| 6 | <PropertyGroup> | 6 | <PropertyGroup> |
| 7 | <ProjectGuid>{3444D952-F21C-496F-AB6B-56435BFD0787}</ProjectGuid> | 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> | 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> | 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'))" /> | 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> | 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')" /> | 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> | 65 | </Project> |
diff --git a/src/wixlib/packages.config b/src/wixlib/packages.config index 25b4e6a9..d73f4d3a 100644 --- a/src/wixlib/packages.config +++ b/src/wixlib/packages.config | |||
| @@ -1,5 +1,5 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | 1 | <?xml version="1.0" encoding="utf-8"?> |
| 2 | <packages> | 2 | <packages> |
| 3 | <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" /> | 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 | 5 | </packages> \ No newline at end of file |
