Skip to content

Commit d789137

Browse files
committed
Release v1.12.0
2 parents d931d22 + fcb3f7d commit d789137

File tree

6 files changed

+8
-19
lines changed

6 files changed

+8
-19
lines changed

Diff for: Hourglass.Bundle/Bundle.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
44
xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
55
<Bundle Name="Hourglass"
6-
Version="1.11.0.0"
6+
Version="1.12.0.0"
77
Manufacturer="Chris Dziemborowicz"
88
UpgradeCode="f1d002c9-cfc9-40fb-84af-96e7aec26e0b"
99
IconSourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico">

Diff for: Hourglass.Setup/Product.wxs

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
33
xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
4-
<Product Id="*" Name="Hourglass" Language="1033" Version="1.11.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
4+
<Product Id="*" Name="Hourglass" Language="1033" Version="1.12.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
55
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
66

77
<Icon Id="AppIcon.exe" SourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico"/>

Diff for: Hourglass.Test/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@
1717
[assembly: AssemblyCulture("")]
1818
[assembly: ComVisible(false)]
1919
[assembly: Guid("002a4be7-7323-4bf9-ab08-5fc8978d9eb0")]
20-
[assembly: AssemblyVersion("1.11.0.0")]
21-
[assembly: AssemblyFileVersion("1.11.0.0")]
20+
[assembly: AssemblyVersion("1.12.0.0")]
21+
[assembly: AssemblyFileVersion("1.12.0.0")]

Diff for: Hourglass/Properties/App.manifest

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<asmv1:assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1" xmlns:asmv1="urn:schemas-microsoft-com:asm.v1" xmlns:asmv2="urn:schemas-microsoft-com:asm.v2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
3-
<assemblyIdentity version="1.11.0.0" name="Hourglass"/>
3+
<assemblyIdentity version="1.12.0.0" name="Hourglass"/>
44
<trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
55
<security>
66
<requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

Diff for: Hourglass/Properties/AssemblyInfo.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@
1717
[assembly: AssemblyCopyright("Copyright © 2021 Chris Dziemborowicz")]
1818
[assembly: AssemblyTrademark("")]
1919
[assembly: AssemblyCulture("")]
20-
[assembly: AssemblyVersion("1.11.0.0")]
21-
[assembly: AssemblyFileVersion("1.11.0.0")]
20+
[assembly: AssemblyVersion("1.12.0.0")]
21+
[assembly: AssemblyFileVersion("1.12.0.0")]
2222
[assembly: NeutralResourcesLanguageAttribute("en-US")]
2323
[assembly: Guid("83DBAA61-6193-4288-BBB7-BEAEC33FE321")]
2424
[assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

Diff for: Hourglass/Windows/SoundPlayer.cs

+1-12
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ namespace Hourglass.Windows
99
using System;
1010
using System.Windows.Media;
1111
using System.Windows.Threading;
12-
using Hourglass.Managers;
12+
1313
using Hourglass.Timing;
1414

1515
/// <summary>
@@ -58,7 +58,6 @@ public SoundPlayer()
5858
// File sound player
5959
this.mediaPlayer = new MediaPlayer();
6060
this.mediaPlayer.MediaEnded += this.MediaPlayerOnMediaEnded;
61-
this.mediaPlayer.MediaFailed += this.MediaPlayerOnMediaFailed;
6261
}
6362

6463
#endregion
@@ -335,16 +334,6 @@ private void MediaPlayerOnMediaEnded(object sender, EventArgs e)
335334
}
336335
}
337336

338-
/// <summary>
339-
/// Invoked when an error is encountered in the <see cref="MediaPlayer"/>.
340-
/// </summary>
341-
/// <param name="sender">The <see cref="MediaPlayer"/>.</param>
342-
/// <param name="e">The event data.</param>
343-
private void MediaPlayerOnMediaFailed(object sender, ExceptionEventArgs e)
344-
{
345-
ErrorManager.Instance.ReportError(e.ErrorException.ToString());
346-
}
347-
348337
#endregion
349338
}
350339
}

0 commit comments

Comments
 (0)