Update manifest for the agent setup wizard.

Refs #4865

diff --git a/tools/icinga2-setup-agent/AgentWizard.cs b/tools/icinga2-setup-agent/AgentWizard.cs
index be3aa4bd33949757acddb4f4a6b017494dff9969..2da6fcd3644927f11eb4fe2150324b80546d88cd 100644 (file)
--- a/tools/icinga2-setup-agent/AgentWizard.cs
+++ b/tools/icinga2-setup-agent/AgentWizard.cs
@@ -297,7 +297,11 @@ namespace Icinga
                                MemoryStream ms = new MemoryStream(bytes);
                                GZipStream gz = new GZipStream(ms, CompressionMode.Decompress);
                                MemoryStream ms2 = new MemoryStream();
-                               gz.CopyTo(ms2);
+
+                               byte[] buffer = new byte[512];
+                               int rc;
+                               while ((rc = gz.Read(buffer, 0, buffer.Length)) > 0)
+                                       ms2.Write(buffer, 0, rc);
                                ms2.Position = 0;
                                TarReader tr = new TarReader(ms2);
                                tr.ReadToEnd(Icinga2InstallDir + "\\etc\\icinga2\\pki\\agent");

diff --git a/tools/icinga2-setup-agent/App.config b/tools/icinga2-setup-agent/App.config
index 8e15646352ec1d9a84bbc6504ef6b46e16bf7823..49c7a61c6c659d7844c6f938dd5390fc1b8076a7 100644 (file)
--- a/tools/icinga2-setup-agent/App.config
+++ b/tools/icinga2-setup-agent/App.config
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <configuration>
-    <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.5" />
+    <startup>
+       <supportedRuntime version="v2.0.50727" />
+        <supportedRuntime version="v4.0" />
     </startup>
 </configuration>
\ No newline at end of file

diff --git a/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj b/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
index c359e9167fb674cd02947a2eb8d3fad7de22bfd4..9e749508f5d49bfcb764c92acd112cd8bfce36c1 100644 (file)
--- a/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
+++ b/tools/icinga2-setup-agent/Icinga2SetupAgent.csproj
@@ -9,8 +9,24 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Icinga</RootNamespace>
     <AssemblyName>Icinga2SetupAgent</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
@@ -108,6 +124,23 @@
   <ItemGroup>
     <Content Include="icinga.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.5">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.5 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/tools/icinga2-setup-agent/Program.cs b/tools/icinga2-setup-agent/Program.cs
index cd5c205c9f164621ebe9bdef1dc6eb03d6e7ea15..ee30b986f6ae67beb62f52c13b2646d21ae08b51 100644 (file)
--- a/tools/icinga2-setup-agent/Program.cs
+++ b/tools/icinga2-setup-agent/Program.cs
@@ -1,7 +1,4 @@
 using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
 using System.Windows.Forms;
 
 namespace Icinga