diff --git a/ATray/ATray.csproj b/ATray/ATray.csproj index 4c95d2a..6fa27ae 100644 --- a/ATray/ATray.csproj +++ b/ATray/ATray.csproj @@ -208,7 +208,6 @@ SettingsForm.cs - ActivityHistoryForm.cs diff --git a/ATray/Properties/AssemblyInfo.cs b/ATray/Properties/AssemblyInfo.cs index e7df3b7..e7654a6 100644 --- a/ATray/Properties/AssemblyInfo.cs +++ b/ATray/Properties/AssemblyInfo.cs @@ -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.2.0")] -[assembly: AssemblyFileVersion("1.1.2.0")] +[assembly: AssemblyVersion("1.2.0.0")] +[assembly: AssemblyFileVersion("1.2.0.0")] diff --git a/ATray/Releases/ATray-1.2.0-delta.nupkg b/ATray/Releases/ATray-1.2.0-delta.nupkg new file mode 100644 index 0000000..115af2f Binary files /dev/null and b/ATray/Releases/ATray-1.2.0-delta.nupkg differ diff --git a/ATray/Releases/ATray-1.2.0-full.nupkg b/ATray/Releases/ATray-1.2.0-full.nupkg new file mode 100644 index 0000000..56b2840 Binary files /dev/null and b/ATray/Releases/ATray-1.2.0-full.nupkg differ diff --git a/ATray/Releases/RELEASES b/ATray/Releases/RELEASES index e1e849c..c707b44 100644 --- a/ATray/Releases/RELEASES +++ b/ATray/Releases/RELEASES @@ -14,4 +14,6 @@ CD902307C82795A331D47100286B1D9A8BD3159B ATray-1.0.6-delta.nupkg 2913720 0196095C8A008DF63340CDA70B32D1A1CA80D415 ATray-1.1.1-delta.nupkg 4444283 4DD681056A9CE6CFD6E38A2061705B7A1DFC1719 ATray-1.1.1-full.nupkg 9389977 52D354F4E72F1715297704BD8FFF5A791E8B6BC0 ATray-1.1.2-delta.nupkg 214200 -8BB8407A585DBCD343D7AFD0E8F1F15FFA686C3B ATray-1.1.2-full.nupkg 6527736 \ No newline at end of file +8BB8407A585DBCD343D7AFD0E8F1F15FFA686C3B ATray-1.1.2-full.nupkg 6527736 +FFB1D198B321036417EAD9C83778B210AD50CA6C ATray-1.2.0-delta.nupkg 2565163 +5FC5CC2ADE732D2B2624A6A0031C2FD02673F2BF ATray-1.2.0-full.nupkg 6619232 \ No newline at end of file diff --git a/ATray/Releases/Setup.exe b/ATray/Releases/Setup.exe index 5b62c95..9bb1a77 100644 Binary files a/ATray/Releases/Setup.exe and b/ATray/Releases/Setup.exe differ diff --git a/ATray/Releases/Setup.msi b/ATray/Releases/Setup.msi index 8a040fd..0477df4 100644 Binary files a/ATray/Releases/Setup.msi and b/ATray/Releases/Setup.msi differ diff --git a/ATray/Tools/BitmapTools.cs b/ATray/Tools/BitmapTools.cs deleted file mode 100644 index 004a859..0000000 --- a/ATray/Tools/BitmapTools.cs +++ /dev/null @@ -1,38 +0,0 @@ -using System; -using System.Drawing; -using System.Drawing.Imaging; - -namespace ATray.Tools -{ - public static class BitmapTools - { - public static void ApplyPerPixel(this Bitmap bmp, Action modifier) - { - if (bmp.PixelFormat != PixelFormat.Format32bppArgb) - throw new Exception("Ahhh my icon has changed format"); - var rect = new Rectangle(0, 0, bmp.Width, bmp.Height); - var bmpData = bmp.LockBits(rect, ImageLockMode.ReadWrite, bmp.PixelFormat); - - var bitsPerPixel = Image.GetPixelFormatSize(bmpData.PixelFormat); - var bytesPerPixel = (bitsPerPixel + 7) / 8; - var unusedBytes = bmpData.Stride - (bmpData.Width * bytesPerPixel); - - unsafe - { - var scan0 = (byte*)bmpData.Scan0.ToPointer(); - var pixelPointer = scan0; - for (var i = 0; i < bmpData.Height; ++i) - { - for (var j = 0; j < bmpData.Width; ++j) - { - modifier((IntPtr) pixelPointer); - pixelPointer += bytesPerPixel; - } - - pixelPointer += unusedBytes; - } - } - bmp.UnlockBits(bmpData); - } - } -} diff --git a/packages/squirrel.windows.1.7.9/tools/SquirrelSetup.log b/packages/squirrel.windows.1.7.9/tools/SquirrelSetup.log index ef26d3f..6034216 100644 --- a/packages/squirrel.windows.1.7.9/tools/SquirrelSetup.log +++ b/packages/squirrel.windows.1.7.9/tools/SquirrelSetup.log @@ -37,3 +37,45 @@ 2018-04-05 08:50:35> DeltaPackageBuilder: \lib\net45\lib\win32\x64\git2-15e1193.dll hasn't changed, writing dummy file 2018-04-05 08:50:35> DeltaPackageBuilder: \lib\net45\lib\win32\x86\git2-15e1193.dll hasn't changed, writing dummy file 2018-04-05 08:50:35> Program: Building embedded zip file for Setup.exe +2018-04-08 13:11:37> Program: Starting Squirrel Updater: --releasify bin\Release\ATray.1.2.0.nupkg +2018-04-08 13:11:37> Program: Bootstrapper EXE found at:C:\Users\JoakimWennergren\Projects\ATray\packages\squirrel.windows.1.7.9\tools\Setup.exe +2018-04-08 13:11:37> Program: Creating release package: C:\Users\JoakimWennergren\Projects\ATray\ATray\Releases\ATray.1.2.0.nupkg +2018-04-08 13:11:37> ReleasePackage: Creating release package: C:\Users\JoakimWennergren\Projects\ATray\ATray\Releases\ATray.1.2.0.nupkg => C:\Users\JoakimWennergren\Projects\ATray\ATray\Releases\ATray-1.2.0-full.nupkg +2018-04-08 13:11:38> ReleasePackage: Extracting dependent packages: [] +2018-04-08 13:11:38> ReleasePackage: Removing unnecessary data +2018-04-08 13:11:38> ReleasePackage: No release notes found in C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\ATray.nuspec +2018-04-08 13:11:40> DeltaPackageBuilder: Extracting .\Releases\ATray-1.1.2-full.nupkg and C:\Users\JoakimWennergren\Projects\ATray\ATray\Releases\ATray-1.2.0-full.nupkg into C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd +2018-04-08 13:11:43> DeltaPackageBuilder: Delta patching C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray.exe => C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray.exe +2018-04-08 13:11:43> DeltaPackageBuilder: \lib\net45\ATray.exe.config hasn't changed, writing dummy file +2018-04-08 13:11:43> DeltaPackageBuilder: Delta patching C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\lib\net45\ATray_ExecutionStub.exe => C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd\lib\net45\ATray_ExecutionStub.exe +2018-04-08 13:11:43> DeltaPackageBuilder: \lib\net45\CredentialManagement.dll hasn't changed, writing dummy file +2018-04-08 13:11:43> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.dll hasn't changed, writing dummy file +2018-04-08 13:11:43> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.MsDelta.dll hasn't changed, writing dummy file +2018-04-08 13:11:43> DeltaPackageBuilder: \lib\net45\DeltaCompressionDotNet.PatchApi.dll hasn't changed, writing dummy file +2018-04-08 13:11:43> DeltaPackageBuilder: Delta patching C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\lib\net45\LibGit2Sharp.dll => C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd\lib\net45\LibGit2Sharp.dll +2018-04-08 13:11:44> DeltaPackageBuilder: Delta patching C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\lib\net45\LibGit2Sharp.dll.config => C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd\lib\net45\LibGit2Sharp.dll.config +2018-04-08 13:11:44> DeltaPackageBuilder: We really couldn't create a delta for LibGit2Sharp.dll.config: System.DivideByZeroException: Attempted to divide by zero. + at Squirrel.Bsdiff.BinaryPatchUtility.Create(Byte[] oldData, Byte[] newData, Stream output) + at Squirrel.DeltaPackageBuilder.createDeltaForSingleFile(FileInfo targetFile, DirectoryInfo workingDirectory, Dictionary`2 baseFileListing) +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Microsoft.Alm.Authentication.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Microsoft.Alm.Git.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Mono.Cecil.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Mdb.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Pdb.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Mono.Cecil.Rocks.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Newtonsoft.Json.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\NuGet.Squirrel.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: Delta patching C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempc\lib\net45\RepositoryManager.dll => C:\Users\JoakimWennergren\AppData\Local\SquirrelTemp\tempd\lib\net45\RepositoryManager.dll +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\RepositoryManager.dll.config hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\SharpCompress.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\SharpPlink-Win32.svnExe hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\SharpSvn.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Splat.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\Squirrel.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\diskusage\DiskUsage.exe hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\diskusage\NtfsReader.dll hasn't changed, writing dummy file +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\lib\linux\x86_64\libgit2-6311e88.so not found in base package, marking as new +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\lib\osx\libgit2-6311e88.dylib not found in base package, marking as new +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\lib\win32\x64\git2-6311e88.dll not found in base package, marking as new +2018-04-08 13:11:44> DeltaPackageBuilder: \lib\net45\lib\win32\x86\git2-6311e88.dll not found in base package, marking as new +2018-04-08 13:11:44> Program: Building embedded zip file for Setup.exe