Merge pull request #4781 from ojrb/issue1694

Update .NET Framework PreReq for new Windows versions
This commit is contained in:
Daniel Simpson 2019-09-05 06:36:17 -07:00 committed by GitHub
commit f2232011bb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -260,8 +260,9 @@ The following table lists the installation prerequisites for the MBAM Administra
<td align="left"><p>Windows Server Features</p></td>
<td align="left"><p><strong>.NET Framework 4.5 features:</strong></p>
<ul>
<li><p><strong>.NET Framework 4.5</strong></p>
<li><p><strong>.NET Framework 4.5 or 4.6</strong></p>
<ul>
<li><p><strong>Windows Server 2016</strong> - .NET Framework 4.6 is already installed for these versions of Windows Server, but you must enable it.</p></li>
<li><p><strong>Windows Server 2012 or Windows Server 2012 R2</strong> - .NET Framework 4.5 is already installed for these versions of Windows Server, but you must enable it.</p></li>
<li><p><strong>Windows Server 2008 R2</strong> - .NET Framework 4.5 is not included with Windows Server 2008 R2, so you must <a href="https://go.microsoft.com/fwlink/?LinkId=392318" data-raw-source="[download Microsoft .NET Framework 4.5](https://go.microsoft.com/fwlink/?LinkId=392318)">download Microsoft .NET Framework 4.5</a> and install it separately.</p>
<div class="alert">
@ -274,7 +275,7 @@ The following table lists the installation prerequisites for the MBAM Administra
<li><p><strong>WCF Activation</strong></p>
<ul>
<li><p>HTTP Activation</p></li>
<li><p>Non-HTTP Activation</p>
<li><p>Non-HTTP Activation (Only for Windows Server 2008, 2012, and 2012 R2)</p>
<p></p></li>
</ul></li>
<li><p><strong>TCP Activation</strong></p></li>