Skip to content

Commit

Permalink
Merge pull request #1808 from glopesdev/dependabot-10
Browse files Browse the repository at this point in the history
Update wix toolset version
  • Loading branch information
glopesdev authored May 20, 2024
2 parents f8bb239 + 1c8eec8 commit 07889c2
Show file tree
Hide file tree
Showing 4 changed files with 7 additions and 7 deletions.
6 changes: 3 additions & 3 deletions Bonsai.Setup.Bootstrapper/Bonsai.Setup.Bootstrapper.wixproj
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\wix.3.14.0\build\wix.props" Condition="Exists('..\packages\wix.3.14.0\build\wix.props')" />
<Import Project="..\packages\wix.3.14.1\build\wix.props" Condition="Exists('..\packages\wix.3.14.1\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
<ProductVersion>3.6</ProductVersion>
<ProjectGuid>{da1c1aa7-15f6-4787-b441-e75bcffe680b}</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Bonsai-2.8.2</OutputName>
<OutputName>Bonsai-2.8.3</OutputName>
<OutputType>Bundle</OutputType>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' AND '$(MSBuildExtensionsPath32)' != '' ">$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
<WixTargetsPath Condition=" '$(WixTargetsPath)' == '' ">$(MSBuildExtensionsPath)\Microsoft\WiX\v3.x\Wix.targets</WixTargetsPath>
Expand Down Expand Up @@ -74,7 +74,7 @@
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\vc143.wixproj.redist.0.1.0\build\vc143.wixproj.redist.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\vc143.wixproj.redist.0.1.0\build\vc143.wixproj.redist.targets'))" />
<Error Condition="!Exists('..\packages\wix.3.14.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.0\build\wix.props'))" />
<Error Condition="!Exists('..\packages\wix.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.1\build\wix.props'))" />
</Target>
<Import Project="..\packages\vc143.wixproj.redist.0.1.0\build\vc143.wixproj.redist.targets" Condition="Exists('..\packages\vc143.wixproj.redist.0.1.0\build\vc143.wixproj.redist.targets')" />
<!--
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Setup.Bootstrapper/packages.config
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="vc143.wixproj.redist" version="0.1.0" />
<package id="wix" version="3.14.0" />
<package id="wix" version="3.14.1" />
</packages>
4 changes: 2 additions & 2 deletions Bonsai.Setup/Bonsai.Setup.wixproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\packages\wix.3.14.0\build\wix.props" Condition="Exists('..\packages\wix.3.14.0\build\wix.props')" />
<Import Project="..\packages\wix.3.14.1\build\wix.props" Condition="Exists('..\packages\wix.3.14.1\build\wix.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
Expand Down Expand Up @@ -61,7 +61,7 @@
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\packages\wix.3.14.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.0\build\wix.props'))" />
<Error Condition="!Exists('..\packages\wix.3.14.1\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.1\build\wix.props'))" />
</Target>
<!--
To modify your build process, add your task inside one of the targets below and uncomment it.
Expand Down
2 changes: 1 addition & 1 deletion Bonsai.Setup/packages.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="wix" version="3.14.0" />
<package id="wix" version="3.14.1" />
</packages>

0 comments on commit 07889c2

Please sign in to comment.