Doc: Raise required .NET framework version

This raises the required .NET framework version in the installation
documentation. This also adds notes in the upgrading documentation
for the new .NET Framework requirements.

Update .NET requirements for development on Windows.

refs #7090

diff --git a/doc/06-distributed-monitoring.md b/doc/06-distributed-monitoring.md
index 00a91157b7c82dbc44f3b1e42e971fff353f585d..7420345dc72c000a92c8476e7fd5831632dd03ab 100644 (file)
--- a/doc/06-distributed-monitoring.md
+++ b/doc/06-distributed-monitoring.md
@@ -697,7 +697,7 @@ Requirements:
 
 * Windows Vista/Server 2008 or higher
 * Versions older than Windows 10/Server 2016 require the [Universal C Runtime for Windows](https://support.microsoft.com/en-us/help/2999226/update-for-universal-c-runtime-in-windows)
-* [Microsoft .NET Framework 2.0](https://www.microsoft.com/de-de/download/details.aspx?id=1639) for the setup wizard
+* [Microsoft .NET Framework 4.6] or higher (https://www.microsoft.com/en-US/download/details.aspx?id=53344) for the setup wizard
 
 The installer package includes the [NSClient++](https://www.nsclient.org/) package
 so that Icinga 2 can use its built-in plugins. You can find more details in

diff --git a/doc/16-upgrading-icinga-2.md b/doc/16-upgrading-icinga-2.md
index 665f41b232757057fb0bddb997a158a4d56851b6..b309e6932f274527775243585e9f55ffe7626852 100644 (file)
--- a/doc/16-upgrading-icinga-2.md
+++ b/doc/16-upgrading-icinga-2.md
@@ -36,6 +36,13 @@ we provide Boost as package on our [package repository](https://packages.icinga.
 After upgrade, you may remove the old Boost packages (1.53 or anything above)
 if you don't need them anymore.
 
+#### Added: .NET Framework 4.6
+
+We modernized the graphical Windows wizard to use the more recent .NET Framework 4.6. This requires that Windows versions
+older than Windows 10/Windows Server 2016 installs at least [.NET Framework 4.6](https://www.microsoft.com/en-US/download/details.aspx?id=53344). Starting with Windows 10/Windows Server 2016 a .NET Framework 4.6 or higher is installed by default.
+
+The MSI-Installer package checks if the .NET Framework 4.6 or higher is present, if not the installation wizard will abort with an error message telling you to install at least .NET Framework 4.6.
+
 #### Removed: YAJL
 
 Our JSON library, namely [YAJL](https://github.com/lloyd/yajl), isn't maintained anymore

diff --git a/doc/21-development.md b/doc/21-development.md
index 0053106b4441ad39378f0397ab3bfd9ccfdafe67..fe0da2ccd4e1ff45002e877fe1107a77741126c9 100644 (file)
--- a/doc/21-development.md
+++ b/doc/21-development.md
@@ -985,7 +985,7 @@ You need a free Microsoft account to download and also store your preferences.
 Choose these individual components on Visual Studio 2017:
 
 * .NET
-  * .NET Framework 3.5 development tools
+  * .NET Framework 4.6 targeting pack
   * .NET Framework 4.6.1 SDK
   * .NET Framework 4.6.1 targeting pack
 * Code tools
@@ -1010,20 +1010,8 @@ Choose these individual components on Visual Studio 2017:
 * Uncategorized
   * GitHub Extension for Visual Studio
 
-
 After a while, Visual Studio will be ready.
 
-#### .NET Framework 3.5
-
-Windows 10 has .NET Framework >= 4.6 installed by default. The Icinga Agent Wizard
-is built on .NET Framework 2.0 which is not included in .NET Framework 4.6.
-
-Windows 10 provides .NET Framework 3.5 which includes .NET Framework 2.0.
-
-Navigate into `Control Panel` -> `Programs` -> `Turn Windows features on or off`.
-Select `.NET Framework 3.5 (includes .NET 2.0 and 3.0)` and wait until the installation process
-is finished.
-
 #### Flex and Bison
 
 Install it using [chocolatey](https://www.wireshark.org/docs/wsdg_html_chunked/ChSetupWin32.html):