Update project files

10 files changed, 54 insertions, 293 deletions

diff --git a/Mammoth.Cli/Mammoth.Cli.csproj b/Mammoth.Cli/Mammoth.Cli.csproj
index f7e125e..7aeedc3 100644
--- a/Mammoth.Cli/Mammoth.Cli.csproj
+++ b/Mammoth.Cli/Mammoth.Cli.csproj
@@ -1,44 +1,23 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{20602E78-EEBD-407B-B8C3-EDB6254BD663}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>Mammoth.Cli</RootNamespace>
-    <AssemblyName>Mammoth.Cli</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>net45</TargetFramework>
+    <AssemblyTitle>Mammoth.Cli</AssemblyTitle>
+    <Copyright>Michael Williamson</Copyright>
+    <Deterministic>false</Deterministic>
+    <AssemblyVersion>1.0.*</AssemblyVersion>
+    <FileVersion>1.0.*</FileVersion>
+    <DebugType>full</DebugType>
+    <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Externalconsole>true</Externalconsole>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
-  <ItemGroup>
-    <ProjectReference Include="..\Mammoth\Mammoth.csproj">
-      <Project>{51C5CBD6-8809-4D5E-BABE-1787A16F5ED8}</Project>
-      <Name>Mammoth</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Mammoth\Mammoth.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Mammoth.Cli/Properties/AssemblyInfo.cs b/Mammoth.Cli/Properties/AssemblyInfo.cs
deleted file mode 100644
index 1f83366..0000000
--- a/Mammoth.Cli/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Mammoth.Cli")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Michael Williamson")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/Mammoth.Tests/DocumentConverterTests.cs b/Mammoth.Tests/DocumentConverterTests.cs
index 5469e08..c61ac04 100644
--- a/Mammoth.Tests/DocumentConverterTests.cs
+++ b/Mammoth.Tests/DocumentConverterTests.cs
@@ -98,7 +98,7 @@ namespace Mammoth.Tests {
                 Directory.Delete(tempDirectory, recursive: true);
             }
         }
