diff --git a/src/SlimJim.Test/Infrastructure/ArgsOptionsBuilderTests.cs b/src/SlimJim.Test/Infrastructure/ArgsOptionsBuilderTests.cs
index 7744234..dd94786 100644
--- a/src/SlimJim.Test/Infrastructure/ArgsOptionsBuilderTests.cs
+++ b/src/SlimJim.Test/Infrastructure/ArgsOptionsBuilderTests.cs
@@ -39,7 +39,6 @@ public void SpecifiedTargetProject()
 
 			Assert.That(options.TargetProjectNames, Is.EqualTo(new[] { "MyProject" }));
 			Assert.That(options.SolutionName, Is.EqualTo("MyProject"));
-
 		}
 
 		[Test]
@@ -48,7 +47,7 @@ public void SpecifiedMultipleTargetProjects()
 			options = ArgsOptionsBuilder.BuildOptions(new[] { "--target", "MyProject", "--target", "YourProject" }, WorkingDirectory);
 
 			Assert.That(options.TargetProjectNames, Is.EqualTo(new[] { "MyProject", "YourProject" }));
-			Assert.That(options.SolutionName, Is.StringMatching("MyProject_YourProject"));
+			Assert.That(options.SolutionName, Does.Match("MyProject_YourProject"));
 		}
 
 		[Test]
@@ -86,15 +85,47 @@ public void SpecifiedVisualStudioVersion2010()
 			Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2010));
 		}
 
-		[Test]
+        [Test]
+        public void SpecifiedVisualStudioVersion2012()
+        {
+            options = ArgsOptionsBuilder.BuildOptions(new[] { "--version", "2012" }, WorkingDirectory);
+
+            Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2012));
+        }
+
+        [Test]
+        public void SpecifiedVisualStudioVersion2013()
+        {
+            options = ArgsOptionsBuilder.BuildOptions(new[] { "--version", "2013" }, WorkingDirectory);
+
+            Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2013));
+        }
+
+        [Test]
+        public void SpecifiedVisualStudioVersion2015()
+        {
+            options = ArgsOptionsBuilder.BuildOptions(new[] { "--version", "2015" }, WorkingDirectory);
+
+            Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2015));
+        }
+
+        [Test]
+        public void SpecifiedVisualStudioVersion2017()
+        {
+            options = ArgsOptionsBuilder.BuildOptions(new[] { "--version", "2017" }, WorkingDirectory);
+
+            Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2017));
+        }
+
+        [Test]
 		public void InvalidVisualStudioVersionNumber()
 		{
 			options = ArgsOptionsBuilder.BuildOptions(new[] { "--version", "dumb" }, WorkingDirectory);
 
-			Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2015));
+			Assert.That(options.VisualStudioVersion, Is.EqualTo(VisualStudioVersion.VS2017));
 		}
 
