Проверка на новую версию

.semver.txt

@@ -0,0 +1 @@
+1.0.15

.travis.yml

@@ -1,11 +1,19 @@
 language: csharp
 solution: src/JiraTimeBot.sln
+  
+before_deploy:
+  - "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
 
-before_deploy: "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
 deploy:
   provider: releases
   api_key: $GITHUB_OAUTH_TOKEN
+  overwrite: true
   file: JiraTimeBot.zip
   skip_cleanup: true
   on:
-    tags: true
+    tags: true
+
+notifications:
+  email:
+    on_success: never
+    on_failure: always

release.cmd

@@ -1,20 +1,33 @@
 @echo off
-for /f "tokens=1 delims=." %%G IN (semver.txt) DO set MAJOR=%%G 
+IF %1.==. GOTO NoCommitMessage
-for /f "tokens=2 delims=." %%G IN (semver.txt) DO set MINOR=%%G 
+echo %~1
-for /f "tokens=3 delims=." %%G IN (semver.txt) DO set PATCH=%%G
+pause
+
+for /f "tokens=1 delims=." %%G IN (.semver.txt) DO set MAJOR=%%G 
+for /f "tokens=2 delims=." %%G IN (.semver.txt) DO set MINOR=%%G 
+for /f "tokens=3 delims=." %%G IN (.semver.txt) DO set PATCH=%%G
 set VERSION_CURRENT=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH%
 echo Current: %VERSION_CURRENT%
 
 SET /a PATCH1 = %PATCH%+1
 set VERSION=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH1%
-echo %VERSION%>semver.txt
+echo %VERSION%>.semver.txt
 echo Updating to %VERSION%
 
+call tools\SetVersion.cmd %VERSION%
+
 git add .
-git commit -m "Commit new version"
+git commit -m "%~1"
 
 git tag -m "Version v%VERSION%" -a v%VERSION%
 git push origin v%VERSION%
 
 git push
-pause
+GOTO End
+pause
+
+:NoCommitMessage
+echo Please specify commit message: %0 "commit message"
+GOTO End
+
+:End

semver.txt

@@ -1 +0,0 @@
-1.0.4

src/JiraTimeBot/Configuration/Settings.cs

@@ -90,7 +90,8 @@ namespace JiraTimeBotForm.Configuration
 
         public static Settings Load()
         {
-            var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName);
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
             if (!File.Exists(settingsPath))
             {
                 return null;
@@ -123,7 +124,8 @@ namespace JiraTimeBotForm.Configuration
             var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl);
             this.JiraPassword = password;
 
-            var settingsPath = Path.Combine(Application.UserAppDataPath, _settingsFileName);
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
             var settingsString = JsonConvert.SerializeObject(this);
             File.WriteAllText(settingsPath, settingsString);
         }

src/JiraTimeBot/JiraTimeBot.csproj

@@ -45,7 +45,7 @@
       <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
     </Reference>
     <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
-      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+      <HintPath>..\packages\Castle.Core.4.3.1\lib\net45\Castle.Core.dll</HintPath>
     </Reference>
     <Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL">
       <HintPath>..\packages\Mercurial.Net.1.1.1.607\lib\net35-Client\Mercurial.Net.dll</HintPath>
@@ -53,9 +53,6 @@
     <Reference Include="Newtonsoft.Json, Version=12.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.5.11\lib\net45\NLog.dll</HintPath>
-    </Reference>
     <Reference Include="RestSharp, Version=106.6.9.0, Culture=neutral, PublicKeyToken=598062e77f915f75, processorArchitecture=MSIL">
       <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
     </Reference>
@@ -121,6 +118,8 @@
     <Compile Include="UI\Tray\ITrayMenu.cs" />
     <Compile Include="UI\Tray\RestoreFromTray.cs" />
     <Compile Include="UI\Tray\TrayMenu.cs" />
+    <Compile Include="Update\GitHubDataObjects.cs" />
+    <Compile Include="Update\UpdateChecker.cs" />
     <EmbeddedResource Include="UI\frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -1,35 +1,31 @@
