Compare commits

...
10 Commits
10 changed files with 114 additions and 52 deletions
+1
View File
@@ -0,0 +1 @@
1.0.14
+10 -2
View File
@@ -1,11 +1,19 @@
language: csharp language: csharp
solution: src/JiraTimeBot.sln 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: deploy:
provider: releases provider: releases
api_key: $GITHUB_OAUTH_TOKEN api_key: $GITHUB_OAUTH_TOKEN
overwrite: true
file: JiraTimeBot.zip file: JiraTimeBot.zip
skip_cleanup: true skip_cleanup: true
on: on:
tags: true tags: true
notifications:
email:
on_success: never
on_failure: always
+19 -6
View File
@@ -1,20 +1,33 @@
@echo off @echo off
for /f "tokens=1 delims=." %%G IN (semver.txt) DO set MAJOR=%%G IF %1.==. GOTO NoCommitMessage
for /f "tokens=2 delims=." %%G IN (semver.txt) DO set MINOR=%%G echo %~1
for /f "tokens=3 delims=." %%G IN (semver.txt) DO set PATCH=%%G 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% set VERSION_CURRENT=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH%
echo Current: %VERSION_CURRENT% echo Current: %VERSION_CURRENT%
SET /a PATCH1 = %PATCH%+1 SET /a PATCH1 = %PATCH%+1
set VERSION=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH1% set VERSION=%MAJOR:~0,1%.%MINOR:~0,1%.%PATCH1%
echo %VERSION%>semver.txt echo %VERSION%>.semver.txt
echo Updating to %VERSION% echo Updating to %VERSION%
call tools\SetVersion.cmd %VERSION%
git add . git add .
git commit -m "Commit new version" git commit -m "%~1"
git tag -m "Version v%VERSION%" -a v%VERSION% git tag -m "Version v%VERSION%" -a v%VERSION%
git push origin v%VERSION% git push origin v%VERSION%
git push git push
pause 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() 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>
+31 -35
View File
@@ -1,35 +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("JiraTimeBotForm")] [assembly: AssemblyDescription("")]
[assembly: AssemblyDescription("")] [assembly: AssemblyConfiguration("")]
[assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("")]
[assembly: AssemblyCompany("")] [assembly: AssemblyProduct("JiraTimeBot")]
[assembly: AssemblyProduct("JiraTimeBotForm")] [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
// to COM components. If you need to access a type in this assembly from
// Setting ComVisible to false makes the types in this assembly not visible // COM, set the ComVisible attribute to true on that type.
// to COM components. If you need to access a type in this assembly from [assembly: ComVisible(false)]
// COM, set the ComVisible attribute to true on that type. // The following GUID is for the ID of the typelib if this project is exposed to COM
[assembly: ComVisible(false)] [assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")]
// Version information for an assembly consists of the following four values:
// The following GUID is for the ID of the typelib if this project is exposed to COM //
[assembly: Guid("f3b89316-c38c-4ce6-9d88-0b1373cfba1a")] // Major Version
// Minor Version
// Version information for an assembly consists of the following four values: // Build Number
// // Revision
// Major Version //
// Minor Version // You can specify all the values or you can default the Build and Revision Numbers
// Build Number // by using the '*' as shown below:
// Revision [assembly: AssemblyVersion("1.0.14")]
// [assembly: AssemblyFileVersion("1.0.14")]
// You can specify all the values or you can default the Build and Revision Numbers [assembly: AssemblyInformationalVersion("1.0.14")]
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
+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>
+47
View File
@@ -0,0 +1,47 @@
@echo off
setlocal enabledelayedexpansion
if [%1] == [] GOTO :USAGE
set version=%1
set fileversion=%1
set informationalversion=%1
if [%2] NEQ [] SET fileversion=%2
if [%3] NEQ [] SET informationalversion=%3
echo Setting assembly version information
for /F "delims=" %%f in ('dir /s /b Assemblyinfo.cs') do (
echo ^> %%f
pushd %%~dpf
for /F "usebackq delims=" %%g in ("AssemblyInfo.cs") do (
set ln=%%g
set skip=0
if "!ln:AssemblyVersion=!" NEQ "!ln!" set skip=1
if "!ln:AssemblyFileVersion=!" NEQ "!ln!" set skip=1
if "!ln:AssemblyInformationalVersion=!" NEQ "!ln!" set skip=1
if !skip!==0 echo !ln! >> AssemblyInfo.cs.versioned
)
echo [assembly: AssemblyVersion^("%version%"^)] >> AssemblyInfo.cs.versioned
echo [assembly: AssemblyFileVersion^("%fileversion%"^)] >> AssemblyInfo.cs.versioned
echo [assembly: AssemblyInformationalVersion^("%informationalversion%"^)] >> AssemblyInfo.cs.versioned
copy /y AssemblyInfo.cs AssemblyInfo.cs.orig
move /y AssemblyInfo.cs.versioned AssemblyInfo.cs
popd
)
echo Done^^!
GOTO:EOF
:USAGE
echo Usage:
echo.
echo SetVersion.bat Version [FileVersion] [InformationalVersion]
echo.
Binary file not shown.