Compare commits

...
9 Commits
8 changed files with 38 additions and 20 deletions
+1
View File
@@ -0,0 +1 @@
1.0.12
+9 -1
View File
@@ -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
notifications:
email:
on_success: never
on_failure: always
+17 -5
View File
@@ -1,20 +1,32 @@
@echo off
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
IF %1.==. GOTO NoCommitMessage
echo %~1
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%
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
GOTO End
pause
:NoCommitMessage
echo Please specify commit message: %0 "commit message"
GOTO End
:End
-1
View File
@@ -1 +0,0 @@
1.0.4
+4 -2
View File
@@ -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);
}
+1 -4
View File
@@ -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>
+3 -3
View File
@@ -4,12 +4,12 @@ using System.Runtime.InteropServices;
// General Information about an assembly is controlled through the following
// set of attributes. Change these attribute values to modify the information
// associated with an assembly.
[assembly: AssemblyTitle("JiraTimeBotForm")]
[assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBotForm")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]
+1 -2
View File
@@ -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>