diff --git a/RZ.Cache/RZCache/RZCache.csproj b/RZ.Cache/RZCache/RZCache.csproj index dcb43b1..e52f09f 100644 --- a/RZ.Cache/RZCache/RZCache.csproj +++ b/RZ.Cache/RZCache/RZCache.csproj @@ -3,8 +3,8 @@ netcoreapp2.0 ..\docker-compose.dcproj - 1.0.3.1 - 1.0.3.2 + 1.0.4.0 + 1.0.4.0 Roger Zander Zander Tools RZWCF Proxy Service @@ -14,17 +14,17 @@ https://github.com/rzander/ruckzuck/blob/master/LICENSE.md software package manager windows cache proxy 3d943e5a-c0e9-40f0-b91e-9ab682223099 - 1.0.3 + 1.0.4 false RZWCF.Program Exe - - - - + + + + diff --git a/RZUpdate/RZUpdate.cs b/RZUpdate/RZUpdate.cs index d4987c1..5d91972 100644 --- 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) /// public static PSDataCollection _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 index 375d3be..a73588c 100644 --- 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) /// public static PSDataCollection _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;