Fix TaglibSharp build

Author: decriptor

src/TaglibSharp/CorruptFileException.cs

@@ -140,28 +140,5 @@ public CorruptFileException (string message, Exception innerException)
 			: base (message, innerException)
 		{
 		}
-
-		/// <summary>
-		///    Constructs and initializes a new instance of <see
-		///    cref="CorruptFileException" /> from a specified
-		///    serialization info and streaming context.
-		/// </summary>
-		/// <param name="info">
-		///    A <see cref="SerializationInfo" /> object containing the
-		///    serialized data to be used for the new instance.
-		/// </param>
-		/// <param name="context">
-		///    A <see cref="StreamingContext" /> object containing the
-		///    streaming context information for the new instance.
-		/// </param>
-		/// <remarks>
-		///    This constructor is implemented because <see
-		///    cref="CorruptFileException" /> implements the <see
-		///    cref="ISerializable" /> interface.
-		/// </remarks>
-		protected CorruptFileException (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
 	}
 }

src/TaglibSharp/File.cs

@@ -12,7 +12,7 @@
 // Copyright (C) 2005, 2007 Brian Nickel
 // Copyright (C) 2006 Novell, Inc.
 // Copyright (C) 2002,2003 Scott Wheeler (Original Implementation)
-// 
+//
 // This library is free software; you can redistribute it and/or modify
 // it  under the terms of the GNU Lesser General Public License version
 // 2.1 as published by the Free Software Foundation.
@@ -28,11 +28,8 @@
 // USA
 //
 
-using System;
-using System.Collections.Generic;
 using System.Globalization;