-        
+
         [Fact]
         public void ImageConversionCanBeCustomised() {
             AssertSuccessfulConversion(
@@ -106,7 +106,7 @@ namespace Mammoth.Tests {
                 "<p><img src=\"iV,image/png\" /></p>"
             );
         }
-        
+
         private IDictionary<string, string> ConvertImage(IImage image) {
             using (var stream = image.GetStream()) {
                 var base64 = StreamToBase64(stream);
@@ -114,7 +114,7 @@ namespace Mammoth.Tests {
                 return new Dictionary<string, string> { { "src", src } };
             }
         }
-        
+
         private static string StreamToBase64(System.IO.Stream stream) {
             var memoryStream = new System.IO.MemoryStream();
             stream.CopyTo(memoryStream);
@@ -269,7 +269,7 @@ namespace Mammoth.Tests {
         }
 
         private string TestFilePath(string name) {
-            return Path.Combine("../../TestData", name);
+            return Path.Combine("../../../TestData", name);
         }
     }
 }
diff --git a/Mammoth.Tests/Mammoth.Tests.csproj b/Mammoth.Tests/Mammoth.Tests.csproj
index d561dde..3cae293 100644
--- a/Mammoth.Tests/Mammoth.Tests.csproj
+++ b/Mammoth.Tests/Mammoth.Tests.csproj
@@ -1,55 +1,29 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{E9C3EA8B-FF3B-4E3E-8137-1510465200B5}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Mammoth.Tests</RootNamespace>
-    <AssemblyName>Mammoth.Tests</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>net45</TargetFramework>
+    <AssemblyTitle>Mammoth.Tests</AssemblyTitle>
+    <Copyright>Michael Williamson</Copyright>
+    <Deterministic>false</Deterministic>
+    <AssemblyVersion>1.0.*</AssemblyVersion>
+    <FileVersion>1.0.*</FileVersion>
+    <DebugType>full</DebugType>
+    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="xunit.abstractions">
-      <HintPath>..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.core">
-      <HintPath>..\packages\xunit.extensibility.core.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.core.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.execution.desktop">
-      <HintPath>..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll</HintPath>
-    </Reference>
-    <Reference Include="xunit.assert">
-      <HintPath>..\packages\xunit.assert.2.1.0\lib\portable-net45+win8+wp8+wpa81\xunit.assert.dll</HintPath>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DocumentConverterTests.cs" />
-  </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <Import Project="..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props" Condition="Exists('..\packages\xunit.core.2.1.0\build\portable-net45+win8+wp8+wpa81\xunit.core.props')" />
   <ItemGroup>
-    <None Include="packages.config" />
+    <PackageReference Include="xunit" Version="2.1.0" />
+    <PackageReference Include="xunit.abstractions" Version="2.0.0" />
+    <PackageReference Include="xunit.assert" Version="2.1.0" />
+    <PackageReference Include="xunit.core" Version="2.1.0" />
+    <PackageReference Include="xunit.extensibility.core" Version="2.1.0" />
+    <PackageReference Include="xunit.extensibility.execution" Version="2.1.0" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="TestData\empty.docx" />
@@ -69,9 +43,6 @@
     <EmbeddedResource Include="TestData\utf8-bom.docx" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Mammoth\Mammoth.csproj">
-      <Project>{51C5CBD6-8809-4D5E-BABE-1787A16F5ED8}</Project>
-      <Name>Mammoth</Name>
-    </ProjectReference>
+    <ProjectReference Include="..\Mammoth\Mammoth.csproj" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/Mammoth.Tests/Properties/AssemblyInfo.cs b/Mammoth.Tests/Properties/AssemblyInfo.cs
deleted file mode 100644
index 79596a3..0000000
--- a/Mammoth.Tests/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle ("Mammoth.Tests")]
-[assembly: AssemblyDescription ("")]
-[assembly: AssemblyConfiguration ("")]
-[assembly: AssemblyCompany ("")]
-[assembly: AssemblyProduct ("")]
-[assembly: AssemblyCopyright ("Michael Williamson")]
-[assembly: AssemblyTrademark ("")]
-[assembly: AssemblyCulture ("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion ("1.0.*")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/Mammoth.Tests/packages.config b/Mammoth.Tests/packages.config
deleted file mode 100644
index 69a4ec4..0000000
--- a/Mammoth.Tests/packages.config
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="xunit" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />
-  <package id="xunit.assert" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.core" version="2.1.0" targetFramework="net45" />
-  <package id="xunit.extensibility.execution" version="2.1.0" targetFramework="net45" />
-</packages>
\ No newline at end of file
diff --git a/Mammoth/Mammoth.csproj b/Mammoth/Mammoth.csproj
index cba1c2f..9a9a58c 100644
--- a/Mammoth/Mammoth.csproj
+++ b/Mammoth/Mammoth.csproj
@@ -1,118 +1,33 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{51C5CBD6-8809-4D5E-BABE-1787A16F5ED8}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <RootNamespace>Mammoth</RootNamespace>
-    <AssemblyName>Mammoth</AssemblyName>
-    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
+    <TargetFramework>net45</TargetFramework>
+    <AssemblyTitle>Mammoth</AssemblyTitle>
+    <Company>Michael Williamson</Company>
+    <Product>Mammoth</Product>
+    <Description>Convert Word documents from docx to simple HTML</Description>
+    <Copyright>Copyright 2015 - 2016 Michael Williamson</Copyright>
+    <Version>1.4.0.0</Version>
+    <AssemblyVersion>1.4.0.0</AssemblyVersion>
+    <FileVersion>1.4.0.0</FileVersion>
+    <DebugType>full</DebugType>
+    <ConsolePause>false</ConsolePause>
+    <Authors>Michael Williamson</Authors>
+    <PackageLicenseUrl>http://opensource.org/licenses/BSD-2-Clause</PackageLicenseUrl>
+    <PackageProjectUrl>https://github.com/mwilliamson/dotnet-mammoth</PackageProjectUrl>
+    <PackageTags>docx html office word</PackageTags>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
     <OutputPath>bin\Debug</OutputPath>
     <DefineConstants>DEBUG;</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>full</DebugType>
-    <Optimize>true</Optimize>
     <OutputPath>bin\Release</OutputPath>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <ConsolePause>false</ConsolePause>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Xml" />
     <Reference Include="System.IO.Compression" />
-    <Reference Include="System.IO.Compression.FileSystem" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="DocumentConverter.cs" />
-    <Compile Include="IImage.cs" />
-    <Compile Include="IResult.cs" />
-    <Compile Include="SimpleResult.cs" />
-    <Compile Include="generated.cs" />
-    <Compile Include="Couscous\Adapters.cs" />
-    <Compile Include="Couscous\HorribleHacks.cs" />
-    <Compile Include="Couscous\IterableExtensions.cs" />
-    <Compile Include="Couscous\JavaStringExtensions.cs" />
-    <Compile Include="Couscous\java\io\File.cs" />
-    <Compile Include="Couscous\java\io\InputStream.cs" />
-    <Compile Include="Couscous\java\io\IOException.cs" />
-    <Compile Include="Couscous\java\io\Closeable.cs" />
-    <Compile Include="Couscous\java\nio\file\Path.cs" />
-    <Compile Include="Couscous\java\lang\IllegalArgumentException.cs" />
-    <Compile Include="Couscous\java\lang\IndexOutOfBoundsException.cs" />
-    <Compile Include="Couscous\java\lang\Iterable.cs" />
-    <Compile Include="Couscous\java\lang\RuntimeException.cs" />
-    <Compile Include="Couscous\java\lang\String.cs" />
-    <Compile Include="Couscous\java\lang\StringBuilder.cs" />
-    <Compile Include="Couscous\java\lang\UnsupportedOperationException.cs" />
-    <Compile Include="Couscous\java\math\BigInteger.cs" />
-    <Compile Include="Couscous\java\net\URI.cs" />
-    <Compile Include="Couscous\java\net\URISyntaxException.cs" />
-    <Compile Include="Couscous\java\net\URL.cs" />
-    <Compile Include="Couscous\java\util\function\BiConsumer.cs" />
-    <Compile Include="Couscous\java\util\function\BiFunction.cs" />
-    <Compile Include="Couscous\java\util\function\BiPredicate.cs" />
-    <Compile Include="Couscous\java\util\function\Consumer.cs" />
-    <Compile Include="Couscous\java\util\function\Function.cs" />
-    <Compile Include="Couscous\java\util\function\IntFunction.cs" />
-    <Compile Include="Couscous\java\util\function\Predicate.cs" />
-    <Compile Include="Couscous\java\util\function\Supplier.cs" />
-    <Compile Include="Couscous\java\util\regex\Matcher.cs" />
-    <Compile Include="Couscous\java\util\regex\Pattern.cs" />
-    <Compile Include="Couscous\java\util\AbstractMap.cs" />
-    <Compile Include="Couscous\java\util\ArrayDeque.cs" />
-    <Compile Include="Couscous\java\util\ArrayList.cs" />
-    <Compile Include="Couscous\java\util\Arrays.cs" />
-    <Compile Include="Couscous\java\util\Collection.cs" />
-    <Compile Include="Couscous\java\util\Deque.cs" />
-    <Compile Include="Couscous\java\util\HashMap.cs" />
-    <Compile Include="Couscous\java\util\HashSet.cs" />
-    <Compile Include="Couscous\java\util\Iterator.cs" />
-    <Compile Include="Couscous\java\util\List.cs" />
-    <Compile Include="Couscous\java\util\Map.cs" />
-    <Compile Include="Couscous\java\util\NoSuchElementException.cs" />
-    <Compile Include="Couscous\java\util\Objects.cs" />
-    <Compile Include="Couscous\java\util\Optional.cs" />
-    <Compile Include="Couscous\java\util\OptionalInt.cs" />
-    <Compile Include="Couscous\java\util\Queue.cs" />
-    <Compile Include="Couscous\java\util\Set.cs" />
-    <Compile Include="Couscous\mammoth\internal\archives\InMemoryArchive.cs" />
-    <Compile Include="Couscous\mammoth\internal\archives\ZippedArchive.cs" />
-    <Compile Include="Couscous\mammoth\internal\styles\parsing\LineParseException.cs" />
-    <Compile Include="Couscous\mammoth\internal\styles\parsing\ParseException.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Base64Encoding.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Casts.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Lists.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Maps.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Paths.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\PassThroughException.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Queues.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Sets.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Streams.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Strings.cs" />
-    <Compile Include="Couscous\mammoth\internal\util\Iterables.cs" />
-    <Compile Include="Couscous\mammoth\internal\xml\XmlWriter.cs" />
-    <Compile Include="Couscous\mammoth\internal\xml\parsing\SimpleSax.cs" />
   </ItemGroup>
-  <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" />
   <ItemGroup>
-    <Folder Include="Couscous\" />
-    <Folder Include="Couscous\java\" />
-    <Folder Include="Couscous\mammoth\" />
-    <Folder Include="Couscous\mammoth\internal\" />
-    <Folder Include="Couscous\mammoth\internal\util\" />
-    <Folder Include="Couscous\java\nio\" />
-    <Folder Include="Couscous\java\nio\file\" />
+    <Compile Remove="Couscous/mammoth/internal/util/Objects.cs" />
+    <Compile Remove="Couscous/mammoth/internal/styles/parsing/StyleMapParser.cs" />
   </ItemGroup>
-</Project>
+</Project>
\ No newline at end of file
diff --git a/Mammoth/Mammoth.nuspec b/Mammoth/Mammoth.nuspec
deleted file mode 100644
index 943c9c6..0000000
--- a/Mammoth/Mammoth.nuspec
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0"?>
-<package >
-  <metadata>
-    <id>$id$</id>
-    <version>$version$</version>
-    <title>$title$</title>
-    <authors>$author$</authors>
-    <owners>$author$</owners>
-    <licenseUrl>http://opensource.org/licenses/BSD-2-Clause</licenseUrl>
-    <projectUrl>https://github.com/mwilliamson/dotnet-mammoth</projectUrl>
-    <requireLicenseAcceptance>false</requireLicenseAcceptance>
-    <description>$description$</description>
-    <copyright>Copyright 2015 - 2016 Michael Williamson</copyright>
-    <tags>docx html office word</tags>
-  </metadata>
-</package>
diff --git a/Mammoth/Properties/AssemblyInfo.cs b/Mammoth/Properties/AssemblyInfo.cs
deleted file mode 100644
index 8f594e4..0000000
--- a/Mammoth/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-
-// Information about this assembly is defined by the following attributes.
-// Change them to the values specific to your project.
-
-[assembly: AssemblyTitle("Mammoth")]
-[assembly: AssemblyDescription("Convert Word documents from docx to simple HTML")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("Michael Williamson")]
-[assembly: AssemblyProduct("Mammoth")]
-[assembly: AssemblyCopyright("Copyright © Michael Williamson 2015 - 2016")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// The assembly version has the format "{Major}.{Minor}.{Build}.{Revision}".
-// The form "{Major}.{Minor}.*" will automatically update the build and revision,
-// and "{Major}.{Minor}.{Build}.*" will update just the revision.
-
-[assembly: AssemblyVersion("1.4.0.0")]
-
-// The following attributes are used to specify the signing key for the assembly,
-// if desired. See the Mono documentation for more information about signing.
-
-//[assembly: AssemblyDelaySign(false)]
-//[assembly: AssemblyKeyFile("")]
-
diff --git a/makefile b/makefile
index 2020215..deaf585 100644
--- a/makefile
+++ b/makefile
@@ -1,8 +1,10 @@
-.PHONY: build test
+.PHONY: build
 
 build:
 	couscous
-	xbuild Mammoth.sln
+	dotnet build
+
+.PHONY: test
 
 test: build
-	mono --debug packages/xunit.runner.console.2.1.0/tools/xunit.console.exe Mammoth.Tests/bin/Debug/Mammoth.Tests.dll -noshadow
+	mono --debug packages/xunit.runner.console.2.1.0/tools/xunit.console.exe Mammoth.Tests/bin/Debug/net45/Mammoth.Tests.dll -noshadow