-using System.Reflection;
+using System.Reflection;      
-using System.Runtime.InteropServices;
+using System.Runtime.InteropServices;      
-
+// General Information about an assembly is controlled through the following      
-// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information      
-// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.      
-// associated with an assembly.
+[assembly: AssemblyTitle("JiraTimeBot")]      
-[assembly: AssemblyTitle("JiraTimeBotForm")]
+[assembly: AssemblyDescription("")]      
-[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]      
-[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]      
-[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("JiraTimeBot")]      
-[assembly: AssemblyProduct("JiraTimeBotForm")]
+[assembly: AssemblyCopyright("Copyright © 2019")]      
-[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]      
-[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]      
-[assembly: AssemblyCulture("")]
+// Setting ComVisible to false makes the types in this assembly not visible      
-
+// to COM components.  If you need to access a type in this assembly from      
-// Setting ComVisible to false makes the types in this assembly not visible
+// COM, set the ComVisible attribute to true on that type.      
-// to COM components.  If you need to access a type in this assembly from
+[assembly: ComVisible(false)]      
-// COM, set the ComVisible attribute to true on that type.
+// The following GUID is for the ID of the typelib if this project is exposed to COM      
-[assembly: ComVisible(false)]
+[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]      
-
+// Version information for an assembly consists of the following four values:      
-// The following GUID is for the ID of the typelib if this project is exposed to COM
+//      
-[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
+//      Major Version      
-
+//      Minor Version      
-// Version information for an assembly consists of the following four values:
+//      Build Number      
-//
+//      Revision      
-//      Major Version
+//      
-//      Minor Version
+// You can specify all the values or you can default the Build and Revision Numbers      
-//      Build Number
+// by using the '*' as shown below:      
-//      Revision
+[assembly: AssemblyVersion("1.0.15")] 
-//
+[assembly: AssemblyFileVersion("1.0.15")] 
-// You can specify all the values or you can default the Build and Revision Numbers
+[assembly: AssemblyInformationalVersion("1.0.15")] 
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -38,6 +38,7 @@
             this.btnMeeting = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
             this.btnSettings = new System.Windows.Forms.Button();
+            this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
             this.SuspendLayout();
             // 
             // txtLog
@@ -111,6 +112,11 @@
             this.btnSettings.UseVisualStyleBackColor = true;
             this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
             // 
+            // tmrUpdate
+            // 
+            this.tmrUpdate.Interval = 1000;
+            this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
+            // 
             // frmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@@ -144,6 +150,7 @@
         private System.Windows.Forms.Button btnMeeting;
         private System.Windows.Forms.Button btnCancel;
         private System.Windows.Forms.Button btnSettings;
+        private System.Windows.Forms.Timer tmrUpdate;
     }
 }
 

src/JiraTimeBot/UI/frmMain.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using System.Net.Configuration;
+using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
@@ -9,6 +9,7 @@ using JiraTimeBotForm.Configuration;
 using JiraTimeBotForm.DI;
 using JiraTimeBotForm.TasksProcessors;
 using JiraTimeBotForm.UI.Tray;
+using JiraTimeBotForm.Update;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -90,8 +91,11 @@ namespace JiraTimeBotForm.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
+            this.Text = this.Text + " v." + Application.ProductVersion;
+
             PrintStartMessage();
             tmrStart.Enabled = true;
+            tmrUpdate.Enabled = true;
         }
 
         private void PrintStartMessage()
@@ -182,5 +186,27 @@ namespace JiraTimeBotForm.UI
 
             PrintStartMessage();
         }
+
+        private void tmrUpdate_Tick(object sender, EventArgs e)
+        {
+            tmrUpdate.Interval = 8 * 60 * 60 * 1000;
+
+            var checker = new UpdateChecker();
+            var release = checker.GetRelease();
+            if (release == null)
+            {
+                return;
+            }
+
+            var gitVersionStr = checker.GetLatestVersion(release);
+            var gitVersion = new Version(gitVersionStr);
+            var appVersion = new Version(Application.ProductVersion);
+
+            if (gitVersion > appVersion)
+            {
+                var downloadUrl = checker.GetDownloadUrl(release);
+                _log.Info($"Доступна новая версия: {gitVersion} {downloadUrl}");
+            }
+        }
     }
 }

src/JiraTimeBot/UI/frmMain.resx

@@ -123,6 +123,9 @@
   <metadata name="tmrStart.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>113, 17</value>
   </metadata>
+  <metadata name="tmrUpdate.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>209, 17</value>
+  </metadata>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>

src/JiraTimeBot/Update/GitHubDataObjects.cs

