Release v1.12.0

dziemborowicz · Sep 28, 2021 · d789137 · d789137
2 parents d931d22 + fcb3f7d
commit d789137
Show file tree

Hide file tree

Showing 6 changed files with 8 additions and 19 deletions.
diff --git a/Hourglass.Bundle/Bundle.wxs b/Hourglass.Bundle/Bundle.wxs
@@ -3,7 +3,7 @@
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
   <Bundle Name="Hourglass"
-          Version="1.11.0.0"
+          Version="1.12.0.0"
           Manufacturer="Chris Dziemborowicz"
           UpgradeCode="f1d002c9-cfc9-40fb-84af-96e7aec26e0b"
           IconSourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico">

diff --git a/Hourglass.Setup/Product.wxs b/Hourglass.Setup/Product.wxs
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
      xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
-    <Product Id="*" Name="Hourglass" Language="1033" Version="1.11.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
+    <Product Id="*" Name="Hourglass" Language="1033" Version="1.12.0.0" Manufacturer="Chris Dziemborowicz" UpgradeCode="172d3713-8820-4374-8195-3e2374e7724f">
         <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine"/>
 
         <Icon Id="AppIcon.exe" SourceFile="$(var.Hourglass.ProjectDir)Resources\AppIcon.ico"/>

diff --git a/Hourglass.Test/Properties/AssemblyInfo.cs b/Hourglass.Test/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 [assembly: AssemblyCulture("")]
 [assembly: ComVisible(false)]
 [assembly: Guid("002a4be7-7323-4bf9-ab08-5fc8978d9eb0")]
-[assembly: AssemblyVersion("1.11.0.0")]
-[assembly: AssemblyFileVersion("1.11.0.0")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]
diff --git a/Hourglass/Properties/App.manifest b/Hourglass/Properties/App.manifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <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">
-    <assemblyIdentity version="1.11.0.0" name="Hourglass"/>
+    <assemblyIdentity version="1.12.0.0" name="Hourglass"/>
     <trustInfo xmlns="urn:schemas-microsoft-com:asm.v2">
         <security>
             <requestedPrivileges xmlns="urn:schemas-microsoft-com:asm.v3">

diff --git a/Hourglass/Properties/AssemblyInfo.cs b/Hourglass/Properties/AssemblyInfo.cs
@@ -17,8 +17,8 @@
 [assembly: AssemblyCopyright("Copyright © 2021 Chris Dziemborowicz")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-[assembly: AssemblyVersion("1.11.0.0")]
-[assembly: AssemblyFileVersion("1.11.0.0")]
+[assembly: AssemblyVersion("1.12.0.0")]
+[assembly: AssemblyFileVersion("1.12.0.0")]
 [assembly: NeutralResourcesLanguageAttribute("en-US")]
 [assembly: Guid("83DBAA61-6193-4288-BBB7-BEAEC33FE321")]
 [assembly: ThemeInfo(ResourceDictionaryLocation.None, ResourceDictionaryLocation.SourceAssembly)]

diff --git a/Hourglass/Windows/SoundPlayer.cs b/Hourglass/Windows/SoundPlayer.cs
@@ -9,7 +9,7 @@ namespace Hourglass.Windows
     using System;
     using System.Windows.Media;
     using System.Windows.Threading;
-    using Hourglass.Managers;
+
     using Hourglass.Timing;
 
     /// <summary>
@@ -58,7 +58,6 @@ public SoundPlayer()
             // File sound player
             this.mediaPlayer = new MediaPlayer();
             this.mediaPlayer.MediaEnded += this.MediaPlayerOnMediaEnded;
-            this.mediaPlayer.MediaFailed += this.MediaPlayerOnMediaFailed;
         }
 
         #endregion
@@ -335,16 +334,6 @@ private void MediaPlayerOnMediaEnded(object sender, EventArgs e)
             }
         }
 
-        /// <summary>
-        /// Invoked when an error is encountered in the <see cref="MediaPlayer"/>.
-        /// </summary>
-        /// <param name="sender">The <see cref="MediaPlayer"/>.</param>
-        /// <param name="e">The event data.</param>
-        private void MediaPlayerOnMediaFailed(object sender, ExceptionEventArgs e)
-        {
-            ErrorManager.Instance.ReportError(e.ErrorException.ToString());
-        }
-
         #endregion
     }
 }