Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions eng/PatchConfig.props
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,7 @@ Later on, this will be checked using this condition:
</PropertyGroup>
<PropertyGroup Condition=" '$(VersionPrefix)' == '2.2.8' ">
<PackagesInPatch>
Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
</PackagesInPatch>
</PropertyGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,10 @@ public virtual IReadOnlyCollection<XElement> GetAllElements()
{
using (var scope = _services.CreateScope())
{
var context = scope.ServiceProvider.GetRequiredService<TContext>();
return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml)).ToList().AsReadOnly();
var context = scope.ServiceProvider.GetRequiredService<TContext>();
// Put logger in a local such that `this` isn't captured.
var logger = _logger;
return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml, logger)).ToList().AsReadOnly();
}
}

Expand All @@ -65,15 +67,15 @@ public void StoreElement(XElement element, string friendlyName)
}
}

private XElement TryParseKeyXml(string xml)
private static XElement TryParseKeyXml(string xml, ILogger logger)
{
try
{
return XElement.Parse(xml);
}
catch (Exception e)
{
_logger?.LogExceptionWhileParsingKeyXml(xml, e);
logger?.LogExceptionWhileParsingKeyXml(xml, e);
return null;
}
}
Expand Down