epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Reduce minimum .NET requirement to 4.6.1.

Browse Source 
4.7.2 causes compatibility issues with Mono 5.4
in the interim period before we migrate to netstandard2.
This commit is contained in:
Paul Chote
2019-04-27 15:47:42 +00:00
committed by reaperrr
parent a4bac42c7f
commit 761b5e094d
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
INSTALL.md
View File

@@ -8,7 +8,7 @@ Windows
Compiling OpenRA requires the following dependencies: Compiling OpenRA requires the following dependencies:
* [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions) * [Windows PowerShell >= 4.0](http://microsoft.com/powershell) (included by default in recent Windows 10 versions)
* [.NET Framework >= 4.7.2](https://dotnet.microsoft.com/download/dotnet-framework/net472) (included by default in recent Windows 10 versions) * [.NET Framework 4.6.1 (Developer Pack)](https://dotnet.microsoft.com/download/dotnet-framework/net461) (or via Visual Studio 2017)
Type `make dependencies` in a command terminal to download pre-compiled native libraries for: Type `make dependencies` in a command terminal to download pre-compiled native libraries for:
* [SDL 2](http://www.libsdl.org/download-2.0.php) * [SDL 2](http://www.libsdl.org/download-2.0.php)

4
packaging/windows/OpenRA.nsi
View File

@@ -181,9 +181,9 @@ Section "-DotNet" DotNet
; https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed ; https://docs.microsoft.com/en-us/dotnet/framework/migration-guide/how-to-determine-which-versions-are-installed
ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release" ReadRegDWORD $0 HKLM "SOFTWARE\Microsoft\NET Framework Setup\NDP\v4\Full" "Release"
IfErrors error 0 IfErrors error 0
IntCmp $0 461808 done error done IntCmp $0 394254 done error done
error: error:
MessageBox MB_OK ".NET Framework v4.7.2 or later is required to run OpenRA." MessageBox MB_OK ".NET Framework v4.6.1 or later is required to run OpenRA."
Abort Abort
done: done:
SectionEnd SectionEnd