-using System.IO;
-using System.Runtime.Serialization;
+using System.Runtime.ExceptionServices;
 
 namespace TagLib
 {
@@ -56,10 +53,10 @@ public enum ReadStyle
 		Average = 2,
 
 		/// <summary>
-		///    Use the <see cref="PictureLazy"/> class in the 
-		///    the property <see cref="Tag.Pictures"/>. 
+		///    Use the <see cref="PictureLazy"/> class in the
+		///    the property <see cref="Tag.Pictures"/>.
 		///    This will avoid loading picture content when reading the Tag.
-		///    Picture will be read lazily, when the picture content is 
+		///    Picture will be read lazily, when the picture content is
 		///    accessed.
 		/// </summary>
 		PictureLazy = 4
@@ -148,7 +145,7 @@ public enum AccessMode
 		///    methods.</para>
 		///    <para>If the resolver returns a new <see cref="File" />,
 		///    it will instantly be returned, by <see
-		///    cref="Create(string)" />. If it returns <see 
+		///    cref="Create(string)" />. If it returns <see
 		///    langword="null" />, <see cref="Create(string)" /> will
 		///    continue to process. If the resolver throws an exception
 		///    it will be uncaught.</para>
@@ -526,15 +523,15 @@ public void Dispose ()
 		///   TagLib.Id3v2.Tag id3 = file.GetTag (TagLib.TagTypes.Id3v2, true);
 		///   if (id3 != null)
 		///      id3.SetTextFrame ("TMOO", moods);
-		///   
+		///
 		///   TagLib.Asf.Tag asf = file.GetTag (TagLib.TagTypes.Asf, true);
 		///   if (asf != null)
 		///      asf.SetDescriptorStrings (moods, "WM/Mood", "Mood");
-		///   
+		///
 		///   TagLib.Ape.Tag ape = file.GetTag (TagLib.TagTypes.Ape);
 		///   if (ape != null)
 		///      ape.SetValue ("MOOD", moods);
-		///      
+		///
 		///   // Whatever tag types you want...
 		///}</code>
 		/// </example>
@@ -572,23 +569,23 @@ public void Dispose ()
 		///      if (f != null)
 		///         return f.FieldList.ToArray ();
 		///   }
-		///   
+		///
 		///   TagLib.Asf.Tag asf = file.GetTag (TagLib.TagTypes.Asf);
 		///   if (asf != null) {
 		///      string [] value = asf.GetDescriptorStrings ("WM/Mood", "Mood");
 		///      if (value.Length &gt; 0)
 		///         return value;
 		///   }
-		///   
+		///
 		///   TagLib.Ape.Tag ape = file.GetTag (TagLib.TagTypes.Ape);
 		///   if (ape != null) {
 		///      Item item = ape.GetItem ("MOOD");
 		///      if (item != null)
 		///         return item.ToStringArray ();
 		///   }
-		///      
+		///
 		///   // Whatever tag types you want...
-		///   
+		///
 		///   return new string [] {};
 		///}</code>
 		/// </example>
@@ -831,7 +828,7 @@ long RFind (ByteVector pattern, long startPosition, ByteVector after)
 			*/
 
 			// Save the location of the current read pointer.  We
-			// will restore the position using Seek() before all 
+			// will restore the position using Seek() before all
 			// returns.
 
 			long original_position = file_stream.Position;
@@ -985,7 +982,7 @@ public void Insert (ByteVector data, long start)
 		/// <summary>
 		///   Inserts a specified block-size into the file repesented
 		///   by the current instance at a specified location. Former
-		///   data at this location is not overwriten and may then 
+		///   data at this location is not overwriten and may then
 		///   contain random content.
 		/// </summary>
 		/// <param name="size">
@@ -999,8 +996,8 @@ public void Insert (ByteVector data, long start)
 		/// <remarks>
 		///    This method is usefull to reserve some space in the file.
 		///    To insert or replace defined data blocks, use <see
-		///    cref="Insert(ByteVector,long)" /> or 
-		///    <see cref="Insert(ByteVector,long,long)"/> 
+		///    cref="Insert(ByteVector,long)" /> or
+		///    <see cref="Insert(ByteVector,long,long)"/>
 		/// </remarks>
 		public void Insert (long size, long start)
 		{
@@ -1321,8 +1318,15 @@ public static File Create (IFileAbstraction abstraction, string mimetype, ReadSt
 				file.MimeType = mimetype;
 				return file;
 			} catch (System.Reflection.TargetInvocationException e) {
-				PrepareExceptionForRethrow (e.InnerException);
+#if NETSTANDARD2_0
+				// .NET Standard 2.0: Stack trace will be lost when rethrowing inner exception.
+				// This is a limitation of .NET Standard 2.0.
 				throw e.InnerException;
+#else
+				// Modern .NET: preserve stack trace
+				ExceptionDispatchInfo.Capture (e.InnerException).Throw ();
+				throw; // Unreachable, but required for compiler
+#endif
 			}
 		}
 
@@ -1335,7 +1339,7 @@ public static File Create (IFileAbstraction abstraction, string mimetype, ReadSt
 		///    file type recognition stack.
 		/// </param>
 		/// <remarks>
-		///    A <see cref="FileTypeResolver" /> adds support for 
+		///    A <see cref="FileTypeResolver" /> adds support for
 		///    recognizing a file type outside of the standard mime-type
 		///    methods.
 		/// </remarks>
@@ -1352,7 +1356,7 @@ public static void AddFileTypeResolver (FileTypeResolver resolver)
 		#region Private/Protected Methods
 
 		/// <summary>
-		///    Prepare to Save the file. Thismust be called at the begining 
+		///    Prepare to Save the file. Thismust be called at the begining
 		///    of every File.Save() method.
 		/// </summary>
 		protected void PreSave ()
@@ -1383,7 +1387,7 @@ protected void PreSave ()
 		/// <param name="data">
 		///    A <see cref="ByteVector" /> object containing the data to
 		///    insert into the file. if null, no data is writen to the
-		///    file and the block is just inserted without overwriting the 
+		///    file and the block is just inserted without overwriting the
 		///    former data at the given location.
 		/// </param>
 		/// <param name="size">
@@ -1451,8 +1455,8 @@ void Insert (ByteVector data, long size, long start, long replace)
 			byte[] buffer;
 			byte[] about_to_overwrite;
 
-			// This is basically a special case of the loop below.  
-			// Here we're just doing the same steps as below, but 
+			// This is basically a special case of the loop below.
+			// Here we're just doing the same steps as below, but
 			// since we aren't using the same buffer size -- instead
 			// we're using the tag size -- this has to be handled as
 			// a special case.  We're also using File::writeBlock()
@@ -1476,12 +1480,12 @@ void Insert (ByteVector data, long size, long start, long replace)
 				about_to_overwrite.Length);
 
 			// Ok, here's the main loop.  We want to loop until the
-			// read fails, which means that we hit the end of the 
+			// read fails, which means that we hit the end of the
 			// file.
 
 			while (buffer_length != 0) {
 				// Seek to the current read position and read
-				// the data that we're about to overwrite. 
+				// the data that we're about to overwrite.
 				// Appropriately increment the readPosition.
 
 				file_stream.Position = read_position;
@@ -1527,25 +1531,8 @@ protected void Truncate (long length)
 			Mode = old_mode;
 		}
 
-		/// <summary>
-		/// Causes the original strack trace of the exception to be preserved when it is rethrown
-		/// </summary>
-		/// <param name="ex"></param>
-		static void PrepareExceptionForRethrow (Exception ex)
-		{
-			var ctx = new StreamingContext (StreamingContextStates.CrossAppDomain);
-			var mgr = new ObjectManager (null, ctx);
-			var si = new SerializationInfo (ex.GetType (), new FormatterConverter ());
-
-			ex.GetObjectData (si, ctx);
-			mgr.RegisterObject (ex, 1, si); // prepare for SetObjectData
-			mgr.DoFixups (); // ObjectManager calls SetObjectData
-		}
-
 		#endregion
 
-
-
 		#region Classes
 
 		/// <summary>
@@ -1669,7 +1656,7 @@ public void CloseStream (Stream stream)
 		///         return;
 		///
 		///      Gnome.Vfs.Vfs.Initialize ();
-		///      
+		///
 		///      try {
 		///          TagLib.File file = TagLib.File.Create (
 		///             new VfsFileAbstraction (args [0]));
@@ -1710,24 +1697,24 @@ public void CloseStream (Stream stream)
 		///import Gnome.Vfs from "gnome-vfs-sharp"
 		///
 		///class VfsFileAbstraction (TagLib.File.IFileAbstraction):
-		///        
+		///
 		///        _name as string
-		///        
+		///
 		///        def constructor(file as string):
 		///                _name = file
-		///        
+		///
 		///        Name:
 		///                get:
 		///                        return _name
-		///                
+		///
 		///        ReadStream:
 		///                get:
 		///                        return VfsStream(_name, FileMode.Open)
-		///                
+		///
 		///        WriteStream:
 		///                get:
 		///                        return VfsStream(_name, FileMode.Open)
-		///        
+		///
 		///if len(argv) == 1:
 		///        Vfs.Initialize()
 		///
@@ -1744,7 +1731,7 @@ public interface IFileAbstraction
 			///    implementation.
 			/// </summary>
 			/// <value>
-			///    A <see cref="string" /> object containing the 
+			///    A <see cref="string" /> object containing the
 			///    name or identifier used by the implementation.
 			/// </value>
 			/// <remarks>

src/TaglibSharp/Riff/List.cs

@@ -116,29 +116,6 @@ public List (TagLib.File file, long position, int length)
 			Parse (file.ReadBlock (length));
 		}
 
-		/// <summary>
-		///    Constructs and initializes a new instance of <see
-		///    cref="List" /> from a specified serialization info and
-		///    streaming context.
-		/// </summary>
-		/// <param name="info">
-		///    A <see cref="SerializationInfo" /> object containing the
-		///    serialized data to be used for the new instance.
-		/// </param>
-		/// <param name="context">
-		///    A <see cref="StreamingContext" /> object containing the
-		///    streaming context information for the new instance.
-		/// </param>
-		/// <remarks>
-		///    This constructor is implemented because <see
-		///    cref="List" /> implements the <see cref="ISerializable"
-		///    /> interface.
-		/// </remarks>
-		protected List (SerializationInfo info, StreamingContext context)
-			: base (info, context)
-		{
-		}
-
 		#endregion
 
 		#region Public Properties