Fixed the serializer's anchor loading.

2010-10-21 11:46:09 +00:00 · 2010-10-21 11:46:09 +00:00 · e540ff3f82
--- a/Dumper/Dumper.csproj
+++ b/Dumper/Dumper.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -12,6 +12,25 @@
    <AssemblyName>Dumper</AssemblyName>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -21,6 +40,7 @@
    <DefineConstants>DEBUG;TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -29,6 +49,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -48,6 +69,23 @@
      <Name>YamlDotNet.Core</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/YamlDotNet.Configuration/YamlDotNet.Configuration.csproj
+++ b/YamlDotNet.Configuration/YamlDotNet.Configuration.csproj
@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -14,6 +14,25 @@
    <AssemblyOriginatorKeyFile>..\YamlDotNet.snk</AssemblyOriginatorKeyFile>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -25,6 +44,7 @@
    <WarningLevel>4</WarningLevel>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>bin\Debug\YamlDotNet.Configuration.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -34,6 +54,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -65,6 +86,23 @@
      <Name>YamlDotNet.RepresentationModel</Name>
    </ProjectReference>
  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
       Other similar extension points exist, see Microsoft.Common.targets.
--- a/YamlDotNet.Converters/YamlDotNet.Converters.csproj
+++ b/YamlDotNet.Converters/YamlDotNet.Converters.csproj
@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -13,10 +14,11 @@
    <AssemblyOriginatorKeyFile>..\YamlDotNet.snk</AssemblyOriginatorKeyFile>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
    <PublishUrl>http://localhost/YamlDotNet.Converters/</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
@ -29,7 +31,6 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
@ -43,6 +44,7 @@
    <WarningLevel>4</WarningLevel>
    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
    <DocumentationFile>bin\Debug\YamlDotNet.Converters.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -51,6 +53,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -76,6 +79,11 @@
    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
      <Visible>False</Visible>
      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@ -91,6 +99,11 @@
      <ProductName>.NET Framework 3.5</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/YamlDotNet.Core/YamlDotNet.Core.csproj
+++ b/YamlDotNet.Core/YamlDotNet.Core.csproj
@ -1,8 +1,9 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.30729</ProductVersion>
+    <ProductVersion>9.0.21022</ProductVersion>
    <SchemaVersion>2.0</SchemaVersion>
    <ProjectGuid>{BF32DE1B-6276-4341-B212-F8862ADBBA7A}</ProjectGuid>
    <OutputType>Library</OutputType>
@ -13,10 +14,11 @@
    <AssemblyOriginatorKeyFile>..\YamlDotNet.snk</AssemblyOriginatorKeyFile>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
    <PublishUrl>http://localhost/YamlDotNet.Core/</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
@ -29,7 +31,6 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
  </PropertyGroup>
@ -42,7 +43,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Debug\YamlDotNet.Core.XML</DocumentationFile>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -51,6 +52,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -62,7 +64,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+      <Link>CommonAssemblyInfo.cs</Link>
    </Compile>
    <Compile Include="CharacterAnalyzer.cs" />
    <Compile Include="Constants.cs" />
@ -137,6 +139,11 @@
    <Compile Include="YamlException.cs" />
  </ItemGroup>
  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
      <Visible>False</Visible>
      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@ -152,6 +159,11 @@
      <ProductName>.NET Framework 3.5</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/YamlDotNet.RepresentationModel/Serialization/YamlSerializer.cs
+++ b/YamlDotNet.RepresentationModel/Serialization/YamlSerializer.cs
@ -211,15 +211,59 @@ namespace YamlDotNet.RepresentationModel.Serialization
 			else
 			{
 				anchors.Add(o, null);
+
+				if (typeof(IDictionary).IsAssignableFrom(type))
+				{
+					LoadDictionaryAliases(type, (IDictionary)o, ref nextId);
+					return;
+				}
+
+				Type iDictionaryType = GetImplementedGenericInterface(type, typeof(IDictionary<,>));
+				if (iDictionaryType != null)
+				{
+					LoadGenericDictionaryAliases(type, iDictionaryType, o, ref nextId);
+					return;
+				}
+
+				if (typeof(IEnumerable).IsAssignableFrom(type))
+				{
+					LoadListAliases(type, (IEnumerable)o, ref nextId);
+					return;
+				}
+
+
+				LoadObjectAliases(type, o, ref nextId);
+			}
+		}
+
+		private void LoadObjectAliases(Type type, object o, ref int nextId)
+		{
 			foreach (var property in GetProperties(type))
 			{
 				object value = property.GetValue(o, null);
-					if (value != null && value.GetType().IsClass)
+				if (value != null && value.GetType().IsClass && !(value is string))
 				{
 					LoadAliases(property.PropertyType, value, ref nextId);
 				}
 			}
 		}
