From 82c42d58aeb401968c2dcd779c99fc503935052c Mon Sep 17 00:00:00 2001
From: Doug Bunting <6431421+dougbu@users.noreply.github.com>
Date: Sun, 22 Sep 2019 16:07:53 -0700
Subject: [PATCH 1/2] Update branding to 2.1.14 -
aspnet/AspNetCore-Internal#3153
---
eng/Baseline.Designer.props | 9 +++++----
eng/Baseline.xml | 6 +++---
eng/PatchConfig.props | 12 ++++--------
.../ArchiveBaseline.2.1.13.txt | 1 +
.../ArchiveBaseline.2.1.13.txt | 1 +
version.props | 2 +-
6 files changed, 15 insertions(+), 16 deletions(-)
create mode 100644 src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
create mode 100644 src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt
diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props
index a830a66044..c82f441f14 100644
--- a/eng/Baseline.Designer.props
+++ b/eng/Baseline.Designer.props
@@ -2,7 +2,7 @@
$(MSBuildAllProjects);$(MSBuildThisFileFullPath)
- 2.1.12
+ 2.1.13
@@ -284,10 +284,11 @@
- 2.1.1
+ 2.1.13
+
@@ -1117,12 +1118,12 @@
- 2.1.1
+ 2.1.13
-
+
diff --git a/eng/Baseline.xml b/eng/Baseline.xml
index dff0b069c0..8ab070f7e9 100644
--- a/eng/Baseline.xml
+++ b/eng/Baseline.xml
@@ -4,7 +4,7 @@ This file contains a list of all the packages and their versions which were rele
build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
-->
-
+
@@ -36,7 +36,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
-
+
@@ -115,7 +115,7 @@ build of ASP.NET Core 2.1.x. Update this list when preparing for a new patch.
-
+
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index e433208e89..71ff8312fd 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -18,14 +18,6 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.Authentication.Google;
-
-
-
-
-
-
-
-
Microsoft.AspNetCore.Identity.UI;
@@ -46,4 +38,8 @@ Later on, this will be checked using this condition:
Microsoft.AspNetCore.SpaServices;
+
+
+
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.13.txt
@@ -0,0 +1 @@
+
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt
new file mode 100644
index 0000000000..8b13789179
--- /dev/null
+++ b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.13.txt
@@ -0,0 +1 @@
+
diff --git a/version.props b/version.props
index e65ef23479..ed48958394 100644
--- a/version.props
+++ b/version.props
@@ -2,7 +2,7 @@
2
1
- 13
+ 14
servicing
Servicing
t000
From 59bdc3449f44912686df0ba79d7bff00117fa028 Mon Sep 17 00:00:00 2001
From: Justin Kotalik
Date: Wed, 2 Oct 2019 08:06:56 +0900
Subject: [PATCH 2/2] [release/2.2] Backport memory leak fix from 3.0 (#13840)
---
eng/PatchConfig.props | 1 +
.../src/EntityFrameworkCoreXmlRepository.cs | 10 ++++++----
2 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
index 36217a524c..dc15b2cbe0 100644
--- a/eng/PatchConfig.props
+++ b/eng/PatchConfig.props
@@ -78,6 +78,7 @@ Later on, this will be checked using this condition:
+ Microsoft.AspNetCore.DataProtection.EntityFrameworkCore;
diff --git a/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs b/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs
index 62250cf3ef..0c9ff11639 100644
--- a/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs
+++ b/src/DataProtection/EntityFrameworkCore/src/EntityFrameworkCoreXmlRepository.cs
@@ -42,8 +42,10 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore
{
using (var scope = _services.CreateScope())
{
- var context = scope.ServiceProvider.GetRequiredService();
- return context.DataProtectionKeys.AsNoTracking().Select(key => TryParseKeyXml(key.Xml)).ToList().AsReadOnly();
+ var context = scope.ServiceProvider.GetRequiredService();
+ // 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();
}
}
@@ -65,7 +67,7 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore
}
}
- private XElement TryParseKeyXml(string xml)
+ private static XElement TryParseKeyXml(string xml, ILogger logger)
{
try
{
@@ -73,7 +75,7 @@ namespace Microsoft.AspNetCore.DataProtection.EntityFrameworkCore
}
catch (Exception e)
{
- _logger?.LogExceptionWhileParsingKeyXml(xml, e);
+ logger?.LogExceptionWhileParsingKeyXml(xml, e);
return null;
}
}