Skip to content

Commit

Permalink
Version 1.1.1 - bugfix for history view back button
Browse files Browse the repository at this point in the history
  • Loading branch information
Joakim Wennergren committed Feb 21, 2018
1 parent 6e3ca14 commit 46c4718
Show file tree
Hide file tree
Showing 10 changed files with 62 additions and 6 deletions.
1 change: 1 addition & 0 deletions ATray/ATray.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,7 @@
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>true</Prefer32Bit>
<LangVersion>latest</LangVersion>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
Expand Down
2 changes: 1 addition & 1 deletion ATray/Dialogs/ActivityHistoryForm.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ private void lastMonthButton_Click(object sender, EventArgs e)
{
monthDropDown.SelectedValue = monthDropDown.Items.Cast<Tuple<int, string>>()
.Where(x => x.Item1 < _currentMonth)
.MinOrDefault(x => x.Item1, monthDropDown.SelectedValue);
.MaxOrDefault(x => x.Item1, monthDropDown.SelectedValue);
}

private void nextMonthButton_Click(object sender, EventArgs e)
Expand Down
9 changes: 7 additions & 2 deletions ATray/MainWindow.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -99,11 +99,16 @@ public void CreateRepositoryMenyEntries()
private void UpdateRepoMenu(ToolStripItem menuItem, string repoName, RepoStatus status)
{
menuItem.Text = $"{repoName}: {Environment.NewLine} {status}";
var r = new Random();
menuItem.BackColor = Color.FromArgb(r.Next(256), r.Next(256), r.Next(256));
//var r = new Random();
//menuItem.BackColor = Color.FromArgb(r.Next(256), r.Next(256), r.Next(256));

if (status == RepoStatus.Conflict)
menuItem.BackColor = Color.Red;
else if (status == RepoStatus.Behind)
menuItem.BackColor = Color.Yellow;
else if (status == RepoStatus.Dirty)
menuItem.BackColor = Color.FromArgb(0xB1, 0xB1, 0xFF);
else menuItem.ResetBackColor();
}

