Sync to 5.0.0-rc.1.20451.13 (release)

Commit 422fcb2a51c7616b0e2bbeb28c10309ed1b3b365
npgsql · Sep 14, 2020 · 4369435 · 4369435
1 parent edf25b4
commit 4369435
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 2 deletions.
diff --git a/Directory.Build.targets b/Directory.Build.targets
@@ -1,7 +1,7 @@
 <Project>
   <PropertyGroup>
-    <EFCoreVersion>5.0.0-rc.1.20426.3</EFCoreVersion>
-    <MicrosoftExtensionsVersion>5.0.0-rc.1.20425.18</MicrosoftExtensionsVersion>
+    <EFCoreVersion>5.0.0-rc.1.20451.13</EFCoreVersion>
+    <MicrosoftExtensionsVersion>5.0.0-rc.1.20451.14</MicrosoftExtensionsVersion>
     <NpgsqlVersion>4.1.4</NpgsqlVersion>
   </PropertyGroup>
 

diff --git a/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsWeakQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/ComplexNavigationsWeakQueryNpgsqlTest.cs
@@ -1,4 +1,6 @@
+using System;
 using System.Threading.Tasks;
+using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
 using Xunit;
 using Xunit.Abstractions;
@@ -15,8 +17,24 @@ public ComplexNavigationsWeakQueryNpgsqlTest(ComplexNavigationsWeakQueryNpgsqlFi
             //Fixture.TestSqlLoggerFactory.SetTestOutputHelper(testOutputHelper);
         }
 
+        public override async Task SelectMany_with_navigation_and_Distinct(bool async)
+        {
+            var message = (await Assert.ThrowsAsync<InvalidOperationException>(
+                () => base.SelectMany_with_navigation_and_Distinct(async))).Message;
+
+            Assert.Equal(RelationalStrings.InsufficientInformationToIdentifyOuterElementOfCollectionJoin, message);
+        }
+
         [ConditionalTheory(Skip = "#1142")]
         public override Task Accessing_optional_property_inside_result_operator_subquery(bool async)
             => base.Accessing_optional_property_inside_result_operator_subquery(async);
+
+        [ConditionalTheory(Skip = "https://github.com/dotnet/efcore/pull/22532")]
+        public override Task Distinct_skip_without_orderby(bool async)
+            => base.Distinct_skip_without_orderby(async);
+
+        [ConditionalTheory(Skip = "https://github.com/dotnet/efcore/pull/22532")]
+        public override Task Distinct_take_without_orderby(bool async)
+            => base.Distinct_take_without_orderby(async);
     }
 }
diff --git a/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs b/test/EFCore.PG.FunctionalTests/Query/NorthwindSelectQueryNpgsqlTest.cs
@@ -1,3 +1,4 @@
+using System;
 using System.Threading.Tasks;
 using Microsoft.EntityFrameworkCore.Diagnostics;
 using Microsoft.EntityFrameworkCore.Query;
@@ -28,6 +29,12 @@ public override Task Reverse_without_explicit_ordering_throws(bool async)
             => AssertTranslationFailedWithDetails(
                 () => base.Reverse_without_explicit_ordering_throws(async), RelationalStrings.MissingOrderingInSqlExpression);
 
+        public override async Task Projecting_after_navigation_and_distinct_throws(bool async)
+            => Assert.Equal(
+                RelationalStrings.InsufficientInformationToIdentifyOuterElementOfCollectionJoin,
+                (await Assert.ThrowsAsync<InvalidOperationException>(
+                    () => base.Projecting_after_navigation_and_distinct_throws(async))).Message);
+
         void AssertSql(params string[] expected)
             => Fixture.TestSqlLoggerFactory.AssertBaseline(expected);