Make version 2.0.0.

aaubry · May 29, 2013 · 38685a8 · 38685a8
1 parent c056a0f
commit 38685a8
Show file tree

Hide file tree

Showing 8 changed files with 106 additions and 121 deletions.
diff --git a/CommonAssemblyInfo.cs b/CommonAssemblyInfo.cs
@@ -33,7 +33,7 @@
 #endif
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("YamlDotNet")]
-[assembly: AssemblyCopyright("Copyright © Antoine Aubry 2008")]
+[assembly: AssemblyCopyright("Copyright © Antoine Aubry 2008, 2009, 2010, 2011, 2012, 2013")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -54,7 +54,7 @@
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("0.2.*")]
-//[assembly: AssemblyFileVersion("0.2.*")]
+[assembly: AssemblyVersion("2.0.*")]
+//[assembly: AssemblyFileVersion("2.0.*")]
 
 [assembly: CLSCompliant(true)]
diff --git a/README.md b/README.md
@@ -9,9 +9,25 @@ YAML, which stands for "YAML Ain't Markup Language", is described as "a human fr
 ## The YamlDotNet library
 
 The library has now been successfully used in multiple projects and is considered fairly stable.
-Where to get it?
+
+## Where to get it?
 
 The most up-to-date version can always be found in the following NuGet packages:
 
 * [http://nuget.org/packages/YamlDotNet.Core](http://nuget.org/packages/YamlDotNet.Core)
 * [http://nuget.org/packages/YamlDotNet.RepresentationModel](http://nuget.org/packages/YamlDotNet.RepresentationModel)
+
+# Changelog
+
+## Version 2.0.0
+
+* YamlSerializer has been replaced by the Deserializer class. It offer the same functionality of YamlSerializer but is easier to maintain and extend.
+  * **Breaking change:** DeserializationOverrides is no longer supported. If you need this, please file a bug and we will analyze it.
+  * **Breaking change:** IDeserializationContext is no longer supported. If you need this, please file a bug and we will analyze it.
+  * Tag mappings are registered directly on the Deserializer using RegisterTagMapping()
+  * ObjectFactory is specified in the constructor, if required.
+
+* Bug fixes to the Serializer:
+  * Fix bug when serializing lists with nulls inside. e9019d5f224f266e88d9882502f83f0c6865ec24
+
+* Adds a YAML editor add-in for Visual Studio 2012. Available on the [Visual Studio Gallery](http://visualstudiogallery.msdn.microsoft.com/34423c06-f756-4721-8394-bc3d23b91ca7).
diff --git a/YamlDotNet.Converters.nuspec b/YamlDotNet.Converters.nuspec
@@ -1,23 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<package> 
-  <metadata> 
-    <id>YamlDotNet.Converters</id> 
-    <version></version> 
-    <authors>Antoine Aubry</authors>
-    <description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
-		<summary>This package contains the converters to other formats, such as XML.</summary>
-		<language>en-US</language>
-    <licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
-    <projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
-		<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
-		<tags>yaml conversion xml development library</tags>
-		<dependencies>
-			<dependency id="YamlDotNet.Core" version="" />
-			<dependency id="YamlDotNet.RepresentationModel" version="" />
-		</dependencies>
-	</metadata>
-	<files>
-		<file src="..\YamlDotNet.Converters\bin\Release\YamlDotNet.Converters.dll" target="lib\net35" />
-		<file src="..\YamlDotNet.Converters\bin\Release\YamlDotNet.Converters.pdb" target="lib\net35" />
-	</files>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+	<id>YamlDotNet.Converters</id>
+	<version></version>
+	<authors>Antoine Aubry</authors>
+	<description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
+	<summary>This package contains the converters to other formats, such as XML.</summary>
+	<language>en-US</language>
+	<licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
+	<projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
+	<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
+	<tags>yaml conversion xml development library</tags>
+	<dependencies>
+	  <dependency id="YamlDotNet.Core" version="" />
+	  <dependency id="YamlDotNet.RepresentationModel" version="" />
+	</dependencies>
+  </metadata>
+  <files>
+	<file src="..\YamlDotNet.Converters\bin\Release\YamlDotNet.Converters.dll" target="lib\net35" />
+	<file src="..\YamlDotNet.Converters\bin\Release\YamlDotNet.Converters.pdb" target="lib\net35" />
+  </files>
 </package>
diff --git a/YamlDotNet.Core.nuspec b/YamlDotNet.Core.nuspec
@@ -1,19 +1,19 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<package> 
-  <metadata> 
-    <id>YamlDotNet.Core</id> 
-    <version></version> 
-    <authors>Antoine Aubry</authors>
-    <description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
-		<summary>This package contains the YAML parser.</summary>
-		<language>en-US</language>
-    <licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
-    <projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
-		<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
-		<tags>yaml parser development library</tags>
-	</metadata>
-	<files>
-		<file src="..\YamlDotNet.Core\bin\Release\YamlDotNet.Core.dll" target="lib\net35" />
-		<file src="..\YamlDotNet.Core\bin\Release\YamlDotNet.Core.pdb" target="lib\net35" />
-	</files>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+	<id>YamlDotNet.Core</id>
+	<version></version>
+	<authors>Antoine Aubry</authors>
+	<description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
+	<summary>This package contains the YAML parser.</summary>
+	<language>en-US</language>
+	<licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
+	<projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
+	<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
+	<tags>yaml parser development library</tags>
+  </metadata>
+  <files>
+	<file src="..\YamlDotNet.Core\bin\Release\YamlDotNet.Core.dll" target="lib\net35" />
+	<file src="..\YamlDotNet.Core\bin\Release\YamlDotNet.Core.pdb" target="lib\net35" />
+  </files>
 </package>
diff --git a/YamlDotNet.RepresentationModel.nuspec b/YamlDotNet.RepresentationModel.nuspec
@@ -1,22 +1,22 @@
-<?xml version="1.0" encoding="utf-8"?> 
-<package> 
-  <metadata> 
-    <id>YamlDotNet.RepresentationModel</id> 
-    <version></version> 
-    <authors>Antoine Aubry</authors>
-    <description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
-		<summary>This package contains the YAML document object model and serialization classes.</summary>
-		<language>en-US</language>
-    <licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
-    <projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
-		<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
-		<tags>yaml serialization development library</tags>
-		<dependencies>
-			<dependency id="YamlDotNet.Core" version="" />
-		</dependencies>
-	</metadata>
-	<files>
-		<file src="..\YamlDotNet.RepresentationModel\bin\Release\YamlDotNet.RepresentationModel.dll" target="lib\net35" />
-		<file src="..\YamlDotNet.RepresentationModel\bin\Release\YamlDotNet.RepresentationModel.pdb" target="lib\net35" />
-	</files>
+<?xml version="1.0" encoding="utf-8"?>
+<package>
+  <metadata>
+	<id>YamlDotNet.RepresentationModel</id>
+	<version></version>
+	<authors>Antoine Aubry</authors>
+	<description>A .NET library for YAML. yamldotnet provides low level parsing and emitting of YAML as well as a high level object model similar to XmlDocument.</description>
+	<summary>This package contains the YAML document object model and serialization classes.</summary>
+	<language>en-US</language>
+	<licenseUrl>http://www.aaubry.net/yamldotnet/license.aspx</licenseUrl>
+	<projectUrl>http://www.aaubry.net/yamldotnet.aspx</projectUrl>
+	<iconUrl>http://www.aaubry.net/IMAGES%2f2012%2f11%2fyamldotnet.png.jpgx</iconUrl>
+	<tags>yaml serialization development library</tags>
+	<dependencies>
+	  <dependency id="YamlDotNet.Core" version="" />
+	</dependencies>
+  </metadata>
+  <files>
+	<file src="..\YamlDotNet.RepresentationModel\bin\Release\YamlDotNet.RepresentationModel.dll" target="lib\net35" />
+	<file src="..\YamlDotNet.RepresentationModel\bin\Release\YamlDotNet.RepresentationModel.pdb" target="lib\net35" />
+  </files>
 </package>
diff --git a/YamlDotNet.Samples/DeserializeObjectGraph.cs b/YamlDotNet.Samples/DeserializeObjectGraph.cs
@@ -11,8 +11,8 @@ public void Run(string[] args)
 			// Setup the input
 			var input = new StringReader(_document);
 
-			var yamlSerializer = new YamlSerializer<Order>();
-			var order = yamlSerializer.Deserialize(input);
+			var deserializer = new Deserializer();
+			var order = (Order)deserializer.Deserialize(input, typeof(Order));
 
 			Console.WriteLine("Receipt: {0}", order.Receipt);
 			Console.WriteLine("Customer: {0} {1}", order.Customer.Given, order.Customer.Family);

diff --git a/YamlDotNet.UnitTests/RepresentationModel/SerializationTests.cs b/YamlDotNet.UnitTests/RepresentationModel/SerializationTests.cs
@@ -17,25 +17,24 @@
 //  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 //  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-//  SOFTWARE.
-
-using System;
-using System.Drawing;
-using System.Linq;
-using System.Text.RegularExpressions;
-using Xunit;
-using System.IO;
-using YamlDotNet.Core;
-using YamlDotNet.RepresentationModel.Serialization;
-using System.Reflection;
-using System.Collections;
-using System.Collections.Generic;
-using YamlDotNet.Core.Events;
-using System.Globalization;
-using System.ComponentModel;
-using YamlDotNet.RepresentationModel.Serialization.NamingConventions;
-using System.Text.RegularExpressions;
-
+//  SOFTWARE.
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Drawing;
+using System.Globalization;
+using System.IO;
+using System.Linq;
+using System.Reflection;
+using System.Text.RegularExpressions;
+using Xunit;
+using YamlDotNet.Core;
+using YamlDotNet.Core.Events;
+using YamlDotNet.RepresentationModel.Serialization;
+using YamlDotNet.RepresentationModel.Serialization.NamingConventions;
+
 namespace YamlDotNet.UnitTests.RepresentationModel
 {
 	public class SerializationTests : YamlTest
@@ -1024,11 +1023,11 @@ public void NullValuesInListsAreAlwaysEmittedWithoutEmitDefaults()
 		[Fact]
 		public void NullValuesInListsAreAlwaysEmittedWithEmitDefaults()
 		{
-			var input = new string[] { "foo", null, "bar" };
-
-			var serializer = new Serializer();
+			var input = new string[] { "foo", null, "bar" };
+
+			var serializer = new Serializer(SerializationOptions.EmitDefaults);
 			var writer = new StringWriter();
-			serializer.Serialize(writer, input, SerializationOptions.EmitDefaults);
+			serializer.Serialize(writer, input);
 			var serialized = writer.ToString();
 
 			Console.WriteLine(serialized);
@@ -1093,35 +1092,5 @@ public void DeserializeManyDocuments()
 			Assert.Equal("Brad", people[1].Name);
 			Assert.Equal("Charles", people[2].Name);
 		}
-
-		[Fact]
-		public void NullValuesInListsAreAlwaysEmittedWithoutEmitDefaults()
-		{
-			var input = new string[] { "foo", null, "bar" };
-
-			var serializer = new Serializer();
-			var writer = new StringWriter();
-			serializer.Serialize(writer, input);
-			var serialized = writer.ToString();
-
-			Console.WriteLine(serialized);
-
-			Assert.Equal(3, Regex.Matches(serialized, "-").Count);
-		}
-
-		[Fact]
-		public void NullValuesInListsAreAlwaysEmittedWithEmitDefaults()
-		{
-			var input = new string[] { "foo", null, "bar" };
-
-			var serializer = new Serializer(SerializationOptions.EmitDefaults);
-			var writer = new StringWriter();
-			serializer.Serialize(writer, input);
-			var serialized = writer.ToString();
-
-			Console.WriteLine(serialized);
-
-			Assert.Equal(3, Regex.Matches(serialized, "-").Count);
-		}
 	}
 }
diff --git a/YamlDotNet.build b/YamlDotNet.build
@@ -4,7 +4,7 @@
 	<!-- This build file requires .NET 4.0 and nant 0.91 alpha 2 or higher -->
 	<property name="nant.settings.currentframework" value="net-4.0"/>
 
-	<property name="version" value="1.3.0" />
+	<property name="version" value="2.0.0" />
 
 	<fileset id="binaries">
 		<include name="YamlDotNet.Core/bin/Release/YamlDotNet.Core.dll" />