+
+		private void LoadListAliases(Type type, IEnumerable list, ref int nextId)
+		{
+			foreach (var item in list)
+			{
+				LoadAliases(item.GetType(), item, ref nextId);
+			}
+		}
+
+		private void LoadGenericDictionaryAliases(Type type, Type iDictionaryType, object o, ref int nextId)
+		{
+			throw new NotImplementedException();
+		}
+
+		private void LoadDictionaryAliases(Type type, IDictionary iDictionary, ref int nextId)
+		{
+			throw new NotImplementedException();
 		}

 		private void SerializeObject(Emitter emitter, Type type, object value, string anchor)
--- a/YamlDotNet.RepresentationModel/YamlDotNet.RepresentationModel.csproj
+++ b/YamlDotNet.RepresentationModel/YamlDotNet.RepresentationModel.csproj
@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -13,9 +14,11 @@
    <AssemblyOriginatorKeyFile>..\YamlDotNet.snk</AssemblyOriginatorKeyFile>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
    <PublishUrl>http://localhost/YamlDotNet.RepresentationModel/</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
@ -28,10 +31,8 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -42,6 +43,7 @@
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
    <DocumentationFile>bin\Debug\YamlDotNet.RepresentationModel.XML</DocumentationFile>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -50,6 +52,7 @@
    <DefineConstants>TRACE</DefineConstants>
    <ErrorReport>prompt</ErrorReport>
    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="System" />
@ -90,6 +93,11 @@
    <Compile Include="YamlVisitor.cs" />
  </ItemGroup>
  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
      <Visible>False</Visible>
      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@ -105,6 +113,11 @@
      <ProductName>.NET Framework 3.5</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
  </ItemGroup>
  <ItemGroup>
    <ProjectReference Include="..\YamlDotNet.Core\YamlDotNet.Core.csproj">
