Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
b867b68a5b | ||
|
|
92830f9edf | ||
|
|
2adff1800b | ||
|
|
58ce16b53e | ||
|
|
4711f80870 | ||
|
|
48920cb892 | ||
|
|
36caa59549 |
+1
-1
@@ -1 +1 @@
|
|||||||
1.0.9
|
1.0.14
|
||||||
|
|||||||
+3
-3
@@ -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
|
||||||
|
|||||||
@@ -14,6 +14,7 @@ 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 "%~1"
|
git commit -m "%~1"
|
||||||
|
|||||||
@@ -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);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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>
|
||||||
|
|||||||
@@ -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")]
|
|
||||||
|
|||||||
@@ -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>
|
||||||
@@ -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.
Reference in New Issue
Block a user