Skip to content

Commit

Permalink
Build for .NET 4.0 instead of 4.5
Browse files Browse the repository at this point in the history
  • Loading branch information
nirbar committed Jun 11, 2020
1 parent 5523ff3 commit c73ea2a
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 7 deletions.
11 changes: 6 additions & 5 deletions Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,13 @@
- Fix WiX issue [6144](https://github.com/wixtoolset/issues/issues/6144): Support multiple attached containers in bundles. Allow bootstrappers larger than 2GB
- Fix WiX issue [6174](https://github.com/wixtoolset/issues/issues/6174): Fix discovery of payloads with no container that need to be assigned to the default container
- Changes by WiX up to build 3.14.0.4118
- Build for .NET Framework 4.0

# WiX Toolset on GitHub
The WiX Toolset builds Windows installation packages from XML source code. The toolset supports a command-line environment that developers may integrate into their build processes to build Windows Installer (MSI) packages and executable bundles. The WiX GitHub project hosts the WiX source code Git repositories. The following links will take you to more details:

## [Home page](http://wixtoolset.org/ "WiX Toolset home page")
## [Releases](http://wixtoolset.org/releases/ "WiX Toolset stable and weekly releases")
## [Bugs and feature requests](http://wixtoolset.org/bugs/ "Files bugs and feature requests for WiX Toolset")
## [Manual](http://wixtoolset.org/documentation/manual/ "WiX Toolset manuals and documentation links")
## [Hacking on WiX](http://wixtoolset.org/development/ "About development on the WiX Toolset")
## [WiX Toolset home page](http://wixtoolset.org/)
## [WiX Toolset stable and weekly releases](http://wixtoolset.org/releases/)
## [Files bugs and feature requests for WiX Toolset](http://wixtoolset.org/bugs/)
## [WiX Toolset manuals and documentation links](http://wixtoolset.org/documentation/manual/)
## [About development on the WiX Toolset](http://wixtoolset.org/development/)
2 changes: 1 addition & 1 deletion tools/WixBuild.csproj.props
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<WarningLevel>4</WarningLevel>
<DefineConstants>$(DefineConstants);TRACE</DefineConstants>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)'=='' ">v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)'=='' ">v4.0</TargetFrameworkVersion>
</PropertyGroup>

<PropertyGroup Condition=" '$(CreateDocumentationFile)' == 'true' ">
Expand Down
2 changes: 1 addition & 1 deletion tools/WixBuild.vcxproj.props
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
<DisableSpecificCompilerWarnings>4564;4800</DisableSpecificCompilerWarnings>
<LinkDelaySign>$(DelaySign)</LinkDelaySign>
<LinkKeyFile>$(AssemblyOriginatorKeyFile)</LinkKeyFile>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)'=='' ">v4.5</TargetFrameworkVersion>
<TargetFrameworkVersion Condition=" '$(TargetFrameworkVersion)'=='' ">v4.0</TargetFrameworkVersion>
<PlatformToolset Condition="$(VS2015Available)">v140</PlatformToolset>
<PlatformToolset Condition="$(VS2017Available)">v141</PlatformToolset>
</PropertyGroup>
Expand Down

0 comments on commit c73ea2a

Please sign in to comment.