--- a/YamlDotNet.UnitTests.Runner/Program.cs
+++ b/YamlDotNet.UnitTests.Runner/Program.cs
@ -0,0 +1,16 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using YamlDotNet.UnitTests.RepresentationModel;
+
+namespace YamlDotNet.UnitTests.Runner
+{
+	class Program
+	{
+		static void Main(string[] args)
+		{
+			new YamlStreamTests().RoundtripSample();
+		}
+	}
+}
--- a/YamlDotNet.UnitTests.Runner/Properties/AssemblyInfo.cs
+++ b/YamlDotNet.UnitTests.Runner/Properties/AssemblyInfo.cs
@ -0,0 +1,36 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("YamlDotNet.UnitTests.Runner")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("Microsoft")]
+[assembly: AssemblyProduct("YamlDotNet.UnitTests.Runner")]
+[assembly: AssemblyCopyright("Copyright © Microsoft 2010")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible 
+// to COM components.  If you need to access a type in this assembly from 
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+// The following GUID is for the ID of the typelib if this project is exposed to COM
+[assembly: Guid("c4486b84-4587-46bd-b367-34bdc4747b61")]
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// 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.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]
--- a/YamlDotNet.UnitTests.Runner/YamlDotNet.UnitTests.Runner.csproj
+++ b/YamlDotNet.UnitTests.Runner/YamlDotNet.UnitTests.Runner.csproj
@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProductVersion>9.0.30729</ProductVersion>
+    <SchemaVersion>2.0</SchemaVersion>
+    <ProjectGuid>{6EEB3F45-C386-47EF-878F-E32654B4612D}</ProjectGuid>
+    <OutputType>Exe</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>YamlDotNet.UnitTests.Runner</RootNamespace>
+    <AssemblyName>YamlDotNet.UnitTests.Runner</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <FileUpgradeFlags>
+    </FileUpgradeFlags>
+    <OldToolsVersion>3.5</OldToolsVersion>
+    <UpgradeBackupLocation />
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Core">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Xml.Linq">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data.DataSetExtensions">
+      <RequiredTargetFramework>3.5</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="System.Data" />
+    <Reference Include="System.Xml" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Program.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\YamlDotNet.UnitTests\YamlDotNet.UnitTests.csproj">
+      <Project>{894DA4C7-9FA7-4126-AFE1-B9769BEE7D43}</Project>
+      <Name>YamlDotNet.UnitTests</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
+      <Visible>False</Visible>
+      <ProductName>Windows Installer 3.1</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
--- a/YamlDotNet.UnitTests/Converters/Xml/XmlConverterTests.cs
+++ b/YamlDotNet.UnitTests/Converters/Xml/XmlConverterTests.cs
@ -11,85 +11,6 @@ namespace YamlDotNet.UnitTests
 	[TestFixture]
 	public class XmlConverterTests : YamlTest
 	{
-		private class TracingVisitor : YamlVisitor {
-			private int indent = 0;
-			
-			private void WriteIndent() {
-				for(int i = 0; i < indent; ++i) {
-					Console.Write("  ");
-				}
-			}
-			
-			protected override void Visit (YamlDocument document) {
-				WriteIndent();				
-				Console.WriteLine("Visit(YamlDocument)");
-				++indent;
-			}
-
-			protected override void Visit (YamlMappingNode mapping)
-			{
-				WriteIndent();				
-				Console.WriteLine("Visit(YamlMapping)");
-				++indent;
-			}
-			
-			protected override void Visit (YamlScalarNode scalar)
-			{
-				WriteIndent();				
-				Console.WriteLine("Visit(YamlScalarNode) - {0}", scalar.Value);
-				++indent;
-			}
-
-			protected override void Visit (YamlSequenceNode sequence)
-			{
-				WriteIndent();				
-				Console.WriteLine("Visit(YamlSequenceNode)");
-				++indent;
-			}
-
-			protected override void Visit (YamlStream stream)
-			{
-				WriteIndent();				
-				Console.WriteLine("Visit(YamlStream)");
-				++indent;
-			}
-
-			protected override void Visited (YamlDocument document)
-			{
-				--indent;
-				WriteIndent();				
-				Console.WriteLine("Visited(YamlDocument)");
-			}
-			
-			protected override void Visited (YamlMappingNode mapping)
-			{
-				--indent;
-				WriteIndent();				
-				Console.WriteLine("Visited(YamlMappingNode)");
-			}
-
-			protected override void Visited (YamlScalarNode scalar)
-			{
-				--indent;
-				WriteIndent();				
-				Console.WriteLine("Visited(YamlScalarNode)");
-			}
-
-			protected override void Visited (YamlSequenceNode sequence)
-			{
-				--indent;
-				WriteIndent();				
-				Console.WriteLine("Visited(YamlSequenceNode)");
-			}
-
-			protected override void Visited (YamlStream stream)
-			{
-				--indent;
-				WriteIndent();				
-				Console.WriteLine("Visited(YamlStream)");
-			}
-		}
-		
 		private static YamlDocument GetDocument(string name) {
 			YamlStream stream = new YamlStream();
 			stream.Load(YamlFile(name));
--- a/YamlDotNet.UnitTests/RepresentationModel/SerializationTests.cs
+++ b/YamlDotNet.UnitTests/RepresentationModel/SerializationTests.cs
@ -381,6 +381,7 @@ namespace YamlDotNet.UnitTests.RepresentationModel
 			}
 		}
 		
+		[CLSCompliant(false)]
 		[TypeConverter(typeof(Converter))]
 		public class Convertible : IConvertible
 		{
--- a/YamlDotNet.UnitTests/RepresentationModel/YamlStreamTests.cs
+++ b/YamlDotNet.UnitTests/RepresentationModel/YamlStreamTests.cs
@ -259,5 +259,16 @@ namespace YamlDotNet.UnitTests.RepresentationModel
 		{
 			RoundtripTest("backreference.yaml");
 		}
+
+		[Test]
+		public void RoundtripSample()
+		{
+			YamlStream original = new YamlStream();
+			original.Load(YamlFile("sample.yaml"));
+
+			original.Accept(new TracingVisitor());
+			
+			//RoundtripTest("sample.yaml");
+		}
 	}
 }
