Bumped dependencies, updated code to work with upgrades

- Prism now highlights args. - Changes to ILogger.Log<TState> broke some unit tests - dotnet/extensions#1319.
JeringTech · Nov 19, 2019 · 40bac9b · 40bac9b
1 parent 0ffda4e
commit 40bac9b
Show file tree

Hide file tree

Showing 7 changed files with 45 additions and 33 deletions.
diff --git a/perf/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.Performance.csproj b/perf/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.Performance.csproj
@@ -2,7 +2,7 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>netcoreapp2.1</TargetFramework>
+        <TargetFramework>netcoreapp3.0</TargetFramework>
         <IsPackable>false</IsPackable>
     </PropertyGroup>
 
@@ -21,7 +21,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="BenchmarkDotNet" Version="0.10.14" />
+        <PackageReference Include="BenchmarkDotNet" Version="0.12.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/specs/FlexiIncludeBlocksSpecs.md b/specs/FlexiIncludeBlocksSpecs.md
@@ -697,13 +697,13 @@ i{
 <svg class="flexi-code__copy-icon" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 18 18"><path fill="none" d="M0,0h18v18H0V0z"/><path d="M12,1H2v13h2V3h8V1z M12,4l4,4v9H5V4H12z M11,9h4l-4-4V9z"/></svg>
 </button>
 </header>
-<pre class="flexi-code__pre"><code class="flexi-code__code"><span class="token keyword">function</span> <span class="token function">exampleFunction</span><span class="token punctuation">(</span>arg<span class="token punctuation">)</span> <span class="token punctuation">{</span>
+<pre class="flexi-code__pre"><code class="flexi-code__code"><span class="token keyword">function</span> <span class="token function">exampleFunction</span><span class="token punctuation">(</span><span class="token parameter">arg</span><span class="token punctuation">)</span> <span class="token punctuation">{</span>
     <span class="token comment">// Example comment</span>
     <span class="token keyword">return</span> arg <span class="token operator">+</span> <span class="token string">'dummyString'</span><span class="token punctuation">;</span>
 <span class="token punctuation">}</span>
 
 <span class="token comment">//#region utility methods</span>
-<span class="token keyword">function</span> <span class="token function">add</span><span class="token punctuation">(</span>a<span class="token punctuation">,</span> b<span class="token punctuation">)</span> <span class="token punctuation">{</span>
+<span class="token keyword">function</span> <span class="token function">add</span><span class="token punctuation">(</span><span class="token parameter">a<span class="token punctuation">,</span> b</span><span class="token punctuation">)</span> <span class="token punctuation">{</span>
     <span class="token keyword">return</span> a <span class="token operator">+</span> b<span class="token punctuation">;</span>
 <span class="token punctuation">}</span>
 <span class="token comment">//#endregion utility methods</span>

diff --git a/src/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.csproj b/src/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.csproj
@@ -22,7 +22,7 @@
     • FlexiVideoBlocks: Videos with lazy loading, fullscreen mode and customizable controls.
 
 Note: Some functionality, like picture lazy loading, requires frontend scripts and styles. We're working on packaging frontend assets for easy usage.</Description>
-        <Copyright>© 2018 Jering. All rights reserved.</Copyright>
+        <Copyright>© 2018-2019 Jering. All rights reserved.</Copyright>
         <PackageProjectUrl>https://www.jering.tech/utilities/jering.markdig.extensions.flexiblocks/index</PackageProjectUrl>
         <RepositoryUrl>https://github.com/JeringTech/Markdig.Extensions.FlexiBlocks</RepositoryUrl>
         <PackageLicenseUrl>$(RepositoryUrl)/blob/master/License.md</PackageLicenseUrl>
@@ -42,22 +42,22 @@ Note: Some functionality, like picture lazy loading, requires frontend scripts a
         <PackageReference Include="Jering.IocServices.Newtonsoft.Json" Version="0.3.0" />
         <PackageReference Include="Jering.IocServices.System.IO" Version="0.3.0" />
         <PackageReference Include="Jering.IocServices.System.Net.Http" Version="0.3.0" />
-        <PackageReference Include="Jering.Web.SyntaxHighlighters.HighlightJS" Version="3.2.1" />
-        <PackageReference Include="Jering.Web.SyntaxHighlighters.Prism" Version="4.2.1" />
+        <PackageReference Include="Jering.Web.SyntaxHighlighters.HighlightJS" Version="3.3.0" />
+        <PackageReference Include="Jering.Web.SyntaxHighlighters.Prism" Version="4.3.0" />
         <PackageReference Include="Markdig" Version="0.16.0" />
         <!-- Requires libcurl-openssl for build to work on Linux "sudo apt install libcurl3 libcurl-openssl1.0-dev"-->
-        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19367-01">
+        <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-19554-01">
           <PrivateAssets>all</PrivateAssets>
           <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Roslynator.Analyzers" Version="2.1.0" PrivateAssets="all" ExcludeAssets="Runtime">
+        <PackageReference Include="Roslynator.Analyzers" Version="2.2.0" PrivateAssets="all" ExcludeAssets="Runtime">
           <IncludeAssets>compile; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Roslynator.CodeFixes" Version="2.0.0" PrivateAssets="all" ExcludeAssets="Runtime">
           <IncludeAssets>compile; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
         <PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-beta0007" />
-        <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
+        <PackageReference Include="System.Collections.Immutable" Version="1.6.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/test/FlexiBlocks/Extensions/FlexiIncludeBlocks/ContentRetrieverServiceUnitTests.cs b/test/FlexiBlocks/Extensions/FlexiIncludeBlocks/ContentRetrieverServiceUnitTests.cs
@@ -520,17 +520,23 @@ public void GetContentFromRemoteSource_LogsWarningsThenThrowsArgumentExceptionIf
             ArgumentException result = Assert.Throws<ArgumentException>(() => testSubject.GetContentFromRemoteSource(dummySource, null, dummyCancellationToken));
             _mockRepository.VerifyAll();
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                // object is of type FormattedLogValues
-                It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_FailureStatusCode, dummySource.AbsoluteUri, (int)HttpStatusCode.InternalServerError, 2)),
-                null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    // object is of type FormattedLogValues
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_FailureStatusCode, dummySource.AbsoluteUri, (int)HttpStatusCode.InternalServerError, 2)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                // object is of type FormattedLogValues
-                It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_Timeout, dummySource.AbsoluteUri, 1)),
-                null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    // object is of type FormattedLogValues
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_Timeout, dummySource.AbsoluteUri, 1)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                // object is of type FormattedLogValues
-                It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_HttpRequestException, dummyHttpRequestException.Message, dummySource.AbsoluteUri, 0)),
-                null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    // object is of type FormattedLogValues
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_ContentRetrieverService_HttpRequestException, dummyHttpRequestException.Message, dummySource.AbsoluteUri, 0)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
             Assert.Equal($@"{string.Format(Strings.ArgumentException_ContentRetrieverService_FailedAfterMultipleAttempts, dummySource.AbsoluteUri)}
 Parameter name: source",
                 result.Message, ignoreLineEndingDifferences: true);

diff --git a/test/FlexiBlocks/Extensions/FlexiIncludeBlocks/DiskCacheServiceUnitTests.cs b/test/FlexiBlocks/Extensions/FlexiIncludeBlocks/DiskCacheServiceUnitTests.cs
@@ -332,15 +332,21 @@ public void GetStream_LogsWarningsThenThrowsIOExceptionIfCacheFileExistsButIsInU
             mockFileService.Verify(f => f.Open(dummyFilePath, dummyFileMode, dummyFileAccess, dummyFileShare), Times.Exactly(3));
             Assert.Same(dummyIOException, result);
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                // object is of type FormattedLogValues
-                It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 2)),
-                null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    // object is of type FormattedLogValues
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 2)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                  It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 1)),
-                  null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 1)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
             mockLogger.Verify(l => l.Log(LogLevel.Warning, 0,
-                  It.Is<object>(f => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 0)),
-                  null, It.IsAny<Func<object, Exception, string>>()), Times.Once);
+                    It.Is<It.IsAnyType>((f, _) => f.ToString() == string.Format(Strings.LogWarning_DiskCacheService_FileInUse, dummyFilePath, 0)),
+                    null,
+                    (Func<It.IsAnyType, Exception, string>)It.IsAny<object>()),
+                Times.Once);
         }
 
         [Fact]

diff --git a/test/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.Tests.csproj b/test/FlexiBlocks/Jering.Markdig.Extensions.FlexiBlocks.Tests.csproj
@@ -8,13 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.msbuild" Version="2.4.0">
+        <PackageReference Include="coverlet.msbuild" Version="2.7.0">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
-        <PackageReference Include="Moq" Version="4.13.0" />
-        <PackageReference Include="Roslynator.Analyzers" Version="2.1.0" ExcludeAssets="Runtime" />
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
+        <PackageReference Include="Moq" Version="4.13.1" />
+        <PackageReference Include="Roslynator.Analyzers" Version="2.2.0" ExcludeAssets="Runtime" />
         <PackageReference Include="Roslynator.CodeFixes" Version="2.0.0" ExcludeAssets="Runtime" />
         <PackageReference Include="xunit" Version="2.4.1" />
         <PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">

diff --git a/test/FlexiBlocks/SpecsTests/FlexiBlocksSpecsTests.cs b/test/FlexiBlocks/SpecsTests/FlexiBlocksSpecsTests.cs
@@ -4054,21 +4054,21 @@ public void FlexiIncludeBlocks_Spec18(string extensions)
             //     <svg class="flexi-code__copy-icon" xmlns="http://www.w3.org/2000/svg" width="18px" height="18px" viewBox="0 0 18 18"><path fill="none" d="M0,0h18v18H0V0z"/><path d="M12,1H2v13h2V3h8V1z M12,4l4,4v9H5V4H12z M11,9h4l-4-4V9z"/></svg>
             //     </button>
             //     </header>
-            //     <pre class="flexi-code__pre"><code class="flexi-code__code"><span class="token keyword">function</span> <span class="token function">exampleFunction</span><span class="token punctuation">(</span>arg<span class="token punctuation">)</span> <span class="token punctuation">{</span>
+            //     <pre class="flexi-code__pre"><code class="flexi-code__code"><span class="token keyword">function</span> <span class="token function">exampleFunction</span><span class="token punctuation">(</span><span class="token parameter">arg</span><span class="token punctuation">)</span> <span class="token punctuation">{</span>
             //         <span class="token comment">// Example comment</span>
             //         <span class="token keyword">return</span> arg <span class="token operator">+</span> <span class="token string">'dummyString'</span><span class="token punctuation">;</span>
             //     <span class="token punctuation">}</span>
             //     
             //     <span class="token comment">//#region utility methods</span>
