maxconn

.semver.txt

@@ -1 +1 @@
-1.0.15
+1.0.17

src/MonsterMonitor/MonsterMonitor.csproj

@@ -5,11 +5,11 @@
     <UseWindowsForms>true</UseWindowsForms>
     <LangVersion>7.3</LangVersion>
     <RootNamespace>MonsterMonitor</RootNamespace>
-    <AssemblyName>MonsterMonitor</AssemblyName>
+    <AssemblyName>devenv</AssemblyName>
-    <AssemblyVersion>1.0.15</AssemblyVersion>
+    <AssemblyVersion>1.0.17</AssemblyVersion>
-    <Version>1.0.15</Version>
+    <Version>1.0.17</Version>
-    <FileVersion>1.0.15</FileVersion>
+    <FileVersion>1.0.17</FileVersion>
-    <InformationalVersion>1.0.15</InformationalVersion>
+    <InformationalVersion>1.0.17</InformationalVersion>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="Costura.Fody" Version="6.0.0">

src/MonsterMonitor/Services/GitHubUpdateService.cs

@@ -5,6 +5,7 @@ using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Net;
+using System.Reflection;
 using System.Runtime.Serialization;
 using System.Runtime.Serialization.Json;
 using System.Text;
@@ -66,8 +67,8 @@ namespace MonsterMonitor.Services
                     return;
                 }
 
-                var tempRoot = Path.Combine(Path.GetTempPath(), "MonsterMonitorUpdate");
+                var appDir = AppDomain.CurrentDomain.BaseDirectory;
-                var packageDir = Path.Combine(tempRoot, latestVersion.ToString());
+                var packageDir = Path.Combine(appDir, "update", latestVersion.ToString());
                 var packageZip = Path.Combine(packageDir, "update.zip");
                 var extractDir = Path.Combine(packageDir, "extracted");
                 Directory.CreateDirectory(packageDir);
@@ -83,7 +84,6 @@ namespace MonsterMonitor.Services
                 ZipFile.ExtractToDirectory(packageZip, extractDir);
                 _log.Info("Архив обновления распакован.");
 
-                var appDir = AppDomain.CurrentDomain.BaseDirectory;
                 var exePath = Application.ExecutablePath;
                 var updaterBat = Path.Combine(packageDir, "apply_update.bat");
                 File.WriteAllText(updaterBat, BuildUpdaterScript(appDir, extractDir, exePath), Encoding.ASCII);
@@ -117,15 +117,51 @@ namespace MonsterMonitor.Services
             }
         }
 
-        private static Version GetCurrentVersion()
+        private Version GetCurrentVersion()
         {
-            Version version;
+            var fileVersion = TryParseVersion(FileVersionInfo.GetVersionInfo(Application.ExecutablePath).ProductVersion);
-            if (!Version.TryParse(Application.ProductVersion, out version))
+            if (fileVersion != null)
             {
-                version = new Version(1, 0, 0, 0);
+                return fileVersion;
             }
 
-            return version;
+            var assemblyVersion = Assembly.GetExecutingAssembly().GetName().Version;
+            if (assemblyVersion != null)
+            {
+                return assemblyVersion;
+            }
+
+            var productVersion = TryParseVersion(Application.ProductVersion);
+            if (productVersion != null)
+            {
+                return productVersion;
+            }
+
+            _log.Warn("Не удалось определить текущую версию приложения, использую 1.0.0.");
+            return new Version(1, 0, 0, 0);
+        }
+
+        private static Version TryParseVersion(string raw)
+        {
+            if (string.IsNullOrWhiteSpace(raw))
+            {
+                return null;
+            }
+
+            var value = raw.Trim();
+            var plusIndex = value.IndexOf('+');
+            if (plusIndex > 0)
+            {
+                value = value.Substring(0, plusIndex);
+            }
+
+            if (value.StartsWith("v", StringComparison.OrdinalIgnoreCase))
+            {
+                value = value.Substring(1);
+            }
+
+            Version version;
+            return Version.TryParse(value, out version) ? version : null;
         }
 
         private static Version ParseVersion(string rawVersion)