--- a/YamlDotNet.UnitTests/Runner.cs
+++ b/YamlDotNet.UnitTests/Runner.cs
@ -9,7 +9,7 @@ namespace YamlDotNet.UnitTests
 	{
 		public static void Main()
 		{
-			new SerializationTests().DeserializeList();
+			new YamlStreamTests().RoundtripSample();
 		}
 	}
 }
--- a/YamlDotNet.UnitTests/TracingVisitor.cs
+++ b/YamlDotNet.UnitTests/TracingVisitor.cs
@ -0,0 +1,91 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using YamlDotNet.RepresentationModel;
+
+namespace YamlDotNet.UnitTests
+{
+	public class TracingVisitor : YamlVisitor
+	{
+		private int indent = 0;
+
+		private void WriteIndent()
+		{
+			for (int i = 0; i < indent; ++i)
+			{
+				Console.Write("  ");
+			}
+		}
+
+		protected override void Visit(YamlDocument document)
+		{
+			WriteIndent();
+			Console.WriteLine("Visit(YamlDocument)");
+			++indent;
+		}
+
+		protected override void Visit(YamlMappingNode mapping)
+		{
+			WriteIndent();
+			Console.WriteLine("Visit(YamlMapping, {0}, {1})", mapping.Anchor, mapping.Tag);
+			++indent;
+		}
+
+		protected override void Visit(YamlScalarNode scalar)
+		{
+			WriteIndent();
+			Console.WriteLine("Visit(YamlScalarNode, {0}, {1}) - {2}", scalar.Anchor, scalar.Tag, scalar.Value);
+			++indent;
+		}
+
+		protected override void Visit(YamlSequenceNode sequence)
+		{
+			WriteIndent();
+			Console.WriteLine("Visit(YamlSequenceNode, {0}, {1})", sequence.Anchor, sequence.Tag);
+			++indent;
+		}
+
+		protected override void Visit(YamlStream stream)
+		{
+			WriteIndent();
+			Console.WriteLine("Visit(YamlStream)");
+			++indent;
+		}
+
+		protected override void Visited(YamlDocument document)
+		{
+			--indent;
+			WriteIndent();
+			Console.WriteLine("Visited(YamlDocument)");
+		}
+
+		protected override void Visited(YamlMappingNode mapping)
+		{
+			--indent;
+			WriteIndent();
+			Console.WriteLine("Visited(YamlMappingNode)");
+		}
+
+		protected override void Visited(YamlScalarNode scalar)
+		{
+			--indent;
+			WriteIndent();
+			Console.WriteLine("Visited(YamlScalarNode)");
+		}
+
+		protected override void Visited(YamlSequenceNode sequence)
+		{
+			--indent;
+			WriteIndent();
+			Console.WriteLine("Visited(YamlSequenceNode)");
+		}
+
+		protected override void Visited(YamlStream stream)
+		{
+			--indent;
+			WriteIndent();
+			Console.WriteLine("Visited(YamlStream)");
+		}
+	}
+}
--- a/YamlDotNet.UnitTests/YamlDotNet.UnitTests.csproj
+++ b/YamlDotNet.UnitTests/YamlDotNet.UnitTests.csproj
@ -1,4 +1,5 @@
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<?xml version="1.0" encoding="utf-8"?>
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
  <PropertyGroup>
    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@ -13,10 +14,13 @@
    <AssemblyOriginatorKeyFile>..\YamlDotNet.snk</AssemblyOriginatorKeyFile>
    <FileUpgradeFlags>
    </FileUpgradeFlags>
-    <OldToolsVersion>2.0</OldToolsVersion>
+    <OldToolsVersion>3.5</OldToolsVersion>
    <UpgradeBackupLocation>
    </UpgradeBackupLocation>
    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <IsWebBootstrapper>true</IsWebBootstrapper>
+    <StartupObject>
+    </StartupObject>
    <PublishUrl>http://localhost/YamlDotNet.UnitTests/</PublishUrl>
    <Install>true</Install>
    <InstallFrom>Web</InstallFrom>
@ -29,11 +33,8 @@
    <MapFileExtensions>true</MapFileExtensions>
    <ApplicationRevision>0</ApplicationRevision>
    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>true</IsWebBootstrapper>
    <UseApplicationTrust>false</UseApplicationTrust>
    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <StartupObject>
