diff --git a/appveyor.yml b/appveyor.yml index ee9442b5630..cca6bae12ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -42,10 +42,10 @@ before_test: Pop-Location } 'MySQL' { - Start-Service 'MySQL57' + Start-Service 'MySQL80' # Create nhibernate database (not handled by NHibernate.TestDatabaseSetup.dll) $env:MYSQL_PWD = 'Password12!' - & 'C:\Program Files\MySQL\MySQL Server 5.7\bin\mysql' -e 'CREATE DATABASE nhibernate;' --user=root + & 'C:\Program Files\MySQL\MySQL Server 8.0\bin\mysql' -e 'CREATE DATABASE nhibernate CHARACTER SET utf8 COLLATE utf8_general_ci;' --user=root } 'Odbc' { Start-Service 'MSSQL$SQL2017' } 'PostgreSQL' { diff --git a/build-common/NHibernate.props b/build-common/NHibernate.props index 6cad2a32da7..cda8885e0b1 100644 --- a/build-common/NHibernate.props +++ b/build-common/NHibernate.props @@ -21,6 +21,7 @@ false true NETCOREAPP2_0_OR_GREATER;$(DefineConstants) + NU1901;NU1902;NU1903;NU1904 NHibernate NHibernate.info diff --git a/src/NHibernate.Test/Async/Linq/MethodCallTests.cs b/src/NHibernate.Test/Async/Linq/MethodCallTests.cs index b3ba92bef4f..621aed6d57c 100644 --- a/src/NHibernate.Test/Async/Linq/MethodCallTests.cs +++ b/src/NHibernate.Test/Async/Linq/MethodCallTests.cs @@ -59,6 +59,7 @@ public async Task CanExecuteCountWithOrderByArgumentsAsync() public async Task CanSelectPropertiesIntoObjectArrayAsync() { var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts}) .FirstAsync()); @@ -71,6 +72,7 @@ public async Task CanSelectPropertiesIntoObjectArrayAsync() public async Task CanSelectComponentsIntoObjectArrayAsync() { var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Component, u.Component.OtherComponent}) .FirstAsync()); @@ -106,6 +108,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync() const string name = "Julian"; var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, pi, name, DateTime.MinValue}) .FirstAsync()); @@ -119,6 +122,7 @@ public async Task CanSelectConstantsIntoObjectArrayAsync() public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync() { var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output}) .FirstAsync()); @@ -131,6 +135,7 @@ public async Task CanSelectPropertiesFromAssociationsIntoObjectArrayAsync() public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync() { var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } }) .FirstAsync()); @@ -144,6 +149,7 @@ public async Task CanSelectPropertiesIntoObjectArrayInPropertyAsync() public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync() { var result = await (db.Users + .OrderBy(u => u.Id) .Select(u => new { Cells = new List { u.Id, u.Name, new object[u.Id] } }) .FirstAsync()); @@ -156,7 +162,7 @@ public async Task CanSelectPropertiesIntoPropertyListInPropertyAsync() [Test, Description("NH-2744")] public async Task CanSelectPropertiesIntoNestedObjectArraysAsync() { - var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}}); + var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}}); var result = await (query.FirstAsync()); Assert.That(result.Length, Is.EqualTo(2)); diff --git a/src/NHibernate.Test/Linq/MethodCallTests.cs b/src/NHibernate.Test/Linq/MethodCallTests.cs index c330b0944da..05abb79c0af 100644 --- a/src/NHibernate.Test/Linq/MethodCallTests.cs +++ b/src/NHibernate.Test/Linq/MethodCallTests.cs @@ -47,6 +47,7 @@ public void CanExecuteCountWithOrderByArguments() public void CanSelectPropertiesIntoObjectArray() { var result = db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, u.Name, u.InvalidLoginAttempts}) .First(); @@ -59,6 +60,7 @@ public void CanSelectPropertiesIntoObjectArray() public void CanSelectComponentsIntoObjectArray() { var result = db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Component, u.Component.OtherComponent}) .First(); @@ -94,6 +96,7 @@ public void CanSelectConstantsIntoObjectArray() const string name = "Julian"; var result = db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, pi, name, DateTime.MinValue}) .First(); @@ -107,6 +110,7 @@ public void CanSelectConstantsIntoObjectArray() public void CanSelectPropertiesFromAssociationsIntoObjectArray() { var result = db.Users + .OrderBy(u => u.Id) .Select(u => new object[] {u.Id, u.Role.Name, u.Role.Entity.Output}) .First(); @@ -119,6 +123,7 @@ public void CanSelectPropertiesFromAssociationsIntoObjectArray() public void CanSelectPropertiesIntoObjectArrayInProperty() { var result = db.Users + .OrderBy(u => u.Id) .Select(u => new { Cells = new object[] { u.Id, u.Name, new object[u.Id] } }) .First(); @@ -132,6 +137,7 @@ public void CanSelectPropertiesIntoObjectArrayInProperty() public void CanSelectPropertiesIntoPropertyListInProperty() { var result = db.Users + .OrderBy(u => u.Id) .Select(u => new { Cells = new List { u.Id, u.Name, new object[u.Id] } }) .First(); @@ -144,7 +150,7 @@ public void CanSelectPropertiesIntoPropertyListInProperty() [Test, Description("NH-2744")] public void CanSelectPropertiesIntoNestedObjectArrays() { - var query = db.Users.Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}}); + var query = db.Users.OrderBy(u => u.Id).Select(u => new object[] {"Root", new object[] {"Sub1", u.Name, new object[] {"Sub2", u.Name}}}); var result = query.First(); Assert.That(result.Length, Is.EqualTo(2)); diff --git a/src/NHibernate.Test/NHibernate.Test.csproj b/src/NHibernate.Test/NHibernate.Test.csproj index 978afb580f2..6414639fd99 100644 --- a/src/NHibernate.Test/NHibernate.Test.csproj +++ b/src/NHibernate.Test/NHibernate.Test.csproj @@ -74,7 +74,7 @@ - + @@ -82,7 +82,7 @@ - + @@ -91,7 +91,7 @@ - +