-            //     <span class="token keyword">function</span> <span class="token function">add</span><span class="token punctuation">(</span>a<span class="token punctuation">,</span> b<span class="token punctuation">)</span> <span class="token punctuation">{</span>
+            //     <span class="token keyword">function</span> <span class="token function">add</span><span class="token punctuation">(</span><span class="token parameter">a<span class="token punctuation">,</span> b</span><span class="token punctuation">)</span> <span class="token punctuation">{</span>
             //         <span class="token keyword">return</span> a <span class="token operator">+</span> b<span class="token punctuation">;</span>
             //     <span class="token punctuation">}</span>
             //     <span class="token comment">//#endregion utility methods</span>
             //     </code></pre>
             //     </div>
 
             SpecTestHelper.AssertCompliance("o{\n    \"language\": \"javascript\"\n}\ni{\n    \"source\": \"exampleInclude.js\"\n}",
-                "<div class=\"flexi-code flexi-code_no-title flexi-code_has-copy-icon flexi-code_has-header flexi-code_language_javascript flexi-code_has-syntax-highlights flexi-code_no-line-numbers flexi-code_has-omitted-lines-icon flexi-code_no-highlighted-lines flexi-code_no-highlighted-phrases\">\n<header class=\"flexi-code__header\">\n<button class=\"flexi-code__copy-button\" aria-label=\"Copy code\">\n<svg class=\"flexi-code__copy-icon\" xmlns=\"http://www.w3.org/2000/svg\" width=\"18px\" height=\"18px\" viewBox=\"0 0 18 18\"><path fill=\"none\" d=\"M0,0h18v18H0V0z\"/><path d=\"M12,1H2v13h2V3h8V1z M12,4l4,4v9H5V4H12z M11,9h4l-4-4V9z\"/></svg>\n</button>\n</header>\n<pre class=\"flexi-code__pre\"><code class=\"flexi-code__code\"><span class=\"token keyword\">function</span> <span class=\"token function\">exampleFunction</span><span class=\"token punctuation\">(</span>arg<span class=\"token punctuation\">)</span> <span class=\"token punctuation\">{</span>\n    <span class=\"token comment\">// Example comment</span>\n    <span class=\"token keyword\">return</span> arg <span class=\"token operator\">+</span> <span class=\"token string\">'dummyString'</span><span class=\"token punctuation\">;</span>\n<span class=\"token punctuation\">}</span>\n\n<span class=\"token comment\">//#region utility methods</span>\n<span class=\"token keyword\">function</span> <span class=\"token function\">add</span><span class=\"token punctuation\">(</span>a<span class=\"token punctuation\">,</span> b<span class=\"token punctuation\">)</span> <span class=\"token punctuation\">{</span>\n    <span class=\"token keyword\">return</span> a <span class=\"token operator\">+</span> b<span class=\"token punctuation\">;</span>\n<span class=\"token punctuation\">}</span>\n<span class=\"token comment\">//#endregion utility methods</span>\n</code></pre>\n</div>",
+                "<div class=\"flexi-code flexi-code_no-title flexi-code_has-copy-icon flexi-code_has-header flexi-code_language_javascript flexi-code_has-syntax-highlights flexi-code_no-line-numbers flexi-code_has-omitted-lines-icon flexi-code_no-highlighted-lines flexi-code_no-highlighted-phrases\">\n<header class=\"flexi-code__header\">\n<button class=\"flexi-code__copy-button\" aria-label=\"Copy code\">\n<svg class=\"flexi-code__copy-icon\" xmlns=\"http://www.w3.org/2000/svg\" width=\"18px\" height=\"18px\" viewBox=\"0 0 18 18\"><path fill=\"none\" d=\"M0,0h18v18H0V0z\"/><path d=\"M12,1H2v13h2V3h8V1z M12,4l4,4v9H5V4H12z M11,9h4l-4-4V9z\"/></svg>\n</button>\n</header>\n<pre class=\"flexi-code__pre\"><code class=\"flexi-code__code\"><span class=\"token keyword\">function</span> <span class=\"token function\">exampleFunction</span><span class=\"token punctuation\">(</span><span class=\"token parameter\">arg</span><span class=\"token punctuation\">)</span> <span class=\"token punctuation\">{</span>\n    <span class=\"token comment\">// Example comment</span>\n    <span class=\"token keyword\">return</span> arg <span class=\"token operator\">+</span> <span class=\"token string\">'dummyString'</span><span class=\"token punctuation\">;</span>\n<span class=\"token punctuation\">}</span>\n\n<span class=\"token comment\">//#region utility methods</span>\n<span class=\"token keyword\">function</span> <span class=\"token function\">add</span><span class=\"token punctuation\">(</span><span class=\"token parameter\">a<span class=\"token punctuation\">,</span> b</span><span class=\"token punctuation\">)</span> <span class=\"token punctuation\">{</span>\n    <span class=\"token keyword\">return</span> a <span class=\"token operator\">+</span> b<span class=\"token punctuation\">;</span>\n<span class=\"token punctuation\">}</span>\n<span class=\"token comment\">//#endregion utility methods</span>\n</code></pre>\n</div>",
                 extensions,
                 false);
         }