Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b74b411e78 | ||
|
|
deca5cf7f2 | ||
|
|
8d44365776 | ||
|
|
9734cb5f9d | ||
|
|
d6dcccad71 | ||
|
|
92fbde025b | ||
|
|
33dee498f8 |
@@ -0,0 +1,34 @@
|
||||
version: 1.0.{build}
|
||||
image: Visual Studio 2017
|
||||
|
||||
init:
|
||||
- ps: >-
|
||||
if ($env:APPVEYOR_REPO_TAG -eq "true")
|
||||
{
|
||||
Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
|
||||
}
|
||||
else
|
||||
{
|
||||
Update-AppveyorBuild -Version "dev-$($env:APPVEYOR_REPO_COMMIT.substring(0,7))"
|
||||
}
|
||||
|
||||
before_build:
|
||||
- cmd: nuget restore src/JiraTimeBot.sln
|
||||
|
||||
build:
|
||||
project: src/JiraTimeBot.sln
|
||||
|
||||
after_build:
|
||||
- cmd: 7z a JiraTimeBot.zip %APPVEYOR_BUILD_FOLDER%/src/JiraTimeBot/bin/Debug/*
|
||||
|
||||
artifacts:
|
||||
- path: JiraTimeBot.zip
|
||||
name: JiraTimeBot.zip
|
||||
|
||||
deploy:
|
||||
- provider: GitHub
|
||||
auth_token:
|
||||
secure: Jg8vtDMtgadXE5uifFSr5y9KNrGAjvFntqnRHzyuVWkssitctTtVq086svS2zXAq
|
||||
artifact: JiraTimeBot.zip
|
||||
on:
|
||||
APPVEYOR_REPO_TAG: true
|
||||
+1
-1
@@ -1 +1 @@
|
||||
1.0.27
|
||||
1.0.32
|
||||
|
||||
@@ -17,10 +17,10 @@ namespace JiraTimeBot.Configuration
|
||||
{
|
||||
byte[] entropy = GetEntropy(address + username);
|
||||
byte[] pass = Encoding.UTF8.GetBytes(password);
|
||||
byte[] crypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
|
||||
var cryptedBase64 = Convert.ToBase64String(crypted);
|
||||
byte[] encrypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
|
||||
var encryptedBase64 = Convert.ToBase64String(encrypted);
|
||||
|
||||
return cryptedBase64;
|
||||
return encryptedBase64;
|
||||
}
|
||||
|
||||
public string Decrypt(string username, string password, string address)
|
||||
@@ -32,7 +32,7 @@ namespace JiraTimeBot.Configuration
|
||||
pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine);
|
||||
return Encoding.UTF8.GetString(pass);
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
|
||||
//
|
||||
// You can specify all the values or you can default the Build and Revision Numbers
|
||||
// by using the '*' as shown below:
|
||||
[assembly: AssemblyVersion("1.0.27")]
|
||||
[assembly: AssemblyFileVersion("1.0.27")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.27")]
|
||||
[assembly: AssemblyVersion("1.0.32")]
|
||||
[assembly: AssemblyFileVersion("1.0.32")]
|
||||
[assembly: AssemblyInformationalVersion("1.0.32")]
|
||||
|
||||
@@ -51,7 +51,7 @@ namespace JiraTimeBot.TaskTime
|
||||
Time = TimeSpan.FromMinutes(30),
|
||||
Branch = settings.TimeControlTask,
|
||||
Commits = 1,
|
||||
Description = "Время на учет задач",
|
||||
Description = "Ведение учета времени",
|
||||
StartTime = DateTime.Now.Date
|
||||
});
|
||||
}
|
||||
@@ -92,7 +92,7 @@ namespace JiraTimeBot.TaskTime
|
||||
{
|
||||
return new List<TaskTimeItem>();
|
||||
}
|
||||
workTimeItems = workTimeItems.OrderBy(f => f.Time).ToList();
|
||||
workTimeItems = workTimeItems.OrderByDescending(f => f.Time).ToList();
|
||||
|
||||
if (remainMinutes != 0)
|
||||
{
|
||||
|
||||
@@ -100,6 +100,7 @@ namespace JiraTimeBot.UI
|
||||
if (System.Diagnostics.Debugger.IsAttached)
|
||||
{
|
||||
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
|
||||
//tmrUpdate.Enabled = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
|
||||
@@ -69,7 +69,7 @@ namespace JiraTimeBot.Update
|
||||
return reader.ReadToEnd();
|
||||
}
|
||||
}
|
||||
catch (Exception ex)
|
||||
catch (Exception)
|
||||
{
|
||||
return "";
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user