-		[Test]
+        [Test]
 		public void SpecifiedSolutionName()
 		{
 			options = ArgsOptionsBuilder.BuildOptions(new[] { "--name", "MyProjects" }, WorkingDirectory);
@@ -106,14 +137,12 @@ public void SpecifiedSolutionName()
 		public void UnspecifiedSolutionNameWithSingleTargetProject()
 		{
 			options = ArgsOptionsBuilder.BuildOptions(new[] { "--target", "MyProject" }, WorkingDirectory);
-
 		}
 
 		[Test]
 		public void UnspecifiedSolutionNameWithMultipleTargetProjectsUsesFirstProjectNamePlusSuffix()
 		{
 			options = ArgsOptionsBuilder.BuildOptions(new[] { "--target", "MyProject", "--target", "YourProject" }, WorkingDirectory);
-
 		}
 		
 		[Test]
diff --git a/src/SlimJim.Test/Infrastructure/ProjectFileFinderTests.cs b/src/SlimJim.Test/Infrastructure/ProjectFileFinderTests.cs
index ac98976..3763314 100644
--- a/src/SlimJim.Test/Infrastructure/ProjectFileFinderTests.cs
+++ b/src/SlimJim.Test/Infrastructure/ProjectFileFinderTests.cs
@@ -50,7 +50,7 @@ public void ReturnsFileInfosForEachProjectInFileSystem()
 		[Test]
 		public void IgnoresRelativePath()
 		{
-			finder.IgnorePatterns("Theirs");
+			finder.IgnorePatterns("Their");
 			projectFiles = finder.FindAllProjectFiles(SampleFileSystemPath);
 
 			AssertFilesMatching(new[]
@@ -80,7 +80,7 @@ public void IgnoresFileName()
 		[Test]
 		public void IgnoresRelativePathWithDifferentCase()
 		{
-			finder.IgnorePatterns("ThEiRs");
+			finder.IgnorePatterns("ThEiR");
 			projectFiles = finder.FindAllProjectFiles(SampleFileSystemPath);
 
 			AssertFilesMatching(new[]
diff --git a/src/SlimJim.Test/Infrastructure/SlnFileRendererTests.cs b/src/SlimJim.Test/Infrastructure/SlnFileRendererTests.cs
index 64fd3f9..422e489 100644
--- a/src/SlimJim.Test/Infrastructure/SlnFileRendererTests.cs
+++ b/src/SlimJim.Test/Infrastructure/SlnFileRendererTests.cs
@@ -61,17 +61,36 @@ public void VisualStudio2008Solution()
 			TestRender();
 		}
 
-		private void MakeSolution(string name, params CsProj[] csProjs)
+        [Test]
+        public void VisualStudio2015Solution()
+        {
+            MakeSolution("VS2015");
+            solution.Version = VisualStudioVersion.VS2015;
+
+            TestRender();
+        }
+
+        [Test]
+        public void VisualStudio2017Solution()
+        {
+            MakeSolution("VS2017");
+            solution.Version = VisualStudioVersion.VS2017;
+
+            TestRender();
+        }
+
+        private void MakeSolution(string name, params CsProj[] csProjs)
 		{
 			solution = new Sln(name, "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}");
+            solution.Version = VisualStudioVersion.VS2010;
 			solution.AddProjects(csProjs);
 		}
 
 		private void TestRender()
 		{
-			renderer = new SlnFileRenderer(solution);
+            renderer = new SlnFileRenderer(solution);
 
-			string actualContents = renderer.Render().Replace("\r\n", "\n").Replace("\n\n", "\n");
+            string actualContents = renderer.Render().Replace("\r\n", "\n").Replace("\n\n", "\n");
 			string expectedContents = SampleFileHelper.GetSlnFileContents(solution.Name).Replace("\r\n", "\n").Replace("\n\n", "\n");
 
 			Assert.That(actualContents, Is.EqualTo(expectedContents));
diff --git a/src/SlimJim.Test/Model/SlnTests.cs b/src/SlimJim.Test/Model/SlnTests.cs
index fa96235..19bb330 100644
--- a/src/SlimJim.Test/Model/SlnTests.cs
+++ b/src/SlimJim.Test/Model/SlnTests.cs
@@ -9,16 +9,16 @@ namespace SlimJim.Test.Model
 	public class SlnTests
 	{
 		[Test]
-		public void VersionDefaultsTo2010()
+		public void VersionDefaultsTo2017()
 		{
-			Assert.That(new Sln("sln").Version, Is.EqualTo(VisualStudioVersion.VS2010));
+			Assert.That(new Sln("sln").Version, Is.EqualTo(VisualStudioVersion.VS2017));
 		}
 
 		[Test]
 		public void GuidFormatIncludesCurlyBraces()
 		{
-			Assert.That(new Sln("sample").Guid, Is.StringStarting("{"));
-			Assert.That(new Sln("sample").Guid, Is.StringEnding("}"));
+			Assert.That(new Sln("sample").Guid, Does.StartWith("{"));
+			Assert.That(new Sln("sample").Guid, Does.EndWith("}"));
 		}
 
 		[Test]
diff --git a/src/SlimJim.Test/SampleFiles/Sln/VS2015.sln b/src/SlimJim.Test/SampleFiles/Sln/VS2015.sln
new file mode 100644
index 0000000..a0a6ae3
--- /dev/null
+++ b/src/SlimJim.Test/SampleFiles/Sln/VS2015.sln
@@ -0,0 +1,9 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 14
+
+
+Global
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/SlimJim.Test/SampleFiles/Sln/VS2017.sln b/src/SlimJim.Test/SampleFiles/Sln/VS2017.sln
new file mode 100644
index 0000000..d10e55d
--- /dev/null
+++ b/src/SlimJim.Test/SampleFiles/Sln/VS2017.sln
@@ -0,0 +1,9 @@
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 15
+
+
+Global
+	GlobalSection(SolutionProperties) = preSolution
+		HideSolutionNode = FALSE
+	EndGlobalSection
+EndGlobal
diff --git a/src/SlimJim.Test/SlimJim.Test.csproj b/src/SlimJim.Test/SlimJim.Test.csproj
index c63624d..8d81263 100644
--- a/src/SlimJim.Test/SlimJim.Test.csproj
+++ b/src/SlimJim.Test/SlimJim.Test.csproj
@@ -31,14 +31,21 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework">
-      <HintPath>..\packages\NUnit.2.5.9.10348\lib\nunit.framework.dll</HintPath>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="nunit.mocks">
-      <HintPath>..\packages\NUnit.2.5.9.10348\lib\nunit.mocks.dll</HintPath>
+    <Reference Include="nunit.framework, Version=3.8.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.3.8.1\lib\net40\nunit.framework.dll</HintPath>
+      <Private>True</Private>
     </Reference>
-    <Reference Include="Rhino.Mocks">
-      <HintPath>..\packages\RhinoMocks.3.6\lib\Rhino.Mocks.dll</HintPath>
+    <Reference Include="nunit.mocks, Version=2.6.4.14350, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+      <HintPath>..\packages\NUnit.Mocks.2.6.4\lib\nunit.mocks.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="Rhino.Mocks, Version=3.6.0.0, Culture=neutral, PublicKeyToken=0b3305902db7183f, processorArchitecture=MSIL">
+      <HintPath>..\packages\RhinoMocks.3.6.1\lib\net\Rhino.Mocks.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
@@ -47,9 +54,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\build\VersionInfo.cs">
@@ -103,8 +107,12 @@
     <Content Include="SampleFiles\Sln\ThreeProjects.sln" />
     <Content Include="SampleFiles\Sln\BlankSolution.sln" />
     <Content Include="SampleFiles\Sln\SingleProject.sln" />
+    <Content Include="SampleFiles\Sln\VS2015.sln" />
+    <Content Include="SampleFiles\Sln\VS2017.sln" />
+  </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>
-  <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.
diff --git a/src/SlimJim.Test/SlnFileGeneratorTests.cs b/src/SlimJim.Test/SlnFileGeneratorTests.cs
index 9688f60..aadabc3 100644
--- a/src/SlimJim.Test/SlnFileGeneratorTests.cs
+++ b/src/SlimJim.Test/SlnFileGeneratorTests.cs
@@ -1,13 +1,15 @@
-using System;
 using System.Collections.Generic;
+
 using NUnit.Framework;
 using Rhino.Mocks;
-using SlimJim.Infrastructure;
-using SlimJim.Model;
+
 
 namespace SlimJim.Test
 {
-	[TestFixture]
+    using SlimJim.Infrastructure;
+    using SlimJim.Model;
+
+    [TestFixture]
 	public class SlnFileGeneratorTests : TestBase
 	{
 		private const string TargetProject = "MyProject";
diff --git a/src/SlimJim.Test/TestBase.cs b/src/SlimJim.Test/TestBase.cs
index a7e9a8d..c633e24 100644
--- a/src/SlimJim.Test/TestBase.cs
+++ b/src/SlimJim.Test/TestBase.cs
@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using NUnit.Framework;
-using Rhino.Mocks;
-using SlimJim.Infrastructure;
-using SlimJim.Model;
+
 using System.IO;
 
 namespace SlimJim.Test
diff --git a/src/SlimJim.Test/packages.config b/src/SlimJim.Test/packages.config
index ba639e2..13e9bc7 100644
--- a/src/SlimJim.Test/packages.config
+++ b/src/SlimJim.Test/packages.config
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="log4net" version="2.0.3" targetFramework="net40" />
-  <package id="NUnit" version="2.5.9.10348" />
-  <package id="RhinoMocks" version="3.6" />
+  <package id="log4net" version="2.0.8" targetFramework="net40" />
+  <package id="NUnit" version="3.8.1" targetFramework="net40" />
+  <package id="NUnit.Mocks" version="2.6.4" targetFramework="net40" />
+  <package id="NUnitTestAdapter" version="2.1.1" targetFramework="net40" />
+  <package id="RhinoMocks" version="3.6.1" targetFramework="net40" />
 </packages>
\ No newline at end of file
diff --git a/src/SlimJim/CsProjConverter.cs b/src/SlimJim/CsProjConverter.cs
index 1a633c3..5109a4f 100644
--- a/src/SlimJim/CsProjConverter.cs
+++ b/src/SlimJim/CsProjConverter.cs
@@ -1,10 +1,15 @@
+
 using System.Xml;
+
 using log4net;
-using SlimJim.Model;
+
 
 namespace SlimJim
 {
-	public abstract class CsProjConverter
+    using Model;
+
+
+    public abstract class CsProjConverter
 	{
 		protected const string MSBuildXmlNamespace = "http://schemas.microsoft.com/developer/msbuild/2003";
 		protected readonly ILog log;
diff --git a/src/SlimJim/HintPathConverter.cs b/src/SlimJim/HintPathConverter.cs
index 81b53d8..7330173 100644
--- a/src/SlimJim/HintPathConverter.cs
+++ b/src/SlimJim/HintPathConverter.cs
@@ -1,13 +1,13 @@
 using System;
 using System.IO;
 using System.Linq;
-using System.Xml;
 using System.Xml.XPath;
-using SlimJim.Model;
 
 namespace SlimJim
 {
-	public class HintPathConverter : CsProjConverter
+    using Model;
+
+    public class HintPathConverter : CsProjConverter
 	{
 		private const string NuGetPackagesDirectoryName = @"packages\";
 		private enum Mode { Convert, Restore }
diff --git a/src/SlimJim/Infrastructure/ArgsOptionsBuilder.cs b/src/SlimJim/Infrastructure/ArgsOptionsBuilder.cs
index ffa292c..30a57ae 100644
--- a/src/SlimJim/Infrastructure/ArgsOptionsBuilder.cs
+++ b/src/SlimJim/Infrastructure/ArgsOptionsBuilder.cs
@@ -42,7 +42,7 @@ private void ProcessArguments(string[] args)
 									v => options.AddAdditionalSearchPaths(v) },
 								{ "o|out=", "directory {PATH} where you want the .sln file written", 
 									v => options.SlnOutputPath = v },
-								{ "version=", "Visual Studio {VERSION} compatibility (2008, 2010, 2012, 2013, 2015 default)", 
+								{ "version=", "Visual Studio {VERSION} compatibility (2008, 2010, 2012, 2013, 2015, 2017 default)", 
 									v => options.VisualStudioVersion = TryParseVersionNumber(v) },
 								{ "n|name=", "alternate {NAME} for solution file", 
 									v => options.SolutionName = v},
diff --git a/src/SlimJim/Infrastructure/CsProjReader.cs b/src/SlimJim/Infrastructure/CsProjReader.cs
index 274d702..46f4fb3 100644
--- a/src/SlimJim/Infrastructure/CsProjReader.cs
+++ b/src/SlimJim/Infrastructure/CsProjReader.cs
@@ -3,13 +3,15 @@
 using System.IO;
 using System.Linq;
 using System.Xml.Linq;
-using SlimJim.Model;
-using log4net;
 using System.Reflection;
 
+using log4net;
+
 namespace SlimJim.Infrastructure
 {
-	public class CsProjReader
+    using Model;
+
+    public class CsProjReader
 	{
         private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
         private static readonly XNamespace Ns = "http://schemas.microsoft.com/developer/msbuild/2003";
@@ -96,8 +98,9 @@ private string ReadProjectGuid(XElement projectReference, FileInfo csprojFile)
 
 		private bool FindImportedNuGetTargets(XElement xml)
 		{
-			var importPaths = (from import in xml.DescendantsAndSelf(Ns + "Import")
-					select import.Attribute("Project").Value);
+            var importPaths = xml.DescendantsAndSelf(Ns + "Import")
+                .Where(i => i.Attribute("Project") != null)
+                .Select(i => i.Attribute("Project").Value);
 			return importPaths.Any(p => p.EndsWith(@"\.nuget\nuget.targets", StringComparison.InvariantCultureIgnoreCase));
 		}
 
diff --git a/src/SlimJim/Infrastructure/ProjectFileFinder.cs b/src/SlimJim/Infrastructure/ProjectFileFinder.cs
index 0fb0c1f..ff7dc68 100644
--- a/src/SlimJim/Infrastructure/ProjectFileFinder.cs
+++ b/src/SlimJim/Infrastructure/ProjectFileFinder.cs
@@ -1,10 +1,13 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
 using System.Text.RegularExpressions;
+
 using log4net;
 
+
 namespace SlimJim.Infrastructure
 {
 	public class ProjectFileFinder
@@ -12,7 +15,10 @@ public class ProjectFileFinder
 		private static readonly ILog Log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 		private readonly List<Regex> ignorePatterns;
 
-		public ProjectFileFinder()
+        private string[] _supportedExtensions = new[] { ".csproj", ".vbproj" };
+
+
+        public ProjectFileFinder()
 		{
 			ignorePatterns = new List<Regex>();
 			IgnorePatterns(@"^\.svn$", @"^\.hg$", @"^\.git$", "^bin$", "^obj$", "ReSharper");
@@ -20,12 +26,12 @@ public ProjectFileFinder()
 
 		public virtual List<FileInfo> FindAllProjectFiles(string startPath)
 		{
-			Log.InfoFormat("Searching for .csproj files at {0}", startPath);
+			Log.InfoFormat($"Searching for '{string.Join(",", _supportedExtensions)}' files at '{startPath}'.");
 
 			var root = new DirectoryInfo(startPath);
 			var projectFiles = GetProjectFiles(root);
 
-			return projectFiles;
+            return projectFiles;
 		}
 
 		private List<FileInfo> GetProjectFiles(DirectoryInfo directory)
@@ -42,19 +48,19 @@ private List<FileInfo> GetProjectFiles(DirectoryInfo directory)
 
 		private void SearchDirectoryForProjects(DirectoryInfo directory, List<FileInfo> files)
 		{
-			FileInfo[] projects = directory
-									.GetFiles("*.csproj")
-									.Where(f => !PathIsIgnored(f.Name))
+            FileInfo[] projects = directory
+                                    .GetFiles("*.*", SearchOption.AllDirectories)
+                                    .Where(f => _supportedExtensions.Contains(f.Extension, StringComparer.OrdinalIgnoreCase))
+                                    .Where(f => !PathIsIgnored(f.Name))
 									.ToArray();
-
-			if (projects.Length > 0)
+            if (projects.Length > 0)
 			{
 				AddProjectFile(projects, files);
 			}
-			else
-			{
-				RecurseChildDirectories(directory, files);
-			}
+            else
+            {
+                RecurseChildDirectories(directory, files);
+            }
 		}
 
 		private void RecurseChildDirectories(DirectoryInfo directory, List<FileInfo> files)
diff --git a/src/SlimJim/Infrastructure/SlnFileRenderer.cs b/src/SlimJim/Infrastructure/SlnFileRenderer.cs
index 7ef12e4..7a3607d 100644
--- a/src/SlimJim/Infrastructure/SlnFileRenderer.cs
+++ b/src/SlimJim/Infrastructure/SlnFileRenderer.cs
@@ -25,9 +25,9 @@ public SlnFileRenderer(Sln solution)
 			this.solution = solution;
 		}
 
-		public string Render()
-		{
-			var slnTemplate = templateGroup.GetInstanceOf("SolutionTemplate");
+        public string Render()
+        {
+            var slnTemplate = templateGroup.GetInstanceOf("SolutionTemplate");
 			slnTemplate.SetAttribute("sln", solution);
 			return slnTemplate.ToString();
 		}
diff --git a/src/SlimJim/Model/Sln.cs b/src/SlimJim/Model/Sln.cs
index b1f21fd..f0ae018 100644
--- a/src/SlimJim/Model/Sln.cs
+++ b/src/SlimJim/Model/Sln.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+
 using log4net;
 
 namespace SlimJim.Model
@@ -19,7 +20,7 @@ public Sln(string name, string guid)
 			Name = name;
 			Guid = guid;
 			Projects = new List<CsProj>();
-			Version = VisualStudioVersion.VS2010;
+			Version = VisualStudioVersion.VS2017;
 		}
 
 		private readonly IDictionary<string, Folder> folders = new Dictionary<string, Folder>();
diff --git a/src/SlimJim/Model/SlnGenerationOptions.cs b/src/SlimJim/Model/SlnGenerationOptions.cs
index 28a513f..852612c 100644
--- a/src/SlimJim/Model/SlnGenerationOptions.cs
+++ b/src/SlimJim/Model/SlnGenerationOptions.cs
@@ -22,7 +22,7 @@ public SlnGenerationOptions(string workingDirectory)
 			additionalSearchPaths = new List<string>();
 			ignoreDirectoryPatterns = new List<string>();
 			TargetProjectNames = new List<string>();
-			VisualStudioVersion = VisualStudioVersion.VS2015;
+			VisualStudioVersion = VisualStudioVersion.VS2017;
 			LoggingThreshold = Level.Info;
 		}
 
diff --git a/src/SlimJim/Model/VisualStudioVersion.cs b/src/SlimJim/Model/VisualStudioVersion.cs
index 01560c7..14b557f 100644
--- a/src/SlimJim/Model/VisualStudioVersion.cs
+++ b/src/SlimJim/Model/VisualStudioVersion.cs
@@ -8,21 +8,48 @@ public sealed class VisualStudioVersion
 		private static readonly VisualStudioVersion vs2008 = new VisualStudioVersion("2008", "10.00", "9.0");
 		private static readonly VisualStudioVersion vs2010 = new VisualStudioVersion("2010", "11.00", "10.0");
 		private static readonly VisualStudioVersion vs2012 = new VisualStudioVersion("2012", "12.00", "12.0");
-		private static readonly VisualStudioVersion vs2013 = new VisualStudioVersion("2013", "13.00", "13.0");
-		private static readonly VisualStudioVersion vs2015 = new VisualStudioVersion("2015", "14.00", "14.0");
+		private static readonly VisualStudioVersion vs2013 = new VisualStudioVersion("2013", "12.00", "13.0");
+		private static readonly VisualStudioVersion vs2015 = new VisualStudioVersion("2015", "12.00", "14.0");
+        private static readonly VisualStudioVersion vs2017 = new VisualStudioVersion("2017", "12.00", "15.0");
 
-		private VisualStudioVersion(string year, string slnFileVersionNumber, string pathVersionNumber)
+        private string _year;
+
+        private VisualStudioVersion(string year, string slnFileVersionNumber, string pathVersionNumber)
 		{
 			Year = year;
 			SlnFileVersionNumber = slnFileVersionNumber;
-			PathVersionNumber = pathVersionNumber;
+            PathVersionNumber = pathVersionNumber;
 		}
 
-		public string Year { get; private set; }
-		public string SlnFileVersionNumber { get; private set; }
-		public string PathVersionNumber { get; private set; }
 
-		public static VisualStudioVersion VS2008
+        /// <summary>
+        /// Starting with Visual Studio 2015, the year, but the version is used in the solution header:
+        ///  Example VS2017 solution header:
+        ///  # Visual Studio 15
+        ///  VisualStudioVersion = 15.0.26430.15
+        ///  MinimumVisualStudioVersion = 10.0.40219.1
+        /// </summary>
+        public string Year
+        {
+            get
+            {
+                if (_year == "2015" || _year == "2017")
+                {
+                    return PathVersionNumber.Substring(0, 2);
+                }
+
+                return _year;
+            }
+            private set
+            {
+                _year = value;
+            }
+        }
+
+        public string SlnFileVersionNumber { get; private set; }
+        public string PathVersionNumber { get; private set; }
+
+        public static VisualStudioVersion VS2008
 		{
 			get { return vs2008; }
 		}
@@ -47,11 +74,17 @@ public static VisualStudioVersion VS2015
             get { return vs2015; }
         }
 
+        public static VisualStudioVersion VS2017
+        {
+            get { return vs2017; }
+        }
+
+
         public static VisualStudioVersion ParseVersionString(string versionNumber)
 		{
-			var versions = new[] { vs2008, vs2010, vs2012, vs2013, vs2015 };
+			var versions = new[] { vs2008, vs2010, vs2012, vs2013, vs2015, vs2017 };
 
-			return versions.FirstOrDefault(v => versionNumber.Contains(v.Year)) ?? VS2015;
+			return versions.FirstOrDefault(v => versionNumber.Contains(v.Year)) ?? VS2017;
 		}
 
 		public override string ToString()
diff --git a/src/SlimJim/ReferenceConverter.cs b/src/SlimJim/ReferenceConverter.cs
index 94e38e8..91401f9 100644
--- a/src/SlimJim/ReferenceConverter.cs
+++ b/src/SlimJim/ReferenceConverter.cs
@@ -2,12 +2,13 @@
 using System.Linq;
 using System.Xml;
 using System.Xml.XPath;
-using SlimJim.Model;
-using log4net;
+
 
 namespace SlimJim
 {
-	public class ReferenceConverter : CsProjConverter
+    using Model;
+
+    public class ReferenceConverter : CsProjConverter
 	{
 		public void ConvertToProjectReferences(Sln solution)
 		{
@@ -83,11 +84,5 @@ private void ConvertToProjectReference(CsProj project, IEnumerable<CsProj> refer
 			doc.Save(project.Path);
 		}
 
-		private static XmlElement CreateElementWithInnerText(XmlDocument doc, string elementName, string text)
-		{
-			var e = doc.CreateElement(elementName, MSBuildXmlNamespace);
-			e.InnerText = text;
-			return e;
-		}
-	}
+    }
 }
\ No newline at end of file
diff --git a/src/SlimJim/SlimJim.csproj b/src/SlimJim/SlimJim.csproj
index 75a067a..8744c08 100644
--- a/src/SlimJim/SlimJim.csproj
+++ b/src/SlimJim/SlimJim.csproj
@@ -50,6 +50,10 @@
     <Reference Include="Antlr3.StringTemplate">
       <HintPath>..\packages\Antlr3.StringTemplate.3.4.1.9005\lib\net35\Antlr3.StringTemplate.dll</HintPath>
     </Reference>
+    <Reference Include="log4net, Version=2.0.8.0, Culture=neutral, PublicKeyToken=669e0ddf0bb1aa2a, processorArchitecture=MSIL">
+      <HintPath>..\packages\log4net.2.0.8\lib\net40-full\log4net.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="NDesk.Options">
       <HintPath>..\packages\NDesk.Options.0.2.1\lib\NDesk.Options.dll</HintPath>
     </Reference>
@@ -60,9 +64,6 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="log4net">
-      <HintPath>..\packages\log4net.2.0.3\lib\net40-full\log4net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\build\VersionInfo.cs">
@@ -97,7 +98,9 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="app.config" />
-    <None Include="packages.config" />
+    <None Include="packages.config">
+      <SubType>Designer</SubType>
+    </None>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/src/SlimJim/SlimJimMain.cs b/src/SlimJim/SlimJimMain.cs
index 69d0272..bc4f507 100644
--- a/src/SlimJim/SlimJimMain.cs
+++ b/src/SlimJim/SlimJimMain.cs
@@ -1,15 +1,17 @@
-using System.IO;
+using System;
+using System.IO;
+
 using log4net;
 using log4net.Appender;
 using log4net.Config;
 using log4net.Core;
 using log4net.Layout;
-using SlimJim.Infrastructure;
-using System;
 
 namespace SlimJim
 {
-	public class SlimJimMain
+    using Infrastructure;
+
+    public class SlimJimMain
 	{
 		public static void Main(string[] args)
 		{
diff --git a/src/SlimJim/SlnFileGenerator.cs b/src/SlimJim/SlnFileGenerator.cs
index 2a83db2..781697f 100644
--- a/src/SlimJim/SlnFileGenerator.cs
+++ b/src/SlimJim/SlnFileGenerator.cs
@@ -2,13 +2,15 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+
 using log4net;
-using SlimJim.Infrastructure;
-using SlimJim.Model;
 
 namespace SlimJim
 {
-	public class SlnFileGenerator
+    using Infrastructure;
+    using Model;
+
+    public class SlnFileGenerator
 	{
 		private static readonly ILog Log = LogManager.GetLogger(typeof(SlnFileGenerator));
 		public CsProjRepository ProjectRepository { get; set; }
diff --git a/src/SlimJim/packages.config b/src/SlimJim/packages.config
index f1e35e0..8abc495 100644
--- a/src/SlimJim/packages.config
+++ b/src/SlimJim/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Antlr3.StringTemplate" version="3.4.1.9005" targetFramework="net40" />
-  <package id="log4net" version="2.0.3" targetFramework="net40" />
+  <package id="log4net" version="2.0.8" targetFramework="net40" />
   <package id="NDesk.Options" version="0.2.1" />
 </packages>
\ No newline at end of file