-    </StartupObject>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
    <DebugSymbols>true</DebugSymbols>
@ -48,6 +49,7 @@
    <RootNamespace>YamlDotNet.UnitTests</RootNamespace>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
    <DebugType>pdbonly</DebugType>
@ -62,6 +64,7 @@
    <RootNamespace>YamlDotNet.UnitTests</RootNamespace>
    <AllowUnsafeBlocks>false</AllowUnsafeBlocks>
    <CheckForOverflowUnderflow>true</CheckForOverflowUnderflow>
+    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
  </PropertyGroup>
  <ItemGroup>
    <Reference Include="nunit.framework, Version=2.4.8.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
@ -78,7 +81,7 @@
  </ItemGroup>
  <ItemGroup>
    <Compile Include="..\CommonAssemblyInfo.cs">
-      <Link>Properties\CommonAssemblyInfo.cs</Link>
+      <Link>CommonAssemblyInfo.cs</Link>
    </Compile>
    <Compile Include="Converters\Xml\XmlConverterTests.cs" />
    <Compile Include="Core\EmitterTests.cs" />
@ -91,6 +94,7 @@
    <Compile Include="RepresentationModel\SerializationTests.cs" />
    <Compile Include="RepresentationModel\YamlStreamTests.cs" />
    <Compile Include="Runner.cs" />
+    <Compile Include="TracingVisitor.cs" />
    <Compile Include="YamlTest.cs" />
  </ItemGroup>
  <ItemGroup>
@ -129,6 +133,11 @@
    <EmbeddedResource Include="forwardAlias.yaml" />
  </ItemGroup>
  <ItemGroup>
+    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
    <BootstrapperPackage Include="Microsoft.Net.Framework.2.0">
      <Visible>False</Visible>
      <ProductName>.NET Framework 2.0 %28x86%29</ProductName>
@ -144,6 +153,11 @@
      <ProductName>.NET Framework 3.5</ProductName>
      <Install>false</Install>
    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
  </ItemGroup>
  <ItemGroup>
    <EmbeddedResource Include="explicitType.yaml" />
@ -171,7 +185,7 @@
    <EmbeddedResource Include="converter.yaml" />
  </ItemGroup>
  <ItemGroup>
-    <EmbeddedResource Include="backreference.yaml" />
+    <EmbeddedResource Include="sample.yaml" />
  </ItemGroup>
  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
--- a/YamlDotNet.UnitTests/sample.yaml
+++ b/YamlDotNet.UnitTests/sample.yaml
@ -0,0 +1,8 @@
+# This is a sample yaml file
+parent:
+  anchor: &default
+    key1: value1
+    key2: value2
+  alias:
+    <<: *default
+    key2: Overriding key2
--- a/YamlDotNet.sln
+++ b/YamlDotNet.sln
@ -1,6 +1,6 @@

-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
+Microsoft Visual Studio Solution File, Format Version 11.00
+# Visual Studio 2010
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Dependencies", "Dependencies", "{7BB532F1-A667-41E6-9CE7-4006046C1AA5}"
 	ProjectSection(SolutionItems) = preProject
 		Dependencies\nunit.framework.dll = Dependencies\nunit.framework.dll
@ -26,6 +26,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet.Configuration",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dumper", "Dumper\Dumper.csproj", "{BB38DE1D-A8E2-4035-AC3A-C6B5AF6B6252}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "YamlDotNet.UnitTests.Runner", "YamlDotNet.UnitTests.Runner\YamlDotNet.UnitTests.Runner.csproj", "{6EEB3F45-C386-47EF-878F-E32654B4612D}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@ -56,6 +58,10 @@ Global
 		{BB38DE1D-A8E2-4035-AC3A-C6B5AF6B6252}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB38DE1D-A8E2-4035-AC3A-C6B5AF6B6252}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB38DE1D-A8E2-4035-AC3A-C6B5AF6B6252}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6EEB3F45-C386-47EF-878F-E32654B4612D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6EEB3F45-C386-47EF-878F-E32654B4612D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6EEB3F45-C386-47EF-878F-E32654B4612D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6EEB3F45-C386-47EF-878F-E32654B4612D}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE