Do not assume foler name

Fixes #1665
Particular · Jun 5, 2019 · 74e317d · 74e317d
1 parent 273be1f
commit 74e317d
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 14 deletions.
diff --git a/src/ServiceControlInstaller.Engine/FileSystem/MonitoringZipInfo.cs b/src/ServiceControlInstaller.Engine/FileSystem/MonitoringZipInfo.cs
@@ -66,7 +66,6 @@ public void ValidateZip()
         public bool TryReadMonitoringReleaseDate(out DateTime releaseDate)
         {
             releaseDate = DateTime.MinValue;
-            var tempFile = Path.Combine(Path.GetTempPath(), $@"ServiceControl.Monitoring\{Constants.MonitoringExe}");
             try
             {
                 using (var zip = ZipFile.Read(FilePath))
@@ -77,18 +76,23 @@ public bool TryReadMonitoringReleaseDate(out DateTime releaseDate)
                         return false;
                     }
 
-                    entry.Extract(Path.GetTempPath(), ExtractExistingFileAction.OverwriteSilently);
-                    return ReleaseDateReader.TryReadReleaseDateAttribute(tempFile, out releaseDate);
+                    var tempPath = Path.GetTempPath();
+                    var tempFile = Path.Combine(tempPath, entry.FileName);
+                    try
+                    {
+                        entry.Extract(tempPath, ExtractExistingFileAction.OverwriteSilently);
+                        return ReleaseDateReader.TryReadReleaseDateAttribute(tempFile, out releaseDate);
+                    }
+                    finally
+                    {
+                        File.Delete(tempFile);
+                    }
                 }
             }
             catch
             {
                 return false;
             }
-            finally
-            {
-                File.Delete(tempFile);
-            }
         }
     }
 }
diff --git a/src/ServiceControlInstaller.Engine/FileSystem/ServiceControlZipInfo.cs b/src/ServiceControlInstaller.Engine/FileSystem/ServiceControlZipInfo.cs
@@ -62,7 +62,6 @@ public void ValidateZip()
         public bool TryReadServiceControlReleaseDate(out DateTime releaseDate)
         {
             releaseDate = DateTime.MinValue;
-            var tempFile = Path.Combine(Path.GetTempPath(), $@"ServiceControl\{Constants.ServiceControlExe}");
             try
             {
                 using (var zip = ZipFile.Read(FilePath))
@@ -73,18 +72,23 @@ public bool TryReadServiceControlReleaseDate(out DateTime releaseDate)
                         return false;
                     }
 
-                    entry.Extract(Path.GetTempPath(), ExtractExistingFileAction.OverwriteSilently);
-                    return ReleaseDateReader.TryReadReleaseDateAttribute(tempFile, out releaseDate);
+                    var tempPath = Path.GetTempPath();
+                    var tempFile = Path.Combine(tempPath, entry.FileName);
+                    try
+                    {
+                        entry.Extract(tempPath, ExtractExistingFileAction.OverwriteSilently);
+                        return ReleaseDateReader.TryReadReleaseDateAttribute(tempFile, out releaseDate);
+                    }
+                    finally
+                    {
+                        File.Delete(tempFile);
+                    }
                 }
             }
             catch
             {
                 return false;
             }
-            finally
-            {
-                File.Delete(tempFile);
-            }
         }
     }
 }