Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update wix toolset version #1695

Merged
merged 2 commits into from
Feb 29, 2024
Merged

Update wix toolset version #1695

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b8cb0df
Update wix toolset version
glopesdev Feb 29, 2024
cd4e9d7
Remove unused wix extension
glopesdev Feb 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 3 additions & 4 deletions Bonsai.Setup.Bootstrapper/Bonsai.Setup.Bootstrapper.wixproj
View file
Open in desktop
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.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
<Import Project="..\packages\wix.3.14.0\build\wix.props" Condition="Exists('..\packages\wix.3.14.0\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.1</OutputName>
<OutputName>Bonsai-2.8.2</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 All @@ -34,7 +34,6 @@
</PropertyGroup>
<ItemGroup>
<Compile Include="Bundle.wxs" />
<Compile Include="NetFx48.wxs" />
</ItemGroup>
<ItemGroup>
<WixExtension Include="WixUtilExtension">
Expand Down Expand Up @@ -74,8 +73,8 @@
<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.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
<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'))" />
</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
100 changes: 0 additions & 100 deletions Bonsai.Setup.Bootstrapper/NetFx48.wxs
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion Bonsai.Setup.Bootstrapper/packages.config
View file
Open in desktop
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.11.2" />
<package id="wix" version="3.14.0" />
</packages>
4 changes: 2 additions & 2 deletions Bonsai.Setup/Bonsai.Setup.wixproj
View file
Open in desktop
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.11.2\build\wix.props" Condition="Exists('..\packages\WiX.3.11.2\build\wix.props')" />
<Import Project="..\packages\wix.3.14.0\build\wix.props" Condition="Exists('..\packages\wix.3.14.0\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.11.2\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\WiX.3.11.2\build\wix.props'))" />
<Error Condition="!Exists('..\packages\wix.3.14.0\build\wix.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\wix.3.14.0\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
View file
Open in desktop
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.11.2" />
<package id="wix" version="3.14.0" />
</packages>
Loading