Compare commits

..
6 Commits
6 changed files with 13 additions and 15 deletions
+1 -1
View File
@@ -1 +1 @@
1.0.9 1.0.12
+3 -3
View File
@@ -1,9 +1,9 @@
language: csharp language: csharp
solution: src/JiraTimeBot.sln solution: src/JiraTimeBot.sln
before_deploy: before_deploy:
- "mv src/JiraTimeBot/bin/Release JiraTimeBot" - "zip -j JiraTimeBot.zip src/JiraTimeBot/bin/Release/*"
- "zip JiraTimeBot.zip JiraTimeBot"
deploy: deploy:
provider: releases provider: releases
api_key: $GITHUB_OAUTH_TOKEN api_key: $GITHUB_OAUTH_TOKEN
+4 -2
View File
@@ -90,7 +90,8 @@ namespace JiraTimeBotForm.Configuration
public static Settings Load() 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)) if (!File.Exists(settingsPath))
{ {
return null; return null;
@@ -123,7 +124,8 @@ namespace JiraTimeBotForm.Configuration
var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl); var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl);
this.JiraPassword = password; 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); var settingsString = JsonConvert.SerializeObject(this);
File.WriteAllText(settingsPath, settingsString); 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> <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
</Reference> </Reference>
<Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL"> <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>
<Reference Include="Mercurial.Net, Version=1.1.1.607, Culture=neutral, PublicKeyToken=9e2fabf3af85dba9, processorArchitecture=MSIL"> <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> <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"> <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> <HintPath>..\packages\Newtonsoft.Json.12.0.1\lib\net45\Newtonsoft.Json.dll</HintPath>
</Reference> </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"> <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> <HintPath>..\packages\RestSharp.106.6.9\lib\net452\RestSharp.dll</HintPath>
</Reference> </Reference>
+3 -3
View File
@@ -4,12 +4,12 @@ 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("JiraTimeBotForm")] [assembly: AssemblyTitle("JiraTimeBot")]
[assembly: AssemblyDescription("")] [assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBotForm")] [assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")] [assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")] [assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")] [assembly: AssemblyCulture("")]
+1 -2
View File
@@ -3,9 +3,8 @@
<package id="Atlassian.SDK" version="10.4.0" targetFramework="net461" /> <package id="Atlassian.SDK" version="10.4.0" targetFramework="net461" />
<package id="Autofac" version="4.9.1" targetFramework="net461" /> <package id="Autofac" version="4.9.1" targetFramework="net461" />
<package id="Autofac.Extras.AggregateService" version="4.1.0" 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="Mercurial.Net" version="1.1.1.607" targetFramework="net461" />
<package id="Newtonsoft.Json" version="12.0.1" 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" /> <package id="RestSharp" version="106.6.9" targetFramework="net461" />
</packages> </packages>