Update default installation timeout from 30 to 60 minutes

rzander · Oct 28, 2018 · d375959 · d375959
1 parent a3b2923
commit d375959
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 11 deletions.
diff --git a/RZ.Cache/RZCache/RZCache.csproj b/RZ.Cache/RZCache/RZCache.csproj
@@ -3,8 +3,8 @@
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
-    <FileVersion>1.0.3.1</FileVersion>
-    <AssemblyVersion>1.0.3.2</AssemblyVersion>
+    <FileVersion>1.0.4.0</FileVersion>
+    <AssemblyVersion>1.0.4.0</AssemblyVersion>
     <Authors>Roger Zander</Authors>
     <Company>Zander Tools</Company>
     <Product>RZWCF Proxy Service</Product>
@@ -14,17 +14,17 @@
     <PackageLicenseUrl>https://github.com/rzander/ruckzuck/blob/master/LICENSE.md</PackageLicenseUrl>
     <PackageTags>software package manager windows cache proxy</PackageTags>
     <UserSecretsId>3d943e5a-c0e9-40f0-b91e-9ab682223099</UserSecretsId>
-    <Version>1.0.3</Version>
+    <Version>1.0.4</Version>
     <SignAssembly>false</SignAssembly>
     <StartupObject>RZWCF.Program</StartupObject>
     <ApplicationIcon />
     <OutputType>Exe</OutputType>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.2" />
-    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.1" />
-    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.2" />
-    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.1" />
+    <PackageReference Include="Microsoft.AspNetCore" Version="2.1.4" />
+    <PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.1.3" />
+    <PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="2.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="2.1.2" />
     <PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.1.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/RZUpdate/RZUpdate.cs b/RZUpdate/RZUpdate.cs
@@ -971,7 +971,7 @@ private bool _Install(bool Force = false)
                         downloadTask.Installing = true;
                         ProgressDetails(this.downloadTask, EventArgs.Empty);
 
-                        var oResult = _RunPS(psPath + SW.PSPreInstall + ";" + SW.PSInstall + ";" + SW.PSPostInstall + ";$ExitCode", "", new TimeSpan(0,30,0));
+                        var oResult = _RunPS(psPath + SW.PSPreInstall + ";" + SW.PSInstall + ";" + SW.PSPostInstall + ";$ExitCode", "", new TimeSpan(0,60,0));
 
                         try
                         {
@@ -1631,7 +1631,7 @@ private bool _checkFileX509(string FilePath, string X509)
         /// <returns></returns>
         public static PSDataCollection<PSObject> _RunPS(string PSScript, string WorkingDir = "",TimeSpan? Timeout = null)
         {
-            TimeSpan timeout = new TimeSpan(0, 5, 0); //default timeout = 5min
+            TimeSpan timeout = new TimeSpan(0, 15, 0); //default timeout = 15min
 
             if (Timeout != null)
                 timeout = (TimeSpan)Timeout;

diff --git a/RuckZuck_Tool/RZUpdate.cs b/RuckZuck_Tool/RZUpdate.cs
@@ -971,7 +971,7 @@ private bool _Install(bool Force = false)
                         downloadTask.Installing = true;
                         ProgressDetails(this.downloadTask, EventArgs.Empty);
 
-                        var oResult = _RunPS(psPath + SW.PSPreInstall + ";" + SW.PSInstall + ";" + SW.PSPostInstall + ";$ExitCode", "", new TimeSpan(0, 30, 0));
+                        var oResult = _RunPS(psPath + SW.PSPreInstall + ";" + SW.PSInstall + ";" + SW.PSPostInstall + ";$ExitCode", "", new TimeSpan(0, 60, 0));
 
                         try
                         {
@@ -1631,7 +1631,7 @@ private bool _checkFileX509(string FilePath, string X509)
         /// <returns></returns>
         public static PSDataCollection<PSObject> _RunPS(string PSScript, string WorkingDir = "", TimeSpan? Timeout = null)
         {
-            TimeSpan timeout = new TimeSpan(0, 5, 0); //default timeout = 5min
+            TimeSpan timeout = new TimeSpan(0, 15, 0); //default timeout = 15min
 
             if (Timeout != null)
                 timeout = (TimeSpan)Timeout;