diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 000000000..f5f897858 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,4 @@ +* text=auto +*.cs diff=csharp +*.sh eol=lf +*.sln eol=crlf diff --git a/.gitignore b/.gitignore index c1035beb6..ef67bd4db 100644 --- a/.gitignore +++ b/.gitignore @@ -1,11 +1,20 @@ +/.build/ +/global.json +QueryBaseline.cs + ## Ignore Visual Studio temporary files, build results, and ## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore # User-specific files *.suo *.user *.userosscache *.sln.docstates +*.user.sln* +/test.ps1 +*.stackdump # User-specific files (MonoDevelop/Xamarin Studio) *.userprefs @@ -21,13 +30,15 @@ bld/ [Bb]in/ [Oo]bj/ [Ll]og/ -/.build # Visual Studio 2015 cache/options directory .vs/ # Uncomment if you have tasks that create the project's static files in wwwroot #wwwroot/ +# BenchmarkDotNet Results +[Bb]enchmarkDotNet.Artifacts/ + # MSTest test Results [Tt]est[Rr]esult*/ [Bb]uild[Ll]og.* @@ -41,9 +52,11 @@ TestResult.xml [Rr]eleasePS/ dlldata.c -# DNX +# .NET Core project.lock.json +project.fragment.lock.json artifacts/ +**/Properties/launchSettings.json *_i.c *_p.c @@ -110,6 +123,10 @@ _TeamCity* # DotCover is a Code Coverage Tool *.dotCover +# Visual Studio code coverage results +*.coverage +*.coveragexml + # NCrunch _NCrunch_* .*crunch*.local.xml @@ -159,7 +176,7 @@ PublishScripts/ !**/packages/build/ # Uncomment if necessary however generally it will be regenerated when needed #!**/packages/repositories.config -# NuGet v3's project.json files produces more ignoreable files +# NuGet v3's project.json files produces more ignorable files *.nuget.props *.nuget.targets @@ -189,9 +206,9 @@ ClientBin/ *~ *.dbmdl *.dbproj.schemaview +*.jfm *.pfx *.publishsettings -node_modules/ orleans.codegen.cs # Since there are multiple workflows, uncomment next line to ignore bower_components @@ -226,6 +243,10 @@ FakesAssemblies/ # Node.js Tools for Visual Studio .ntvs_analysis.dat +node_modules/ + +# Typescript v1 declaration files +typings/ # Visual Studio 6 build log *.plg @@ -233,6 +254,9 @@ FakesAssemblies/ # Visual Studio 6 workspace options file *.opt +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + # Visual Studio LightSwitch build output **/*.HTMLClient/GeneratedArtifacts **/*.DesktopClient/GeneratedArtifacts @@ -252,5 +276,22 @@ paket-files/ .idea/ *.sln.iml -# vscode -.vscode +# CodeRush +.cr/ + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs diff --git a/.travis.sources.list b/.travis.sources.list deleted file mode 100644 index 53c7e0849..000000000 --- a/.travis.sources.list +++ /dev/null @@ -1,42 +0,0 @@ -# See http://help.ubuntu.com/community/UpgradeNotes for how to upgrade to -# newer versions of the distribution. -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial main restricted -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial main restricted - -## Major bug fix updates produced after the final release of the -## distribution. -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates main restricted -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates main restricted - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team. Also, please note that software in universe WILL NOT receive any -## review or updates from the Ubuntu security team. -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial universe -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial universe -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates universe -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates universe - -## N.B. software from this repository is ENTIRELY UNSUPPORTED by the Ubuntu -## team, and may not be under a free licence. Please satisfy yourself as to -## your rights to use the software. Also, please note that software in -## multiverse WILL NOT receive any review or updates from the Ubuntu -## security team. -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial multiverse -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial multiverse -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates multiverse -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-updates multiverse - -## N.B. software from this repository may not have been tested as -## extensively as that contained in the main release, although it includes -## newer versions of some applications which may provide useful features. -## Also, please note that software in backports WILL NOT receive any review -## or updates from the Ubuntu security team. -deb http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse -deb-src http://us-central1.gce.archive.ubuntu.com/ubuntu/ xenial-backports main restricted universe multiverse - -deb http://security.ubuntu.com/ubuntu xenial-security main restricted -deb-src http://security.ubuntu.com/ubuntu xenial-security main restricted -deb http://security.ubuntu.com/ubuntu xenial-security universe -deb-src http://security.ubuntu.com/ubuntu xenial-security universe -deb http://security.ubuntu.com/ubuntu xenial-security multiverse -deb-src http://security.ubuntu.com/ubuntu xenial-security multiverse diff --git a/.travis.yml b/.travis.yml index c8c631e69..2fd37cbcc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,26 +7,32 @@ branches: only: - master - release - - dev - - /^.*-wip$/ - - /^(.*\/)?ci-.*$/ + - /^f_2.1.0.*$/ before_install: - - docker run --name mysql -e MYSQL_ROOT_PASSWORD=Password12! -d mysql:5.7 - - docker run -v $(pwd):/dotnet/:rw -e 'CI=True' --name dotnet --link mysql:mysql -d microsoft/dotnet:2.0.0-sdk sh -c 'while true; do sleep 0.1; done' - - cp test/EFCore.MySql.FunctionalTests/appsettings.ci.json test/EFCore.MySql.FunctionalTests/appsettings.json + - sudo service mysql stop + - docker run --name mysql -e MYSQL_ROOT_PASSWORD=Password12! -p 3306:3306 -d mysql:5.7 + - sudo apt-get update && sudo apt-get install libunwind8 + - cp test/EFCore.MySql.FunctionalTests/config.json.example test/EFCore.MySql.FunctionalTests/config.json + - cp test/EFCore.MySql.IntegrationTests/config.json.example test/EFCore.MySql.IntegrationTests/config.json + - ./run.sh install-tools + - ./dotnet-run.sh ./test/EFCore.MySql.IntegrationTests/scripts/rebuild.sh script: - - docker exec -it dotnet sh -c 'cd /dotnet && dotnet restore' - - docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.Tests && dotnet xunit -c Release' - - echo "Building migrations" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && cp config.json.example config.json && sed -i "s/127.0.0.1/mysql/g" config.json && ./scripts/rebuild.sh' - - echo "Test applying migrations" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && dotnet run -c Release testMigrate' - - echo "Test scaffolding" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && ./scripts/scaffold.sh; rc=$?; rm -rf Scaffold; exit $rc' - - echo "Test with EF_BATCH_SIZE=1" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && dotnet xunit -c Release' - - echo "Test with EF_BATCH_SIZE=10" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && export EF_BATCH_SIZE=10 && dotnet xunit -c Release' - - echo "Test with EF_RETRY_ON_FAILURE=3" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && export EF_RETRY_ON_FAILURE=3 && dotnet xunit -c Release' - - echo "Test legacy migrations" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && ./scripts/legacy.sh' - - echo "Building migrations with EF_DATABASE=pomelo_test2" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && export EF_SCHEMA=pomelo_test2 && ./scripts/rebuild.sh' - - echo "Test with EF_SCHEMA=pomelo_test2" && docker exec -it dotnet sh -c 'cd /dotnet/test/EFCore.MySql.FunctionalTests && export EF_SCHEMA=pomelo_test2 && dotnet xunit -c Release' + # KoreBuild disabled due to failing Functional Tests + # - ./build.sh + - echo "Tests" && ./dotnet-run.sh dotnet test test/EFCore.MySql.Tests + # Too many Functional Tests failing; fix before re-enabling in CI + # - echo "Functional Tests" && ./dotnet-run.sh dotnet test test/EFCore.MySql.FunctionalTests + - echo "Integration Tests applying migrations" && ./dotnet-run.sh dotnet run --project test/EFCore.MySql.IntegrationTests -c Release testMigrate + - echo "Integration Tests scaffolding" && ./dotnet-run.sh ./test/EFCore.MySql.IntegrationTests/scripts/scaffold.sh + - echo "Remove scaffolding files" && rm -rf ./test/EFCore.MySql.IntegrationTests/scripts/Scaffold + - echo "Integration Tests with EF_BATCH_SIZE=1" && ./dotnet-run.sh dotnet test -c Release test/EFCore.MySql.IntegrationTests + - echo "Integration Tests with EF_BATCH_SIZE=10" && ./dotnet-run.sh dotnet test -c Release test/EFCore.MySql.IntegrationTests + - echo "Integration Tests with EF_RETRY_ON_FAILURE=3" && export EF_RETRY_ON_FAILURE="3" && ./dotnet-run.sh dotnet test -c Release test/EFCore.MySql.IntegrationTests + - echo "Integration Tests legacy migrations" && ./dotnet-run.sh ./test/EFCore.MySql.IntegrationTests/scripts/legacy.sh + - echo "Integration Tests Building migrations with EF_DATABASE=pomelo_test2" && export EF_SCHEMA="pomelo_test2" && ./dotnet-run.sh ./test/EFCore.MySql.IntegrationTests/scripts/rebuild.sh + - echo "Integration Tests with EF_SCHEMA=pomelo_test2" && export EF_SCHEMA="pomelo_test2" && ./dotnet-run.sh dotnet test -c Release test/EFCore.MySql.IntegrationTests + notifications: email: false diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 000000000..c16c4a2b9 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,28 @@ +{ + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md + "version": "0.2.0", + "configurations": [ + { + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceRoot}/test/EFCore.MySql.IntegrationTests/bin/Debug/netcoreapp2.0/Pomelo.EntityFrameworkCore.MySql.FunctionalTests.dll", + "args": [], + "cwd": "${workspaceRoot}/test/EFCore.MySql.IntegrationTests", + // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window + "console": "internalConsole", + "stopAtEntry": false, + "internalConsoleOptions": "openOnSessionStart" + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach", + "processId": "${command:pickProcess}" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 000000000..476b30e9f --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,16 @@ +{ + "version": "0.1.0", + "command": "dotnet", + "isShellCommand": true, + "args": [], + "tasks": [ + { + "taskName": "build", + "args": [ + "${workspaceRoot}/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj" + ], + "isBuildCommand": true, + "problemMatcher": "$msCompile" + } + ] +} \ No newline at end of file diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 000000000..2bfb8541c --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,22 @@ + + + + + + + + + git + $(MSBuildThisFileDirectory) + https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql.git + true + 7.2 + $(NoWarn);CA1032;CA1034;CA1063;CA1815;CA1819 + + + + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 000000000..31714811b --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,9 @@ + + + + $(MicrosoftNETCoreApp11PackageVersion) + $(MicrosoftNETCoreApp20PackageVersion) + $(MicrosoftNETCoreApp21PackageVersion) + $(NETStandardLibrary20PackageVersion) + + diff --git a/Pomelo.EntityFrameworkCore.MySql.sln b/Pomelo.EntityFrameworkCore.MySql.sln index 40243b4dd..0cc239497 100644 --- a/Pomelo.EntityFrameworkCore.MySql.sln +++ b/Pomelo.EntityFrameworkCore.MySql.sln @@ -1,24 +1,22 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 VisualStudioVersion = 15.0.27130.2027 -MinimumVisualStudioVersion = 10.0.40219.1 +MinimumVisualStudioVersion = 15.0.26730.03 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{7E8380DB-F015-407B-99C2-26404E551673}" + ProjectSection(SolutionItems) = preProject + src\Directory.Build.props = src\Directory.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{6EC4A4AA-D865-4EF9-BD52-C2D0AA075CDF}" + ProjectSection(SolutionItems) = preProject + test\Directory.Build.props = test\Directory.Build.props + EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F0BD39F9-2120-45AD-9FA0-9B080E38DAE5}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - .gitignore = .gitignore - .travis.sources.list = .travis.sources.list - .travis.yml = .travis.yml - appveyor.yml = appveyor.yml - build-run.ps1 = build-run.ps1 - build.cmd = build.cmd - build.sh = build.sh - LICENSE = LICENSE - NuGet.config = NuGet.config - README.md = README.md + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets EndProjectSection EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.MySql", "src\EFCore.MySql\EFCore.MySql.csproj", "{FC2779F0-2A2A-4BE2-B5A8-FDA31A4A404A}" @@ -27,7 +25,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.MySql.Tests", "test\ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "EFCore.MySql.FunctionalTests", "test\EFCore.MySql.FunctionalTests\EFCore.MySql.FunctionalTests.csproj", "{E7D9C7D9-1CDD-4745-975D-9752AE095418}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.MySql.UpstreamFunctionalTests", "test\EFCore.MySql.UpstreamFunctionalTests\EFCore.MySql.UpstreamFunctionalTests.csproj", "{FF3B4140-42B3-4127-96D8-681858A5387B}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "EFCore.MySql.IntegrationTests", "test\EFCore.MySql.IntegrationTests\EFCore.MySql.IntegrationTests.csproj", "{FF3B4140-42B3-4127-96D8-681858A5387B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/appveyor.yml b/appveyor.yml index 6a24a4fc9..0d509fb6d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,9 +1,26 @@ image: Visual Studio 2017 clone_depth: 1 + services: -- mysql + - mysql + build_script: -- dotnet --info + - ps: cp test\EFCore.MySql.FunctionalTests\config.json.example test\EFCore.MySql.FunctionalTests\config.json + - ps: cp test\EFCore.MySql.IntegrationTests\config.json.example test\EFCore.MySql.IntegrationTests\config.json + - ps: .\run.ps1 install-tools + - ps: .\dotnet-run.ps1 .\test\EFCore.MySql.IntegrationTests\scripts\rebuild.ps1 + test_script: -- ps: .\build.ps1 + # KoreBuild disabled due to failing Functional Tests + # - .\build.cmd + - ps: echo "Tests"; .\dotnet-run.ps1 dotnet test test\EFCore.MySql.Tests + # Too many Functional Tests failing; fix before re-enabling in CI + # - echo "Functional Tests"; .\dotnet-run.ps1 dotnet test test\EFCore.MySql.FunctionalTests + - ps: echo "Integration Tests applying migrations"; .\dotnet-run.ps1 dotnet run --project test\EFCore.MySql.IntegrationTests -c Release testMigrate + - ps: echo "Integration Tests with EF_BATCH_SIZE=1"; .\dotnet-run.ps1 dotnet test -c Release test\EFCore.MySql.IntegrationTests + - ps: echo "Integration Tests with EF_BATCH_SIZE=10"; .\dotnet-run.ps1 dotnet test -c Release test\EFCore.MySql.IntegrationTests + - ps: echo "Integration Tests with EF_RETRY_ON_FAILURE=3"; $env:EF_RETRY_ON_FAILURE="3"; .\dotnet-run.ps1 dotnet test -c Release test\EFCore.MySql.IntegrationTests + - ps: echo "Integration Tests Building migrations with EF_DATABASE=pomelo_test2"; $env:EF_SCHEMA="pomelo_test2"; .\dotnet-run.ps1 .\test\EFCore.MySql.IntegrationTests\scripts\rebuild.ps1 + - ps: echo "Integration Tests with EF_SCHEMA=pomelo_test2"; $env:EF_SCHEMA="pomelo_test2"; .\dotnet-run.ps1 dotnet test -c Release test\EFCore.MySql.IntegrationTests + deploy: off diff --git a/build.cmd b/build.cmd new file mode 100644 index 000000000..c0050bda1 --- /dev/null +++ b/build.cmd @@ -0,0 +1,2 @@ +@ECHO OFF +PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' default-build %*; exit $LASTEXITCODE" diff --git a/build.ps1 b/build.ps1 deleted file mode 100644 index 066fa60f8..000000000 --- a/build.ps1 +++ /dev/null @@ -1,73 +0,0 @@ -$ErrorActionPreference = "Stop" - -$repoFolder = $PSScriptRoot -dotnet --info - -########################## -# BEGIN REPOSITORY TESTS -########################## - -# restore -cd "$repoFolder" -dotnet restore -if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; -} - -# supress logging output (exceptions will still be printed) -cp -Force test\EFCore.MySql.FunctionalTests\appsettings.ci.json test\EFCore.MySql.FunctionalTests\appsettings.json - -# build to verify no build errors -cd (Join-Path $repoFolder (Join-Path "src" "EFCore.MySql")) -dotnet build -c Release -if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; -} - -# run unit tests -cd (Join-Path $repoFolder (Join-Path "test" "EFCore.MySql.Tests")) -dotnet test -c Release -if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; -} - -# run functional tests if not on MyGet -if ($env:BuildRunner -ne "MyGet"){ - cd (Join-Path $repoFolder (Join-Path "test" "EFCore.MySql.FunctionalTests")) - cp config.json.example config.json - - echo "Building Migrations" - scripts\rebuild.ps1 - - echo "Test applying migrations" - dotnet run -c Release testMigrate - if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; - } - - echo "Test with EF_BATCH_SIZE=1" - dotnet test -c Release - if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; - } - - echo "Test with EF_BATCH_SIZE=10" - $env:EF_BATCH_SIZE = 10 - dotnet test -c Release - if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; - } -} - -########################## -# END REPOSITORY TESTS -########################## - -# MyGet expects nuget packages to be build -cd (Join-Path $repoFolder (Join-Path "src" "EFCore.MySql")) -if ($env:BuildRunner -eq "MyGet"){ - dotnet pack -c Release - if ($LASTEXITCODE -ne 0){ - exit $LASTEXITCODE; - } -} diff --git a/build.sh b/build.sh new file mode 100755 index 000000000..98a4b2276 --- /dev/null +++ b/build.sh @@ -0,0 +1,8 @@ +#!/usr/bin/env bash + +set -euo pipefail +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" + +# Call "sync" between "chmod" and execution to prevent "text file busy" error in Docker (aufs) +chmod +x "$DIR/run.sh"; sync +"$DIR/run.sh" default-build "$@" diff --git a/build/dependencies.props b/build/dependencies.props new file mode 100644 index 000000000..f11e47f1a --- /dev/null +++ b/build/dependencies.props @@ -0,0 +1,28 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + + + + 2.1.0 + 2.1.0 + 2.1.0 + 0.40.4 + 1.1.1 + + 15.6.1 + 2.3.1 + 2.3.1 + 2.4.0-beta.1.build3958 + 2.1.0 + + 2.1.0 + 2.1.0 + + 2.1.0-preview2-final + + 4.8.2 + + + \ No newline at end of file diff --git a/dotnet-run.ps1 b/dotnet-run.ps1 new file mode 100644 index 000000000..a2e1cca0d --- /dev/null +++ b/dotnet-run.ps1 @@ -0,0 +1,9 @@ +if (!$DotNetHome) { + $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` + elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` + elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` + else { Join-Path $PSScriptRoot '.dotnet'} +} + +$env:Path = "$DotNetHome;$env:Path" +& ($ARGS | Select-Object -First 1) @($ARGS | Select-Object -Skip 1) diff --git a/dotnet-run.sh b/dotnet-run.sh new file mode 100755 index 000000000..563ca3d56 --- /dev/null +++ b/dotnet-run.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" +export PATH="$DOTNET_HOME:$PATH" +exec "$@" diff --git a/korebuild-lock.txt b/korebuild-lock.txt new file mode 100644 index 000000000..d0e67daad --- /dev/null +++ b/korebuild-lock.txt @@ -0,0 +1,2 @@ +version:2.1.0-rtm-15783 +commithash:5fc2b2f607f542a2ffde11c19825e786fc1a3774 \ No newline at end of file diff --git a/korebuild.json b/korebuild.json new file mode 100644 index 000000000..678d8bb94 --- /dev/null +++ b/korebuild.json @@ -0,0 +1,4 @@ +{ + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/release/2.1/tools/korebuild.schema.json", + "channel": "release/2.1" +} diff --git a/run.cmd b/run.cmd new file mode 100644 index 000000000..d52d5c7e6 --- /dev/null +++ b/run.cmd @@ -0,0 +1,2 @@ +@ECHO OFF +PowerShell -NoProfile -NoLogo -ExecutionPolicy unrestricted -Command "[System.Threading.Thread]::CurrentThread.CurrentCulture = ''; [System.Threading.Thread]::CurrentThread.CurrentUICulture = '';& '%~dp0run.ps1' %*; exit $LASTEXITCODE" diff --git a/run.ps1 b/run.ps1 new file mode 100644 index 000000000..96c6c54c6 --- /dev/null +++ b/run.ps1 @@ -0,0 +1,208 @@ +#!/usr/bin/env powershell +#requires -version 4 + +<# +.SYNOPSIS +Executes KoreBuild commands. + +.DESCRIPTION +Downloads korebuild if required. Then executes the KoreBuild command. To see available commands, execute with `-Command help`. + +.PARAMETER Command +The KoreBuild command to run. + +.PARAMETER Path +The folder to build. Defaults to the folder containing this script. + +.PARAMETER Channel +The channel of KoreBuild to download. Overrides the value from the config file. + +.PARAMETER DotNetHome +The directory where .NET Core tools will be stored. + +.PARAMETER ToolsSource +The base url where build tools can be downloaded. Overrides the value from the config file. + +.PARAMETER Update +Updates KoreBuild to the latest version even if a lock file is present. + +.PARAMETER Reinstall +Re-installs KoreBuild + +.PARAMETER ConfigFile +The path to the configuration file that stores values. Defaults to korebuild.json. + +.PARAMETER ToolsSourceSuffix +The Suffix to append to the end of the ToolsSource. Useful for query strings in blob stores. + +.PARAMETER CI +Sets up CI specific settings and variables. + +.PARAMETER Arguments +Arguments to be passed to the command + +.NOTES +This function will create a file $PSScriptRoot/korebuild-lock.txt. This lock file can be committed to source, but does not have to be. +When the lockfile is not present, KoreBuild will create one using latest available version from $Channel. + +The $ConfigFile is expected to be an JSON file. It is optional, and the configuration values in it are optional as well. Any options set +in the file are overridden by command line parameters. + +.EXAMPLE +Example config file: +```json +{ + "$schema": "https://raw.githubusercontent.com/aspnet/BuildTools/dev/tools/korebuild.schema.json", + "channel": "dev", + "toolsSource": "https://aspnetcore.blob.core.windows.net/buildtools" +} +``` +#> +[CmdletBinding(PositionalBinding = $false)] +param( + [Parameter(Mandatory = $true, Position = 0)] + [string]$Command, + [string]$Path = $PSScriptRoot, + [Alias('c')] + [string]$Channel, + [Alias('d')] + [string]$DotNetHome, + [Alias('s')] + [string]$ToolsSource, + [Alias('u')] + [switch]$Update, + [switch]$Reinstall, + [string]$ToolsSourceSuffix, + [string]$ConfigFile = $null, + [switch]$CI, + [Parameter(ValueFromRemainingArguments = $true)] + [string[]]$Arguments +) + +Set-StrictMode -Version 2 +$ErrorActionPreference = 'Stop' + +# +# Functions +# + +function Get-KoreBuild { + + $lockFile = Join-Path $Path 'korebuild-lock.txt' + + if (!(Test-Path $lockFile) -or $Update) { + Get-RemoteFile "$ToolsSource/korebuild/channels/$Channel/latest.txt" $lockFile $ToolsSourceSuffix + } + + $version = Get-Content $lockFile | Where-Object { $_ -like 'version:*' } | Select-Object -first 1 + if (!$version) { + Write-Error "Failed to parse version from $lockFile. Expected a line that begins with 'version:'" + } + $version = $version.TrimStart('version:').Trim() + $korebuildPath = Join-Paths $DotNetHome ('buildtools', 'korebuild', $version) + + if ($Reinstall -and (Test-Path $korebuildPath)) { + Remove-Item -Force -Recurse $korebuildPath + } + + if (!(Test-Path $korebuildPath)) { + Write-Host -ForegroundColor Magenta "Downloading KoreBuild $version" + New-Item -ItemType Directory -Path $korebuildPath | Out-Null + $remotePath = "$ToolsSource/korebuild/artifacts/$version/korebuild.$version.zip" + + try { + $tmpfile = Join-Path ([IO.Path]::GetTempPath()) "KoreBuild-$([guid]::NewGuid()).zip" + Get-RemoteFile $remotePath $tmpfile $ToolsSourceSuffix + if (Get-Command -Name 'Expand-Archive' -ErrorAction Ignore) { + # Use built-in commands where possible as they are cross-plat compatible + Expand-Archive -Path $tmpfile -DestinationPath $korebuildPath + } + else { + # Fallback to old approach for old installations of PowerShell + Add-Type -AssemblyName System.IO.Compression.FileSystem + [System.IO.Compression.ZipFile]::ExtractToDirectory($tmpfile, $korebuildPath) + } + } + catch { + Remove-Item -Recurse -Force $korebuildPath -ErrorAction Ignore + throw + } + finally { + Remove-Item $tmpfile -ErrorAction Ignore + } + } + + return $korebuildPath +} + +function Join-Paths([string]$path, [string[]]$childPaths) { + $childPaths | ForEach-Object { $path = Join-Path $path $_ } + return $path +} + +function Get-RemoteFile([string]$RemotePath, [string]$LocalPath, [string]$RemoteSuffix) { + if ($RemotePath -notlike 'http*') { + Copy-Item $RemotePath $LocalPath + return + } + + $retries = 10 + while ($retries -gt 0) { + $retries -= 1 + try { + Invoke-WebRequest -UseBasicParsing -Uri $($RemotePath + $RemoteSuffix) -OutFile $LocalPath + return + } + catch { + Write-Verbose "Request failed. $retries retries remaining" + } + } + + Write-Error "Download failed: '$RemotePath'." +} + +# +# Main +# + +# Load configuration or set defaults + +$Path = Resolve-Path $Path +if (!$ConfigFile) { $ConfigFile = Join-Path $Path 'korebuild.json' } + +if (Test-Path $ConfigFile) { + try { + $config = Get-Content -Raw -Encoding UTF8 -Path $ConfigFile | ConvertFrom-Json + if ($config) { + if (!($Channel) -and (Get-Member -Name 'channel' -InputObject $config)) { [string] $Channel = $config.channel } + if (!($ToolsSource) -and (Get-Member -Name 'toolsSource' -InputObject $config)) { [string] $ToolsSource = $config.toolsSource} + } + } + catch { + Write-Warning "$ConfigFile could not be read. Its settings will be ignored." + Write-Warning $Error[0] + } +} + +if (!$DotNetHome) { + $DotNetHome = if ($env:DOTNET_HOME) { $env:DOTNET_HOME } ` + elseif ($env:USERPROFILE) { Join-Path $env:USERPROFILE '.dotnet'} ` + elseif ($env:HOME) {Join-Path $env:HOME '.dotnet'}` + else { Join-Path $PSScriptRoot '.dotnet'} +} + +if (!$Channel) { $Channel = 'dev' } +if (!$ToolsSource) { $ToolsSource = 'https://aspnetcore.blob.core.windows.net/buildtools' } + +# Execute + +$korebuildPath = Get-KoreBuild +Import-Module -Force -Scope Local (Join-Path $korebuildPath 'KoreBuild.psd1') + +try { + Set-KoreBuildSettings -ToolsSource $ToolsSource -DotNetHome $DotNetHome -RepoPath $Path -ConfigFile $ConfigFile -CI:$CI + Invoke-KoreBuildCommand $Command @Arguments +} +finally { + Remove-Module 'KoreBuild' -ErrorAction Ignore +} diff --git a/run.sh b/run.sh new file mode 100755 index 000000000..4606a42e7 --- /dev/null +++ b/run.sh @@ -0,0 +1,245 @@ +#!/usr/bin/env bash + +set -euo pipefail + +# +# variables +# + +RESET="\033[0m" +RED="\033[0;31m" +YELLOW="\033[0;33m" +MAGENTA="\033[0;95m" +DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" +[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" +verbose=false +update=false +reinstall=false +repo_path="$DIR" +channel='' +tools_source='' +tools_source_suffix='' +ci=false + +# +# Functions +# +__usage() { + echo "Usage: $(basename "${BASH_SOURCE[0]}") command [options] [[--] ...]" + echo "" + echo "Arguments:" + echo " command The command to be run." + echo " ... Arguments passed to the command. Variable number of arguments allowed." + echo "" + echo "Options:" + echo " --verbose Show verbose output." + echo " -c|--channel The channel of KoreBuild to download. Overrides the value from the config file.." + echo " --config-file The path to the configuration file that stores values. Defaults to korebuild.json." + echo " -d|--dotnet-home The directory where .NET Core tools will be stored. Defaults to '\$DOTNET_HOME' or '\$HOME/.dotnet." + echo " --path The directory to build. Defaults to the directory containing the script." + echo " -s|--tools-source|-ToolsSource The base url where build tools can be downloaded. Overrides the value from the config file." + echo " --tools-source-suffix|-ToolsSourceSuffix The suffix to append to tools-source. Useful for query strings." + echo " -u|--update Update to the latest KoreBuild even if the lock file is present." + echo " --reinstall Reinstall KoreBuild." + echo " --ci Apply CI specific settings and environment variables." + echo "" + echo "Description:" + echo " This function will create a file \$DIR/korebuild-lock.txt. This lock file can be committed to source, but does not have to be." + echo " When the lockfile is not present, KoreBuild will create one using latest available version from \$channel." + + if [[ "${1:-}" != '--no-exit' ]]; then + exit 2 + fi +} + +get_korebuild() { + local version + local lock_file="$repo_path/korebuild-lock.txt" + if [ ! -f "$lock_file" ] || [ "$update" = true ]; then + __get_remote_file "$tools_source/korebuild/channels/$channel/latest.txt" "$lock_file" "$tools_source_suffix" + fi + version="$(grep 'version:*' -m 1 "$lock_file")" + if [[ "$version" == '' ]]; then + __error "Failed to parse version from $lock_file. Expected a line that begins with 'version:'" + return 1 + fi + version="$(echo "${version#version:}" | sed -e 's/^[[:space:]]*//' -e 's/[[:space:]]*$//')" + local korebuild_path="$DOTNET_HOME/buildtools/korebuild/$version" + + if [ "$reinstall" = true ] && [ -d "$korebuild_path" ]; then + rm -rf "$korebuild_path" + fi + + { + if [ ! -d "$korebuild_path" ]; then + mkdir -p "$korebuild_path" + local remote_path="$tools_source/korebuild/artifacts/$version/korebuild.$version.zip" + tmpfile="$(mktemp)" + echo -e "${MAGENTA}Downloading KoreBuild ${version}${RESET}" + if __get_remote_file "$remote_path" "$tmpfile" "$tools_source_suffix"; then + unzip -q -d "$korebuild_path" "$tmpfile" + fi + rm "$tmpfile" || true + fi + + source "$korebuild_path/KoreBuild.sh" + } || { + if [ -d "$korebuild_path" ]; then + echo "Cleaning up after failed installation" + rm -rf "$korebuild_path" || true + fi + return 1 + } +} + +__error() { + echo -e "${RED}error: $*${RESET}" 1>&2 +} + +__warn() { + echo -e "${YELLOW}warning: $*${RESET}" +} + +__machine_has() { + hash "$1" > /dev/null 2>&1 + return $? +} + +__get_remote_file() { + local remote_path=$1 + local local_path=$2 + local remote_path_suffix=$3 + + if [[ "$remote_path" != 'http'* ]]; then + cp "$remote_path" "$local_path" + return 0 + fi + + local failed=false + if __machine_has wget; then + wget --tries 10 --quiet -O "$local_path" "${remote_path}${remote_path_suffix}" || failed=true + else + failed=true + fi + + if [ "$failed" = true ] && __machine_has curl; then + failed=false + curl --retry 10 -sSL -f --create-dirs -o "$local_path" "${remote_path}${remote_path_suffix}" || failed=true + fi + + if [ "$failed" = true ]; then + __error "Download failed: $remote_path" 1>&2 + return 1 + fi +} + +# +# main +# + +command="${1:-}" +shift + +while [[ $# -gt 0 ]]; do + case $1 in + -\?|-h|--help) + __usage --no-exit + exit 0 + ;; + -c|--channel|-Channel) + shift + channel="${1:-}" + [ -z "$channel" ] && __usage + ;; + --config-file|-ConfigFile) + shift + config_file="${1:-}" + [ -z "$config_file" ] && __usage + if [ ! -f "$config_file" ]; then + __error "Invalid value for --config-file. $config_file does not exist." + exit 1 + fi + ;; + -d|--dotnet-home|-DotNetHome) + shift + DOTNET_HOME="${1:-}" + [ -z "$DOTNET_HOME" ] && __usage + ;; + --path|-Path) + shift + repo_path="${1:-}" + [ -z "$repo_path" ] && __usage + ;; + -s|--tools-source|-ToolsSource) + shift + tools_source="${1:-}" + [ -z "$tools_source" ] && __usage + ;; + --tools-source-suffix|-ToolsSourceSuffix) + shift + tools_source_suffix="${1:-}" + [ -z "$tools_source_suffix" ] && __usage + ;; + -u|--update|-Update) + update=true + ;; + --reinstall|-[Rr]einstall) + reinstall=true + ;; + --ci) + ci=true + ;; + --verbose|-Verbose) + verbose=true + ;; + --) + shift + break + ;; + *) + break + ;; + esac + shift +done + +if ! __machine_has unzip; then + __error 'Missing required command: unzip' + exit 1 +fi + +if ! __machine_has curl && ! __machine_has wget; then + __error 'Missing required command. Either wget or curl is required.' + exit 1 +fi + +[ -z "${config_file:-}" ] && config_file="$repo_path/korebuild.json" +if [ -f "$config_file" ]; then + if __machine_has jq ; then + if jq '.' "$config_file" >/dev/null ; then + config_channel="$(jq -r 'select(.channel!=null) | .channel' "$config_file")" + config_tools_source="$(jq -r 'select(.toolsSource!=null) | .toolsSource' "$config_file")" + else + __warn "$config_file is invalid JSON. Its settings will be ignored." + fi + elif __machine_has python ; then + if python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'))" >/dev/null ; then + config_channel="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['channel'] if 'channel' in obj else '')")" + config_tools_source="$(python -c "import json,codecs;obj=json.load(codecs.open('$config_file', 'r', 'utf-8-sig'));print(obj['toolsSource'] if 'toolsSource' in obj else '')")" + else + __warn "$config_file is invalid JSON. Its settings will be ignored." + fi + else + __warn 'Missing required command: jq or pyton. Could not parse the JSON file. Its settings will be ignored.' + fi + + [ ! -z "${config_channel:-}" ] && channel="$config_channel" + [ ! -z "${config_tools_source:-}" ] && tools_source="$config_tools_source" +fi + +[ -z "$channel" ] && channel='dev' +[ -z "$tools_source" ] && tools_source='https://aspnetcore.blob.core.windows.net/buildtools' + +get_korebuild +set_korebuildsettings "$tools_source" "$DOTNET_HOME" "$repo_path" "$config_file" "$ci" +invoke_korebuild_command "$command" "$@" diff --git a/src/Directory.Build.props b/src/Directory.Build.props new file mode 100644 index 000000000..b30636e83 --- /dev/null +++ b/src/Directory.Build.props @@ -0,0 +1,3 @@ + + + diff --git a/src/EFCore.MySql/Design/Internal/MySqlAnnotationCodeGenerator.cs b/src/EFCore.MySql/Design/Internal/MySqlAnnotationCodeGenerator.cs index 98c223b96..9b66e678b 100644 --- a/src/EFCore.MySql/Design/Internal/MySqlAnnotationCodeGenerator.cs +++ b/src/EFCore.MySql/Design/Internal/MySqlAnnotationCodeGenerator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; -namespace EFCore.MySql.Design.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Design.Internal { public class MySqlAnnotationCodeGenerator : AnnotationCodeGenerator { diff --git a/src/EFCore.MySql/Design/Internal/MySqlDesignTimeServices.cs b/src/EFCore.MySql/Design/Internal/MySqlDesignTimeServices.cs index ca902cf20..92cca4599 100644 --- a/src/EFCore.MySql/Design/Internal/MySqlDesignTimeServices.cs +++ b/src/EFCore.MySql/Design/Internal/MySqlDesignTimeServices.cs @@ -1,14 +1,14 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Scaffolding.Internal; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Scaffolding.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Scaffolding; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.Extensions.DependencyInjection; -namespace EFCore.MySql.Design.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Design.Internal { public class MySqlDesignTimeServices : IDesignTimeServices { diff --git a/src/EFCore.MySql/EFCore.MySql.csproj b/src/EFCore.MySql/EFCore.MySql.csproj index 67b5eb1d3..78fc65487 100644 --- a/src/EFCore.MySql/EFCore.MySql.csproj +++ b/src/EFCore.MySql/EFCore.MySql.csproj @@ -19,10 +19,10 @@ false - - - - - + + + + + \ No newline at end of file diff --git a/src/EFCore.MySql/Extensions/MySqlDatabaseFacadeExtensions.cs b/src/EFCore.MySql/Extensions/MySqlDatabaseFacadeExtensions.cs index 6bb4cb6b6..966617a95 100644 --- a/src/EFCore.MySql/Extensions/MySqlDatabaseFacadeExtensions.cs +++ b/src/EFCore.MySql/Extensions/MySqlDatabaseFacadeExtensions.cs @@ -3,7 +3,7 @@ using System; using System.Reflection; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/src/EFCore.MySql/Extensions/MySqlDbContextOptionsExtensions.cs b/src/EFCore.MySql/Extensions/MySqlDbContextOptionsExtensions.cs index 45a4eebf8..b4f6f7035 100644 --- a/src/EFCore.MySql/Extensions/MySqlDbContextOptionsExtensions.cs +++ b/src/EFCore.MySql/Extensions/MySqlDbContextOptionsExtensions.cs @@ -4,7 +4,7 @@ using System; using System.Data; using System.Data.Common; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; diff --git a/src/EFCore.MySql/Extensions/MySqlEntityTypeBuilderExtensions.cs b/src/EFCore.MySql/Extensions/MySqlEntityTypeBuilderExtensions.cs index 1fd572620..b3cce8b0c 100644 --- a/src/EFCore.MySql/Extensions/MySqlEntityTypeBuilderExtensions.cs +++ b/src/EFCore.MySql/Extensions/MySqlEntityTypeBuilderExtensions.cs @@ -2,6 +2,9 @@ // Licensed under the MIT. See LICENSE in the project root for license information. // ReSharper disable once CheckNamespace + +using Microsoft.EntityFrameworkCore.Metadata.Builders; + namespace Microsoft.EntityFrameworkCore { /// diff --git a/src/EFCore.MySql/Extensions/MySqlPropertyBuilderExtensions.cs b/src/EFCore.MySql/Extensions/MySqlPropertyBuilderExtensions.cs index 57977b252..7495b1c3d 100644 --- a/src/EFCore.MySql/Extensions/MySqlPropertyBuilderExtensions.cs +++ b/src/EFCore.MySql/Extensions/MySqlPropertyBuilderExtensions.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; diff --git a/src/EFCore.MySql/Extensions/MySqlServiceCollectionExtensions.cs b/src/EFCore.MySql/Extensions/MySqlServiceCollectionExtensions.cs index c608e004c..ed08d084e 100644 --- a/src/EFCore.MySql/Extensions/MySqlServiceCollectionExtensions.cs +++ b/src/EFCore.MySql/Extensions/MySqlServiceCollectionExtensions.cs @@ -1,14 +1,14 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Infrastructure.Internal; -using EFCore.MySql.Internal; -using EFCore.MySql.Migrations.Internal; -using EFCore.MySql.Query.ExpressionTranslators.Internal; -using EFCore.MySql.Query.Sql.Internal; -using EFCore.MySql.Storage.Internal; -using EFCore.MySql.Update.Internal; -using EFCore.MySql.ValueGeneration.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Internal; +using Pomelo.EntityFrameworkCore.MySql.Migrations.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Update.Internal; +using Pomelo.EntityFrameworkCore.MySql.ValueGeneration.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata.Conventions; diff --git a/src/EFCore.MySql/Infrastructure/Internal/IMySqlOptions.cs b/src/EFCore.MySql/Infrastructure/Internal/IMySqlOptions.cs index 9e91888c8..6237522c4 100644 --- a/src/EFCore.MySql/Infrastructure/Internal/IMySqlOptions.cs +++ b/src/EFCore.MySql/Infrastructure/Internal/IMySqlOptions.cs @@ -1,10 +1,10 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace EFCore.MySql.Infrastructure.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal { public interface IMySqlOptions : ISingletonOptions { diff --git a/src/EFCore.MySql/Infrastructure/Internal/MySqlOptionsExtension.cs b/src/EFCore.MySql/Infrastructure/Internal/MySqlOptionsExtension.cs index def996370..c19443047 100644 --- a/src/EFCore.MySql/Infrastructure/Internal/MySqlOptionsExtension.cs +++ b/src/EFCore.MySql/Infrastructure/Internal/MySqlOptionsExtension.cs @@ -2,13 +2,13 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System.Text; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Utilities; using Microsoft.Extensions.DependencyInjection; -namespace EFCore.MySql.Infrastructure.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal { public sealed class MySqlOptionsExtension : RelationalOptionsExtension { diff --git a/src/EFCore.MySql/Infrastructure/MySqlDbContextOptionsBuilder.cs b/src/EFCore.MySql/Infrastructure/MySqlDbContextOptionsBuilder.cs index c5c040d7d..78c8e424f 100644 --- a/src/EFCore.MySql/Infrastructure/MySqlDbContextOptionsBuilder.cs +++ b/src/EFCore.MySql/Infrastructure/MySqlDbContextOptionsBuilder.cs @@ -3,10 +3,11 @@ using System; using System.Collections.Generic; -using EFCore.MySql.Infrastructure; -using EFCore.MySql.Infrastructure.Internal; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using JetBrains.Annotations; +using Microsoft.EntityFrameworkCore.Storage; // ReSharper disable once CheckNamespace namespace Microsoft.EntityFrameworkCore.Infrastructure diff --git a/src/EFCore.MySql/Infrastructure/ServerType.cs b/src/EFCore.MySql/Infrastructure/ServerType.cs index 6d8828ea3..f6b148abd 100644 --- a/src/EFCore.MySql/Infrastructure/ServerType.cs +++ b/src/EFCore.MySql/Infrastructure/ServerType.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -namespace EFCore.MySql.Infrastructure +namespace Pomelo.EntityFrameworkCore.MySql.Infrastructure { public enum ServerType { diff --git a/src/EFCore.MySql/Internal/MySqlOptions.cs b/src/EFCore.MySql/Internal/MySqlOptions.cs index c54f613c5..030dbd25d 100644 --- a/src/EFCore.MySql/Internal/MySqlOptions.cs +++ b/src/EFCore.MySql/Internal/MySqlOptions.cs @@ -2,13 +2,13 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System; -using EFCore.MySql.Infrastructure.Internal; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Internal; -namespace EFCore.MySql.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Internal { public class MySqlOptions : IMySqlOptions { diff --git a/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGenerationStrategyConvention.cs b/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGenerationStrategyConvention.cs index 5349f94f3..8b410c4dc 100644 --- a/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGenerationStrategyConvention.cs +++ b/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGenerationStrategyConvention.cs @@ -1,12 +1,12 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Conventions.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Conventions.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGeneratorConvention.cs b/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGeneratorConvention.cs index 93de420c9..eef71f055 100644 --- a/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGeneratorConvention.cs +++ b/src/EFCore.MySql/Metadata/Conventions/Internal/MySqlValueGeneratorConvention.cs @@ -1,14 +1,14 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Conventions.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Conventions.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Conventions/MySqlConventionSetBuilder.cs b/src/EFCore.MySql/Metadata/Conventions/MySqlConventionSetBuilder.cs index 066771bf5..8f6be9976 100644 --- a/src/EFCore.MySql/Metadata/Conventions/MySqlConventionSetBuilder.cs +++ b/src/EFCore.MySql/Metadata/Conventions/MySqlConventionSetBuilder.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Conventions.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Conventions.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal; using Microsoft.EntityFrameworkCore.Utilities; diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlAnnotationNames.cs b/src/EFCore.MySql/Metadata/Internal/MySqlAnnotationNames.cs index b2d084bb0..41c5d7593 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlAnnotationNames.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlAnnotationNames.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlEntityTypeBuilderAnnotations.cs b/src/EFCore.MySql/Metadata/Internal/MySqlEntityTypeBuilderAnnotations.cs index 42ba33217..e6b456b69 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlEntityTypeBuilderAnnotations.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlEntityTypeBuilderAnnotations.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Metadata.Internal; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { public class MySqlEntityTypeBuilderAnnotations : MySqlEntityTypeAnnotations { diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlIndexBuilderAnnotations.cs b/src/EFCore.MySql/Metadata/Internal/MySqlIndexBuilderAnnotations.cs index a417ddf60..1a4ee8d83 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlIndexBuilderAnnotations.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlIndexBuilderAnnotations.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlInternalMetadataBuilderExtensions.cs b/src/EFCore.MySql/Metadata/Internal/MySqlInternalMetadataBuilderExtensions.cs index 500f8bc75..b3bdaff6f 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlInternalMetadataBuilderExtensions.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlInternalMetadataBuilderExtensions.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlKeyBuilderAnnotations.cs b/src/EFCore.MySql/Metadata/Internal/MySqlKeyBuilderAnnotations.cs index 06eda7049..d4dfe9558 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlKeyBuilderAnnotations.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlKeyBuilderAnnotations.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlModelBuilderAnnotations.cs b/src/EFCore.MySql/Metadata/Internal/MySqlModelBuilderAnnotations.cs index 3e21b0c8c..fab7d6d9e 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlModelBuilderAnnotations.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlModelBuilderAnnotations.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/Internal/MySqlPropertyBuilderAnnotations.cs b/src/EFCore.MySql/Metadata/Internal/MySqlPropertyBuilderAnnotations.cs index a3fc030c8..8e86e9742 100644 --- a/src/EFCore.MySql/Metadata/Internal/MySqlPropertyBuilderAnnotations.cs +++ b/src/EFCore.MySql/Metadata/Internal/MySqlPropertyBuilderAnnotations.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; -namespace EFCore.MySql.Metadata.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Metadata.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Metadata/MySqlIndexAnnotations.cs b/src/EFCore.MySql/Metadata/MySqlIndexAnnotations.cs index aa3bcbda0..52f2eeff8 100644 --- a/src/EFCore.MySql/Metadata/MySqlIndexAnnotations.cs +++ b/src/EFCore.MySql/Metadata/MySqlIndexAnnotations.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; //ReSharper disable once CheckNamespace diff --git a/src/EFCore.MySql/Metadata/MySqlModelAnnotations.cs b/src/EFCore.MySql/Metadata/MySqlModelAnnotations.cs index ac160d9f7..9d3a3c5ac 100644 --- a/src/EFCore.MySql/Metadata/MySqlModelAnnotations.cs +++ b/src/EFCore.MySql/Metadata/MySqlModelAnnotations.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; //ReSharper disable once CheckNamespace diff --git a/src/EFCore.MySql/Metadata/MySqlPropertyAnnotations.cs b/src/EFCore.MySql/Metadata/MySqlPropertyAnnotations.cs index b333d3366..b1861aacd 100644 --- a/src/EFCore.MySql/Metadata/MySqlPropertyAnnotations.cs +++ b/src/EFCore.MySql/Metadata/MySqlPropertyAnnotations.cs @@ -2,7 +2,7 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System; -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Internal; using Microsoft.EntityFrameworkCore.Metadata.Internal; diff --git a/src/EFCore.MySql/Migrations/Internal/MySqlHistoryRepository.cs b/src/EFCore.MySql/Migrations/Internal/MySqlHistoryRepository.cs index c80e2fc40..74955c31d 100644 --- a/src/EFCore.MySql/Migrations/Internal/MySqlHistoryRepository.cs +++ b/src/EFCore.MySql/Migrations/Internal/MySqlHistoryRepository.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Migrations.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Migrations.Internal { public class MySqlHistoryRepository : HistoryRepository { diff --git a/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsAnnotationProvider.cs b/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsAnnotationProvider.cs index 1a1260120..b3c66c87d 100644 --- a/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsAnnotationProvider.cs +++ b/src/EFCore.MySql/Migrations/Internal/MySqlMigrationsAnnotationProvider.cs @@ -2,14 +2,14 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System.Collections.Generic; -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -namespace EFCore.MySql.Migrations.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Migrations.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Migrations/MySqlMigrationsSqlGenerator.cs b/src/EFCore.MySql/Migrations/MySqlMigrationsSqlGenerator.cs index bae4ebaf8..f6ef658e7 100644 --- a/src/EFCore.MySql/Migrations/MySqlMigrationsSqlGenerator.cs +++ b/src/EFCore.MySql/Migrations/MySqlMigrationsSqlGenerator.cs @@ -4,8 +4,8 @@ using System; using System.Linq; using System.Text.RegularExpressions; -using EFCore.MySql.Infrastructure.Internal; -using EFCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; diff --git a/src/EFCore.MySql/MySqlRetryingExecutionStrategy.cs b/src/EFCore.MySql/MySqlRetryingExecutionStrategy.cs index 0e3998a55..0d61508e4 100644 --- a/src/EFCore.MySql/MySqlRetryingExecutionStrategy.cs +++ b/src/EFCore.MySql/MySqlRetryingExecutionStrategy.cs @@ -3,7 +3,7 @@ using System; using System.Collections.Generic; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Storage; using MySql.Data.MySqlClient; diff --git a/src/EFCore.MySql/Properties/AssemblyInfo.cs b/src/EFCore.MySql/Properties/AssemblyInfo.cs index f0586bc8a..311306987 100644 --- a/src/EFCore.MySql/Properties/AssemblyInfo.cs +++ b/src/EFCore.MySql/Properties/AssemblyInfo.cs @@ -5,7 +5,7 @@ using System.Runtime.CompilerServices; using Microsoft.EntityFrameworkCore.Design; -[assembly: AssemblyTitle("EFCore.MySql")] +[assembly: AssemblyTitle("Pomelo.EntityFrameworkCore.MySql")] [assembly: AssemblyDescription("MySQL provider for Entity Framework Core")] -[assembly: DesignTimeProviderServices("EFCore.MySql.Design.Internal.MySqlDesignTimeServices")] -[assembly: InternalsVisibleTo("EFCore.MySql.Tests")] +[assembly: DesignTimeProviderServices("Pomelo.EntityFrameworkCore.MySql.Design.Internal.MySqlDesignTimeServices")] +[assembly: InternalsVisibleTo("Pomelo.EntityFrameworkCore.Tests")] diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMemberTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMemberTranslator.cs index 2b43f8b58..48a64556e 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMemberTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMemberTranslator.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMethodCallTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMethodCallTranslator.cs index bfd4792fc..0ef6298a6 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMethodCallTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlCompositeMethodCallTranslator.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlContainsOptimizedTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlContainsOptimizedTranslator.cs index 0b72c767d..2f07a503a 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlContainsOptimizedTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlContainsOptimizedTranslator.cs @@ -1,4 +1,4 @@ -/// Copyright (c) Pomelo Foundation. All rights reserved. +// Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. using System.Linq.Expressions; @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlConvertTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlConvertTranslator.cs index 917637836..50278ef82 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlConvertTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlConvertTranslator.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateAddTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateAddTranslator.cs index 2915d056b..c274d6f8b 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateAddTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateAddTranslator.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDateComponentTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDateComponentTranslator.cs index f8a7adbbd..b420f7b13 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDateComponentTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDateComponentTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDatePartComponentTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDatePartComponentTranslator.cs index 3ad868bc1..e54dc7777 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDatePartComponentTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeDatePartComponentTranslator.cs @@ -3,11 +3,11 @@ using System; using System.Linq.Expressions; -using EFCore.MySql.Query.Expressions.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal; using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeNowTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeNowTranslator.cs index aeed69887..23264a180 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeNowTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlDateTimeNowTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlEndsWithOptimizedTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlEndsWithOptimizedTranslator.cs index ba5840ccd..85329ff90 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlEndsWithOptimizedTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlEndsWithOptimizedTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlMathTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlMathTranslator.cs index b1554e37d..1fea19ac7 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlMathTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlMathTranslator.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlNewGuidTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlNewGuidTranslator.cs index 0de025e53..16a8fc42d 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlNewGuidTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlNewGuidTranslator.cs @@ -4,7 +4,7 @@ using System; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlObjectToStringTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlObjectToStringTranslator.cs index 85157689c..c432e9096 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlObjectToStringTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlObjectToStringTranslator.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlRegexIsMatchTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlRegexIsMatchTranslator.cs index e79a4e219..2596b6486 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlRegexIsMatchTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlRegexIsMatchTranslator.cs @@ -4,10 +4,10 @@ using System.Linq.Expressions; using System.Reflection; using System.Text.RegularExpressions; -using EFCore.MySql.Query.Expressions.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { public class MySqlRegexIsMatchTranslator : IMethodCallTranslator diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStartsWithOptimizedTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStartsWithOptimizedTranslator.cs index 24c739d09..236d8e41c 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStartsWithOptimizedTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStartsWithOptimizedTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringIsNullOrWhiteSpaceTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringIsNullOrWhiteSpaceTranslator.cs index ecbbda4ec..1a99dfd4f 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringIsNullOrWhiteSpaceTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringIsNullOrWhiteSpaceTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringLengthTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringLengthTranslator.cs index 52f6fd737..b465c09c4 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringLengthTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringLengthTranslator.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringReplaceTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringReplaceTranslator.cs index 05afda22d..3657c0d5d 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringReplaceTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringReplaceTranslator.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringSubstringTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringSubstringTranslator.cs index 0f3c54189..85e84003b 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringSubstringTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringSubstringTranslator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToLowerTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToLowerTranslator.cs index 7dff14a2f..a4965dd3e 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToLowerTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToLowerTranslator.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToUpperTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToUpperTranslator.cs index e198e9716..00e1e2775 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToUpperTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringToUpperTranslator.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimEndTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimEndTranslator.cs index e0a0dee17..e93e9ba0d 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimEndTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimEndTranslator.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimStartTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimStartTranslator.cs index b673fd47a..187d83753 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimStartTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimStartTranslator.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimTranslator.cs b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimTranslator.cs index cdbcead31..b022ee96e 100644 --- a/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimTranslator.cs +++ b/src/EFCore.MySql/Query/ExpressionTranslators/Internal/MySqlStringTrimTranslator.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.ExpressionTranslators; -namespace EFCore.MySql.Query.ExpressionTranslators.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.ExpressionTranslators.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/Expressions/Internal/MySqlFunctionExpression.cs b/src/EFCore.MySql/Query/Expressions/Internal/MySqlFunctionExpression.cs index 0205b1a10..85dc7d377 100644 --- a/src/EFCore.MySql/Query/Expressions/Internal/MySqlFunctionExpression.cs +++ b/src/EFCore.MySql/Query/Expressions/Internal/MySqlFunctionExpression.cs @@ -6,11 +6,11 @@ using System.Collections.ObjectModel; using System.Linq; using System.Linq.Expressions; -using EFCore.MySql.Query.Sql.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Query.Expressions.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal { public class MySqlFunctionExpression : Expression { diff --git a/src/EFCore.MySql/Query/Expressions/Internal/RegexpExpression.cs b/src/EFCore.MySql/Query/Expressions/Internal/RegexpExpression.cs index bba5f7513..160fc8098 100644 --- a/src/EFCore.MySql/Query/Expressions/Internal/RegexpExpression.cs +++ b/src/EFCore.MySql/Query/Expressions/Internal/RegexpExpression.cs @@ -3,11 +3,11 @@ using System; using System.Linq.Expressions; -using EFCore.MySql.Query.Sql.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Query.Expressions.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal { public class RegexpExpression : Expression { diff --git a/src/EFCore.MySql/Query/Sql/Internal/IMySqlExpressionVisitor.cs b/src/EFCore.MySql/Query/Sql/Internal/IMySqlExpressionVisitor.cs index 125f73996..2f716cbf9 100644 --- a/src/EFCore.MySql/Query/Sql/Internal/IMySqlExpressionVisitor.cs +++ b/src/EFCore.MySql/Query/Sql/Internal/IMySqlExpressionVisitor.cs @@ -2,10 +2,10 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System.Linq.Expressions; -using EFCore.MySql.Query.Expressions.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal; using JetBrains.Annotations; -namespace EFCore.MySql.Query.Sql.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal { public interface IMySqlExpressionVisitor { diff --git a/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGenerator.cs b/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGenerator.cs index 525e06182..f9c9439eb 100644 --- a/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGenerator.cs +++ b/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGenerator.cs @@ -4,14 +4,14 @@ using System; using System.Collections.Generic; using System.Linq.Expressions; -using EFCore.MySql.Query.Expressions.Internal; +using Pomelo.EntityFrameworkCore.MySql.Query.Expressions.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Query.Expressions; using Microsoft.EntityFrameworkCore.Query.Sql; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Query.Sql.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGeneratorFactory.cs b/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGeneratorFactory.cs index 1dcc747f3..d2f516fd0 100644 --- a/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGeneratorFactory.cs +++ b/src/EFCore.MySql/Query/Sql/Internal/MySqlQuerySqlGeneratorFactory.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Query.Sql; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Query.Sql.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Query.Sql.Internal { public class MySqlQuerySqlGeneratorFactory : QuerySqlGeneratorFactoryBase { diff --git a/src/EFCore.MySql/Scaffolding/Internal/MySqlCodeGenerator.cs b/src/EFCore.MySql/Scaffolding/Internal/MySqlCodeGenerator.cs index 8548ce128..ed24654cf 100644 --- a/src/EFCore.MySql/Scaffolding/Internal/MySqlCodeGenerator.cs +++ b/src/EFCore.MySql/Scaffolding/Internal/MySqlCodeGenerator.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Design; using Microsoft.EntityFrameworkCore.Scaffolding; -namespace EFCore.MySql.Scaffolding.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Scaffolding.Internal { public class MySqlCodeGenerator : ProviderCodeGenerator { diff --git a/src/EFCore.MySql/Scaffolding/Internal/MySqlDatabaseModelFactory.cs b/src/EFCore.MySql/Scaffolding/Internal/MySqlDatabaseModelFactory.cs index 1caa046a4..6b012993f 100644 --- a/src/EFCore.MySql/Scaffolding/Internal/MySqlDatabaseModelFactory.cs +++ b/src/EFCore.MySql/Scaffolding/Internal/MySqlDatabaseModelFactory.cs @@ -14,7 +14,7 @@ using Microsoft.Extensions.Logging; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Scaffolding.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Scaffolding.Internal { public class MySqlDatabaseModelFactory : IDatabaseModelFactory { diff --git a/src/EFCore.MySql/Storage/Internal/ByteArrayComparer.cs b/src/EFCore.MySql/Storage/Internal/ByteArrayComparer.cs index edde49554..09c1bc43a 100644 --- a/src/EFCore.MySql/Storage/Internal/ByteArrayComparer.cs +++ b/src/EFCore.MySql/Storage/Internal/ByteArrayComparer.cs @@ -5,7 +5,7 @@ using System.Linq; using Microsoft.EntityFrameworkCore.ChangeTracking; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class ByteArrayComparer : ValueComparer { diff --git a/src/EFCore.MySql/Storage/Internal/BytesToDateTimeConverter.cs b/src/EFCore.MySql/Storage/Internal/BytesToDateTimeConverter.cs index 398ac361e..05e4473e3 100644 --- a/src/EFCore.MySql/Storage/Internal/BytesToDateTimeConverter.cs +++ b/src/EFCore.MySql/Storage/Internal/BytesToDateTimeConverter.cs @@ -4,7 +4,7 @@ using System; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class BytesToDateTimeConverter : ValueConverter { diff --git a/src/EFCore.MySql/Storage/Internal/IMySqlRelationalConnection.cs b/src/EFCore.MySql/Storage/Internal/IMySqlRelationalConnection.cs index 806857a87..77225edbe 100644 --- a/src/EFCore.MySql/Storage/Internal/IMySqlRelationalConnection.cs +++ b/src/EFCore.MySql/Storage/Internal/IMySqlRelationalConnection.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/IOBehavior.cs b/src/EFCore.MySql/Storage/Internal/IOBehavior.cs index dac9e4f60..a45d571e0 100644 --- a/src/EFCore.MySql/Storage/Internal/IOBehavior.cs +++ b/src/EFCore.MySql/Storage/Internal/IOBehavior.cs @@ -1,7 +1,7 @@ // Copyright (c) Pomelo Foundation. All rights reserved. // Licensed under the MIT. See LICENSE in the project root for license information. -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// Specifies whether to perform synchronous or asynchronous I/O. diff --git a/src/EFCore.MySql/Storage/Internal/MySqlBoolTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlBoolTypeMapping.cs index 4a06a7440..491b925fe 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlBoolTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlBoolTypeMapping.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlByteArrayTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlByteArrayTypeMapping.cs index 03e1e0959..25c1fd286 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlByteArrayTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlByteArrayTypeMapping.cs @@ -9,7 +9,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/MySqlConnectionSettings.cs b/src/EFCore.MySql/Storage/Internal/MySqlConnectionSettings.cs index 653638b63..edca7a96e 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlConnectionSettings.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlConnectionSettings.cs @@ -4,7 +4,7 @@ using System.Data.Common; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlConnectionSettings { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDatabaseCreator.cs b/src/EFCore.MySql/Storage/Internal/MySqlDatabaseCreator.cs index 94d72a591..bb103c874 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDatabaseCreator.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDatabaseCreator.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDateTimeOffsetTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlDateTimeOffsetTypeMapping.cs index 4825016dd..9867140f1 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDateTimeOffsetTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDateTimeOffsetTypeMapping.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDateTimeTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlDateTimeTypeMapping.cs index 7ead05d56..7b2470a53 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDateTimeTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDateTimeTypeMapping.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDateTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlDateTypeMapping.cs index 428005255..d368407b0 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDateTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDateTypeMapping.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDecimalTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlDecimalTypeMapping.cs index 745c52505..463c97404 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDecimalTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDecimalTypeMapping.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlDecimalTypeMapping : RelationalTypeMapping { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlDoubleTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlDoubleTypeMapping.cs index de9a2e9ee..cd0f76129 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlDoubleTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlDoubleTypeMapping.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlDoubleTypeMapping : DoubleTypeMapping { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategy.cs b/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategy.cs index a687a42f8..8d851762b 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategy.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategy.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategyFactory.cs b/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategyFactory.cs index 887406b3b..9327fa45d 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategyFactory.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlExecutionStrategyFactory.cs @@ -4,7 +4,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/MySqlFloatTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlFloatTypeMapping.cs index 554b9656c..ae8891be4 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlFloatTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlFloatTypeMapping.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlFloatTypeMapping : RelationalTypeMapping { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlJsonTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlJsonTypeMapping.cs index cea9eb03e..a6890dc18 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlJsonTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlJsonTypeMapping.cs @@ -10,7 +10,7 @@ using Microsoft.EntityFrameworkCore.Storage.ValueConversion; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlRelationalConnection.cs b/src/EFCore.MySql/Storage/Internal/MySqlRelationalConnection.cs index dcc691879..c6835bbed 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlRelationalConnection.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlRelationalConnection.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Storage; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlRelationalConnection : RelationalConnection, IMySqlRelationalConnection { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransaction.cs b/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransaction.cs index 7f63d569c..cb4bbacff 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransaction.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransaction.cs @@ -14,7 +14,7 @@ using Microsoft.EntityFrameworkCore.Storage; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlRelationalTransaction : RelationalTransaction { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransactionFactory.cs b/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransactionFactory.cs index 16f73fd8a..3c066a470 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransactionFactory.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlRelationalTransactionFactory.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlRelationalTransactionFactory : RelationalTransactionFactory { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlSqlGeneratorHelper.cs b/src/EFCore.MySql/Storage/Internal/MySqlSqlGeneratorHelper.cs index 788b3a832..816f95b05 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlSqlGeneratorHelper.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlSqlGeneratorHelper.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlSqlGenerationHelper : RelationalSqlGenerationHelper { diff --git a/src/EFCore.MySql/Storage/Internal/MySqlStringTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlStringTypeMapping.cs index 6b4b2de07..649dedf66 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlStringTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlStringTypeMapping.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Storage/Internal/MySqlTimeSpanTypeMapping.cs b/src/EFCore.MySql/Storage/Internal/MySqlTimeSpanTypeMapping.cs index c7ad79550..b7f870efd 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlTimeSpanTypeMapping.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlTimeSpanTypeMapping.cs @@ -6,7 +6,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.ValueConversion; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// diff --git a/src/EFCore.MySql/Storage/Internal/MySqlTransientExceptionDetector.cs b/src/EFCore.MySql/Storage/Internal/MySqlTransientExceptionDetector.cs index b75241194..b1a3a7d49 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlTransientExceptionDetector.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlTransientExceptionDetector.cs @@ -5,7 +5,7 @@ using JetBrains.Annotations; using MySql.Data.MySqlClient; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// Detects the exceptions caused by SQL Server transient failures. diff --git a/src/EFCore.MySql/Storage/Internal/MySqlTypeMappingSource.cs b/src/EFCore.MySql/Storage/Internal/MySqlTypeMappingSource.cs index ae1aff27d..2d4a86b90 100644 --- a/src/EFCore.MySql/Storage/Internal/MySqlTypeMappingSource.cs +++ b/src/EFCore.MySql/Storage/Internal/MySqlTypeMappingSource.cs @@ -4,12 +4,12 @@ using System; using System.Collections.Generic; using System.Data; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Storage; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class MySqlTypeMappingSource : RelationalTypeMappingSource { diff --git a/src/EFCore.MySql/Storage/Internal/ServerVersion.cs b/src/EFCore.MySql/Storage/Internal/ServerVersion.cs index 04d90ecc1..fd0cf449f 100644 --- a/src/EFCore.MySql/Storage/Internal/ServerVersion.cs +++ b/src/EFCore.MySql/Storage/Internal/ServerVersion.cs @@ -3,9 +3,9 @@ using System; using System.Text.RegularExpressions; -using EFCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { public class ServerVersion { diff --git a/src/EFCore.MySql/Storage/Internal/WrappedMySqlDataReader.cs b/src/EFCore.MySql/Storage/Internal/WrappedMySqlDataReader.cs index b494793e2..d60dd8ca6 100644 --- a/src/EFCore.MySql/Storage/Internal/WrappedMySqlDataReader.cs +++ b/src/EFCore.MySql/Storage/Internal/WrappedMySqlDataReader.cs @@ -9,7 +9,7 @@ using System.Threading; using System.Threading.Tasks; -namespace EFCore.MySql.Storage.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Storage.Internal { /// /// wraps and enhances to diff --git a/src/EFCore.MySql/Strings.Designer.cs b/src/EFCore.MySql/Strings.Designer.cs index 308355979..8eb674225 100644 --- a/src/EFCore.MySql/Strings.Designer.cs +++ b/src/EFCore.MySql/Strings.Designer.cs @@ -8,7 +8,7 @@ // //------------------------------------------------------------------------------ -namespace EFCore.MySql +namespace Pomelo.EntityFrameworkCore.MySql { using System.Reflection; diff --git a/src/EFCore.MySql/Update/Internal/IMySqlUpdateSqlGenerator.cs b/src/EFCore.MySql/Update/Internal/IMySqlUpdateSqlGenerator.cs index 5b0c6b6e2..aef7c1f94 100644 --- a/src/EFCore.MySql/Update/Internal/IMySqlUpdateSqlGenerator.cs +++ b/src/EFCore.MySql/Update/Internal/IMySqlUpdateSqlGenerator.cs @@ -6,7 +6,7 @@ using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Update; -namespace EFCore.MySql.Update.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal { public interface IMySqlUpdateSqlGenerator : IUpdateSqlGenerator { diff --git a/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatch.cs b/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatch.cs index 881b24135..a77046ba5 100644 --- a/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatch.cs +++ b/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatch.cs @@ -11,7 +11,7 @@ using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Update; -namespace EFCore.MySql.Update.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal { /// /// This API supports the Entity Framework Core infrastructure and is not intended to be used diff --git a/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatchFactory.cs b/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatchFactory.cs index f89a7dc86..043683273 100644 --- a/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatchFactory.cs +++ b/src/EFCore.MySql/Update/Internal/MySqlModificationCommandBatchFactory.cs @@ -2,14 +2,14 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System.Linq; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Update; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Update.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal { public class MySqlModificationCommandBatchFactory : IModificationCommandBatchFactory { diff --git a/src/EFCore.MySql/Update/Internal/MySqlUpdateSqlGenerator.cs b/src/EFCore.MySql/Update/Internal/MySqlUpdateSqlGenerator.cs index 5c7188e29..a539b2c82 100644 --- a/src/EFCore.MySql/Update/Internal/MySqlUpdateSqlGenerator.cs +++ b/src/EFCore.MySql/Update/Internal/MySqlUpdateSqlGenerator.cs @@ -12,7 +12,7 @@ using Microsoft.EntityFrameworkCore.Update; using Microsoft.EntityFrameworkCore.Utilities; -namespace EFCore.MySql.Update.Internal +namespace Pomelo.EntityFrameworkCore.MySql.Update.Internal { public class MySqlUpdateSqlGenerator : UpdateSqlGenerator, IMySqlUpdateSqlGenerator { diff --git a/src/EFCore.MySql/ValueGeneration/Internal/MySqlSequentialGuidValueGenerator.cs b/src/EFCore.MySql/ValueGeneration/Internal/MySqlSequentialGuidValueGenerator.cs index 5e9072fd4..955890595 100644 --- a/src/EFCore.MySql/ValueGeneration/Internal/MySqlSequentialGuidValueGenerator.cs +++ b/src/EFCore.MySql/ValueGeneration/Internal/MySqlSequentialGuidValueGenerator.cs @@ -1,10 +1,10 @@ using System; using System.Security.Cryptography; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using Microsoft.EntityFrameworkCore.ChangeTracking; using Microsoft.EntityFrameworkCore.ValueGeneration; -namespace EFCore.MySql.ValueGeneration.Internal +namespace Pomelo.EntityFrameworkCore.MySql.ValueGeneration.Internal { public class MySqlSequentialGuidValueGenerator : ValueGenerator { diff --git a/src/EFCore.MySql/ValueGeneration/Internal/MySqlValueGeneratorSelector.cs b/src/EFCore.MySql/ValueGeneration/Internal/MySqlValueGeneratorSelector.cs index 0213f5fb1..2b74b41a0 100644 --- a/src/EFCore.MySql/ValueGeneration/Internal/MySqlValueGeneratorSelector.cs +++ b/src/EFCore.MySql/ValueGeneration/Internal/MySqlValueGeneratorSelector.cs @@ -2,14 +2,14 @@ // Licensed under the MIT. See LICENSE in the project root for license information. using System; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using JetBrains.Annotations; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Utilities; using Microsoft.EntityFrameworkCore.ValueGeneration; -namespace EFCore.MySql.ValueGeneration.Internal +namespace Pomelo.EntityFrameworkCore.MySql.ValueGeneration.Internal { public class MySqlValueGeneratorSelector : RelationalValueGeneratorSelector { diff --git a/test/Directory.Build.props b/test/Directory.Build.props new file mode 100644 index 000000000..e5cae96e8 --- /dev/null +++ b/test/Directory.Build.props @@ -0,0 +1,23 @@ + + + + + netcoreapp2.1 + $(DeveloperBuildTestTfms) + netcoreapp2.0;netcoreapp2.1 + net461;$(StandardTestTfms) + + + + $(NoWarn);CA1822;xUnit1004 + + + + + + + + + + + diff --git a/test/EFCore.MySql.FunctionalTests/BuiltInDataTypesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/BuiltInDataTypesMySqlTest.cs index c89f9b3e8..4b1bdd3d9 100644 --- a/test/EFCore.MySql.FunctionalTests/BuiltInDataTypesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/BuiltInDataTypesMySqlTest.cs @@ -3,7 +3,7 @@ using System.ComponentModel.DataAnnotations.Schema; using System.Linq; using System.Text; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.Infrastructure; @@ -17,7 +17,7 @@ using Xunit; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class BuiltInDataTypesMySqlTest : BuiltInDataTypesTestBase diff --git a/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorMySqlTest.cs index 4e4dc04dd..316b47ac3 100644 --- a/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/ConcurrencyDetectorMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.Query; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class ConcurrencyDetectorMySqlTest : ConcurrencyDetectorRelationalTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/ConvertToProviderTypesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/ConvertToProviderTypesMySqlTest.cs index 6a94697be..585c9e1f0 100644 --- a/test/EFCore.MySql.FunctionalTests/ConvertToProviderTypesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/ConvertToProviderTypesMySqlTest.cs @@ -1,5 +1,5 @@ using System; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; @@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class ConvertToProviderTypesMySqlTest : ConvertToProviderTypesTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/CustomConvertersMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/CustomConvertersMySqlTest.cs index 90d9d4282..31f842319 100644 --- a/test/EFCore.MySql.FunctionalTests/CustomConvertersMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/CustomConvertersMySqlTest.cs @@ -1,10 +1,10 @@ using System; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class CustomConvertersMySqlTest : CustomConvertersTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/DataAnnotationMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/DataAnnotationMySqlTest.cs index 4f97d0429..6c777415c 100644 --- a/test/EFCore.MySql.FunctionalTests/DataAnnotationMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/DataAnnotationMySqlTest.cs @@ -1,5 +1,5 @@ using System; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Internal; @@ -10,7 +10,7 @@ using Xunit; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class DataAnnotationMySqlTest : DataAnnotationTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/DatabindingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/DatabindingMySqlTest.cs index c8f05681a..d4c37c7f8 100644 --- a/test/EFCore.MySql.FunctionalTests/DatabindingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/DatabindingMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class DatabindingMySqlTest : DatabindingTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/DefaultValuesTest.cs b/test/EFCore.MySql.FunctionalTests/DefaultValuesTest.cs index abf58bf8f..29accd7ee 100644 --- a/test/EFCore.MySql.FunctionalTests/DefaultValuesTest.cs +++ b/test/EFCore.MySql.FunctionalTests/DefaultValuesTest.cs @@ -1,12 +1,12 @@ using System; using System.Linq; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; // ReSharper disable InconsistentNaming -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class DefaultValuesTest : SharedStoreFixtureBase { diff --git a/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj b/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj new file mode 100644 index 000000000..b460aff3a --- /dev/null +++ b/test/EFCore.MySql.FunctionalTests/EFCore.MySql.FunctionalTests.csproj @@ -0,0 +1,29 @@ + + + + $(StandardTestTfms) + Pomelo.EntityFrameworkCore.MySql.FunctionalTests + Microsoft.EntityFrameworkCore + + + + + + + + + + + + + + + + + + + Always + + + + diff --git a/test/EFCore.MySql.FunctionalTests/EFCore.MySql.UpstreamFunctionalTests.csproj b/test/EFCore.MySql.FunctionalTests/EFCore.MySql.UpstreamFunctionalTests.csproj deleted file mode 100644 index 619e083fb..000000000 --- a/test/EFCore.MySql.FunctionalTests/EFCore.MySql.UpstreamFunctionalTests.csproj +++ /dev/null @@ -1,32 +0,0 @@ - - - - net461;netcoreapp2.1 - 7.2 - - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json - - - - - - - - - - - - - - - - - - - - - - Always - - - diff --git a/test/EFCore.MySql.FunctionalTests/F1MySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/F1MySqlFixture.cs index 992196030..373955e1a 100644 --- a/test/EFCore.MySql.FunctionalTests/F1MySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/F1MySqlFixture.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class F1MySqlFixture : F1RelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/FieldMappingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/FieldMappingMySqlTest.cs index ee63ac6e7..2f34de6e0 100644 --- a/test/EFCore.MySql.FunctionalTests/FieldMappingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/FieldMappingMySqlTest.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public abstract class FieldMappingMySqlTest { diff --git a/test/EFCore.MySql.FunctionalTests/FindMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/FindMySqlTest.cs index 502d48b5f..e03ce4a92 100644 --- a/test/EFCore.MySql.FunctionalTests/FindMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/FindMySqlTest.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class FindMySqlTest : FindTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTest.cs index 82f29311e..13546f936 100644 --- a/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/GraphUpdatesMySqlTest.cs @@ -1,4 +1,4 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; @@ -7,7 +7,7 @@ using Microsoft.Extensions.Logging; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public abstract class GraphUpdatesMySqlTest { diff --git a/test/EFCore.MySql.FunctionalTests/LazyLoadProxyMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/LazyLoadProxyMySqlTest.cs index 337e31cee..baa9024ae 100644 --- a/test/EFCore.MySql.FunctionalTests/LazyLoadProxyMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/LazyLoadProxyMySqlTest.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class LazyLoadProxyMySqlTest : LazyLoadProxyTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/LoadMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/LoadMySqlTest.cs index 87051f4df..dd2eb8ecc 100644 --- a/test/EFCore.MySql.FunctionalTests/LoadMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/LoadMySqlTest.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class LoadMySqlTest : LoadTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/LoggingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/LoggingMySqlTest.cs index a034b5980..f088770bb 100644 --- a/test/EFCore.MySql.FunctionalTests/LoggingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/LoggingMySqlTest.cs @@ -1,9 +1,9 @@ using System; -using EFCore.MySql.Infrastructure.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure.Internal; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class LoggingMySqlTest : LoggingRelationalTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySql55Test.cs b/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySql55Test.cs index ddfb2bbcc..362d85a6e 100644 --- a/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySql55Test.cs +++ b/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySql55Test.cs @@ -1,14 +1,14 @@ using System; using System.Linq; -using EFCore.MySql.Infrastructure; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Migrations.Operations; using Microsoft.Extensions.DependencyInjection; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MigrationSqlGeneratorMySql55Test : MigrationSqlGeneratorMySqlTest { diff --git a/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySqlTest.cs index 65e77b495..a6b5bc73b 100644 --- a/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/MigrationSqlGeneratorMySqlTest.cs @@ -1,6 +1,6 @@ using System; -using EFCore.MySql.Metadata.Internal; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.Metadata.Internal; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Metadata.Internal; @@ -9,7 +9,7 @@ using Xunit; // ReSharper disable InconsistentNaming -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MigrationSqlGeneratorMySqlTest : MigrationSqlGeneratorTestBase { @@ -439,108 +439,108 @@ public virtual void AlterColumnOperation_with_no_default_value_column_types(stri Assert.Equal( $"ALTER TABLE `People` MODIFY COLUMN `Blob` {type} NULL;" + EOL, Sql); - } - - public override void AddForeignKeyOperation_with_name() - { - base.AddForeignKeyOperation_with_name(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `FK_People_Companies` FOREIGN KEY (`EmployerId1`, `EmployerId2`) REFERENCES `hr`.`Companies` (`Id1`, `Id2`) ON DELETE CASCADE;" + EOL, - Sql); - } - - public override void AddForeignKeyOperation_without_name() - { - base.AddForeignKeyOperation_without_name(); - - Assert.Equal( - "ALTER TABLE `People` ADD FOREIGN KEY (`SpouseId`) REFERENCES `People` (`Id`);" + EOL, - Sql); - } - - [Fact] - public override void AddPrimaryKeyOperation_with_name() - { - base.AddPrimaryKeyOperation_with_name(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `PK_People` PRIMARY KEY (`Id1`, `Id2`);" + EOL, - Sql); - } - - [Fact] - public override void AddPrimaryKeyOperation_without_name() - { - base.AddPrimaryKeyOperation_without_name(); - - var test = - "ALTER TABLE `People` ADD PRIMARY KEY (`Id`);" + EOL + - @"DROP PROCEDURE IF EXISTS POMELO_AFTER_ADD_PRIMARY_KEY; -CREATE PROCEDURE POMELO_AFTER_ADD_PRIMARY_KEY(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255), IN `COLUMN_NAME_ARGUMENT` VARCHAR(255)) -BEGIN - DECLARE HAS_AUTO_INCREMENT_ID INT(11); - DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); - DECLARE PRIMARY_KEY_TYPE VARCHAR(255); - DECLARE SQL_EXP VARCHAR(1000); - - SELECT COUNT(*) - INTO HAS_AUTO_INCREMENT_ID - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - IF HAS_AUTO_INCREMENT_ID THEN - SELECT `COLUMN_TYPE` - INTO PRIMARY_KEY_TYPE - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - SELECT `COLUMN_NAME` - INTO PRIMARY_KEY_COLUMN_NAME - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT - AND `COLUMN_TYPE` LIKE '%int%' - AND `COLUMN_KEY` = 'PRI'; - SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL AUTO_INCREMENT;'); - SET @SQL_EXP = SQL_EXP; - PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; - EXECUTE SQL_EXP_EXECUTE; - DEALLOCATE PREPARE SQL_EXP_EXECUTE; - END IF; -END; -CALL POMELO_AFTER_ADD_PRIMARY_KEY(NULL, 'People', 'Id'); -DROP PROCEDURE IF EXISTS POMELO_AFTER_ADD_PRIMARY_KEY;".Replace("\r", string.Empty).Replace("\n", EOL) + EOL; - - Assert.Equal(test, - Sql); - } - - [Fact] - public override void AddUniqueConstraintOperation_with_name() - { - base.AddUniqueConstraintOperation_with_name(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `AK_People_DriverLicense` UNIQUE (`DriverLicense_State`, `DriverLicense_Number`);" + EOL, - Sql); - } - - [Fact] - public override void AddUniqueConstraintOperation_without_name() - { - base.AddUniqueConstraintOperation_without_name(); - - Assert.Equal( - "ALTER TABLE `People` ADD UNIQUE (`SSN`);" + EOL, - Sql); + } + + public override void AddForeignKeyOperation_with_name() + { + base.AddForeignKeyOperation_with_name(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `FK_People_Companies` FOREIGN KEY (`EmployerId1`, `EmployerId2`) REFERENCES `hr`.`Companies` (`Id1`, `Id2`) ON DELETE CASCADE;" + EOL, + Sql); + } + + public override void AddForeignKeyOperation_without_name() + { + base.AddForeignKeyOperation_without_name(); + + Assert.Equal( + "ALTER TABLE `People` ADD FOREIGN KEY (`SpouseId`) REFERENCES `People` (`Id`);" + EOL, + Sql); + } + + [Fact] + public override void AddPrimaryKeyOperation_with_name() + { + base.AddPrimaryKeyOperation_with_name(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `PK_People` PRIMARY KEY (`Id1`, `Id2`);" + EOL, + Sql); + } + + [Fact] + public override void AddPrimaryKeyOperation_without_name() + { + base.AddPrimaryKeyOperation_without_name(); + + var test = + "ALTER TABLE `People` ADD PRIMARY KEY (`Id`);" + EOL + + @"DROP PROCEDURE IF EXISTS POMELO_AFTER_ADD_PRIMARY_KEY; +CREATE PROCEDURE POMELO_AFTER_ADD_PRIMARY_KEY(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255), IN `COLUMN_NAME_ARGUMENT` VARCHAR(255)) +BEGIN + DECLARE HAS_AUTO_INCREMENT_ID INT(11); + DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); + DECLARE PRIMARY_KEY_TYPE VARCHAR(255); + DECLARE SQL_EXP VARCHAR(1000); + + SELECT COUNT(*) + INTO HAS_AUTO_INCREMENT_ID + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT + AND `COLUMN_TYPE` LIKE '%int%' + AND `COLUMN_KEY` = 'PRI'; + IF HAS_AUTO_INCREMENT_ID THEN + SELECT `COLUMN_TYPE` + INTO PRIMARY_KEY_TYPE + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT + AND `COLUMN_TYPE` LIKE '%int%' + AND `COLUMN_KEY` = 'PRI'; + SELECT `COLUMN_NAME` + INTO PRIMARY_KEY_COLUMN_NAME + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `COLUMN_NAME` = COLUMN_NAME_ARGUMENT + AND `COLUMN_TYPE` LIKE '%int%' + AND `COLUMN_KEY` = 'PRI'; + SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL AUTO_INCREMENT;'); + SET @SQL_EXP = SQL_EXP; + PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; + EXECUTE SQL_EXP_EXECUTE; + DEALLOCATE PREPARE SQL_EXP_EXECUTE; + END IF; +END; +CALL POMELO_AFTER_ADD_PRIMARY_KEY(NULL, 'People', 'Id'); +DROP PROCEDURE IF EXISTS POMELO_AFTER_ADD_PRIMARY_KEY;".Replace("\r", string.Empty).Replace("\n", EOL) + EOL; + + Assert.Equal(test, + Sql); + } + + [Fact] + public override void AddUniqueConstraintOperation_with_name() + { + base.AddUniqueConstraintOperation_with_name(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` ADD CONSTRAINT `AK_People_DriverLicense` UNIQUE (`DriverLicense_State`, `DriverLicense_Number`);" + EOL, + Sql); + } + + [Fact] + public override void AddUniqueConstraintOperation_without_name() + { + base.AddUniqueConstraintOperation_without_name(); + + Assert.Equal( + "ALTER TABLE `People` ADD UNIQUE (`SSN`);" + EOL, + Sql); } [Fact] @@ -693,95 +693,95 @@ public virtual void RenameColumnOperation_with_model() "ALTER TABLE `Person` CHANGE `Name` `FullName` longtext CHARACTER SET ucs2", Sql); } - - [Fact] - public override void DropColumnOperation() - { - base.DropColumnOperation(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` DROP COLUMN `LuckyNumber`;", - Sql); - } - - [Fact] - public override void DropForeignKeyOperation() - { - base.DropForeignKeyOperation(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` DROP FOREIGN KEY `FK_People_Companies`;" + EOL, - Sql); - } - - [Fact] - public override void DropPrimaryKeyOperation() - { - base.DropPrimaryKeyOperation(); - - Assert.Equal( - @"DROP PROCEDURE IF EXISTS POMELO_BEFORE_DROP_PRIMARY_KEY; -CREATE PROCEDURE POMELO_BEFORE_DROP_PRIMARY_KEY(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255)) -BEGIN - DECLARE HAS_AUTO_INCREMENT_ID TINYINT(1); - DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); - DECLARE PRIMARY_KEY_TYPE VARCHAR(255); - DECLARE SQL_EXP VARCHAR(1000); - - SELECT COUNT(*) - INTO HAS_AUTO_INCREMENT_ID - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `Extra` = 'auto_increment' - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - IF HAS_AUTO_INCREMENT_ID THEN - SELECT `COLUMN_TYPE` - INTO PRIMARY_KEY_TYPE - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - SELECT `COLUMN_NAME` - INTO PRIMARY_KEY_COLUMN_NAME - FROM `information_schema`.`COLUMNS` - WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) - AND `TABLE_NAME` = TABLE_NAME_ARGUMENT - AND `COLUMN_KEY` = 'PRI' - LIMIT 1; - SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL;'); - SET @SQL_EXP = SQL_EXP; - PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; - EXECUTE SQL_EXP_EXECUTE; - DEALLOCATE PREPARE SQL_EXP_EXECUTE; - END IF; -END; -CALL POMELO_BEFORE_DROP_PRIMARY_KEY('dbo', 'People'); -DROP PROCEDURE IF EXISTS POMELO_BEFORE_DROP_PRIMARY_KEY; -ALTER TABLE `dbo`.`People` DROP PRIMARY KEY;".Replace("\r", string.Empty).Replace("\n", EOL) + EOL, - Sql); - } - - [Fact] - public override void DropTableOperation() - { - base.DropTableOperation(); - - Assert.Equal( - "DROP TABLE `dbo`.`People`;" + EOL, - Sql); - } - - [Fact] - public override void DropUniqueConstraintOperation() - { - base.DropUniqueConstraintOperation(); - - Assert.Equal( - "ALTER TABLE `dbo`.`People` DROP CONSTRAINT `AK_People_SSN`;" + EOL, - Sql); + + [Fact] + public override void DropColumnOperation() + { + base.DropColumnOperation(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` DROP COLUMN `LuckyNumber`;", + Sql); + } + + [Fact] + public override void DropForeignKeyOperation() + { + base.DropForeignKeyOperation(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` DROP FOREIGN KEY `FK_People_Companies`;" + EOL, + Sql); + } + + [Fact] + public override void DropPrimaryKeyOperation() + { + base.DropPrimaryKeyOperation(); + + Assert.Equal( + @"DROP PROCEDURE IF EXISTS POMELO_BEFORE_DROP_PRIMARY_KEY; +CREATE PROCEDURE POMELO_BEFORE_DROP_PRIMARY_KEY(IN `SCHEMA_NAME_ARGUMENT` VARCHAR(255), IN `TABLE_NAME_ARGUMENT` VARCHAR(255)) +BEGIN + DECLARE HAS_AUTO_INCREMENT_ID TINYINT(1); + DECLARE PRIMARY_KEY_COLUMN_NAME VARCHAR(255); + DECLARE PRIMARY_KEY_TYPE VARCHAR(255); + DECLARE SQL_EXP VARCHAR(1000); + + SELECT COUNT(*) + INTO HAS_AUTO_INCREMENT_ID + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `Extra` = 'auto_increment' + AND `COLUMN_KEY` = 'PRI' + LIMIT 1; + IF HAS_AUTO_INCREMENT_ID THEN + SELECT `COLUMN_TYPE` + INTO PRIMARY_KEY_TYPE + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `COLUMN_KEY` = 'PRI' + LIMIT 1; + SELECT `COLUMN_NAME` + INTO PRIMARY_KEY_COLUMN_NAME + FROM `information_schema`.`COLUMNS` + WHERE `TABLE_SCHEMA` = (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())) + AND `TABLE_NAME` = TABLE_NAME_ARGUMENT + AND `COLUMN_KEY` = 'PRI' + LIMIT 1; + SET SQL_EXP = CONCAT('ALTER TABLE `', (SELECT IFNULL(SCHEMA_NAME_ARGUMENT, SCHEMA())), '`.`', TABLE_NAME_ARGUMENT, '` MODIFY COLUMN `', PRIMARY_KEY_COLUMN_NAME, '` ', PRIMARY_KEY_TYPE, ' NOT NULL;'); + SET @SQL_EXP = SQL_EXP; + PREPARE SQL_EXP_EXECUTE FROM @SQL_EXP; + EXECUTE SQL_EXP_EXECUTE; + DEALLOCATE PREPARE SQL_EXP_EXECUTE; + END IF; +END; +CALL POMELO_BEFORE_DROP_PRIMARY_KEY('dbo', 'People'); +DROP PROCEDURE IF EXISTS POMELO_BEFORE_DROP_PRIMARY_KEY; +ALTER TABLE `dbo`.`People` DROP PRIMARY KEY;".Replace("\r", string.Empty).Replace("\n", EOL) + EOL, + Sql); + } + + [Fact] + public override void DropTableOperation() + { + base.DropTableOperation(); + + Assert.Equal( + "DROP TABLE `dbo`.`People`;" + EOL, + Sql); + } + + [Fact] + public override void DropUniqueConstraintOperation() + { + base.DropUniqueConstraintOperation(); + + Assert.Equal( + "ALTER TABLE `dbo`.`People` DROP CONSTRAINT `AK_People_SSN`;" + EOL, + Sql); } public override void DropIndexOperation() diff --git a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlFixture.cs index ec6e8361b..eba9297f1 100644 --- a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MigrationsMySqlFixture : MigrationsFixtureBase { diff --git a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs index c6a243f99..f823798dc 100644 --- a/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/MigrationsMySqlTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MigrationsMySqlTest : MigrationsTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/MonsterFixupChangedOnlyMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/MonsterFixupChangedOnlyMySqlTest.cs index 3915fd33a..281a4962f 100644 --- a/test/EFCore.MySql.FunctionalTests/MonsterFixupChangedOnlyMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/MonsterFixupChangedOnlyMySqlTest.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MonsterFixupChangedOnlyMySqlTest : MonsterFixupTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs b/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs index a92a3f183..802bd7478 100644 --- a/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs +++ b/test/EFCore.MySql.FunctionalTests/MySqlComplianceTest.cs @@ -3,7 +3,7 @@ using System.Reflection; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MySqlComplianceTest : RelationalComplianceTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/MySqlServiceCollectionExtensionsTest.cs b/test/EFCore.MySql.FunctionalTests/MySqlServiceCollectionExtensionsTest.cs index 1d5623ea8..d5b571aae 100644 --- a/test/EFCore.MySql.FunctionalTests/MySqlServiceCollectionExtensionsTest.cs +++ b/test/EFCore.MySql.FunctionalTests/MySqlServiceCollectionExtensionsTest.cs @@ -1,7 +1,7 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class MySqlServiceCollectionExtensionsTest : RelationalServiceCollectionExtensionsTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/NotificationEntitiesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/NotificationEntitiesMySqlTest.cs index 51d8e519f..288be2fce 100644 --- a/test/EFCore.MySql.FunctionalTests/NotificationEntitiesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/NotificationEntitiesMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class NotificationEntitiesMySqlTest : NotificationEntitiesTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/OptimisticConcurrencyMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/OptimisticConcurrencyMySqlTest.cs index 9d958d665..7fb218ec6 100644 --- a/test/EFCore.MySql.FunctionalTests/OptimisticConcurrencyMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/OptimisticConcurrencyMySqlTest.cs @@ -8,7 +8,7 @@ using Microsoft.EntityFrameworkCore.TestModels.ConcurrencyModel; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class OptimisticConcurrencyMySqlTest : OptimisticConcurrencyTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/PropertyEntryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/PropertyEntryMySqlTest.cs index ed9cd7865..d8a8b40c2 100644 --- a/test/EFCore.MySql.FunctionalTests/PropertyEntryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/PropertyEntryMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class PropertyEntryMySqlTest : PropertyEntryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/PropertyValuesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/PropertyValuesMySqlTest.cs index e4042ef90..036429598 100644 --- a/test/EFCore.MySql.FunctionalTests/PropertyValuesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/PropertyValuesMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class PropertyValuesMySqlTest : PropertyValuesTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/ProxyGraphUpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/ProxyGraphUpdatesMySqlTest.cs index 68ea7ca1f..94501f633 100644 --- a/test/EFCore.MySql.FunctionalTests/ProxyGraphUpdatesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/ProxyGraphUpdatesMySqlTest.cs @@ -1,4 +1,4 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; @@ -6,7 +6,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class ProxyGraphUpdatesMySqlTest { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsNoTrackingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsNoTrackingMySqlTest.cs index d507d5a17..6f99eadd4 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsNoTrackingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsNoTrackingMySqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsNoTrackingMySqlTest : AsNoTrackingTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsTrackingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsTrackingMySqlTest.cs index 987080cc1..1c4355d79 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsTrackingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsTrackingMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsTrackingMySqlTest : AsTrackingTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlQueryMySqlTest.cs index cbbf4aabe..933751119 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlQueryMySqlTest.cs @@ -7,7 +7,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncFromSqlQueryMySqlTest : AsyncFromSqlQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlSprocQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlSprocQueryMySqlTest.cs index f7c2bddb0..29291bc82 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlSprocQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncFromSqlSprocQueryMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncFromSqlSprocQueryMySqlTest : AsyncFromSqlSprocQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncGearsOfWarQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncGearsOfWarQueryMySqlTest.cs index 74c0dc33b..3718bd071 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncGearsOfWarQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncGearsOfWarQueryMySqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Query; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncGearsOfWarQueryMySqlTest : AsyncGearsOfWarQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncGroupByQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncGroupByQueryMySqlTest.cs index 765a1ab4d..4f4020c42 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncGroupByQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncGroupByQueryMySqlTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncGroupByQueryMySqlTest : AsyncGroupByQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncQueryNavigationsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncQueryNavigationsMySqlTest.cs index 2b95da5f1..77a1ddae2 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncQueryNavigationsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncQueryNavigationsMySqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncQueryNavigationsMySqlTest : AsyncQueryNavigationsTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/AsyncSimpleQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/AsyncSimpleQueryMySqlTest.cs index c2bfbf5ec..3b39baefd 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/AsyncSimpleQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/AsyncSimpleQueryMySqlTest.cs @@ -8,7 +8,7 @@ // ReSharper disable InconsistentNaming #pragma warning disable 1998 -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class AsyncSimpleQueryMySqlTest : AsyncSimpleQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/BadDataMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/BadDataMySqlTest.cs index 1058e36af..1b83849c1 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/BadDataMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/BadDataMySqlTest.cs @@ -19,7 +19,7 @@ using Xunit; // ReSharper disable InconsistentNaming -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class BadDataMySqlTest : IClassFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/ChangeTrackingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ChangeTrackingMySqlTest.cs index c1c828236..a55f2c4df 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/ChangeTrackingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/ChangeTrackingMySqlTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class ChangeTrackingMySqlTest : ChangeTrackingTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/CompiledQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/CompiledQueryMySqlTest.cs index d52ff7867..5301e9a3c 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/CompiledQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/CompiledQueryMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class CompiledQueryMySqlTest : CompiledQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlFixture.cs index 04129a803..51df12858 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class ComplexNavigationsQueryMySqlFixture : ComplexNavigationsQueryRelationalFixtureBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs index 3aaba1310..7432d5a2c 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsQueryMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class ComplexNavigationsQueryMySqlTest : ComplexNavigationsQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlFixture.cs index 9b81f4071..492b9cd55 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class ComplexNavigationsWeakQueryMySqlFixture : ComplexNavigationsWeakQueryRelationalFixtureBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlTest.cs index 9bef34bd9..27ef5811e 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/ComplexNavigationsWeakQueryMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class ComplexNavigationsWeakQueryMySqlTest : ComplexNavigationsWeakQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/DbFunctionsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/DbFunctionsMySqlTest.cs index 65fe864e5..71410ea9d 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/DbFunctionsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/DbFunctionsMySqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class DbFunctionsMySqlTest : DbFunctionsTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlFixture.cs index aa5506520..887f659bf 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlFixture.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FiltersInheritanceMySqlFixture : InheritanceMySqlFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlTest.cs index 25706fb54..808e365b5 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FiltersInheritanceMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FiltersInheritanceMySqlTest : FiltersInheritanceTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FiltersMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FiltersMySqlTest.cs index 0475c8d0f..422e04f06 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FiltersMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FiltersMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FiltersMySqlTest : FiltersTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FromSqlQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FromSqlQueryMySqlTest.cs index 7280ae55f..0951fad17 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FromSqlQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FromSqlQueryMySqlTest.cs @@ -10,7 +10,7 @@ using MySql.Data.MySqlClient; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FromSqlQueryMySqlTest : FromSqlQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FromSqlSprocQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FromSqlSprocQueryMySqlTest.cs index bf5ffc591..58b85f026 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FromSqlSprocQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FromSqlSprocQueryMySqlTest.cs @@ -1,6 +1,6 @@ using System; using System.Linq; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestModels.Northwind; @@ -8,7 +8,7 @@ using Xunit; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FromSqlSprocQueryMySqlTest : FromSqlSprocQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs index 90e427e1c..3c7ff4a48 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/FunkyDataQueryMySqlTest.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class FunkyDataQueryMySqlTest : FunkyDataQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarFromSqlQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarFromSqlQueryMySqlTest.cs index c1e2b4f4b..fadea1ced 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarFromSqlQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarFromSqlQueryMySqlTest.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.TestModels.GearsOfWarModel; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class GearsOfWarFromSqlQueryMySqlTest : GearsOfWarFromSqlQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlFixture.cs index 1f9fe3397..cea51c6fd 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class GearsOfWarQueryMySqlFixture : GearsOfWarQueryRelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs index 05a00822d..0d160235a 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/GearsOfWarQueryMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class GearsOfWarQueryMySqlTest : GearsOfWarQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/GroupByQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/GroupByQueryMySqlTest.cs index 1a2f2c06a..35d0d77d6 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/GroupByQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/GroupByQueryMySqlTest.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class GroupByQueryMySqlTest : GroupByQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/IncludeAsyncMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/IncludeAsyncMySqlTest.cs index 085fdbdc3..d0413395e 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/IncludeAsyncMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/IncludeAsyncMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class IncludeAsyncMySqlTest : IncludeAsyncTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlFixture.cs index fa51601bc..c3c2e7860 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlFixture.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class IncludeMySqlFixture : NorthwindQueryMySqlFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlTest.cs index b6c60ec6c..f6532e324 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/IncludeMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class IncludeMySqlTest : IncludeTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/IncludeOneToOneMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/IncludeOneToOneMySqlTest.cs index 8aac191fe..16b8657c1 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/IncludeOneToOneMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/IncludeOneToOneMySqlTest.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class IncludeOneToOneMySqlTest : IncludeOneToOneTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlFixture.cs index 024033408..568164c28 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class InheritanceMySqlFixture : InheritanceRelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlTest.cs index 92ec9629e..5118acd60 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/InheritanceMySqlTest.cs @@ -7,7 +7,7 @@ using Xunit; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class InheritanceMySqlTest : InheritanceRelationalTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlFixture.cs index d29d522e9..9ac133c5d 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class InheritanceRelationshipsQueryMySqlFixture : InheritanceRelationshipsQueryRelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlTest.cs index 58ef4d980..f2073b0fe 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/InheritanceRelationshipsQueryMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class InheritanceRelationshipsQueryMySqlTest : InheritanceRelationshipsQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/MappingQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/MappingQueryMySqlTest.cs index d30ee51d8..e1270c38b 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/MappingQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/MappingQueryMySqlTest.cs @@ -1,11 +1,11 @@ using System; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class MappingQueryMySqlTest : MappingQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryMySqlFixture.cs index 634fd9825..66aee88c1 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/NorthwindQueryMySqlFixture.cs @@ -1,11 +1,11 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestModels.Northwind; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class NorthwindQueryMySqlFixture : NorthwindQueryRelationalFixture where TModelCustomizer : IModelCustomizer, new() diff --git a/test/EFCore.MySql.FunctionalTests/Query/NullKeysMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NullKeysMySqlTest.cs index 59dfee085..7e5c51c92 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/NullKeysMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/NullKeysMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class NullKeysMySqlTest : NullKeysTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlFixture.cs index 976a0389e..25eb8a7e6 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class NullSemanticsQueryMySqlFixture : NullSemanticsQueryRelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlTest.cs index 82c86e1e2..18f30afd3 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/NullSemanticsQueryMySqlTest.cs @@ -5,7 +5,7 @@ using Microsoft.EntityFrameworkCore.TestModels.NullSemanticsModel; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class NullSemanticsQueryMySqlTest : NullSemanticsQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/OwnedQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/OwnedQueryMySqlTest.cs index 1a603e46a..aba7cd011 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/OwnedQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/OwnedQueryMySqlTest.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class OwnedQueryMySqlTest : RelationalOwnedQueryTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/QueryFilterFuncletizationMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/QueryFilterFuncletizationMySqlTest.cs index 74aac9fe6..42edef0b8 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/QueryFilterFuncletizationMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/QueryFilterFuncletizationMySqlTest.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class QueryFilterFuncletizationMySqlTest : QueryFilterFuncletizationTestBase diff --git a/test/EFCore.MySql.FunctionalTests/Query/QueryNavigationsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/QueryNavigationsMySqlTest.cs index 5026a6aa4..e1b8045f4 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/QueryNavigationsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/QueryNavigationsMySqlTest.cs @@ -1,7 +1,7 @@ using Microsoft.EntityFrameworkCore.Query; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class QueryNavigationsMySqlTest : QueryNavigationsTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlFixture.cs index ed9656a86..96a33e14b 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlFixture.cs @@ -2,7 +2,7 @@ using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class QueryNoClientEvalMySqlFixture : NorthwindQueryMySqlFixture { diff --git a/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlTest.cs index 519f17746..09a064871 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/QueryNoClientEvalMySqlTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.Query; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class QueryNoClientEvalMySqlTest : QueryNoClientEvalTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs index 3fc7caef1..aa0e692c7 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/SimpleQueryMySqlTest.cs @@ -4,7 +4,7 @@ using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class SimpleQueryMySqlTest : SimpleQueryTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/SqlExecutorMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/SqlExecutorMySqlTest.cs index f8d410fbf..69ed052ab 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/SqlExecutorMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/SqlExecutorMySqlTest.cs @@ -6,7 +6,7 @@ using MySql.Data.MySqlClient; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class SqlExecutorMySqlTest : SqlExecutorTestBase> { diff --git a/test/EFCore.MySql.FunctionalTests/Query/WarningsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/Query/WarningsMySqlTest.cs index 3b8c7cf75..0ef6cb964 100644 --- a/test/EFCore.MySql.FunctionalTests/Query/WarningsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Query/WarningsMySqlTest.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Query; -namespace EFCore.MySql.UpstreamFunctionalTests.Query +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Query { public class WarningsMySqlTest : WarningsTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/README.md b/test/EFCore.MySql.FunctionalTests/README.md index d48ddc43a..93515ff65 100644 --- a/test/EFCore.MySql.FunctionalTests/README.md +++ b/test/EFCore.MySql.FunctionalTests/README.md @@ -1,4 +1,4 @@ -Upstream Functional Tests +Functional Tests ================================ **Configuring the Database** diff --git a/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs b/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs index 449a85f99..9cddbd160 100644 --- a/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs +++ b/test/EFCore.MySql.FunctionalTests/Scaffolding/MySqlDatabaseModelFactoryTest.cs @@ -1,8 +1,8 @@ using System; using System.Collections.Generic; using System.Linq; -using EFCore.MySql.Scaffolding.Internal; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.Scaffolding.Internal; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Scaffolding.Metadata; @@ -11,7 +11,7 @@ using Xunit; // ReSharper disable InconsistentNaming -namespace EFCore.MySql.UpstreamFunctionalTests.Scaffolding +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.Scaffolding { public class MySqlDatabaseModelFactoryTest : IClassFixture { diff --git a/test/EFCore.MySql.FunctionalTests/StoreGeneratedFixupMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/StoreGeneratedFixupMySqlTest.cs index f5c5a4352..4533e1de7 100644 --- a/test/EFCore.MySql.FunctionalTests/StoreGeneratedFixupMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/StoreGeneratedFixupMySqlTest.cs @@ -1,4 +1,4 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; @@ -6,7 +6,7 @@ using Xunit; // ReSharper disable InconsistentNaming -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class StoreGeneratedFixupMySqlTest : StoreGeneratedFixupRelationalTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs index 96036206e..9ec4ecccd 100644 --- a/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/StoreGeneratedMySqlTest.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class StoreGeneratedMySqlTest : StoreGeneratedTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/TableSplittingMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/TableSplittingMySqlTest.cs index 8aa5732e5..3af7fa956 100644 --- a/test/EFCore.MySql.FunctionalTests/TableSplittingMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/TableSplittingMySqlTest.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit.Abstractions; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class TableSplittingMySqlTest : TableSplittingTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlConnectionStringTestStoreFactory.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlConnectionStringTestStoreFactory.cs index 692dc4222..026c39693 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlConnectionStringTestStoreFactory.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlConnectionStringTestStoreFactory.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public class MySqlConnectionStringTestStoreFactory : ITestStoreFactory { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseCleaner.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseCleaner.cs index 26eab6599..964ce2eb2 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseCleaner.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseCleaner.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.Scaffolding.Internal; +using Pomelo.EntityFrameworkCore.MySql.Scaffolding.Internal; using Microsoft.EntityFrameworkCore.Scaffolding; using Microsoft.EntityFrameworkCore.Scaffolding.Metadata; using Microsoft.EntityFrameworkCore.TestUtilities; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public class MySqlDatabaseCleaner : RelationalDatabaseCleaner { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseFacadeTestExtensions.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseFacadeTestExtensions.cs index f52be9cb2..c45862ae3 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseFacadeTestExtensions.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlDatabaseFacadeTestExtensions.cs @@ -1,6 +1,6 @@ using Microsoft.EntityFrameworkCore.Infrastructure; -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public static class MySqlDatabaseFacadeTestExtensions { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs index a9d34d35d..48a68187d 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestHelpers.cs @@ -1,7 +1,7 @@ using System; using System.Collections.Generic; using System.Linq; -using EFCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata.Conventions.Internal; @@ -9,7 +9,7 @@ using Microsoft.Extensions.DependencyInjection; //ReSharper disable once CheckNamespace -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public class MySqlTestHelpers : TestHelpers { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStore.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStore.cs index 33375e743..ffb026683 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStore.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStore.cs @@ -8,7 +8,7 @@ using Microsoft.Extensions.Configuration; using MySql.Data.MySqlClient; -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public class MySqlTestStore : RelationalTestStore { diff --git a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs index 41b6d73b8..3fc3a17c1 100644 --- a/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs +++ b/test/EFCore.MySql.FunctionalTests/TestUtilities/MySqlTestStoreFactory.cs @@ -2,7 +2,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.UpstreamFunctionalTests.TestUtilities +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities { public class MySqlTestStoreFactory : ITestStoreFactory { diff --git a/test/EFCore.MySql.FunctionalTests/TransactionMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/TransactionMySqlTest.cs index 68427600d..f276809d9 100644 --- a/test/EFCore.MySql.FunctionalTests/TransactionMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/TransactionMySqlTest.cs @@ -2,13 +2,13 @@ using System.Collections.Generic; using System.Linq; using System.Transactions; -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Diagnostics; using Microsoft.EntityFrameworkCore.TestUtilities; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class TransactionMySqlTest : TransactionTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlFixture.cs b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlFixture.cs index 175394eb2..95a56ab3d 100644 --- a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlFixture.cs +++ b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlFixture.cs @@ -1,8 +1,8 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class UpdatesMySqlFixture : UpdatesRelationalFixture { diff --git a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs index caf1cc0d8..706389ed7 100644 --- a/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/UpdatesMySqlTest.cs @@ -3,7 +3,7 @@ using Microsoft.EntityFrameworkCore.TestModels.UpdatesModel; using Xunit; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class UpdatesMySqlTest : UpdatesRelationalTestBase { diff --git a/test/EFCore.MySql.FunctionalTests/WithConstructorsMySqlTest.cs b/test/EFCore.MySql.FunctionalTests/WithConstructorsMySqlTest.cs index 6194244b4..414336a6e 100644 --- a/test/EFCore.MySql.FunctionalTests/WithConstructorsMySqlTest.cs +++ b/test/EFCore.MySql.FunctionalTests/WithConstructorsMySqlTest.cs @@ -1,10 +1,10 @@ -using EFCore.MySql.UpstreamFunctionalTests.TestUtilities; +using Pomelo.EntityFrameworkCore.MySql.FunctionalTests.TestUtilities; using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.TestUtilities; -namespace EFCore.MySql.UpstreamFunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.FunctionalTests { public class WithConstructorsMySqlTest : WithConstructorsTestBase { diff --git a/test/EFCore.MySql.IntegrationTests/AppConfig.cs b/test/EFCore.MySql.IntegrationTests/AppConfig.cs index ec654d067..0f79e60a6 100644 --- a/test/EFCore.MySql.IntegrationTests/AppConfig.cs +++ b/test/EFCore.MySql.IntegrationTests/AppConfig.cs @@ -3,7 +3,7 @@ using System.Reflection; using Microsoft.Extensions.Configuration; -namespace EFCore.MySql.FunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests { public static class AppConfig { diff --git a/test/EFCore.MySql.IntegrationTests/AppDb.cs b/test/EFCore.MySql.IntegrationTests/AppDb.cs index e85273f41..a541adc86 100644 --- a/test/EFCore.MySql.IntegrationTests/AppDb.cs +++ b/test/EFCore.MySql.IntegrationTests/AppDb.cs @@ -1,9 +1,9 @@ -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.AspNetCore.Identity; using Microsoft.AspNetCore.Identity.EntityFrameworkCore; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests { public class AppDb : IdentityDbContext { diff --git a/test/EFCore.MySql.IntegrationTests/AppDbScope.cs b/test/EFCore.MySql.IntegrationTests/AppDbScope.cs index 0d9762a0d..72c88a18c 100644 --- a/test/EFCore.MySql.IntegrationTests/AppDbScope.cs +++ b/test/EFCore.MySql.IntegrationTests/AppDbScope.cs @@ -3,7 +3,7 @@ using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.FunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests { public class AppDbScope : IDisposable { diff --git a/test/EFCore.MySql.IntegrationTests/Commands/CommandRunner.cs b/test/EFCore.MySql.IntegrationTests/Commands/CommandRunner.cs index 940e1fde0..fc78f6c73 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/CommandRunner.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/CommandRunner.cs @@ -1,6 +1,6 @@ using System; -namespace EFCore.MySql.FunctionalTests.Commands{ +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands{ public class CommandRunner : ICommandRunner { diff --git a/test/EFCore.MySql.IntegrationTests/Commands/ConnectionStringCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/ConnectionStringCommand.cs index 261e5c8c8..ef9dee297 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/ConnectionStringCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/ConnectionStringCommand.cs @@ -1,6 +1,6 @@ using System; -namespace EFCore.MySql.FunctionalTests.Commands{ +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands{ public class ConnectionStringCommand : IConnectionStringCommand { diff --git a/test/EFCore.MySql.IntegrationTests/Commands/ICommandRunner.cs b/test/EFCore.MySql.IntegrationTests/Commands/ICommandRunner.cs index 3f82da2e4..b60c29ebc 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/ICommandRunner.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/ICommandRunner.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.FunctionalTests.Commands +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands { public interface ICommandRunner diff --git a/test/EFCore.MySql.IntegrationTests/Commands/IConnectionStringCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/IConnectionStringCommand.cs index fba5a467e..a3ade7057 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/IConnectionStringCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/IConnectionStringCommand.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.FunctionalTests.Commands +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands { public interface IConnectionStringCommand diff --git a/test/EFCore.MySql.IntegrationTests/Commands/ITestMigrateCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/ITestMigrateCommand.cs index 2dbcc9113..c13ed8117 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/ITestMigrateCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/ITestMigrateCommand.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.FunctionalTests.Commands +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands { public interface ITestMigrateCommand diff --git a/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceCommand.cs index 16b6a3af1..cbb4bd20b 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceCommand.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.FunctionalTests.Commands +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands { public interface ITestPerformanceCommand diff --git a/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceRunner.cs b/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceRunner.cs index 02b9dec1b..0131106e0 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceRunner.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/ITestPerformanceRunner.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace EFCore.MySql.FunctionalTests.Commands +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands { public interface ITestPerformanceRunner diff --git a/test/EFCore.MySql.IntegrationTests/Commands/TestMigrateCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/TestMigrateCommand.cs index 828c3ee56..f7aad3adf 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/TestMigrateCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/TestMigrateCommand.cs @@ -3,7 +3,7 @@ using MySql.Data.MySqlClient; using Xunit; -namespace EFCore.MySql.FunctionalTests.Commands{ +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands{ public class TestMigrateCommand : ITestMigrateCommand { diff --git a/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceCommand.cs b/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceCommand.cs index d4261081c..def193d2c 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceCommand.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceCommand.cs @@ -4,12 +4,12 @@ using System.Linq; using System.Threading; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.FunctionalTests.Commands{ +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands{ public class TestPerformanceCommand : ITestPerformanceCommand { diff --git a/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceRunner.cs b/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceRunner.cs index f8619432b..66f5ce7c8 100644 --- a/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceRunner.cs +++ b/test/EFCore.MySql.IntegrationTests/Commands/TestPerformanceRunner.cs @@ -1,7 +1,7 @@ using System; using System.Threading.Tasks; -namespace EFCore.MySql.FunctionalTests.Commands{ +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands{ public class TestPerformanceRunner : ITestPerformanceRunner { diff --git a/test/EFCore.MySql.IntegrationTests/Controllers/AsyncController.cs b/test/EFCore.MySql.IntegrationTests/Controllers/AsyncController.cs index 5d4104bbe..1927f9638 100644 --- a/test/EFCore.MySql.IntegrationTests/Controllers/AsyncController.cs +++ b/test/EFCore.MySql.IntegrationTests/Controllers/AsyncController.cs @@ -1,10 +1,10 @@ using System.Linq; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests.Controllers +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Controllers { [Route("api/[controller]")] public class AsyncController : Controller diff --git a/test/EFCore.MySql.IntegrationTests/Controllers/SyncController.cs b/test/EFCore.MySql.IntegrationTests/Controllers/SyncController.cs index 674c14cb5..8c3d925b5 100644 --- a/test/EFCore.MySql.IntegrationTests/Controllers/SyncController.cs +++ b/test/EFCore.MySql.IntegrationTests/Controllers/SyncController.cs @@ -1,9 +1,9 @@ using System.Linq; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.AspNetCore.Mvc; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests.Controllers +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Controllers { [Route("api/[controller]")] public class SyncController : Controller diff --git a/test/EFCore.MySql.IntegrationTests/EFCore.MySql.FunctionalTests.csproj b/test/EFCore.MySql.IntegrationTests/EFCore.MySql.FunctionalTests.csproj deleted file mode 100644 index 3a71b7053..000000000 --- a/test/EFCore.MySql.IntegrationTests/EFCore.MySql.FunctionalTests.csproj +++ /dev/null @@ -1,44 +0,0 @@ - - - - netcoreapp2.1 - - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json - - 7.2 - EFCore.MySql.FunctionalTests - EFCore.MySql.FunctionalTests.Program - Exe - EFCore.MySql.FunctionalTests - true - true - 64 - - - - - - - - - - - - - - - - - - - - - - Always - - - Always - - - - diff --git a/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj b/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj new file mode 100644 index 000000000..4bf331ca7 --- /dev/null +++ b/test/EFCore.MySql.IntegrationTests/EFCore.MySql.IntegrationTests.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp2.1 + + https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json + + 7.2 + Pomelo.EntityFrameworkCore.MySql.IntegrationTests + Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Program + Exe + Pomelo.EntityFrameworkCore.MySql.IntegrationTests + true + true + 64 + + + + + + + + + + + + + Always + + + Always + + + + diff --git a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.Designer.csbak b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.Designer.csbak index 33eec7197..5745c7577 100755 --- a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.Designer.csbak +++ b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.Designer.csbak @@ -4,10 +4,10 @@ using Microsoft.EntityFrameworkCore; using Microsoft.EntityFrameworkCore.Infrastructure; using Microsoft.EntityFrameworkCore.Metadata; using Microsoft.EntityFrameworkCore.Migrations; -using EFCore.MySql.FunctionalTests; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; -namespace EFCore.MySql.FunctionalTests.Migrations +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Migrations { [DbContext(typeof(AppDb))] [Migration("20170829174711_initial")] diff --git a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.csbak b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.csbak index 5b7bc4526..60cfdf6e3 100755 --- a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.csbak +++ b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/20170829174711_initial.csbak @@ -2,7 +2,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore.Migrations; -namespace EFCore.MySql.FunctionalTests.Migrations +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Migrations { public partial class initial : Migration { diff --git a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/AppDbModelSnapshot.csbak b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/AppDbModelSnapshot.csbak index e798dd139..f387069ef 100755 --- a/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/AppDbModelSnapshot.csbak +++ b/test/EFCore.MySql.IntegrationTests/LegacyMigrations/1.1.2/AppDbModelSnapshot.csbak @@ -6,12 +6,12 @@ using Microsoft.EntityFrameworkCore.Migrations; using Microsoft.EntityFrameworkCore.Storage; using Microsoft.EntityFrameworkCore.Storage.Internal; using Microsoft.EntityFrameworkCore.ValueGeneration; -using EFCore.MySql.FunctionalTests; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using System; using System.Collections.Generic; -namespace EFCore.MySql.FunctionalTests.Migrations +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Migrations { [DbContext(typeof(AppDb))] partial class AppDbModelSnapshot : ModelSnapshot diff --git a/test/EFCore.MySql.IntegrationTests/Models/Batch.cs b/test/EFCore.MySql.IntegrationTests/Models/Batch.cs index 8545ddbda..0032ed0df 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/Batch.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/Batch.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations.Schema; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public class Product { diff --git a/test/EFCore.MySql.IntegrationTests/Models/Blog.cs b/test/EFCore.MySql.IntegrationTests/Models/Blog.cs index eaef83911..7de587b74 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/Blog.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/Blog.cs @@ -1,6 +1,6 @@ using System.Collections.Generic; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public class Blog { diff --git a/test/EFCore.MySql.IntegrationTests/Models/Crm.cs b/test/EFCore.MySql.IntegrationTests/Models/Crm.cs index d3ca7c629..cf0710db4 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/Crm.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/Crm.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public static class CrmMeta diff --git a/test/EFCore.MySql.IntegrationTests/Models/DataTypes.cs b/test/EFCore.MySql.IntegrationTests/Models/DataTypes.cs index 98a2ac159..788bd61ef 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/DataTypes.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/DataTypes.cs @@ -2,7 +2,7 @@ using System.Collections.Generic; using System.ComponentModel.DataAnnotations; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public class DataTypesSimple { diff --git a/test/EFCore.MySql.IntegrationTests/Models/GeneratedTypes.cs b/test/EFCore.MySql.IntegrationTests/Models/GeneratedTypes.cs index 61069adb9..32f08a1ba 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/GeneratedTypes.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/GeneratedTypes.cs @@ -4,7 +4,7 @@ using System.ComponentModel.DataAnnotations.Schema; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public static class GeneratedContactMeta { diff --git a/test/EFCore.MySql.IntegrationTests/Models/Identity.cs b/test/EFCore.MySql.IntegrationTests/Models/Identity.cs index 3550505f1..33196ac9a 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/Identity.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/Identity.cs @@ -1,6 +1,6 @@ using Microsoft.AspNetCore.Identity; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public class AppIdentityUser : IdentityUser { diff --git a/test/EFCore.MySql.IntegrationTests/Models/People.cs b/test/EFCore.MySql.IntegrationTests/Models/People.cs index cc7c8a2fa..493ca98b6 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/People.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/People.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using Microsoft.EntityFrameworkCore; -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public static class PeopleMeta { diff --git a/test/EFCore.MySql.IntegrationTests/Models/Sequence.cs b/test/EFCore.MySql.IntegrationTests/Models/Sequence.cs index c38f34b68..d12a70228 100644 --- a/test/EFCore.MySql.IntegrationTests/Models/Sequence.cs +++ b/test/EFCore.MySql.IntegrationTests/Models/Sequence.cs @@ -1,4 +1,4 @@ -namespace EFCore.MySql.FunctionalTests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models { public class Sequence diff --git a/test/EFCore.MySql.IntegrationTests/Program.cs b/test/EFCore.MySql.IntegrationTests/Program.cs index e351d451f..c6f6a7929 100644 --- a/test/EFCore.MySql.IntegrationTests/Program.cs +++ b/test/EFCore.MySql.IntegrationTests/Program.cs @@ -1,11 +1,11 @@ using System; -using EFCore.MySql.FunctionalTests.Commands; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Commands; using Microsoft.AspNetCore; using Microsoft.AspNetCore.Hosting; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -namespace EFCore.MySql.FunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests { public class Program { diff --git a/test/EFCore.MySql.IntegrationTests/README.md b/test/EFCore.MySql.IntegrationTests/README.md index 41c36a14b..18d9480ea 100644 --- a/test/EFCore.MySql.IntegrationTests/README.md +++ b/test/EFCore.MySql.IntegrationTests/README.md @@ -1,4 +1,4 @@ -Functional and Performance Tests +Integration and Performance Tests ================================ **Configuring the Database** @@ -7,7 +7,7 @@ You first must configure your MySql Database. Open the `config.json.example` fi Next, you must rebuild migrations. Run the `scripts/rebuild.sh` script on Linux or the `scripts/rebuild.ps1` script on Windows. Any time you make changes to database models, run the rebuild script. -**Running Functional Tests** +**Running Integration Tests** 1. Configure the Databse 2. Run `dotnet test` diff --git a/test/EFCore.MySql.IntegrationTests/Startup.cs b/test/EFCore.MySql.IntegrationTests/Startup.cs index d434eec13..88e74314c 100644 --- a/test/EFCore.MySql.IntegrationTests/Startup.cs +++ b/test/EFCore.MySql.IntegrationTests/Startup.cs @@ -1,7 +1,7 @@ using System; using System.Buffers; using System.Data.Common; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Identity; @@ -12,7 +12,7 @@ using Microsoft.Extensions.Logging; using Newtonsoft.Json; -namespace EFCore.MySql.FunctionalTests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests { public class Startup { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Attributes.cs b/test/EFCore.MySql.IntegrationTests/Tests/Attributes.cs index 0dc4c06ad..b97d8ce07 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Attributes.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Attributes.cs @@ -1,6 +1,6 @@ using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests { public class SkipAppVeyorFact : FactAttribute { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Connection/ConnectionTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Connection/ConnectionTest.cs index c8bc04553..7f77812cb 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Connection/ConnectionTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Connection/ConnectionTest.cs @@ -1,9 +1,9 @@ using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using MySql.Data.MySqlClient; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Connection +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Connection { public class ConnectionTest { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/BatchTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/BatchTest.cs index 351feb503..00b80aa5c 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/BatchTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/BatchTest.cs @@ -1,9 +1,9 @@ using System.Collections.Generic; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class BatchTest { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/CrmTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/CrmTest.cs index 505886741..c88278539 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/CrmTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/CrmTest.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class CrmFixture { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/DataTypesTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/DataTypesTest.cs index d7ae5d6ae..3d33a337e 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/DataTypesTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/DataTypesTest.cs @@ -2,11 +2,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class DataTypesTest diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/DiscriminatorTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/DiscriminatorTest.cs index d253baac5..ca532f40b 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/DiscriminatorTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/DiscriminatorTest.cs @@ -1,11 +1,11 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class DiscriminatorFixture { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/ExpressionTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/ExpressionTest.cs index be4ee832b..ca693decc 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/ExpressionTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/ExpressionTest.cs @@ -2,11 +2,11 @@ using System.Linq; using System.Text.RegularExpressions; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class ExpressionTest : IDisposable diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/GeneratedTypesTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/GeneratedTypesTest.cs index ed2358705..cb6da6c32 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/GeneratedTypesTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/GeneratedTypesTest.cs @@ -2,12 +2,12 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Microsoft.EntityFrameworkCore; using MySql.Data.MySqlClient; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class GeneratedTypesTest { diff --git a/test/EFCore.MySql.IntegrationTests/Tests/Models/SequenceTest.cs b/test/EFCore.MySql.IntegrationTests/Tests/Models/SequenceTest.cs index bb064b66c..42e418f4c 100644 --- a/test/EFCore.MySql.IntegrationTests/Tests/Models/SequenceTest.cs +++ b/test/EFCore.MySql.IntegrationTests/Tests/Models/SequenceTest.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; -using EFCore.MySql.FunctionalTests.Models; +using Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Models; using Xunit; -namespace EFCore.MySql.FunctionalTests.Tests.Models +namespace Pomelo.EntityFrameworkCore.MySql.IntegrationTests.Tests.Models { public class SequenceTest { diff --git a/test/EFCore.MySql.Tests/EFCore.MySql.Tests.csproj b/test/EFCore.MySql.Tests/EFCore.MySql.Tests.csproj index 305396652..53f61171e 100644 --- a/test/EFCore.MySql.Tests/EFCore.MySql.Tests.csproj +++ b/test/EFCore.MySql.Tests/EFCore.MySql.Tests.csproj @@ -1,31 +1,25 @@  + - netcoreapp2.1 - - https://dotnetfeed.blob.core.windows.net/orchestrated-release-2-1/20180515-07/final/index.json - - 7.2 - EFCore.MySql.Tests - EFCore.MySql.Tests - false - false - false + $(StandardTestTfms) + Pomelo.EntityFrameworkCore.MySql.Tests + Pomelo.EntityFrameworkCore + - - + + PreserveNewest + + - - - - - - - - + + + - + + + diff --git a/test/EFCore.MySql.Tests/Migrations/ServerVersionTest.cs b/test/EFCore.MySql.Tests/Migrations/ServerVersionTest.cs index bc0afcda8..d2db1c1b3 100644 --- a/test/EFCore.MySql.Tests/Migrations/ServerVersionTest.cs +++ b/test/EFCore.MySql.Tests/Migrations/ServerVersionTest.cs @@ -1,9 +1,9 @@ using System; -using EFCore.MySql.Infrastructure; -using EFCore.MySql.Storage.Internal; +using Pomelo.EntityFrameworkCore.MySql.Infrastructure; +using Pomelo.EntityFrameworkCore.MySql.Storage.Internal; using Xunit; -namespace EFCore.MySql.Tests.Migrations +namespace Pomelo.EntityFrameworkCore.MySql.Tests.Migrations { public class ServerVersionTest { diff --git a/test/EFCore.MySql.Tests/Properties/AssemblyInfo.cs b/test/EFCore.MySql.Tests/Properties/AssemblyInfo.cs deleted file mode 100644 index 90352b3e9..000000000 --- a/test/EFCore.MySql.Tests/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,18 +0,0 @@ -using System.Reflection; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Pomelo.EntityFrameworkCore.MySql.Test")] -[assembly: AssemblyTrademark("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("de5212ae-4c17-4702-851d-0f1fc0d32e3c")] diff --git a/test/EFCore.MySql.Tests/dotnet-run.sh b/test/EFCore.MySql.Tests/dotnet-run.sh new file mode 100755 index 000000000..563ca3d56 --- /dev/null +++ b/test/EFCore.MySql.Tests/dotnet-run.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +[ -z "${DOTNET_HOME:-}" ] && DOTNET_HOME="$HOME/.dotnet" +export PATH="$DOTNET_HOME:$PATH" +exec "$@" diff --git a/test/xunit.runner.json b/test/xunit.runner.json new file mode 100644 index 000000000..c276745d0 --- /dev/null +++ b/test/xunit.runner.json @@ -0,0 +1,3 @@ +{ + "appDomain": "denied" +} diff --git a/version.props b/version.props new file mode 100644 index 000000000..334d35360 --- /dev/null +++ b/version.props @@ -0,0 +1,18 @@ + + + 2.1.0 + rtm + $(VersionPrefix) + $(VersionPrefix)-$(VersionSuffix)-final + t000 + a- + $(FeatureBranchVersionPrefix)$(VersionSuffix)-$([System.Text.RegularExpressions.Regex]::Replace('$(FeatureBranchVersionSuffix)', '[^\w-]', '-')) + $(VersionSuffix)-$(BuildNumber) + + 0.1.0 + rtm + $(ExperimentalVersionPrefix) + $(ExperimentalVersionPrefix)-$(ExperimentalVersionSuffix)-final + $(ExperimentalVersionSuffix)-$(BuildNumber) + + \ No newline at end of file