From b2d092b5507f01813a2e9b73b889e73bf59ee2a7 Mon Sep 17 00:00:00 2001 From: Matthieu Penant Date: Thu, 9 May 2019 11:17:11 -0400 Subject: [PATCH] .NET 4.8 support --- src/Setup/FxHelper.cpp | 20 ++++++++++++++++++++ src/Setup/FxHelper.h | 2 +- src/Setup/Setup.rc | Bin 10040 -> 11122 bytes src/Setup/resource.h | Bin 1522 -> 3496 bytes 4 files changed, 21 insertions(+), 1 deletion(-) diff --git a/src/Setup/FxHelper.cpp b/src/Setup/FxHelper.cpp index 72e106e85..c9efc2be0 100644 --- a/src/Setup/FxHelper.cpp +++ b/src/Setup/FxHelper.cpp @@ -13,6 +13,7 @@ static const int fx462ReleaseVersion = 394802; // Minimum version for .NET 4.6.2 static const int fx47ReleaseVersion = 460798; // Minimum version for .NET 4.7 static const int fx471ReleaseVersion = 461308; // Minimum version for .NET 4.7.1 static const int fx472ReleaseVersion = 461808; // Minimum version for .NET 4.7.2 +static const int fx48ReleaseVersion = 528040; // Minimum version for .NET 4.8 // According to https://msdn.microsoft.com/en-us/library/8z6watww%28v=vs.110%29.aspx, // to install .NET 4.5 we must be Vista SP2+, Windows 7 SP1+, or later. @@ -34,6 +35,7 @@ NetVersion CFxHelper::GetRequiredDotNetVersion() if (resourceFlag.Compare(L"net47") == 0) return NetVersion::net47; if (resourceFlag.Compare(L"net471") == 0) return NetVersion::net471; if (resourceFlag.Compare(L"net472") == 0) return NetVersion::net472; + if (resourceFlag.Compare(L"net48") == 0) return NetVersion::net48; //Default to standard net45 return NetVersion::net45; @@ -75,6 +77,8 @@ UINT CFxHelper::GetDotNetVersionReleaseNumber(NetVersion version) return fx471ReleaseVersion; case NetVersion::net472: return fx472ReleaseVersion; + case NetVersion::net48: + return fx48ReleaseVersion; case NetVersion::net45: default: return fx45ReleaseVersion; @@ -281,6 +285,10 @@ HRESULT CFxHelper::InstallDotNetFramework(NetVersion version, bool isQuiet) UINT CFxHelper::GetInstallerMainInstructionForVersion(NetVersion version) { + if (version >= NetVersion::net48) { + return IDS_FXINSTRUCTION48; + } + if (version >= NetVersion::net47) { return IDS_FXINSTRUCTION47; } @@ -293,6 +301,10 @@ UINT CFxHelper::GetInstallerMainInstructionForVersion(NetVersion version) UINT CFxHelper::GetInstallerContentForVersion(NetVersion version) { + if (version >= NetVersion::net48) { + return IDS_FXCONTENT48; + } + if (version >= NetVersion::net47) { return IDS_FXCONTENT47; } @@ -305,6 +317,10 @@ UINT CFxHelper::GetInstallerContentForVersion(NetVersion version) UINT CFxHelper::GetInstallerExpandedInfoForVersion(NetVersion version) { + if (version >= NetVersion::net48) { + return IDS_FXEXPANDEDINFO48; + } + if (version >= NetVersion::net47) { return IDS_FXEXPANDEDINFO47; } @@ -317,6 +333,10 @@ UINT CFxHelper::GetInstallerExpandedInfoForVersion(NetVersion version) UINT CFxHelper::GetInstallerUrlForVersion(NetVersion version) { + if (version >= NetVersion::net48) { + return IDS_FXDOWNLOADURL48; + } + if (version >= NetVersion::net47) { return IDS_FXDOWNLOADURL47; } diff --git a/src/Setup/FxHelper.h b/src/Setup/FxHelper.h index 91e15c715..183eacfde 100644 --- a/src/Setup/FxHelper.h +++ b/src/Setup/FxHelper.h @@ -1,6 +1,6 @@ #pragma once -enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6, net471=7, net472=8}; +enum class NetVersion {net45=0, net451=1, net452=2, net46=3, net461=4, net462=5, net47=6, net471=7, net472=8, net48=9}; class CFxHelper { diff --git a/src/Setup/Setup.rc b/src/Setup/Setup.rc index df779c78547643c2b25ffdc024316c865d2be281..911631d8c34006ea62f3f8bc3acea66df932f497 100644 GIT binary patch delta 106 zcmdnt_bF_{2j$7j0E_Pm9{>OV diff --git a/src/Setup/resource.h b/src/Setup/resource.h index b223f102b7966dc549b6da81b16afaf7e72e0b5c..ef1f5f9a81b9fd49d005925b18f160c1f1faa0e9 100644 GIT binary patch literal 3496 zcmbuCTW`}q5QXO%iT_}UM@s zc3qI=dUv({_GE6J{`uXIhWx}ek~6uIp7dpmdt^o4QYNGQIBq&kZCnH?2#ou(qwN%<*tNB3Z9SA+k?Bx&FGr>^`iaKAy8hWE6+% zMw#5H5g*hXt{a-2+sLv)<>83raNRhJXCJSildRVb=RqyIb;Z`sdUiW)C9!xr>l z3%6D`NM;T`?qmk|!gjsA0mkNs*o*d10km@U!YuJL4N`3=u|xt7lu&#`x7d}lji>%|rJTV4bY zjZK#^MQpGKwH@dTqxXoD-hD?^N{qQ~}ptN^yB zPZ38kwAa0=V{)I$44r^abvcx<>x)hF&!BdQ`Qt8A_iq)Mv6-5j<@b^~pm8G;>m5}0 r`np}@XU2+tI=}6_LY8(mvHqcl{akv3mDZ8@f6@*9hgm+HbU6PD92KA+ literal 1522 zcmai!U2mH(6o&6B^*>nJWu=CbWX*QzVP~=iHo}l4yRp*5OiU4(0_;Oo|N9I{ify_r zH^k=g%lUYHCX=TpE)<~&<%IH(QThCQdo!7!xZItN^|5Hss;t}X0fl#W=&P>uY1`;M zDy!Y0-D^~o2Yufk$ZNCx_!~*xwBPSfyKeLL=FMIgWu?(dsufKo6I?OA6v+RbpVZ&X_mhvbJ2R6zvj{L+1<#)ca z=}1O-b|tJQ1P&bjC+7EmQTF2PJ^&E-FkL6un3aru1mM`HtA-7`@&KMUmg|c{U9L|P zVC0P}ys+wU{tGbjh7*Q!0$}8gOP%KqcL~GshTm@Y0D#kO&(EGZfYZTL#n{w0#qp~* zW$M9sLU2aa7nY2Qfneq|B{fZX83oG-yLT35rYZe6;rdsD%<$N@hX(!F9$H?$4cRh(sia%Dn*`#RIPB7ztjn4Rzn9k6me{9>#}GzT`XSJ?mUo+$ipEBtm`m{ Tn|!D*eZ4!n+LwjN^z!@z%a3Y&