diff --git a/Directory.Packages.props b/Directory.Packages.props index a4e450f4483..aa5da41933a 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -22,9 +22,9 @@ - - - + + + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 371ce18d341..3febb679816 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -24,6 +24,14 @@ This file should be imported by eng/Versions.props 10.0.0-rc.2.25427.104 10.0.0-rc.2.25427.104 10.0.0-rc.2.25427.104 + + 17.15.0-preview-25453-107 + 17.15.0-preview-25453-107 + 17.15.0-preview-25453-107 + + 5.0.0-2.25453.107 + 5.0.0-2.25453.107 + 5.0.0-2.25453.107 @@ -46,5 +54,13 @@ This file should be imported by eng/Versions.props $(SystemRuntimeCachingPackageVersion) $(SystemTextEncodingsWebPackageVersion) $(SystemTextJsonPackageVersion) + + $(MicrosoftBuildFrameworkPackageVersion) + $(MicrosoftBuildUtilitiesCorePackageVersion) + $(MicrosoftBuildTasksCorePackageVersion) + + $(MicrosoftCodeAnalysisCSharpPackageVersion) + $(MicrosoftCodeAnalysisCSharpWorkspacesPackageVersion) + $(MicrosoftCodeAnalysisWorkspacesMSBuildPackageVersion) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f3d3a432aa4..51f264ac1ac 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -62,6 +62,30 @@ https://github.com/dotnet/dotnet 7ac1ca67bb1fb8a381c1c94a9f82a97725f0ccf3 + + https://github.com/dotnet/msbuild + 53a2d6ba9edc932e724dc80a5a56eeb9943863cf + + + https://github.com/dotnet/msbuild + 53a2d6ba9edc932e724dc80a5a56eeb9943863cf + + + https://github.com/dotnet/msbuild + 53a2d6ba9edc932e724dc80a5a56eeb9943863cf + + + https://github.com/dotnet/roslyn + e5924c0044a45b9b10ccde820a447adbb636f8be + + + https://github.com/dotnet/roslyn + e5924c0044a45b9b10ccde820a447adbb636f8be + + + https://github.com/dotnet/roslyn + e5924c0044a45b9b10ccde820a447adbb636f8be + diff --git a/eng/Versions.props b/eng/Versions.props index d9d60dcf6d5..ab4f7d976d5 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -17,11 +17,6 @@ False - 17.14.8 - 17.14.8 - 17.14.8 - - 4.14.0 1.1.3-beta1.24423.1 1.1.3-beta1.24352.1 1.14.2 @@ -29,4 +24,4 @@ 1.12.0 2.1.11 - + \ No newline at end of file diff --git a/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs b/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs index 6006d510c6b..428ea6002c2 100644 --- a/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs +++ b/test/EFCore.Relational.Specification.Tests/Query/PrecompiledQueryRelationalTestBase.cs @@ -965,7 +965,7 @@ public virtual Task Contains_with_parameterized_collection() => Test( """ int[] ids = [1, 2, 3]; -_ = await context.Blogs.Where(b => ids.Contains(b.Id)).ToListAsync(); +_ = await context.Blogs.Where(b => ((IEnumerable)ids).Contains(b.Id)).ToListAsync(); """); [ConditionalFact] diff --git a/test/EFCore.Specification.Tests/Directory.Packages.props b/test/EFCore.Specification.Tests/Directory.Packages.props index c779d47c5be..314248643a4 100644 --- a/test/EFCore.Specification.Tests/Directory.Packages.props +++ b/test/EFCore.Specification.Tests/Directory.Packages.props @@ -1,9 +1,3 @@ - - - - - - \ No newline at end of file diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledQuerySqlServerTest.cs index 2d50701376a..f7d013e0b75 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledQuerySqlServerTest.cs @@ -1800,13 +1800,13 @@ public override async Task Contains_with_parameterized_collection() AssertSql( """ -@ids1='1' -@ids2='2' -@ids3='3' +@p1='1' +@p2='2' +@p3='3' SELECT [b].[Id], [b].[Name], [b].[Json] FROM [Blogs] AS [b] -WHERE [b].[Id] IN (@ids1, @ids2, @ids3) +WHERE [b].[Id] IN (@p1, @p2, @p3) """); } diff --git a/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs b/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs index 9ad3fe1ed22..301cf3d46b5 100644 --- a/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs +++ b/test/EFCore.SqlServer.FunctionalTests/Query/PrecompiledSqlPregenerationQuerySqlServerTest.cs @@ -233,18 +233,18 @@ public virtual async Task Do_not_cache_is_respected() await Test( """ string[] names = ["foo", "bar"]; -var blogs = await context.Blogs.Where(b => names.Contains(b.Name)).ToListAsync(); +var blogs = await context.Blogs.Where(b => ((IEnumerable)names).Contains(b.Name)).ToListAsync(); """, interceptorCodeAsserter: code => Assert.Contains(nameof(RelationalCommandCache), code)); AssertSql( """ -@names1='foo' (Size = 4000) -@names2='bar' (Size = 4000) +@p1='foo' (Size = 4000) +@p2='bar' (Size = 4000) SELECT [b].[Id], [b].[Name] FROM [Blogs] AS [b] -WHERE [b].[Name] IN (@names1, @names2) +WHERE [b].[Name] IN (@p1, @p2) """); }