@@ -0,0 +1,167 @@
+using System;
+using System.Collections.Generic;
+using System.Globalization;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+
+namespace JiraTimeBotForm.Update
+{
+    public partial class GitHubReleaseResponse
+    {
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("assets_url")]
+        public Uri AssetsUrl { get; set; }
+
+        [JsonProperty("upload_url")]
+        public string UploadUrl { get; set; }
+
+        [JsonProperty("html_url")]
+        public Uri HtmlUrl { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("tag_name")]
+        public string TagName { get; set; }
+
+        [JsonProperty("target_commitish")]
+        public string TargetCommitish { get; set; }
+
+        [JsonProperty("name")]
+        public object Name { get; set; }
+
+        [JsonProperty("draft")]
+        public bool Draft { get; set; }
+
+        [JsonProperty("author")]
+        public Author Author { get; set; }
+
+        [JsonProperty("prerelease")]
+        public bool Prerelease { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTimeOffset CreatedAt { get; set; }
+
+        [JsonProperty("published_at")]
+        public DateTimeOffset PublishedAt { get; set; }
+
+        [JsonProperty("assets")]
+        public Asset[] Assets { get; set; }
+
+        [JsonProperty("tarball_url")]
+        public Uri TarballUrl { get; set; }
+
+        [JsonProperty("zipball_url")]
+        public Uri ZipballUrl { get; set; }
+
+        [JsonProperty("body")]
+        public object Body { get; set; }
+    }
+
+    public partial class Asset
+    {
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("name")]
+        public string Name { get; set; }
+
+        [JsonProperty("label")]
+        public string Label { get; set; }
+
+        [JsonProperty("uploader")]
+        public Author Uploader { get; set; }
+
+        [JsonProperty("content_type")]
+        public string ContentType { get; set; }
+
+        [JsonProperty("state")]
+        public string State { get; set; }
+
+        [JsonProperty("size")]
+        public long Size { get; set; }
+
+        [JsonProperty("download_count")]
+        public long DownloadCount { get; set; }
+
+        [JsonProperty("created_at")]
+        public DateTimeOffset CreatedAt { get; set; }
+
+        [JsonProperty("updated_at")]
+        public DateTimeOffset UpdatedAt { get; set; }
+
+        [JsonProperty("browser_download_url")]
+        public Uri BrowserDownloadUrl { get; set; }
+    }
+
+    public partial class Author
+    {
+        [JsonProperty("login")]
+        public string Login { get; set; }
+
+        [JsonProperty("id")]
+        public long Id { get; set; }
+
+        [JsonProperty("node_id")]
+        public string NodeId { get; set; }
+
+        [JsonProperty("avatar_url")]
+        public Uri AvatarUrl { get; set; }
+
+        [JsonProperty("gravatar_id")]
+        public string GravatarId { get; set; }
+
+        [JsonProperty("url")]
+        public Uri Url { get; set; }
+
+        [JsonProperty("html_url")]
+        public Uri HtmlUrl { get; set; }
+
+        [JsonProperty("followers_url")]
+        public Uri FollowersUrl { get; set; }
+
+        [JsonProperty("following_url")]
+        public string FollowingUrl { get; set; }
+
+        [JsonProperty("gists_url")]
+        public string GistsUrl { get; set; }
+
+        [JsonProperty("starred_url")]
+        public string StarredUrl { get; set; }
+
+        [JsonProperty("subscriptions_url")]
+        public Uri SubscriptionsUrl { get; set; }
+
+        [JsonProperty("organizations_url")]
+        public Uri OrganizationsUrl { get; set; }
+
+        [JsonProperty("repos_url")]
+        public Uri ReposUrl { get; set; }
+
+        [JsonProperty("events_url")]
+        public string EventsUrl { get; set; }
+
+        [JsonProperty("received_events_url")]
+        public Uri ReceivedEventsUrl { get; set; }
+
+        [JsonProperty("type")]
+        public string Type { get; set; }
+
+        [JsonProperty("site_admin")]
+        public bool SiteAdmin { get; set; }
+    }
+}

src/JiraTimeBot/Update/UpdateChecker.cs

