Merge remote-tracking branch 'refs/remotes/origin/dev'

geaz · Dec 2, 2016 · 36c3d11 · 36c3d11
2 parents e38abb3 + 379bbed
commit 36c3d11
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 5 deletions.
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
@@ -1,4 +1,13 @@
-Version 1.1.2
+Version 1.2.1
+
+- Some minor bug fixes
+
+Version 1.2.0
+
+- Some minor bug fixes
+- Added 'Show Code' option to HTML Exporter
+
+Version 1.1.2
 
 - Some minor bug fixes
 

diff --git a/sharpDox SDK.nuspec b/sharpDox SDK.nuspec
@@ -2,7 +2,7 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd">
     <metadata>
         <id>sharpDoxSDK</id>
-        <version>1.1.2</version>
+        <version>1.2.0</version>
         <title>sharpDox SDK</title>
         <authors>Gerrit 'Geaz' Gazic</authors>
         <owners>Gerrit 'Geaz' Gazic</owners>

diff --git a/src/Core/SharpDox.Core/Properties/AssemblyInfo.cs b/src/Core/SharpDox.Core/Properties/AssemblyInfo.cs
@@ -33,6 +33,6 @@
 // übernehmen, indem Sie "*" eingeben:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.1.0")]
+[assembly: AssemblyFileVersion("1.2.0")]
 
 [assembly: InternalsVisibleTo("SharpDox.Config.Tests")]
diff --git a/src/Libraries/SharpDox.Build.Roslyn/Parser/ProjectParser/SeeParser.cs b/src/Libraries/SharpDox.Build.Roslyn/Parser/ProjectParser/SeeParser.cs
@@ -39,9 +39,9 @@ internal void ResolveAllSeeTokens()
                             if (cleanedRef.Contains('`'))
                             {
                                 var splittedName = seeToken.Name.Split('`');
-                                var type = _sdRepository.GetAllTypes().SingleOrDefault(
+                                var type = _sdRepository.GetAllTypes().FirstOrDefault(
                                     t => t.Namespace.Fullname == seeToken.Namespace &&
-                                    t.Name == splittedName[0] && t.TypeArguments.Count == int.Parse(splittedName[1]));
+                                         t.Name == splittedName[0] && t.TypeArguments.Count == int.Parse(splittedName[1]));
 
                                 seeToken.Identifier = type?.Identifier;
                                 seeToken.Name = type != null ? type.Name : $"Missing: {seeToken.AttributeValue}";