From bd479121c34cdce3a764af63d2568b4d026966cc Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]" <dotnet-maestro[bot]@users.noreply.github.com>
Date: Wed, 7 Jul 2021 18:58:43 +0000
Subject: [PATCH 1/2] Update dependencies from https://github.com/dotnet/efcore
 build 20210707.11

Microsoft.EntityFrameworkCore.Tools , dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.Design
 From Version 6.0.0-preview.6.21352.1 -> To Version 6.0.0-preview.6.21357.11
---
 eng/Version.Details.xml | 32 ++++++++++++++++----------------
 eng/Versions.props      | 16 ++++++++--------
 2 files changed, 24 insertions(+), 24 deletions(-)

diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index f854dee6c0a2..47c0e5a65d8e 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -9,37 +9,37 @@
 -->
 <Dependencies>
   <ProductDependencies>
-    <Dependency Name="dotnet-ef" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="dotnet-ef" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.InMemory" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Tools" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.6.21352.1">
+    <Dependency Name="Microsoft.EntityFrameworkCore.Design" Version="6.0.0-preview.6.21357.11">
       <Uri>https://github.com/dotnet/efcore</Uri>
-      <Sha>891cf8ff6264729bbdbd733f90fcc11a28f64507</Sha>
+      <Sha>2cbc1861b96a9860dd5369dbac639f52b7d1cad4</Sha>
     </Dependency>
     <Dependency Name="Microsoft.Extensions.Caching.Abstractions" Version="6.0.0-preview.6.21352.12">
       <Uri>https://github.com/dotnet/runtime</Uri>
diff --git a/eng/Versions.props b/eng/Versions.props
index 4fa615419c03..09c8eb25de39 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -129,14 +129,14 @@
     <!-- Only listed explicitly to workaround https://github.com/dotnet/cli/issues/10528 -->
     <MicrosoftNETCorePlatformsVersion>6.0.0-preview.6.21352.12</MicrosoftNETCorePlatformsVersion>
     <!-- Packages from dotnet/efcore -->
-    <dotnetefVersion>6.0.0-preview.6.21352.1</dotnetefVersion>
-    <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreInMemoryVersion>
-    <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreRelationalVersion>
-    <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreSqliteVersion>
-    <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreSqlServerVersion>
-    <MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreToolsVersion>
-    <MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreVersion>
-    <MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.6.21352.1</MicrosoftEntityFrameworkCoreDesignVersion>
+    <dotnetefVersion>6.0.0-preview.6.21357.11</dotnetefVersion>
+    <MicrosoftEntityFrameworkCoreInMemoryVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreInMemoryVersion>
+    <MicrosoftEntityFrameworkCoreRelationalVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreRelationalVersion>
+    <MicrosoftEntityFrameworkCoreSqliteVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreSqliteVersion>
+    <MicrosoftEntityFrameworkCoreSqlServerVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreSqlServerVersion>
+    <MicrosoftEntityFrameworkCoreToolsVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreToolsVersion>
+    <MicrosoftEntityFrameworkCoreVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreVersion>
+    <MicrosoftEntityFrameworkCoreDesignVersion>6.0.0-preview.6.21357.11</MicrosoftEntityFrameworkCoreDesignVersion>
     <!-- Packages from dotnet/arcade -->
     <MicrosoftDotNetBuildTasksInstallersVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksInstallersVersion>
     <MicrosoftDotNetBuildTasksTemplatingVersion>6.0.0-beta.21311.3</MicrosoftDotNetBuildTasksTemplatingVersion>

From 1863879d3bab8c08947581d39ddc2908f85d1cda Mon Sep 17 00:00:00 2001
From: Brennan <brecon@microsoft.com>
Date: Thu, 1 Jul 2021 12:45:25 -0700
Subject: [PATCH 2/2] Quarantine Reset_PriorOSVersions_NotSupported (#34004)

---
 src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs b/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
index 551cdc149134..f8e5e93cd3df 100644
--- a/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
+++ b/src/Servers/HttpSys/test/FunctionalTests/Http2Tests.cs
@@ -624,6 +624,7 @@ public async Task Reset_Http1_NotSupported()
             Assert.Equal("Hello World", response);
         }
 
+        [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/34003")]
         [ConditionalFact]
         [MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Http2 requires Win10")]
         [MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H2, SkipReason = "This is last version without Reset support")]