private void OnRepositoryStatusChanged(object sender, RepositoryEventArgs e)
Expand Down
4 changes: 2 additions & 2 deletions ATray/Properties/AssemblyInfo.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
// 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.*")]
[assembly: AssemblyVersion("1.1.0.0")]
[assembly: AssemblyFileVersion("1.1.0.0")]
[assembly: AssemblyVersion("1.1.1.0")]
[assembly: AssemblyFileVersion("1.1.1.0")]
Binary file added ATray/Releases/ATray-1.1.1-delta.nupkg
View file
Binary file not shown.
Binary file added ATray/Releases/ATray-1.1.1-full.nupkg
View file
Binary file not shown.
4 changes: 3 additions & 1 deletion ATray/Releases/RELEASES
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,6 @@ AD29B90CB6A8CFCD811878B3B4EDD026EC9BDEBB ATray-1.0.5-delta.nupkg 47696
CD902307C82795A331D47100286B1D9A8BD3159B ATray-1.0.6-delta.nupkg 2913720
6AF4102B2403BB8BECAF4742418CF5AEBA58777F ATray-1.0.6-full.nupkg 7277747
9C3106CCE1EC1529ACFF0BC89403B6EDAE344727 ATray-1.1.0-delta.nupkg 80380
3B903448EF422ABA45E33A57F9C4B37BFBC95968 ATray-1.1.0-full.nupkg 7290863
3B903448EF422ABA45E33A57F9C4B37BFBC95968 ATray-1.1.0-full.nupkg 7290863
0196095C8A008DF63340CDA70B32D1A1CA80D415 ATray-1.1.1-delta.nupkg 4444283
4DD681056A9CE6CFD6E38A2061705B7A1DFC1719 ATray-1.1.1-full.nupkg 9389977
Binary file modified ATray/Releases/Setup.exe
View file
Binary file not shown.
Binary file modified ATray/Releases/Setup.msi
View file
Binary file not shown.
48 changes: 48 additions & 0 deletions packages/squirrel.windows.1.7.8/tools/SquirrelSetup.log
View file
Original file line number Diff line number Diff line change
Expand Up @@ -615,3 +615,51 @@ File name: 'bin\Release\ATray.1.0.6448.nupkg'
2017-12-30 15:21:45> DeltaPackageBuilder: \lib\net45\lib\win32\x64\git2-15e1193.dll hasn't changed, writing dummy file
2017-12-30 15:21:45> DeltaPackageBuilder: \lib\net45\lib\win32\x86\git2-15e1193.dll hasn't changed, writing dummy file
2017-12-30 15:21:46> Program: Building embedded zip file for Setup.exe
2018-02-21 15:09:32> Program: Starting Squirrel Updater: --releasify bin\Release\ATray.1.1.1.nupkg
2018-02-21 15:09:32> Program: Bootstrapper EXE found at:C:\Projects\Misc\ATray\packages\squirrel.windows.1.7.8\tools\Setup.exe
2018-02-21 15:09:32> Program: Creating release package: C:\Projects\Misc\ATray\ATray\Releases\ATray.1.1.1.nupkg
2018-02-21 15:09:32> ReleasePackage: Creating release package: C:\Projects\Misc\ATray\ATray\Releases\ATray.1.1.1.nupkg => C:\Projects\Misc\ATray\ATray\Releases\ATray-1.1.1-full.nupkg
2018-02-21 15:09:33> ReleasePackage: Extracting dependent packages: []
2018-02-21 15:09:33> ReleasePackage: Removing unnecessary data
2018-02-21 15:09:33> ReleasePackage: No release notes found in C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\ATray.nuspec
2018-02-21 15:09:34> DeltaPackageBuilder: Extracting .\Releases\ATray-1.1.0-full.nupkg and C:\Projects\Misc\ATray\ATray\Releases\ATray-1.1.1-full.nupkg into C:\Users\joawen\AppData\Local\SquirrelTemp\tempd
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray.application => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray.application
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray.exe => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray.exe
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray.exe.config => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray.exe.config
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray.exe.manifest => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray.exe.manifest
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray_ExecutionStub.exe => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray_ExecutionStub.exe
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\CredentialManagement.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.MsDelta.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.PatchApi.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\LibGit2Sharp.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\LibGit2Sharp.dll.config hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\Microsoft.Alm.Authentication.dll => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\Microsoft.Alm.Authentication.dll
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\Microsoft.Alm.Git.dll => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\Microsoft.Alm.Git.dll
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Mono.Cecil.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Mdb.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Pdb.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Rocks.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Newtonsoft.Json.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\NuGet.Squirrel.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\Ookii.Dialogs.dll not found in base package, marking as new
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\RepositoryManager.dll => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\RepositoryManager.dll
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\RepositoryManager.dll.config => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\RepositoryManager.dll.config
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\SharpCompress.dll hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\SharpPlink-Win32.svnExe not found in base package, marking as new
2018-02-21 15:09:36> DeltaPackageBuilder: \lib\net45\SharpPlink-x64.svnExe hasn't changed, writing dummy file
2018-02-21 15:09:36> DeltaPackageBuilder: Delta patching C:\Users\joawen\AppData\Local\SquirrelTemp\tempc\lib\net45\SharpSvn.dll => C:\Users\joawen\AppData\Local\SquirrelTemp\tempd\lib\net45\SharpSvn.dll
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\Splat.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\Squirrel.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\diskusage\DiskUsage.exe hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\diskusage\Newtonsoft.Json.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\diskusage\NtfsReader.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\linux\x86_64\libgit2-15e1193.so hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\linux\x86_64\libgit2-a5cf255.so not found in base package, marking as new
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\osx\libgit2-15e1193.dylib hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\osx\libgit2-a5cf255.dylib not found in base package, marking as new
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\win32\x64\git2-15e1193.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\win32\x64\git2-a5cf255.dll not found in base package, marking as new
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\win32\x86\git2-15e1193.dll hasn't changed, writing dummy file
2018-02-21 15:09:47> DeltaPackageBuilder: \lib\net45\lib\win32\x86\git2-a5cf255.dll not found in base package, marking as new
2018-02-21 15:09:48> Program: Building embedded zip file for Setup.exe

0 comments on commit 46c4718

Please sign in to comment.