From 5029ac705f2d349bfa1cc44b7bea97bbd254f0c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Matthias=20Mail=C3=A4nder?= Date: Fri, 25 Dec 2015 09:04:17 +0100 Subject: [PATCH] Update to .NET 4.5 --- .travis.yml | 2 +- INSTALL.md | 2 +- OpenRA.Game/OpenRA.Game.csproj | 1 + OpenRA.GameMonitor/OpenRA.GameMonitor.csproj | 1 + OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj | 5 ++--- OpenRA.Mods.Common/OpenRA.Mods.Common.csproj | 2 +- OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj | 5 ++--- OpenRA.Mods.RA/OpenRA.Mods.RA.csproj | 1 + OpenRA.Mods.TS/OpenRA.Mods.TS.csproj | 1 + OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj | 1 + OpenRA.Server/OpenRA.Server.csproj | 5 ++--- OpenRA.Test/OpenRA.Test.csproj | 2 +- OpenRA.Utility/OpenRA.Utility.csproj | 5 ++--- packaging/linux/deb/DEBIAN/control | 2 +- packaging/windows/OpenRA.nsi | 6 +++--- 15 files changed, 21 insertions(+), 20 deletions(-) diff --git a/.travis.yml b/.travis.yml index dca6c0c488..9151869a83 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,7 +31,7 @@ env: # Run the NUnit tests script: - travis_retry make all-dependencies - - make all SDK="-sdk:4.0" + - make all SDK="-sdk:4.5" - make check - make check-scripts - make test diff --git a/INSTALL.md b/INSTALL.md index 57c8bc403e..b7f14a7349 100644 --- a/INSTALL.md +++ b/INSTALL.md @@ -7,7 +7,7 @@ Windows ======= * [Windows PowerShell >= 4.0](http://microsoft.com/powershell) -* [.NET Framework >= 4.0 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=17113) +* [.NET Framework >= 4.5 (Client Profile)](http://www.microsoft.com/en-us/download/details.aspx?id=30653) * [SDL 2](http://www.libsdl.org/download-2.0.php) (included) * [FreeType](http://gnuwin32.sourceforge.net/packages/freetype.htm) (included) * [zlib](http://gnuwin32.sourceforge.net/packages/zlib.htm) (included) diff --git a/OpenRA.Game/OpenRA.Game.csproj b/OpenRA.Game/OpenRA.Game.csproj index dd968f003f..09495ea5da 100644 --- a/OpenRA.Game/OpenRA.Game.csproj +++ b/OpenRA.Game/OpenRA.Game.csproj @@ -31,6 +31,7 @@ 1.0.0.%2a false true + v4.5 true diff --git a/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj b/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj index 82acbe5ad4..f2a1398538 100644 --- a/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj +++ b/OpenRA.GameMonitor/OpenRA.GameMonitor.csproj @@ -7,6 +7,7 @@ WinExe OpenRA OpenRA + v4.5 true diff --git a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj index 530bc27637..2586125256 100644 --- a/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj +++ b/OpenRA.Mods.Cnc/OpenRA.Mods.Cnc.csproj @@ -30,6 +30,7 @@ false false true + v4.5 true @@ -66,9 +67,7 @@ - - 4.0 - + ..\thirdparty\download\Eluant.dll diff --git a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj index 59de2a6e3f..0f83ca0cfc 100644 --- a/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj +++ b/OpenRA.Mods.Common/OpenRA.Mods.Common.csproj @@ -9,7 +9,7 @@ Properties OpenRA.Mods.Common OpenRA.Mods.Common - v4.0 + v4.5 512 diff --git a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj index 9ebea2e601..135b3d8f09 100644 --- a/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj +++ b/OpenRA.Mods.D2k/OpenRA.Mods.D2k.csproj @@ -30,6 +30,7 @@ false false true + v4.5 true @@ -67,9 +68,7 @@ - - 4.0 - + ..\thirdparty\download\Eluant.dll diff --git a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj index ab16686649..64a0b7e57d 100644 --- a/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj +++ b/OpenRA.Mods.RA/OpenRA.Mods.RA.csproj @@ -30,6 +30,7 @@ false false true + v4.5 true diff --git a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj index 21524eeea9..1b40518b05 100644 --- a/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj +++ b/OpenRA.Mods.TS/OpenRA.Mods.TS.csproj @@ -9,6 +9,7 @@ Library OpenRA.Mods.TS OpenRA.Mods.TS + v4.5 true diff --git a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj index b71de0ca90..2ed721caaa 100644 --- a/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj +++ b/OpenRA.Platforms.Default/OpenRA.Platforms.Default.csproj @@ -9,6 +9,7 @@ Library OpenRA.Platforms.Default OpenRA.Platforms.Default + v4.5 true diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj index 8a40e94b90..e1a0a50c7b 100644 --- a/OpenRA.Server/OpenRA.Server.csproj +++ b/OpenRA.Server/OpenRA.Server.csproj @@ -30,6 +30,7 @@ false false true + v4.5 true @@ -56,9 +57,7 @@ - - 4.0 - + diff --git a/OpenRA.Test/OpenRA.Test.csproj b/OpenRA.Test/OpenRA.Test.csproj index 3d43054cc6..3710a4db67 100644 --- a/OpenRA.Test/OpenRA.Test.csproj +++ b/OpenRA.Test/OpenRA.Test.csproj @@ -9,7 +9,7 @@ Properties OpenRA.Test OpenRA.Test - v4.0 + v4.5 512 diff --git a/OpenRA.Utility/OpenRA.Utility.csproj b/OpenRA.Utility/OpenRA.Utility.csproj index d380f222f5..34b8977c49 100644 --- a/OpenRA.Utility/OpenRA.Utility.csproj +++ b/OpenRA.Utility/OpenRA.Utility.csproj @@ -30,6 +30,7 @@ false false true + v4.5 true @@ -56,9 +57,7 @@ - - 4.0 - + diff --git a/packaging/linux/deb/DEBIAN/control b/packaging/linux/deb/DEBIAN/control index ab9cd2b4dd..cbf7cefd95 100644 --- a/packaging/linux/deb/DEBIAN/control +++ b/packaging/linux/deb/DEBIAN/control @@ -3,7 +3,7 @@ Version: {VERSION} Architecture: all Maintainer: Paul Chote Installed-Size: {SIZE} -Depends: libopenal1, mono-runtime (>= 2.10), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-data4.0-cil, libmono-system-numerics4.0-cil, libmono-system-runtime-serialization4.0-cil, libmono-system-xml-linq4.0-cil, libmono-i18n4.0-all, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity, libsdl2 | libsdl2-2.0-0, liblua5.1-0 +Depends: libopenal1, mono-runtime (>= 3.2), libmono-system-core4.0-cil, libmono-system-drawing4.0-cil, libmono-system-data4.0-cil, libmono-system-numerics4.0-cil, libmono-system-runtime-serialization4.0-cil, libmono-system-xml-linq4.0-cil, libmono-i18n4.0-all, libfreetype6, libc6, libasound2, libgl1-mesa-glx, libgl1-mesa-dri, xdg-utils, zenity, libsdl2 | libsdl2-2.0-0, liblua5.1-0 Section: games Priority: extra Homepage: http://www.openra.net/ diff --git a/packaging/windows/OpenRA.nsi b/packaging/windows/OpenRA.nsi index 0eaffbcdc7..bde0cffa28 100644 --- a/packaging/windows/OpenRA.nsi +++ b/packaging/windows/OpenRA.nsi @@ -148,14 +148,14 @@ Section "-DotNet" DotNet IfErrors error 0 IntCmp $0 1 done error done error: - MessageBox MB_YESNO ".NET Framework v4.0 or later is required to run OpenRA. $\n \ + MessageBox MB_YESNO ".NET Framework v4.5 or later is required to run OpenRA. $\n \ Do you wish for the installer to launch your web browser in order to download and install it?" \ IDYES download IDNO error2 download: - ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=17113" + ExecShell "open" "http://www.microsoft.com/en-us/download/details.aspx?id=30653" Goto done error2: - MessageBox MB_OK "Installation will continue, but be aware that OpenRA will not run unless .NET v4.0 \ + MessageBox MB_OK "Installation will continue, but be aware that OpenRA will not run unless .NET v4.5 \ or later is installed." done: SectionEnd