diff --git a/src/Markdig.SyntaxHighlighting.Tests/Example/CodeSample.cs b/src/Markdig.SyntaxHighlighting.Tests/Example/CodeSample.cs index 2bb03d2..5013606 100644 --- a/src/Markdig.SyntaxHighlighting.Tests/Example/CodeSample.cs +++ b/src/Markdig.SyntaxHighlighting.Tests/Example/CodeSample.cs @@ -7,8 +7,9 @@ namespace Markdig.SyntaxHighlighting.Tests.Example { public class CodeSample { [Fact] public void CodeSampleWorks() { - var codebase = Assembly.GetExecutingAssembly().GetName().CodeBase; - var directory = Path.GetDirectoryName(codebase); + + var location = GetType().GetTypeInfo().Assembly.Location; + var directory = Path.GetDirectoryName(location); if (directory == null) { throw new NullReferenceException("appPath came back null."); } diff --git a/src/Markdig.SyntaxHighlighting.Tests/IntegrationTests.cs b/src/Markdig.SyntaxHighlighting.Tests/IntegrationTests.cs index 1c4ef1f..769394f 100644 --- a/src/Markdig.SyntaxHighlighting.Tests/IntegrationTests.cs +++ b/src/Markdig.SyntaxHighlighting.Tests/IntegrationTests.cs @@ -1,55 +1,55 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Xunit; - -namespace Markdig.SyntaxHighlighting.Tests -{ - public class IntegrationTests - { - - [Fact] - public void ShouldUseDefaultRendererIfLanguageIsNotIndicated() { - string testString = @" -# This is a test - -``` -{ - ""jsonProperty"": 1 -} -```"; - var pipeline = new MarkdownPipelineBuilder() - .UseAdvancedExtensions() - .UseSyntaxHighlighting() - .Build(); - var html = Markdown.ToHtml(testString, pipeline); - Assert.True(html.Contains("
"));
-            Assert.True(html.Contains("jsonProperty"));
-            Assert.False(html.Contains("lang-"));
-        }
-
-        [Fact]
-        public void ShouldColorizeSyntaxWhenLanguageIsIndicated()
-        {
-            string testString = @"
-# This is a test
-
-```json
-{
-    ""jsonProperty"": 1
-}
-```";
-            var pipeline = new MarkdownPipelineBuilder()
-                .UseAdvancedExtensions()
-                .UseSyntaxHighlighting()
-                .Build();
-            var html = Markdown.ToHtml(testString, pipeline);
-            Assert.True(html.Contains(""));
+            Assert.True(html.Contains("jsonProperty"));
+            Assert.False(html.Contains("lang-"));
+        }
+
+        [Fact]
+        public void ShouldColorizeSyntaxWhenLanguageIsIndicated()
+        {
+            string testString = @"
+# This is a test
+
+```json
+{
+    ""jsonProperty"": 1
+}
+```";
+            var pipeline = new MarkdownPipelineBuilder()
+                .UseAdvancedExtensions()
+                .UseSyntaxHighlighting()
+                .Build();
+            var html = Markdown.ToHtml(testString, pipeline);
+            Assert.True(html.Contains("
-
-  
-  
+
+
   
-    Debug
-    AnyCPU
-    {B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}
-    Library
-    Properties
-    Markdig.SyntaxHighlighting.Tests
-    Markdig.SyntaxHighlighting.Tests
-    v4.6.1
-    512
-    
-    
-  
-  
-    true
-    full
-    false
-    bin\Debug\
-    DEBUG;TRACE
-    prompt
-    4
-  
-  
-    pdbonly
-    true
-    bin\Release\
-    TRACE
-    prompt
-    4
+    netcoreapp1.0
+    false
+    false
   
+
   
-    
-      ..\packages\Castle.Core.3.3.3\lib\net45\Castle.Core.dll
-      True
-    
-    
-      ..\packages\ColorCode.Portable.1.0.3\lib\portable45-net45+win8+wp8+wpa81\ColorCode.dll
-      True
-    
-    
-      ..\packages\Markdig.0.11.0\lib\net40\Markdig.dll
-    
-    
-      ..\packages\Moq.4.5.16\lib\net45\Moq.dll
-      True
-    
-    
-    
-    
-    
-    
-    
-    
-    
-    
-      ..\packages\xunit.abstractions.2.0.0\lib\net35\xunit.abstractions.dll
-      True
-    
-    
-      ..\packages\xunit.assert.2.1.0\lib\dotnet\xunit.assert.dll
-      True
-    
-    
-      ..\packages\xunit.extensibility.core.2.1.0\lib\dotnet\xunit.core.dll
-      True
-    
-    
-      ..\packages\xunit.extensibility.execution.2.1.0\lib\net45\xunit.execution.desktop.dll
-      True
-    
+    
+    
+    
   
+
   
-    
-    
-    
-    
-    
-    
-      Properties\SharedAssemblyInfo.cs
-    
-    
+    
   
+
   
-    
-      PreserveNewest
-    
-    
-  
-  
-    
-      {5d1e4e89-83a2-4b14-bb11-deb3c69665f0}
-      Markdig.SyntaxHighlighting
-    
-  
-  
-    
+    
       PreserveNewest
     
-    
+    
       PreserveNewest
     
     
       PreserveNewest
     
   
+
+  
+    
+    
+    
+    
+    
+    
+  
+
   
-    
+    
+  
+
+  
+    
+      PreserveNewest
+    
   
-  
-  
-    
-      This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.
-    
-    
-  
-  
-
\ No newline at end of file
+
+
diff --git a/src/Markdig.SyntaxHighlighting.Tests/packages.config b/src/Markdig.SyntaxHighlighting.Tests/packages.config
deleted file mode 100644
index 820471c..0000000
--- a/src/Markdig.SyntaxHighlighting.Tests/packages.config
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-  
-
\ No newline at end of file
diff --git a/src/Markdig.SyntaxHighlighting.sln b/src/Markdig.SyntaxHighlighting.sln
index ca3ec99..817d1ba 100644
--- a/src/Markdig.SyntaxHighlighting.sln
+++ b/src/Markdig.SyntaxHighlighting.sln
@@ -1,11 +1,11 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.25420.1
+# Visual Studio 15
+VisualStudioVersion = 15.0.27703.2035
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdig.SyntaxHighlighting.Tests", "Markdig.SyntaxHighlighting.Tests\Markdig.SyntaxHighlighting.Tests.csproj", "{B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Markdig.SyntaxHighlighting", "Markdig.SyntaxHighlighting\Markdig.SyntaxHighlighting.csproj", "{EDBB77FA-BBEA-471B-9F94-24BD9533A7F1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdig.SyntaxHighlighting", "Markdig.SyntaxHighlighting\Markdig.SyntaxHighlighting.csproj", "{5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Markdig.SyntaxHighlighting.Tests", "Markdig.SyntaxHighlighting.Tests\Markdig.SyntaxHighlighting.Tests.csproj", "{CEBB07C8-7219-45DF-9195-918D4B7F01A4}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -13,16 +13,19 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{B0696B7B-33C0-49B3-B8B2-DE07A7FCFBE9}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}.Release|Any CPU.Build.0 = Release|Any CPU
+		{EDBB77FA-BBEA-471B-9F94-24BD9533A7F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{EDBB77FA-BBEA-471B-9F94-24BD9533A7F1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{EDBB77FA-BBEA-471B-9F94-24BD9533A7F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{EDBB77FA-BBEA-471B-9F94-24BD9533A7F1}.Release|Any CPU.Build.0 = Release|Any CPU
+		{CEBB07C8-7219-45DF-9195-918D4B7F01A4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{CEBB07C8-7219-45DF-9195-918D4B7F01A4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{CEBB07C8-7219-45DF-9195-918D4B7F01A4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{CEBB07C8-7219-45DF-9195-918D4B7F01A4}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+		SolutionGuid = {459BD81B-3844-4E63-9FA1-C7C038393D2D}
+	EndGlobalSection
 EndGlobal
diff --git a/src/Markdig.SyntaxHighlighting.sln.DotSettings b/src/Markdig.SyntaxHighlighting.sln.DotSettings
index 83e2e81..6d721dc 100644
--- a/src/Markdig.SyntaxHighlighting.sln.DotSettings
+++ b/src/Markdig.SyntaxHighlighting.sln.DotSettings
@@ -1,4 +1,5 @@
 
+	NEVER
 	END_OF_LINE
 	END_OF_LINE
 	END_OF_LINE
@@ -63,7 +64,12 @@
 	©$CURRENT_YEAR$ Amido Limited (https://www.amido.com), Licensed under the terms of the Apache 2.0 Licence (http://www.apache.org/licenses/LICENSE-2.0)
 	<?xml version="1.0" encoding="utf-16"?><Profile name="General Cleanup"><CSReorderTypeMembers>True</CSReorderTypeMembers><CSUpdateFileHeader>True</CSUpdateFileHeader><RemoveCodeRedundancies>True</RemoveCodeRedundancies><CSUseAutoProperty>True</CSUseAutoProperty><CSMakeFieldReadonly>True</CSMakeFieldReadonly><CSMakeAutoPropertyGetOnly>True</CSMakeAutoPropertyGetOnly><CSArrangeQualifiers>True</CSArrangeQualifiers><CSFixBuiltinTypeReferences>True</CSFixBuiltinTypeReferences><CSEnforceVarKeywordUsageSettings>True</CSEnforceVarKeywordUsageSettings><CSOptimizeUsings><OptimizeUsings>True</OptimizeUsings><EmbraceInRegion>False</EmbraceInRegion><RegionName></RegionName></CSOptimizeUsings><CSShortenReferences>True</CSShortenReferences><CSReformatCode>True</CSReformatCode><CSharpFormatDocComments>True</CSharpFormatDocComments><AspOptimizeRegisterDirectives>True</AspOptimizeRegisterDirectives><HtmlReformatCode>True</HtmlReformatCode><FormatAttributeQuoteDescriptor>True</FormatAttributeQuoteDescriptor><JsInsertSemicolon>True</JsInsertSemicolon><CorrectVariableKindsDescriptor>True</CorrectVariableKindsDescriptor><VariablesToInnerScopesDescriptor>True</VariablesToInnerScopesDescriptor><StringToTemplatesDescriptor>True</StringToTemplatesDescriptor><JsReformatCode>True</JsReformatCode><JsFormatDocComments>True</JsFormatDocComments><CssAlphabetizeProperties>True</CssAlphabetizeProperties><CssReformatCode>True</CssReformatCode><VBShortenReferences>True</VBShortenReferences><VBOptimizeImports>True</VBOptimizeImports><VBReformatCode>True</VBReformatCode><VBFormatDocComments>True</VBFormatDocComments></Profile>
 	C42+,FF38+,IE10+,O28+,S6+
+	True
+	True
+	True
+	True
 	True
+	True
 	True
 	True
 	True
diff --git a/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.csproj b/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.csproj
index 37477f3..cc30733 100644
--- a/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.csproj
+++ b/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.csproj
@@ -1,66 +1,17 @@
-
-
-  
+
+
   
-    10.0
-    Debug
-    AnyCPU
-    {5D1E4E89-83A2-4B14-BB11-DEB3C69665F0}
-    Library
-    Properties
-    Markdig.SyntaxHighlighting
-    Markdig.SyntaxHighlighting
-    en-US
-    512
-    {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-    Profile259
-    v4.5
+    netstandard1.6
+    false
   
-  
-    true
-    full
-    false
-    bin\Debug\
-    DEBUG;TRACE
-    prompt
-    4
-  
-  
-    pdbonly
-    true
-    bin\Release\
-    TRACE
-    prompt
-    4
-  
-  
-    
-    
-    
-      Properties\SharedAssemblyInfo.cs
-    
-    
-    
-    
-  
+
   
-    
-      ..\packages\ColorCode.Portable.1.0.3\lib\portable45-net45+win8+wp8+wpa81\ColorCode.dll
-      True
-    
-    
-      ..\packages\Markdig.0.11.0\lib\portable40-net40+sl5+win8+wp8+wpa81\Markdig.dll
-    
+    
   
+
   
-    
+    
+    
   
-  
-  
-
\ No newline at end of file
+
+
diff --git a/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.nuspec b/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.nuspec
deleted file mode 100644
index c5d91dc..0000000
--- a/src/Markdig.SyntaxHighlighting/Markdig.SyntaxHighlighting.nuspec
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-  
-    $id$
-    $version$
-    $title$
-    $author$
-    $author$
-    https://github.com/RichardSlater/Markdig.SyntaxHighlighting/blob/master/LICENSE.md
-    https://github.com/RichardSlater/Markdig.SyntaxHighlighting/
-    https://cdn.rawgit.com/RichardSlater/Markdig.SyntaxHighlighting/56be978d313c4199396ca1ac0b1407d2c1cb7dfa/assets/icon.png
-    false
-    Syntax Highlighting for Markdig.
-    Initial Version.
-    Copyright 2016 Richard Slater
-    markdown code syntax highlighting
-  
-
diff --git a/src/Markdig.SyntaxHighlighting/SyntaxHighlightingCodeBlockRenderer.cs b/src/Markdig.SyntaxHighlighting/SyntaxHighlightingCodeBlockRenderer.cs
index f82b3a2..3b2f76b 100644
--- a/src/Markdig.SyntaxHighlighting/SyntaxHighlightingCodeBlockRenderer.cs
+++ b/src/Markdig.SyntaxHighlighting/SyntaxHighlightingCodeBlockRenderer.cs
@@ -8,12 +8,12 @@
 
 namespace Markdig.SyntaxHighlighting {
     public class SyntaxHighlightingCodeBlockRenderer : HtmlObjectRenderer {
-        private readonly CodeBlockRenderer _underlyingRenderer;
-        private readonly IStyleSheet _customCss;
-
+        private readonly CodeBlockRenderer _underlyingRenderer;
+        private readonly IStyleSheet _customCss;
+
         public SyntaxHighlightingCodeBlockRenderer(CodeBlockRenderer underlyingRenderer = null, IStyleSheet customCss = null) {
-            _underlyingRenderer = underlyingRenderer ?? new CodeBlockRenderer();
-            _customCss = customCss;
+            _underlyingRenderer = underlyingRenderer ?? new CodeBlockRenderer();
+            _customCss = customCss;
         }
 
         protected override void Write(HtmlRenderer renderer, CodeBlock obj) {
diff --git a/src/Markdig.SyntaxHighlighting/SyntaxHighlightingExtensions.cs b/src/Markdig.SyntaxHighlighting/SyntaxHighlightingExtensions.cs
index 5e7ae15..668aced 100644
--- a/src/Markdig.SyntaxHighlighting/SyntaxHighlightingExtensions.cs
+++ b/src/Markdig.SyntaxHighlighting/SyntaxHighlightingExtensions.cs
@@ -1,5 +1,5 @@
-using ColorCode;
-
+using ColorCode;
+
 namespace Markdig.SyntaxHighlighting {
     public static class SyntaxHighlightingExtensions {
         public static MarkdownPipelineBuilder UseSyntaxHighlighting(this MarkdownPipelineBuilder pipeline, IStyleSheet customCss = null) {
diff --git a/src/Markdig.SyntaxHighlighting/packages.config b/src/Markdig.SyntaxHighlighting/packages.config
deleted file mode 100644
index 2e1a130..0000000
--- a/src/Markdig.SyntaxHighlighting/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-  
-  
-
\ No newline at end of file