Compare commits

...
3 Commits
Author SHA1 Message Date
Danil Kislov b74b411e78 Мелкие исправления 2019-03-22 14:59:47 +03:00
Danil Kislov deca5cf7f2 Фикс билда2 2019-03-22 14:22:29 +03:00
Danil Kislov 8d44365776 Фикс билда 2019-03-22 14:04:04 +03:00
7 changed files with 41 additions and 40 deletions
+2 -2
View File
@@ -2,7 +2,7 @@ version: 1.0.{build}
image: Visual Studio 2017
init:
- ps: >-
- ps: >-
if ($env:APPVEYOR_REPO_TAG -eq "true")
{
Update-AppveyorBuild -Version "$env:APPVEYOR_REPO_TAG_NAME"
@@ -28,7 +28,7 @@ artifacts:
deploy:
- provider: GitHub
auth_token:
secure: vcrXfbGk400wdnU45LZqhuGCdnPJsYn5lSHjguHSRm1riRDiVMC20BzvfvDIjcI/
secure: Jg8vtDMtgadXE5uifFSr5y9KNrGAjvFntqnRHzyuVWkssitctTtVq086svS2zXAq
artifact: JiraTimeBot.zip
on:
APPVEYOR_REPO_TAG: true
+1 -1
View File
@@ -1 +1 @@
1.0.29
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 "";
}
+31 -31
View File
@@ -1,31 +1,31 @@
using System.Reflection;
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("JiraTimeBot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[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
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.29")]
[assembly: AssemblyFileVersion("1.0.29")]
[assembly: AssemblyInformationalVersion("1.0.29")]
using System.Reflection;
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("JiraTimeBot")]
[assembly: AssemblyDescription("")]
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyCopyright("Copyright © 2019")]
[assembly: AssemblyTrademark("")]
[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
// COM, set the ComVisible attribute to true on that type.
[assembly: ComVisible(false)]
// The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values:
//
// Major Version
// Minor Version
// Build Number
// Revision
//
// 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.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
});
}
+1
View File
@@ -100,6 +100,7 @@ namespace JiraTimeBot.UI
if (System.Diagnostics.Debugger.IsAttached)
{
_log.Trace("Приложение запущено в режиме отладки. Отключаю обновление.");
//tmrUpdate.Enabled = true;
}
else
{
+1 -1
View File
@@ -69,7 +69,7 @@ namespace JiraTimeBot.Update
return reader.ReadToEnd();
}
}
catch (Exception ex)
catch (Exception)
{
return "";
}