From acc4ae006aa862c94312e0425112870989a07d6d Mon Sep 17 00:00:00 2001
From: Brice Lambson <brice@bricelam.net>
Date: Mon, 12 Apr 2021 13:29:24 -0700
Subject: [PATCH] :arrow_up: Update to .NET SDK 6.0 Preview 3

---
 global.json                                               | 8 ++++----
 .../Query/GearsOfWarODataQueryTests.cs                    | 2 +-
 .../Query/NorthwindODataQueryTests.cs                     | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/global.json b/global.json
index dcc50616da1..16644d62ebf 100644
--- a/global.json
+++ b/global.json
@@ -1,19 +1,19 @@
 {
   "tools": {
-    "dotnet": "6.0.100-preview.2.21155.3",
+    "dotnet": "6.0.100-preview.3.21202.5",
     "runtimes": {
       "dotnet": [
         "3.1.14",
-        "5.0.4"
+        "5.0.5"
       ],
       "aspnetcore": [
         "3.1.14",
-        "5.0.4"
+        "5.0.5"
       ]
     }
   },
   "sdk": {
-    "version": "6.0.100-preview.2.21155.3",
+    "version": "6.0.100-preview.3.21202.5",
     "allowPrerelease": true,
     "rollForward": "latestMajor"
   },
diff --git a/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTests.cs b/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTests.cs
index 0ee608a9ab3..ef85498363a 100644
--- a/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTests.cs
+++ b/test/EFCore.OData.FunctionalTests/Query/GearsOfWarODataQueryTests.cs
@@ -64,7 +64,7 @@ public async Task Basic_query_single_element_from_set_composite_key()
             Assert.Equal("Marcus", result["Nickname"].ToString());
         }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "OData/WebApi#2437")]
         public async Task Complex_query_with_any_on_collection_navigation()
         {
             var requestUri = string.Format(@"{0}/odata/Gears?$filter=Weapons/any(w: w/Id gt 4)", BaseAddress);
diff --git a/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTests.cs b/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTests.cs
index 6df4f04b039..b04c7890a98 100644
--- a/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTests.cs
+++ b/test/EFCore.OData.FunctionalTests/Query/NorthwindODataQueryTests.cs
@@ -47,7 +47,7 @@ public async Task Basic_query_select_single_customer()
             Assert.Equal("ALFKI", result["CustomerID"].ToString());
         }
 
-        [ConditionalFact]
+        [ConditionalFact(Skip = "OData/WebApi#2437")]
         public async Task Query_for_alfki_expand_orders()
         {
             var requestUri = string.Format(@"{0}/odata/Customers?$filter=CustomerID eq 'ALFKI'&$expand=Orders", BaseAddress);