From 34949638e9bdc63a50602661eb8bc40b2577ac7d Mon Sep 17 00:00:00 2001 From: Smit Patel Date: Thu, 14 Dec 2017 14:24:48 -0800 Subject: [PATCH] Fix Oracle build break Add Oracle.FunctionalTests into Core.sln --- EFCore.sln | 111 ++++++++++-------- build/repo.props | 3 +- samples/OracleProvider/OracleProvider.sln | 26 ++-- .../OracleStringSubstringTranslator.cs | 16 ++- .../OracleProvider.FunctionalTests.csproj | 1 - .../Query/SimpleQueryOracleTest.cs | 6 + ...Core.Relational.Specification.Tests.csproj | 1 - .../EFCore.Specification.Tests.csproj | 1 - .../Xunit/FrameworkSkipConditionAttribute.cs | 2 +- 9 files changed, 97 insertions(+), 70 deletions(-) diff --git a/EFCore.sln b/EFCore.sln index dd11ca117b..35931954e0 100644 --- a/EFCore.sln +++ b/EFCore.sln @@ -3,7 +3,30 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27110.0 MinimumVisualStudioVersion = 15.0.26730.03 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore", "src\EFCore\EFCore.csproj", "{715C38E9-B2F5-4DB2-8025-0C6492DEBDD4}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{8C6EFBE5-F0FB-48D1-B138-A651BB95C957}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchmarks\EFCore.Benchmarks\EFCore.Benchmarks.csproj", "{E4F44442-7AD2-480D-AD6B-AAC4424F5FA7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks.EFCore", "benchmarks\EFCore.Benchmarks.EFCore\EFCore.Benchmarks.EFCore.csproj", "{8B289879-9CF1-4EFD-AD4B-781AEA94BDBE}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C41FD56B-38CD-40E3-89E6-071A6C58E36C}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OracleProvider", "OracleProvider", "{EA847C1D-EC25-442B-A940-460969577CD5}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2EBC4218-8437-4FCF-8B82-28AE27DD3676}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OracleProvider", "samples\OracleProvider\src\OracleProvider\OracleProvider.csproj", "{9511216F-EC10-480D-AA8D-F72312C96962}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{A424E48C-C5D9-41C5-8493-E3BDFD17A959}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OracleProvider.FunctionalTests", "samples\OracleProvider\test\OracleProvider.FunctionalTests\OracleProvider.FunctionalTests.csproj", "{2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9E4CC99-199C-4E3B-9EC5-D1FDFCD6C27B}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CE6B50B2-34AE-44C9-940A-4E48C3E1B3BC}" ProjectSection(SolutionItems) = preProject @@ -11,27 +34,51 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{CE6B50B2-34A src\EFCore.ruleset = src\EFCore.ruleset EndProjectSection EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{258D5057-81B9-40EC-A872-D21E27452749}" - ProjectSection(SolutionItems) = preProject - test\Directory.Build.props = test\Directory.Build.props - EndProjectSection +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-ef", "src\dotnet-ef\dotnet-ef.csproj", "{2D66A1DA-D102-4DD9-960B-7D863BBB53DE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef", "src\ef\ef.csproj", "{4F7C93F3-A30F-4061-804C-32293DC256A1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore", "src\EFCore\EFCore.csproj", "{715C38E9-B2F5-4DB2-8025-0C6492DEBDD4}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Design", "src\EFCore.Design\EFCore.Design.csproj", "{D3D0A8E8-EC2F-4E01-8650-8554E186A66F}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.InMemory", "src\EFCore.InMemory\EFCore.InMemory.csproj", "{6B102CC4-4396-4A7B-9F72-2C6B5C4D8310}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational", "src\EFCore.Relational\EFCore.Relational.csproj", "{6A25DF99-2615-46D8-9532-821764647EE1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite", "src\EFCore.Sqlite\EFCore.Sqlite.csproj", "{6FF0B963-0544-4428-8AE1-5A71872B55AD}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.Core", "src\EFCore.Sqlite.Core\EFCore.Sqlite.Core.csproj", "{A257C01B-BB91-44BA-831C-1E04F7800AC8}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.SqlServer", "src\EFCore.SqlServer\EFCore.SqlServer.csproj", "{99595B81-D47C-40BA-8C61-5328A5A0E4AB}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tools", "src\EFCore.Tools\EFCore.Tools.csproj", "{87ADBDB5-CA57-4EAB-9A8A-5E89480C9C6D}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tools.DotNet", "src\EFCore.Tools.DotNet\EFCore.Tools.DotNet.csproj", "{31ED3EA7-8270-478D-935D-0067BD7935B7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{258D5057-81B9-40EC-A872-D21E27452749}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-ef.Tests", "test\dotnet-ef.Tests\dotnet-ef.Tests.csproj", "{27018CE2-C235-439C-80F2-C573C8904892}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef.Tests", "test\ef.Tests\ef.Tests.csproj", "{935B51B9-A9B9-4DA2-93A2-663D3BCEAA83}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.CrossStore.FunctionalTests", "test\EFCore.CrossStore.FunctionalTests\EFCore.CrossStore.FunctionalTests.csproj", "{7EAC2B8E-4AF6-40D2-95C0-A6662762A7E0}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Design.Tests", "test\EFCore.Design.Tests\EFCore.Design.Tests.csproj", "{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.InMemory.FunctionalTests", "test\EFCore.InMemory.FunctionalTests\EFCore.InMemory.FunctionalTests.csproj", "{305B30D3-0E30-46E9-BA9D-060E0B79BE98}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.InMemory.Tests", "test\EFCore.InMemory.Tests\EFCore.InMemory.Tests.csproj", "{AB8D4BD7-8AB6-4004-AF21-32790EED93BC}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Specification.Tests", "src\EFCore.Relational.Specification.Tests\EFCore.Relational.Specification.Tests.csproj", "{07FA2B15-A6A5-4292-A096-7771FB32EEDA}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Tests", "test\EFCore.Relational.Tests\EFCore.Relational.Tests.csproj", "{1A884122-DC9E-42B1-8821-E43340F954D1}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Specification.Tests", "src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj", "{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.FunctionalTests", "test\EFCore.Sqlite.FunctionalTests\EFCore.Sqlite.FunctionalTests.csproj", "{7BB7D051-56D7-4A40-A29E-3801F5C19239}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite.Tests", "test\EFCore.Sqlite.Tests\EFCore.Sqlite.Tests.csproj", "{7E436D99-82A6-496C-A725-0819CBED056D}" @@ -42,47 +89,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.SqlServer.Tests", "t EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tests", "test\EFCore.Tests\EFCore.Tests.csproj", "{313F46FE-9962-4A15-805F-FCBDF5A6181E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Specification.Tests", "src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj", "{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Specification.Tests", "src\EFCore.Relational.Specification.Tests\EFCore.Relational.Specification.Tests.csproj", "{07FA2B15-A6A5-4292-A096-7771FB32EEDA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Design", "src\EFCore.Design\EFCore.Design.csproj", "{D3D0A8E8-EC2F-4E01-8650-8554E186A66F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Design.Tests", "test\EFCore.Design.Tests\EFCore.Design.Tests.csproj", "{7583E3F0-8B29-4BEA-A55E-E8B66E6FD508}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Sqlite", "src\EFCore.Sqlite\EFCore.Sqlite.csproj", "{6FF0B963-0544-4428-8AE1-5A71872B55AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-ef", "src\dotnet-ef\dotnet-ef.csproj", "{2D66A1DA-D102-4DD9-960B-7D863BBB53DE}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef", "src\ef\ef.csproj", "{4F7C93F3-A30F-4061-804C-32293DC256A1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tools", "src\EFCore.Tools\EFCore.Tools.csproj", "{87ADBDB5-CA57-4EAB-9A8A-5E89480C9C6D}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Tools.DotNet", "src\EFCore.Tools.DotNet\EFCore.Tools.DotNet.csproj", "{31ED3EA7-8270-478D-935D-0067BD7935B7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-ef.Tests", "test\dotnet-ef.Tests\dotnet-ef.Tests.csproj", "{27018CE2-C235-439C-80F2-C573C8904892}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ef.Tests", "test\ef.Tests\ef.Tests.csproj", "{935B51B9-A9B9-4DA2-93A2-663D3BCEAA83}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks", "benchmarks\EFCore.Benchmarks\EFCore.Benchmarks.csproj", "{E4F44442-7AD2-480D-AD6B-AAC4424F5FA7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Benchmarks.EFCore", "benchmarks\EFCore.Benchmarks.EFCore\EFCore.Benchmarks.EFCore.csproj", "{8B289879-9CF1-4EFD-AD4B-781AEA94BDBE}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "benchmarks", "benchmarks", "{8C6EFBE5-F0FB-48D1-B138-A651BB95C957}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{C41FD56B-38CD-40E3-89E6-071A6C58E36C}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "OracleProvider", "OracleProvider", "{EA847C1D-EC25-442B-A940-460969577CD5}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OracleProvider", "samples\OracleProvider\src\OracleProvider\OracleProvider.csproj", "{9511216F-EC10-480D-AA8D-F72312C96962}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{B9E4CC99-199C-4E3B-9EC5-D1FDFCD6C27B}" - ProjectSection(SolutionItems) = preProject - .editorconfig = .editorconfig - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - EndProjectSection -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -311,6 +317,14 @@ Global {9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.Build.0 = Release|Any CPU {9511216F-EC10-480D-AA8D-F72312C96962}.ReleaseNoBenchmarks|Any CPU.ActiveCfg = Release|Any CPU {9511216F-EC10-480D-AA8D-F72312C96962}.ReleaseNoBenchmarks|Any CPU.Build.0 = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.DebugNoBenchmarks|Any CPU.ActiveCfg = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.DebugNoBenchmarks|Any CPU.Build.0 = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.Build.0 = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.ReleaseNoBenchmarks|Any CPU.ActiveCfg = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.ReleaseNoBenchmarks|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -344,7 +358,10 @@ Global {E4F44442-7AD2-480D-AD6B-AAC4424F5FA7} = {8C6EFBE5-F0FB-48D1-B138-A651BB95C957} {8B289879-9CF1-4EFD-AD4B-781AEA94BDBE} = {8C6EFBE5-F0FB-48D1-B138-A651BB95C957} {EA847C1D-EC25-442B-A940-460969577CD5} = {C41FD56B-38CD-40E3-89E6-071A6C58E36C} - {9511216F-EC10-480D-AA8D-F72312C96962} = {EA847C1D-EC25-442B-A940-460969577CD5} + {9511216F-EC10-480D-AA8D-F72312C96962} = {2EBC4218-8437-4FCF-8B82-28AE27DD3676} + {2EBC4218-8437-4FCF-8B82-28AE27DD3676} = {EA847C1D-EC25-442B-A940-460969577CD5} + {A424E48C-C5D9-41C5-8493-E3BDFD17A959} = {EA847C1D-EC25-442B-A940-460969577CD5} + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105} = {A424E48C-C5D9-41C5-8493-E3BDFD17A959} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {285A5EB4-BCF4-40EB-B9E1-DF6DBCB5E705} diff --git a/build/repo.props b/build/repo.props index d41e56957b..1d3fea0017 100644 --- a/build/repo.props +++ b/build/repo.props @@ -12,10 +12,9 @@ - + - diff --git a/samples/OracleProvider/OracleProvider.sln b/samples/OracleProvider/OracleProvider.sln index af2019a6a4..aece6ade6e 100644 --- a/samples/OracleProvider/OracleProvider.sln +++ b/samples/OracleProvider/OracleProvider.sln @@ -3,20 +3,20 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.26730.3 MinimumVisualStudioVersion = 15.0.26730.03 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{57595541-E77D-477C-B48B-C69E061C11F9}" +EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore", "..\..\src\EFCore\EFCore.csproj", "{715C38E9-B2F5-4DB2-8025-0C6492DEBDD4}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational", "..\..\src\EFCore.Relational\EFCore.Relational.csproj", "{6A25DF99-2615-46D8-9532-821764647EE1}" EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Framework", "Framework", "{57595541-E77D-477C-B48B-C69E061C11F9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Specification.Tests", "..\..\src\EFCore.Relational.Specification.Tests\EFCore.Relational.Specification.Tests.csproj", "{07FA2B15-A6A5-4292-A096-7771FB32EEDA}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Specification.Tests", "..\..\src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj", "{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OracleProvider", "src\OracleProvider\OracleProvider.csproj", "{9511216F-EC10-480D-AA8D-F72312C96962}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OracleProvider.FunctionalTests", "test\OracleProvider.FunctionalTests\OracleProvider.FunctionalTests.csproj", "{2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Relational.Specification.Tests", "..\..\src\EFCore.Relational.Specification.Tests\EFCore.Relational.Specification.Tests.csproj", "{07FA2B15-A6A5-4292-A096-7771FB32EEDA}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.Specification.Tests", "..\..\src\EFCore.Specification.Tests\EFCore.Specification.Tests.csproj", "{1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -31,14 +31,6 @@ Global {6A25DF99-2615-46D8-9532-821764647EE1}.Debug|Any CPU.Build.0 = Debug|Any CPU {6A25DF99-2615-46D8-9532-821764647EE1}.Release|Any CPU.ActiveCfg = Release|Any CPU {6A25DF99-2615-46D8-9532-821764647EE1}.Release|Any CPU.Build.0 = Release|Any CPU - {9511216F-EC10-480D-AA8D-F72312C96962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9511216F-EC10-480D-AA8D-F72312C96962}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.Build.0 = Release|Any CPU - {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.Build.0 = Release|Any CPU {07FA2B15-A6A5-4292-A096-7771FB32EEDA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {07FA2B15-A6A5-4292-A096-7771FB32EEDA}.Debug|Any CPU.Build.0 = Debug|Any CPU {07FA2B15-A6A5-4292-A096-7771FB32EEDA}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -47,6 +39,14 @@ Global {1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Debug|Any CPU.Build.0 = Debug|Any CPU {1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Release|Any CPU.ActiveCfg = Release|Any CPU {1A73D95E-E8B5-4F96-908C-7B040E4F7AFE}.Release|Any CPU.Build.0 = Release|Any CPU + {9511216F-EC10-480D-AA8D-F72312C96962}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {9511216F-EC10-480D-AA8D-F72312C96962}.Debug|Any CPU.Build.0 = Debug|Any CPU + {9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.ActiveCfg = Release|Any CPU + {9511216F-EC10-480D-AA8D-F72312C96962}.Release|Any CPU.Build.0 = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2F3A8AA1-7E95-42DC-8A5D-FB71EEDB6105}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/samples/OracleProvider/src/OracleProvider/Query/ExpressionTranslators/Internal/OracleStringSubstringTranslator.cs b/samples/OracleProvider/src/OracleProvider/Query/ExpressionTranslators/Internal/OracleStringSubstringTranslator.cs index de038fe687..d0bfa9a435 100644 --- a/samples/OracleProvider/src/OracleProvider/Query/ExpressionTranslators/Internal/OracleStringSubstringTranslator.cs +++ b/samples/OracleProvider/src/OracleProvider/Query/ExpressionTranslators/Internal/OracleStringSubstringTranslator.cs @@ -13,8 +13,13 @@ namespace Microsoft.EntityFrameworkCore.Query.ExpressionTranslators.Internal = typeof(string).GetRuntimeMethod(nameof(string.Substring), new[] { typeof(int), typeof(int) }); public virtual Expression Translate(MethodCallExpression methodCallExpression) - => _methodInfo.Equals(methodCallExpression.Method) - ? new SqlFunctionExpression( + { + if (_methodInfo.Equals(methodCallExpression.Method) + // Oracle returns null if length is not greater than 0 + && (!(methodCallExpression.Arguments[1] is ConstantExpression constantExpression) + || (int)constantExpression.Value > 0)) + { + return new SqlFunctionExpression( "SUBSTR", methodCallExpression.Type, new[] @@ -28,7 +33,10 @@ namespace Microsoft.EntityFrameworkCore.Query.ExpressionTranslators.Internal methodCallExpression.Arguments[0], Expression.Constant(1)), methodCallExpression.Arguments[1] - }) - : null; + }); + } + + return null; + } } } diff --git a/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj b/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj index d0922b4a06..85c47a11b7 100644 --- a/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj +++ b/samples/OracleProvider/test/OracleProvider.FunctionalTests/OracleProvider.FunctionalTests.csproj @@ -2,7 +2,6 @@ net461 - netcoreapp2.0 Microsoft.EntityFrameworkCore.Oracle.FunctionalTests Microsoft.EntityFrameworkCore diff --git a/samples/OracleProvider/test/OracleProvider.FunctionalTests/Query/SimpleQueryOracleTest.cs b/samples/OracleProvider/test/OracleProvider.FunctionalTests/Query/SimpleQueryOracleTest.cs index 12a5765a7e..28a3f2ca7e 100644 --- a/samples/OracleProvider/test/OracleProvider.FunctionalTests/Query/SimpleQueryOracleTest.cs +++ b/samples/OracleProvider/test/OracleProvider.FunctionalTests/Query/SimpleQueryOracleTest.cs @@ -43,6 +43,12 @@ namespace Microsoft.EntityFrameworkCore.Query // Oracle doesn't short-circuit AND } + [ConditionalFact(Skip = "See issue#10563")] + public override void Indexof_with_emptystring() + { + base.Indexof_with_emptystring(); + } + public override void DefaultIfEmpty_in_subquery_nested() { AssertQuery( diff --git a/src/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj b/src/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj index 1c6bb05986..6eb25f2756 100644 --- a/src/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj +++ b/src/EFCore.Relational.Specification.Tests/EFCore.Relational.Specification.Tests.csproj @@ -3,7 +3,6 @@ Shared test suite for Entity Framework Core relational database providers. net461;netcoreapp2.0 - netcoreapp2.0 Microsoft.EntityFrameworkCore.Relational.Specification.Tests Microsoft.EntityFrameworkCore $(NoWarn);CS1591 diff --git a/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj b/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj index 3979164767..a58a73e7e6 100644 --- a/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj +++ b/src/EFCore.Specification.Tests/EFCore.Specification.Tests.csproj @@ -3,7 +3,6 @@ Shared test suite for Entity Framework Core database providers. net461;netcoreapp2.0 - netcoreapp2.0 Microsoft.EntityFrameworkCore.Specification.Tests Microsoft.EntityFrameworkCore $(NoWarn);CS1591 diff --git a/src/EFCore.Specification.Tests/TestUtilities/Xunit/FrameworkSkipConditionAttribute.cs b/src/EFCore.Specification.Tests/TestUtilities/Xunit/FrameworkSkipConditionAttribute.cs index 5b04502cfa..efc4dfceb1 100644 --- a/src/EFCore.Specification.Tests/TestUtilities/Xunit/FrameworkSkipConditionAttribute.cs +++ b/src/EFCore.Specification.Tests/TestUtilities/Xunit/FrameworkSkipConditionAttribute.cs @@ -31,7 +31,7 @@ namespace Microsoft.EntityFrameworkCore.TestUtilities.Xunit { return false; } -#elif NETCOREAPP2_0 +#elif NETCOREAPP2_0 || NETCOREAPP2_1 if (excludedFrameworks.HasFlag(RuntimeFrameworks.CoreCLR)) { return false;