React to breaking changes in Microsoft.Extensions.Logging.Abstractions

src/MusicStore/build.sh

@@ -0,0 +1,7 @@
+#!/usr/bin/env bash
+
+set -euo pipefail
+
+DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+repo_root="$DIR/../.."
+"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@"

src/MusicStore/build/dependencies.props

@@ -45,5 +45,6 @@
     <XunitRunnerVisualStudioPackageVersion>2.4.0</XunitRunnerVisualStudioPackageVersion>
   </PropertyGroup>
   <PropertyGroup Label="Package Versions: Pinned" />
+  <Import Project="$(MSBuildThisFileDirectory)..\..\..\build\dependencies.props" />
   <Import Project="$(DotNetPackageVersionPropsPath)" Condition=" '$(DotNetPackageVersionPropsPath)' != '' " />
 </Project>

src/MusicStore/test/MusicStore.E2ETests/Implementation/Validator.cs

@@ -7,7 +7,6 @@ using System.Security.Principal;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Server.IntegrationTesting;
 using Microsoft.Extensions.Logging;
-using Microsoft.Extensions.Logging.Internal;
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Xunit;
@@ -68,15 +67,13 @@ namespace E2ETests
         {
             var requestHeaders = string.Join("\n", response.RequestMessage.Headers.Select(h => h.Key + "=" + string.Join(",", h.Value)));
             _logger.Log(logLevel, 0,
-               new FormattedLogValues("Request headers: {0}", requestHeaders),
+               "Request headers: {0}",
-               exception: null,
+               requestHeaders);
-               formatter: (o, e) => o.ToString());
 
             var responseHeaders = string.Join("\n", response.Headers.Select(h => h.Key + "=" + string.Join(",", h.Value)));
             _logger.Log(logLevel, 0,
-                new FormattedLogValues("Response headers: {0}", responseHeaders),
+                "Response headers: {0}",
-                exception: null,
+                responseHeaders);
-                formatter: (o, e) => o.ToString());
         }
 
         public async Task VerifyHomePage(

src/MusicStore/test/MusicStore.E2ETests/MusicStore.E2ETests.csproj

@@ -29,6 +29,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="$(MicrosoftExtensionsConfigurationUserSecretsPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="$(MicrosoftExtensionsLoggingConsolePackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="$(MicrosoftExtensionsLoggingPackageVersion)" />
     <PackageReference Include="Microsoft.Extensions.Logging.Testing" Version="$(MicrosoftExtensionsLoggingTestingPackageVersion)" />
     <PackageReference Include="System.Data.SqlClient" Version="$(SystemDataSqlClientPackageVersion)" />
   </ItemGroup>