Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b74b411e78 | ||
|
|
deca5cf7f2 | ||
|
|
8d44365776 |
+2
-2
@@ -2,7 +2,7 @@ version: 1.0.{build}
|
|||||||
image: Visual Studio 2017
|
image: Visual Studio 2017
|
||||||
|
|
||||||
init:
|
init:
|
||||||
- ps: >-
|
- ps: >-
|
||||||
if ($env:APPVEYOR_REPO_TAG -eq "true")
|
if ($env:APPVEYOR_REPO_TAG -eq "true")
|
||||||
{
|
{
|
||||||
Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
|
Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
|
||||||
@@ -28,7 +28,7 @@ artifacts:
|
|||||||
deploy:
|
deploy:
|
||||||
- provider: GitHub
|
- provider: GitHub
|
||||||
auth_token:
|
auth_token:
|
||||||
secure: vcrXfbGk400wdnU45LZqhuGCdnPJsYn5lSHjguHSRm1riRDiVMC20BzvfvDIjcI/
|
secure: Jg8vtDMtgadXE5uifFSr5y9KNrGAjvFntqnRHzyuVWkssitctTtVq086svS2zXAq
|
||||||
artifact: JiraTimeBot.zip
|
artifact: JiraTimeBot.zip
|
||||||
on:
|
on:
|
||||||
APPVEYOR_REPO_TAG: true
|
APPVEYOR_REPO_TAG: true
|
||||||
+1
-1
@@ -1 +1 @@
|
|||||||
1.0.29
|
1.0.32
|
||||||
|
|||||||
@@ -17,10 +17,10 @@ namespace JiraTimeBot.Configuration
|
|||||||
{
|
{
|
||||||
byte[] entropy = GetEntropy(address + username);
|
byte[] entropy = GetEntropy(address + username);
|
||||||
byte[] pass = Encoding.UTF8.GetBytes(password);
|
byte[] pass = Encoding.UTF8.GetBytes(password);
|
||||||
byte[] crypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
|
byte[] encrypted = ProtectedData.Protect(pass, entropy, DataProtectionScope.LocalMachine);
|
||||||
var cryptedBase64 = Convert.ToBase64String(crypted);
|
var encryptedBase64 = Convert.ToBase64String(encrypted);
|
||||||
|
|
||||||
return cryptedBase64;
|
return encryptedBase64;
|
||||||
}
|
}
|
||||||
|
|
||||||
public string Decrypt(string username, string password, string address)
|
public string Decrypt(string username, string password, string address)
|
||||||
@@ -32,7 +32,7 @@ namespace JiraTimeBot.Configuration
|
|||||||
pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine);
|
pass = ProtectedData.Unprotect(pass, entropy, DataProtectionScope.LocalMachine);
|
||||||
return Encoding.UTF8.GetString(pass);
|
return Encoding.UTF8.GetString(pass);
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,31 +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("JiraTimeBot")]
|
||||||
[assembly: AssemblyDescription("")]
|
[assembly: AssemblyDescription("")]
|
||||||
[assembly: AssemblyConfiguration("")]
|
[assembly: AssemblyConfiguration("")]
|
||||||
[assembly: AssemblyCompany("")]
|
[assembly: AssemblyCompany("")]
|
||||||
[assembly: AssemblyProduct("JiraTimeBot")]
|
[assembly: AssemblyProduct("JiraTimeBot")]
|
||||||
[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
|
// 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
|
// to COM components. If you need to access a type in this assembly from
|
||||||
// COM, set the ComVisible attribute to true on that type.
|
// COM, set the ComVisible attribute to true on that type.
|
||||||
[assembly: ComVisible(false)]
|
[assembly: ComVisible(false)]
|
||||||
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
// The following GUID is for the ID of the typelib if this project is exposed to COM
|
||||||
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
|
||||||
// Version information for an assembly consists of the following four values:
|
// Version information for an assembly consists of the following four values:
|
||||||
//
|
//
|
||||||
// Major Version
|
// Major Version
|
||||||
// Minor Version
|
// Minor Version
|
||||||
// Build Number
|
// Build Number
|
||||||
// Revision
|
// Revision
|
||||||
//
|
//
|
||||||
// You can specify all the values or you can default the Build and Revision Numbers
|
// You can specify all the values or you can default the Build and Revision Numbers
|
||||||
// by using the '*' as shown below:
|
// by using the '*' as shown below:
|
||||||
[assembly: AssemblyVersion("1.0.29")]
|
[assembly: AssemblyVersion("1.0.32")]
|
||||||
[assembly: AssemblyFileVersion("1.0.29")]
|
[assembly: AssemblyFileVersion("1.0.32")]
|
||||||
[assembly: AssemblyInformationalVersion("1.0.29")]
|
[assembly: AssemblyInformationalVersion("1.0.32")]
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ namespace JiraTimeBot.TaskTime
|
|||||||
Time = TimeSpan.FromMinutes(30),
|
Time = TimeSpan.FromMinutes(30),
|
||||||
Branch = settings.TimeControlTask,
|
Branch = settings.TimeControlTask,
|
||||||
Commits = 1,
|
Commits = 1,
|
||||||
Description = "Время на учет задач",
|
Description = "Ведение учета времени",
|
||||||
StartTime = DateTime.Now.Date
|
StartTime = DateTime.Now.Date
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ namespace JiraTimeBot.UI
|
|||||||
if (System.Diagnostics.Debugger.IsAttached)
|
if (System.Diagnostics.Debugger.IsAttached)
|
||||||
{
|
{
|
||||||
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
|
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
|
||||||
|
//tmrUpdate.Enabled = true;
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -69,7 +69,7 @@ namespace JiraTimeBot.Update
|
|||||||
return reader.ReadToEnd();
|
return reader.ReadToEnd();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
catch (Exception ex)
|
catch (Exception)
|
||||||
{
|
{
|
||||||
return "";
|
return "";
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user