@@ -0,0 +1,71 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using System.Net;
+using System.Text;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+
+namespace JiraTimeBotForm.Update
+{
+    class UpdateChecker
+    {
+        private const string GithubUser = "monster1025";
+        private const string GithubRepo = "JiraTimeBot";
+
+        public string GetLatestVersion(GitHubReleaseResponse release)
+        {
+            var version = release?.TagName?.TrimStart('v');
+            return version;
+        }
+
+        public string GetDownloadUrl(GitHubReleaseResponse release)
+        {
+            var downloadUrl = release?.Assets?.FirstOrDefault()?.BrowserDownloadUrl?.ToString();
+            return downloadUrl ?? "";
+        }
+
+        public GitHubReleaseResponse GetRelease()
+        {
+            var latestReleasePage = Get($"https://api.github.com/repos/{GithubUser}/{GithubRepo}/releases/latest");
+            if (string.IsNullOrEmpty(latestReleasePage))
+            {
+                return null;
+            }
+
+            var release = JsonConvert.DeserializeObject<GitHubReleaseResponse>(latestReleasePage);
+            return release;
+        }
+
+        public void DownloadFile(string url)
+        {
+            using (var client = new WebClient())
+            {
+                client.Headers.Add("User-Agent", "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0");
+                client.DownloadFile(url, "update.zip");
+            }
+        }
+
+        private string Get(string uri)
+        {
+            try
+            {
+                HttpWebRequest request = (HttpWebRequest) WebRequest.Create(uri);
+                request.AutomaticDecompression = DecompressionMethods.GZip | DecompressionMethods.Deflate;
+                request.UserAgent = "Mozilla/5.0 (X11; Linux i686; rv:64.0) Gecko/20100101 Firefox/64.0";
+
+                using (HttpWebResponse response = (HttpWebResponse) request.GetResponse())
+                using (Stream stream = response.GetResponseStream())
+                using (StreamReader reader = new StreamReader(stream))
+                {
+                    return reader.ReadToEnd();
+                }
+            }
+            catch (Exception ex)
+            {
+                return "";
+            }
+        }
+    }
+}

src/JiraTimeBot/packages.config

@@ -3,9 +3,8 @@
   <package id="Atlassian.SDK" version="10.4.0" targetFramework="net461" />
   <package id="Autofac" version="4.9.1" targetFramework="net461" />
   <package id="Autofac.Extras.AggregateService" version="4.1.0" targetFramework="net461" />
-  <package id="Castle.Core" version="4.0.0" targetFramework="net461" />
+  <package id="Castle.Core" version="4.3.1" targetFramework="net461" />
   <package id="Mercurial.Net" version="1.1.1.607" targetFramework="net461" />
   <package id="Newtonsoft.Json" version="12.0.1" targetFramework="net461" />
-  <package id="NLog" version="4.5.11" targetFramework="net461" />
   <package id="RestSharp" version="106.6.9" targetFramework="net461" />
 </packages>

tools/SetVersion.cmd

@@ -0,0 +1,47 @@
+@echo off
+setlocal enabledelayedexpansion
+
+if [%1] == [] GOTO :USAGE
+set version=%1
+set fileversion=%1
+set informationalversion=%1
+
+if [%2] NEQ [] SET fileversion=%2
+if [%3] NEQ [] SET informationalversion=%3
+
+echo Setting assembly version information
+
+for /F "delims=" %%f in ('dir /s /b Assemblyinfo.cs') do (
+    echo ^> %%f
+
+    pushd %%~dpf
+
+    for /F "usebackq delims=" %%g in ("AssemblyInfo.cs") do (
+        set ln=%%g
+        set skip=0
+
+        if "!ln:AssemblyVersion=!" NEQ "!ln!" set skip=1
+        if "!ln:AssemblyFileVersion=!" NEQ "!ln!" set skip=1
+        if "!ln:AssemblyInformationalVersion=!" NEQ "!ln!" set skip=1
+
+        if !skip!==0 echo !ln! >> AssemblyInfo.cs.versioned
+    )
+
+    echo [assembly: AssemblyVersion^("%version%"^)] >> AssemblyInfo.cs.versioned
+    echo [assembly: AssemblyFileVersion^("%fileversion%"^)] >> AssemblyInfo.cs.versioned
+    echo [assembly: AssemblyInformationalVersion^("%informationalversion%"^)] >> AssemblyInfo.cs.versioned
+
+    copy /y AssemblyInfo.cs AssemblyInfo.cs.orig
+    move /y AssemblyInfo.cs.versioned AssemblyInfo.cs
+
+    popd
+)
+echo Done^^!
+
+GOTO:EOF
+
+:USAGE
+echo Usage:
+echo.
+echo SetVersion.bat Version [FileVersion] [InformationalVersion]
+echo.