From efcbc443f5259969b6259fa07ccf134fc300d178 Mon Sep 17 00:00:00 2001 From: Adelin Owona <51498470+adelinowona@users.noreply.github.com> Date: Mon, 7 Oct 2024 21:32:33 -0400 Subject: [PATCH] CSHARP-5313: rename libmongocrypt project (#1483) --- CSharpDriver.sln | 4 ++-- .../LibmongocryptBindingBenchmark.cs | 1 - .../MongoDB.Driver.Benchmarks.csproj | 2 +- build.cake | 4 ++-- evergreen/evergreen.yml | 12 ++++++------ evergreen/export-libmongocrypt-path.sh | 2 +- evergreen/push-packages.sh | 2 +- .../AssemblyInfo.cs | 2 +- .../AutoEncryptionLibMongoController.cs | 4 +--- .../Binary.cs | 2 +- .../BinarySafeHandle.cs | 2 +- .../CheckableSafeHandle.cs | 2 +- .../CipherCallbacks.cs | 2 +- .../ClientEncryption.cs | 4 +--- .../ClientEncryptionOptions.cs | 3 +-- .../ContextSafeHandle.cs | 2 +- .../CreateEncryptedCollectionResult.cs | 2 +- .../CryptClient.cs | 2 +- .../CryptClientFactory.cs | 2 +- .../CryptContext.cs | 2 +- .../CryptException.cs | 2 +- .../CryptOptions.cs | 2 +- .../DataKeyOptions.cs | 3 +-- .../EncryptOptions.cs | 4 +--- .../EncryptionAlgorithm.cs | 2 +- .../ExplicitEncryptionLibMongoCryptController.cs | 4 +--- .../ExtensionManagerExtensions.cs | 4 +--- .../HashCallback.cs | 2 +- .../HmacShaCallbacks.cs | 2 +- .../IStatus.cs | 2 +- .../KmsCredentials.cs | 2 +- .../KmsKeyId.cs | 2 +- .../KmsRequest.cs | 2 +- .../KmsRequestCollection.cs | 2 +- .../LibMongoCryptControllerBase.cs | 4 +--- .../LibmongocryptExtensionsMethods.cs | 4 +--- .../Library.cs | 2 +- .../LibraryLoader.cs | 2 +- .../LibraryLoadingException.cs | 2 +- .../LogLevel.cs | 2 +- .../MongoCryptSafeHandle.cs | 2 +- .../MongoDB.Driver.Encryption.csproj} | 6 +++--- .../MongoDB.Driver.Encryption.ruleset} | 0 .../MongoDB.Driver.Encryption.targets} | 0 .../MongoEncryptionCreateCollectionException.cs | 3 +-- .../MongoEncryptionException.cs | 3 +-- .../MongocryptdFactory.cs | 4 +--- .../OperatingSystemHelper.cs | 2 +- .../PinnedBinary.cs | 2 +- .../RewrapManyDataKeyOptions.cs | 3 +-- .../RewrapManyDataKeyResult.cs | 4 +--- .../SecureRandomCallback.cs | 2 +- .../SigningRSAESPKCSCallback.cs | 2 +- .../Status.cs | 2 +- .../StatusSafeHandle.cs | 2 +- .../BasicTests.cs | 2 +- .../BsonUtil.cs | 2 +- .../CallbackUtils.cs | 2 +- .../CipherCallbacksTests.cs | 2 +- .../HashCallbackTests.cs | 2 +- .../HmacShaCallbacksTests.cs | 2 +- .../MongoDB.Driver.Encryption.Tests.csproj} | 2 +- .../SigningRSAESPKCSCallbackTests.cs | 2 +- .../test/example/cmd.json | 0 .../test/example/collection-info.json | 0 .../test/example/command-reply.json | 0 .../test/example/encrypted-command-reply.json | 0 .../test/example/encrypted-command.json | 0 .../test/example/encrypted-value.json | 0 .../test/example/key-document.json | 0 .../test/example/key-filter.json | 0 .../test/example/kms-decrypt-reply.txt | 0 .../test/example/kms-encrypt-reply.txt | 0 .../test/example/list-collections-filter.json | 0 .../test/example/mongocryptd-command.json | 0 .../test/example/mongocryptd-reply.json | 0 .../xunit.runner.json | 0 .../ClientEncryptionExamples.cs | 1 - .../ClientSideEncryption2Examples.cs | 1 - .../ExplicitEncryptionExamples.cs | 2 -- .../MongoDB.Driver.Examples.csproj | 2 +- .../DriverTestConfiguration.cs | 2 +- .../MongoDB.Driver.TestHelpers.csproj | 2 +- .../Encryption/ClientEncryptionOptionsTests.cs | 1 - .../Encryption/ClientEncryptionTests.cs | 3 +-- .../Encryption/EncryptOptionsTests.cs | 1 - .../MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj | 2 +- .../MongoDB.Driver.Tests/MongocryptdFactoryTests.cs | 2 +- .../client-side-encryption/EncryptionTestHelper.cs | 1 - .../prose-tests/ClientEncryptionProseTests.cs | 1 - .../Specifications/sessions/SessionsProseTests.cs | 2 +- .../UnifiedAddKeyAltNameOperation.cs | 2 +- .../UnifiedCreateDataKeyOperation.cs | 1 - .../UnifiedTestOperations/UnifiedDecryptOperation.cs | 2 +- .../UnifiedDeleteKeyOperation.cs | 1 - .../UnifiedTestOperations/UnifiedEncryptOperation.cs | 1 - .../UnifiedTestOperations/UnifiedEntityMap.cs | 3 +-- .../UnifiedGetKeyByAltNameOperation.cs | 1 - .../UnifiedTestOperations/UnifiedGetKeyOperation.cs | 1 - .../UnifiedTestOperations/UnifiedGetKeysOperation.cs | 1 - .../UnifiedRemoveKeyAltNameOperation.cs | 1 - .../UnifiedRewrapManyDataKeyOperation.cs | 1 - .../InfrastructureUtilities.cs | 2 +- .../LibmongocryptTests.cs | 1 - .../MongoDB.Driver.SmokeTests.Sdk.csproj | 4 ++-- 105 files changed, 82 insertions(+), 125 deletions(-) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/AssemblyInfo.cs (51%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/AutoEncryptionLibMongoController.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/Binary.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/BinarySafeHandle.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CheckableSafeHandle.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CipherCallbacks.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/ClientEncryption.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/ClientEncryptionOptions.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/ContextSafeHandle.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CreateEncryptedCollectionResult.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CryptClient.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CryptClientFactory.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CryptContext.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CryptException.cs (96%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/CryptOptions.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/DataKeyOptions.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/EncryptOptions.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/EncryptionAlgorithm.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/ExplicitEncryptionLibMongoCryptController.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/ExtensionManagerExtensions.cs (95%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/HashCallback.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/HmacShaCallbacks.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/IStatus.cs (95%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/KmsCredentials.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/KmsKeyId.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/KmsRequest.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/KmsRequestCollection.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/LibMongoCryptControllerBase.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/LibmongocryptExtensionsMethods.cs (96%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/Library.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/LibraryLoader.cs (99%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/LibraryLoadingException.cs (96%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/LogLevel.cs (95%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/MongoCryptSafeHandle.cs (97%) rename src/{MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj => MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj} (97%) rename src/{MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.ruleset => MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.ruleset} (100%) rename src/{MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.targets => MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets} (100%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/MongoEncryptionCreateCollectionException.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/MongoEncryptionException.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/MongocryptdFactory.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/OperatingSystemHelper.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/PinnedBinary.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/RewrapManyDataKeyOptions.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/RewrapManyDataKeyResult.cs (95%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/SecureRandomCallback.cs (97%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/SigningRSAESPKCSCallback.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/Status.cs (98%) rename src/{MongoDB.Libmongocrypt => MongoDB.Driver.Encryption}/StatusSafeHandle.cs (97%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/BasicTests.cs (99%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/BsonUtil.cs (98%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/CallbackUtils.cs (96%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/CipherCallbacksTests.cs (97%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/HashCallbackTests.cs (96%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/HmacShaCallbacksTests.cs (97%) rename tests/{MongoDB.Libmongocrypt.Tests/MongoDB.Libmongocrypt.Tests.csproj => MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj} (91%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/SigningRSAESPKCSCallbackTests.cs (98%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/cmd.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/collection-info.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/command-reply.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/encrypted-command-reply.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/encrypted-command.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/encrypted-value.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/key-document.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/key-filter.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/kms-decrypt-reply.txt (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/kms-encrypt-reply.txt (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/list-collections-filter.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/mongocryptd-command.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/test/example/mongocryptd-reply.json (100%) rename tests/{MongoDB.Libmongocrypt.Tests => MongoDB.Driver.Encryption.Tests}/xunit.runner.json (100%) diff --git a/CSharpDriver.sln b/CSharpDriver.sln index 6b1f6f85d55..3b6e1439ca5 100644 --- a/CSharpDriver.sln +++ b/CSharpDriver.sln @@ -54,9 +54,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FaasTests", "FaasTests", "{ EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.LambdaTest", "tests\FaasTests\LambdaTests\MongoDB.Driver.LambdaTest\MongoDB.Driver.LambdaTest.csproj", "{33B11279-DA4A-46EA-99BF-9DEDCAC50D95}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Libmongocrypt", "src\MongoDB.Libmongocrypt\MongoDB.Libmongocrypt.csproj", "{642518BC-D28A-4ABC-851C-BC18CC34EEDA}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Encryption", "src\MongoDB.Driver.Encryption\MongoDB.Driver.Encryption.csproj", "{642518BC-D28A-4ABC-851C-BC18CC34EEDA}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Libmongocrypt.Tests", "tests\MongoDB.Libmongocrypt.Tests\MongoDB.Libmongocrypt.Tests.csproj", "{AB4AD0CB-756C-444F-9F37-26DA35148934}" +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Encryption.Tests", "tests\MongoDB.Driver.Encryption.Tests\MongoDB.Driver.Encryption.Tests.csproj", "{AB4AD0CB-756C-444F-9F37-26DA35148934}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Authentication.AWS", "src\MongoDB.Driver.Authentication.AWS\MongoDB.Driver.Authentication.AWS.csproj", "{A0CAC199-457E-4862-AF9E-971C7A77CBF9}" EndProject diff --git a/benchmarks/MongoDB.Driver.Benchmarks/LibmongocryptBindingBenchmark.cs b/benchmarks/MongoDB.Driver.Benchmarks/LibmongocryptBindingBenchmark.cs index c8b33ee404d..4c542abf74d 100644 --- a/benchmarks/MongoDB.Driver.Benchmarks/LibmongocryptBindingBenchmark.cs +++ b/benchmarks/MongoDB.Driver.Benchmarks/LibmongocryptBindingBenchmark.cs @@ -22,7 +22,6 @@ using MongoDB.Driver; using MongoDB.Driver.Encryption; using MongoDB.Driver.TestHelpers; -using MongoDB.Libmongocrypt; namespace MongoDB.Benchmarks { diff --git a/benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj b/benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj index 291de38138d..a4dee94eb1c 100644 --- a/benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj +++ b/benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj @@ -31,7 +31,7 @@ - + diff --git a/build.cake b/build.cake index cdefc7b7502..cce60f49ff7 100644 --- a/build.cake +++ b/build.cake @@ -285,7 +285,7 @@ Task("PackageNugetPackages") { "MongoDB.Bson", "MongoDB.Driver", - "MongoDB.Libmongocrypt" + "MongoDB.Driver.Encryption" }; foreach (var project in projects) @@ -365,7 +365,7 @@ Task("SmokeTests") DotNetTool( testProject.FullPath, - "add package MongoDB.Libmongocrypt", + "add package MongoDB.Driver.Encryption", $"--no-restore --version [{buildConfig.PackageVersion}]", toolSettings); diff --git a/evergreen/evergreen.yml b/evergreen/evergreen.yml index c976d39b07e..245fd0fa42e 100644 --- a/evergreen/evergreen.yml +++ b/evergreen/evergreen.yml @@ -944,8 +944,8 @@ functions: - "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg" - "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.nupkg" - "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.snupkg" - - "mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg" - - "mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg" + - "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg" + - "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg" cleanup: - command: shell.exec @@ -1111,15 +1111,15 @@ functions: params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg - remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg + local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg + remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg bucket: mciuploads - command: s3.get params: aws_key: ${aws_key} aws_secret: ${aws_secret} - local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg - remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg + local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg + remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg bucket: mciuploads build-apidocs: diff --git a/evergreen/export-libmongocrypt-path.sh b/evergreen/export-libmongocrypt-path.sh index 39887c9ee3e..637dc709b5a 100755 --- a/evergreen/export-libmongocrypt-path.sh +++ b/evergreen/export-libmongocrypt-path.sh @@ -5,7 +5,7 @@ set -o errexit # Exit the script with error if any of the commands fail # Environment variables used as input: # OS The current operating system -LIBMONGOCRYPT_DIR="$(pwd)/src/MongoDB.Libmongocrypt" +LIBMONGOCRYPT_DIR="$(pwd)/src/MongoDB.Driver.Encryption" # export the LIBMONGOCRYPT_PATH variable based on OS if [[ "$OS" =~ Ubuntu|ubuntu ]]; then diff --git a/evergreen/push-packages.sh b/evergreen/push-packages.sh index da1cd641d2b..0cdd1fc2186 100644 --- a/evergreen/push-packages.sh +++ b/evergreen/push-packages.sh @@ -55,7 +55,7 @@ if [ "$PACKAGES_SOURCE" = "https://api.nuget.org/v3/index.json" ] && [[ ! "$PACK exit 1 fi -PACKAGES=("MongoDB.Bson" "MongoDB.Driver" "MongoDB.Driver.Authentication.AWS" "MongoDB.Libmongocrypt") +PACKAGES=("MongoDB.Bson" "MongoDB.Driver" "MongoDB.Driver.Authentication.AWS" "MongoDB.Driver.Encryption") for package in ${PACKAGES[*]}; do dotnet nuget verify ./artifacts/nuget/"$package"."$PACKAGE_VERSION".nupkg --certificate-fingerprint "$NUGET_SIGN_CERTIFICATE_FINGERPRINT" diff --git a/src/MongoDB.Libmongocrypt/AssemblyInfo.cs b/src/MongoDB.Driver.Encryption/AssemblyInfo.cs similarity index 51% rename from src/MongoDB.Libmongocrypt/AssemblyInfo.cs rename to src/MongoDB.Driver.Encryption/AssemblyInfo.cs index 016afbb71d4..72755506a01 100644 --- a/src/MongoDB.Libmongocrypt/AssemblyInfo.cs +++ b/src/MongoDB.Driver.Encryption/AssemblyInfo.cs @@ -1,4 +1,4 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")] +[assembly: InternalsVisibleTo("MongoDB.Driver.Encryption.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")] [assembly: InternalsVisibleTo("MongoDB.Driver.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")] diff --git a/src/MongoDB.Libmongocrypt/AutoEncryptionLibMongoController.cs b/src/MongoDB.Driver.Encryption/AutoEncryptionLibMongoController.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/AutoEncryptionLibMongoController.cs rename to src/MongoDB.Driver.Encryption/AutoEncryptionLibMongoController.cs index 58c27252d0f..40714e34d81 100644 --- a/src/MongoDB.Libmongocrypt/AutoEncryptionLibMongoController.cs +++ b/src/MongoDB.Driver.Encryption/AutoEncryptionLibMongoController.cs @@ -19,11 +19,9 @@ using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; -using MongoDB.Driver; using MongoDB.Driver.Core.Servers; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal sealed class AutoEncryptionLibMongoCryptController : LibMongoCryptControllerBase, IAutoEncryptionLibMongoCryptController { diff --git a/src/MongoDB.Libmongocrypt/Binary.cs b/src/MongoDB.Driver.Encryption/Binary.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/Binary.cs rename to src/MongoDB.Driver.Encryption/Binary.cs index ea1e85f9bf0..ce8283b160f 100644 --- a/src/MongoDB.Libmongocrypt/Binary.cs +++ b/src/MongoDB.Driver.Encryption/Binary.cs @@ -18,7 +18,7 @@ using System.IO; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A pointer and length pair the contains raw bytes to pass or retrieve from libmongocrypt. diff --git a/src/MongoDB.Libmongocrypt/BinarySafeHandle.cs b/src/MongoDB.Driver.Encryption/BinarySafeHandle.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/BinarySafeHandle.cs rename to src/MongoDB.Driver.Encryption/BinarySafeHandle.cs index fe1325655d5..5ddb85cb625 100644 --- a/src/MongoDB.Libmongocrypt/BinarySafeHandle.cs +++ b/src/MongoDB.Driver.Encryption/BinarySafeHandle.cs @@ -18,7 +18,7 @@ using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// SafeHandle to manage the lifetime of a mongocrypt_binary_t. diff --git a/src/MongoDB.Libmongocrypt/CheckableSafeHandle.cs b/src/MongoDB.Driver.Encryption/CheckableSafeHandle.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/CheckableSafeHandle.cs rename to src/MongoDB.Driver.Encryption/CheckableSafeHandle.cs index b5d109f8b64..e17ea7d8beb 100644 --- a/src/MongoDB.Libmongocrypt/CheckableSafeHandle.cs +++ b/src/MongoDB.Driver.Encryption/CheckableSafeHandle.cs @@ -18,7 +18,7 @@ using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// SafeHandle to manage the lifetime of a mongocrypt_ctx_t. diff --git a/src/MongoDB.Libmongocrypt/CipherCallbacks.cs b/src/MongoDB.Driver.Encryption/CipherCallbacks.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/CipherCallbacks.cs rename to src/MongoDB.Driver.Encryption/CipherCallbacks.cs index 9d206a4bffb..cf6a398198c 100644 --- a/src/MongoDB.Libmongocrypt/CipherCallbacks.cs +++ b/src/MongoDB.Driver.Encryption/CipherCallbacks.cs @@ -17,7 +17,7 @@ using System; using System.Security.Cryptography; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal enum CryptMode { diff --git a/src/MongoDB.Libmongocrypt/ClientEncryption.cs b/src/MongoDB.Driver.Encryption/ClientEncryption.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/ClientEncryption.cs rename to src/MongoDB.Driver.Encryption/ClientEncryption.cs index 4dac9cabd9f..88548895cde 100644 --- a/src/MongoDB.Libmongocrypt/ClientEncryption.cs +++ b/src/MongoDB.Driver.Encryption/ClientEncryption.cs @@ -19,12 +19,10 @@ using System.Threading; using System.Threading.Tasks; using MongoDB.Bson; -using MongoDB.Driver; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Explicit client encryption. diff --git a/src/MongoDB.Libmongocrypt/ClientEncryptionOptions.cs b/src/MongoDB.Driver.Encryption/ClientEncryptionOptions.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/ClientEncryptionOptions.cs rename to src/MongoDB.Driver.Encryption/ClientEncryptionOptions.cs index 0a8981c658e..992dcc5d841 100644 --- a/src/MongoDB.Libmongocrypt/ClientEncryptionOptions.cs +++ b/src/MongoDB.Driver.Encryption/ClientEncryptionOptions.cs @@ -15,10 +15,9 @@ using System; using System.Collections.Generic; -using MongoDB.Driver; using MongoDB.Driver.Core.Misc; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Client encryption options. diff --git a/src/MongoDB.Libmongocrypt/ContextSafeHandle.cs b/src/MongoDB.Driver.Encryption/ContextSafeHandle.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/ContextSafeHandle.cs rename to src/MongoDB.Driver.Encryption/ContextSafeHandle.cs index 02430e1d302..707715a932c 100644 --- a/src/MongoDB.Libmongocrypt/ContextSafeHandle.cs +++ b/src/MongoDB.Driver.Encryption/ContextSafeHandle.cs @@ -16,7 +16,7 @@ using System.Runtime.ConstrainedExecution; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// SafeHandle to manage the lifetime of a mongocrypt_ctx_t. diff --git a/src/MongoDB.Libmongocrypt/CreateEncryptedCollectionResult.cs b/src/MongoDB.Driver.Encryption/CreateEncryptedCollectionResult.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/CreateEncryptedCollectionResult.cs rename to src/MongoDB.Driver.Encryption/CreateEncryptedCollectionResult.cs index 6f5cef24f59..30476cf8f0a 100644 --- a/src/MongoDB.Libmongocrypt/CreateEncryptedCollectionResult.cs +++ b/src/MongoDB.Driver.Encryption/CreateEncryptedCollectionResult.cs @@ -15,7 +15,7 @@ using MongoDB.Bson; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Represents the result of a create encrypted collection. diff --git a/src/MongoDB.Libmongocrypt/CryptClient.cs b/src/MongoDB.Driver.Encryption/CryptClient.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/CryptClient.cs rename to src/MongoDB.Driver.Encryption/CryptClient.cs index e12a180e816..c2f03c4500f 100644 --- a/src/MongoDB.Libmongocrypt/CryptClient.cs +++ b/src/MongoDB.Driver.Encryption/CryptClient.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// CryptClient represents a session with libmongocrypt. diff --git a/src/MongoDB.Libmongocrypt/CryptClientFactory.cs b/src/MongoDB.Driver.Encryption/CryptClientFactory.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/CryptClientFactory.cs rename to src/MongoDB.Driver.Encryption/CryptClientFactory.cs index 0fcce88d7ef..e9dc48cd839 100644 --- a/src/MongoDB.Libmongocrypt/CryptClientFactory.cs +++ b/src/MongoDB.Driver.Encryption/CryptClientFactory.cs @@ -21,7 +21,7 @@ using MongoDB.Bson.IO; using MongoDB.Driver.Core.Configuration; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A factory for CryptClients. diff --git a/src/MongoDB.Libmongocrypt/CryptContext.cs b/src/MongoDB.Driver.Encryption/CryptContext.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/CryptContext.cs rename to src/MongoDB.Driver.Encryption/CryptContext.cs index 5ca5705c555..23ab25cae99 100644 --- a/src/MongoDB.Libmongocrypt/CryptContext.cs +++ b/src/MongoDB.Driver.Encryption/CryptContext.cs @@ -17,7 +17,7 @@ using System; using System.Collections.Generic; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A encryption or decryption session. It may not be reused. diff --git a/src/MongoDB.Libmongocrypt/CryptException.cs b/src/MongoDB.Driver.Encryption/CryptException.cs similarity index 96% rename from src/MongoDB.Libmongocrypt/CryptException.cs rename to src/MongoDB.Driver.Encryption/CryptException.cs index 70cc552792d..ceceece3e88 100644 --- a/src/MongoDB.Libmongocrypt/CryptException.cs +++ b/src/MongoDB.Driver.Encryption/CryptException.cs @@ -16,7 +16,7 @@ using System; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// An exception from libmongocrypt. diff --git a/src/MongoDB.Libmongocrypt/CryptOptions.cs b/src/MongoDB.Driver.Encryption/CryptOptions.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/CryptOptions.cs rename to src/MongoDB.Driver.Encryption/CryptOptions.cs index 0dd22979ec2..c801aace3fc 100644 --- a/src/MongoDB.Libmongocrypt/CryptOptions.cs +++ b/src/MongoDB.Driver.Encryption/CryptOptions.cs @@ -19,7 +19,7 @@ using System.Collections.ObjectModel; using System.Linq; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Options to configure mongocrypt with. diff --git a/src/MongoDB.Libmongocrypt/DataKeyOptions.cs b/src/MongoDB.Driver.Encryption/DataKeyOptions.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/DataKeyOptions.cs rename to src/MongoDB.Driver.Encryption/DataKeyOptions.cs index b984a67d8c6..76e4f7d2632 100644 --- a/src/MongoDB.Libmongocrypt/DataKeyOptions.cs +++ b/src/MongoDB.Driver.Encryption/DataKeyOptions.cs @@ -15,9 +15,8 @@ using System.Collections.Generic; using MongoDB.Bson; -using MongoDB.Driver; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Options for creating a data key. diff --git a/src/MongoDB.Libmongocrypt/EncryptOptions.cs b/src/MongoDB.Driver.Encryption/EncryptOptions.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/EncryptOptions.cs rename to src/MongoDB.Driver.Encryption/EncryptOptions.cs index 5313135ca70..56c2be13e84 100644 --- a/src/MongoDB.Libmongocrypt/EncryptOptions.cs +++ b/src/MongoDB.Driver.Encryption/EncryptOptions.cs @@ -15,11 +15,9 @@ using System; using MongoDB.Bson; -using MongoDB.Driver; using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Range options. diff --git a/src/MongoDB.Libmongocrypt/EncryptionAlgorithm.cs b/src/MongoDB.Driver.Encryption/EncryptionAlgorithm.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/EncryptionAlgorithm.cs rename to src/MongoDB.Driver.Encryption/EncryptionAlgorithm.cs index 73cb4117d93..850a9d02ba2 100644 --- a/src/MongoDB.Libmongocrypt/EncryptionAlgorithm.cs +++ b/src/MongoDB.Driver.Encryption/EncryptionAlgorithm.cs @@ -13,7 +13,7 @@ * limitations under the License. */ -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Represents an encryption algorithm. diff --git a/src/MongoDB.Libmongocrypt/ExplicitEncryptionLibMongoCryptController.cs b/src/MongoDB.Driver.Encryption/ExplicitEncryptionLibMongoCryptController.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/ExplicitEncryptionLibMongoCryptController.cs rename to src/MongoDB.Driver.Encryption/ExplicitEncryptionLibMongoCryptController.cs index 68ac5bd62d5..657a4cfa87b 100644 --- a/src/MongoDB.Libmongocrypt/ExplicitEncryptionLibMongoCryptController.cs +++ b/src/MongoDB.Driver.Encryption/ExplicitEncryptionLibMongoCryptController.cs @@ -20,11 +20,9 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Bson.Serialization; -using MongoDB.Driver; using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal sealed class ExplicitEncryptionLibMongoCryptController : LibMongoCryptControllerBase { diff --git a/src/MongoDB.Libmongocrypt/ExtensionManagerExtensions.cs b/src/MongoDB.Driver.Encryption/ExtensionManagerExtensions.cs similarity index 95% rename from src/MongoDB.Libmongocrypt/ExtensionManagerExtensions.cs rename to src/MongoDB.Driver.Encryption/ExtensionManagerExtensions.cs index 480e672f639..42dfb87b84f 100644 --- a/src/MongoDB.Libmongocrypt/ExtensionManagerExtensions.cs +++ b/src/MongoDB.Driver.Encryption/ExtensionManagerExtensions.cs @@ -13,9 +13,7 @@ * limitations under the License. */ -using MongoDB.Driver; - -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// IExtensionManager extensions. diff --git a/src/MongoDB.Libmongocrypt/HashCallback.cs b/src/MongoDB.Driver.Encryption/HashCallback.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/HashCallback.cs rename to src/MongoDB.Driver.Encryption/HashCallback.cs index 3418d2d07e0..351adbe7ec9 100644 --- a/src/MongoDB.Libmongocrypt/HashCallback.cs +++ b/src/MongoDB.Driver.Encryption/HashCallback.cs @@ -17,7 +17,7 @@ using System; using System.Security.Cryptography; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal static class HashCallback { diff --git a/src/MongoDB.Libmongocrypt/HmacShaCallbacks.cs b/src/MongoDB.Driver.Encryption/HmacShaCallbacks.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/HmacShaCallbacks.cs rename to src/MongoDB.Driver.Encryption/HmacShaCallbacks.cs index 691aa5e5cb7..116b096d995 100644 --- a/src/MongoDB.Libmongocrypt/HmacShaCallbacks.cs +++ b/src/MongoDB.Driver.Encryption/HmacShaCallbacks.cs @@ -17,7 +17,7 @@ using System; using System.Security.Cryptography; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal static class HmacShaCallbacks { diff --git a/src/MongoDB.Libmongocrypt/IStatus.cs b/src/MongoDB.Driver.Encryption/IStatus.cs similarity index 95% rename from src/MongoDB.Libmongocrypt/IStatus.cs rename to src/MongoDB.Driver.Encryption/IStatus.cs index e5f607f5c40..8c1ffef4387 100644 --- a/src/MongoDB.Libmongocrypt/IStatus.cs +++ b/src/MongoDB.Driver.Encryption/IStatus.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Interface for checking the status of the various libmongocrypt options. diff --git a/src/MongoDB.Libmongocrypt/KmsCredentials.cs b/src/MongoDB.Driver.Encryption/KmsCredentials.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/KmsCredentials.cs rename to src/MongoDB.Driver.Encryption/KmsCredentials.cs index 27d94f1db5a..2832e70e1e2 100644 --- a/src/MongoDB.Libmongocrypt/KmsCredentials.cs +++ b/src/MongoDB.Driver.Encryption/KmsCredentials.cs @@ -16,7 +16,7 @@ using System; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// KMS Credentials. diff --git a/src/MongoDB.Libmongocrypt/KmsKeyId.cs b/src/MongoDB.Driver.Encryption/KmsKeyId.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/KmsKeyId.cs rename to src/MongoDB.Driver.Encryption/KmsKeyId.cs index 5d26b5dc3b5..f0c1b6faf65 100644 --- a/src/MongoDB.Libmongocrypt/KmsKeyId.cs +++ b/src/MongoDB.Driver.Encryption/KmsKeyId.cs @@ -17,7 +17,7 @@ using System.Collections.Generic; using System.Linq; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Represent a kms key. diff --git a/src/MongoDB.Libmongocrypt/KmsRequest.cs b/src/MongoDB.Driver.Encryption/KmsRequest.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/KmsRequest.cs rename to src/MongoDB.Driver.Encryption/KmsRequest.cs index d1e9b981336..c80f5b8af95 100644 --- a/src/MongoDB.Libmongocrypt/KmsRequest.cs +++ b/src/MongoDB.Driver.Encryption/KmsRequest.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Contains a KMS request to make to a remote server. diff --git a/src/MongoDB.Libmongocrypt/KmsRequestCollection.cs b/src/MongoDB.Driver.Encryption/KmsRequestCollection.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/KmsRequestCollection.cs rename to src/MongoDB.Driver.Encryption/KmsRequestCollection.cs index 4edbb4dd714..13fd5ed0035 100644 --- a/src/MongoDB.Libmongocrypt/KmsRequestCollection.cs +++ b/src/MongoDB.Driver.Encryption/KmsRequestCollection.cs @@ -17,7 +17,7 @@ using System.Collections; using System.Collections.Generic; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A collection of kms requests to make. diff --git a/src/MongoDB.Libmongocrypt/LibMongoCryptControllerBase.cs b/src/MongoDB.Driver.Encryption/LibMongoCryptControllerBase.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/LibMongoCryptControllerBase.cs rename to src/MongoDB.Driver.Encryption/LibMongoCryptControllerBase.cs index b4251f47515..0ac163e9fad 100644 --- a/src/MongoDB.Libmongocrypt/LibMongoCryptControllerBase.cs +++ b/src/MongoDB.Driver.Encryption/LibMongoCryptControllerBase.cs @@ -24,13 +24,11 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Bson.IO; -using MongoDB.Driver; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Core.Connections; using MongoDB.Driver.Core.Misc; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal abstract class LibMongoCryptControllerBase { diff --git a/src/MongoDB.Libmongocrypt/LibmongocryptExtensionsMethods.cs b/src/MongoDB.Driver.Encryption/LibmongocryptExtensionsMethods.cs similarity index 96% rename from src/MongoDB.Libmongocrypt/LibmongocryptExtensionsMethods.cs rename to src/MongoDB.Driver.Encryption/LibmongocryptExtensionsMethods.cs index d7f53fe0a5d..f3681812cec 100644 --- a/src/MongoDB.Libmongocrypt/LibmongocryptExtensionsMethods.cs +++ b/src/MongoDB.Driver.Encryption/LibmongocryptExtensionsMethods.cs @@ -16,11 +16,9 @@ using System.Linq; using System.Security.Cryptography.X509Certificates; using MongoDB.Bson; -using MongoDB.Driver; using MongoDB.Driver.Core.Configuration; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal static class LibmongocryptExtensionsMethods { diff --git a/src/MongoDB.Libmongocrypt/Library.cs b/src/MongoDB.Driver.Encryption/Library.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/Library.cs rename to src/MongoDB.Driver.Encryption/Library.cs index 4f6d1c30f90..6baf1abdad2 100644 --- a/src/MongoDB.Libmongocrypt/Library.cs +++ b/src/MongoDB.Driver.Encryption/Library.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// The low-level interface to libmongocrypt. diff --git a/src/MongoDB.Libmongocrypt/LibraryLoader.cs b/src/MongoDB.Driver.Encryption/LibraryLoader.cs similarity index 99% rename from src/MongoDB.Libmongocrypt/LibraryLoader.cs rename to src/MongoDB.Driver.Encryption/LibraryLoader.cs index 126dc3a2a23..a99ec1e8c4b 100644 --- a/src/MongoDB.Libmongocrypt/LibraryLoader.cs +++ b/src/MongoDB.Driver.Encryption/LibraryLoader.cs @@ -20,7 +20,7 @@ using System.Reflection; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// LibraryLoader abstracts loading C functions from a shared library across OS diff --git a/src/MongoDB.Libmongocrypt/LibraryLoadingException.cs b/src/MongoDB.Driver.Encryption/LibraryLoadingException.cs similarity index 96% rename from src/MongoDB.Libmongocrypt/LibraryLoadingException.cs rename to src/MongoDB.Driver.Encryption/LibraryLoadingException.cs index 0e8a065d7c0..954f8fd6ff2 100644 --- a/src/MongoDB.Libmongocrypt/LibraryLoadingException.cs +++ b/src/MongoDB.Driver.Encryption/LibraryLoadingException.cs @@ -15,7 +15,7 @@ */ using System; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// An exception that indicates that an error occured while loading a library. diff --git a/src/MongoDB.Libmongocrypt/LogLevel.cs b/src/MongoDB.Driver.Encryption/LogLevel.cs similarity index 95% rename from src/MongoDB.Libmongocrypt/LogLevel.cs rename to src/MongoDB.Driver.Encryption/LogLevel.cs index 20144b21b5b..feebe3d3bef 100644 --- a/src/MongoDB.Libmongocrypt/LogLevel.cs +++ b/src/MongoDB.Driver.Encryption/LogLevel.cs @@ -14,7 +14,7 @@ * limitations under the License. */ -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal enum LogLevel { MONGOCRYPT_LOG_LEVEL_FATAL = 0, diff --git a/src/MongoDB.Libmongocrypt/MongoCryptSafeHandle.cs b/src/MongoDB.Driver.Encryption/MongoCryptSafeHandle.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/MongoCryptSafeHandle.cs rename to src/MongoDB.Driver.Encryption/MongoCryptSafeHandle.cs index ab6609e0c5d..557fc8c17dd 100644 --- a/src/MongoDB.Libmongocrypt/MongoCryptSafeHandle.cs +++ b/src/MongoDB.Driver.Encryption/MongoCryptSafeHandle.cs @@ -16,7 +16,7 @@ using System.Runtime.ConstrainedExecution; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// SafeHandle to manage the lifetime of a mongocrypt_t. diff --git a/src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj similarity index 97% rename from src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj rename to src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj index 9fe99f84c5f..77c2546b839 100644 --- a/src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.csproj +++ b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj @@ -2,11 +2,11 @@ true - MongoDB.Libmongocrypt.ruleset + MongoDB.Driver.Encryption.ruleset - MongoDB.Libmongocrypt + MongoDB.Driver.Encryption Libmongocrypt wrapper for the .NET driver. Libmongocrypt wrapper for the .NET driver. false @@ -118,7 +118,7 @@ - + true build diff --git a/src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.ruleset b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.ruleset similarity index 100% rename from src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.ruleset rename to src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.ruleset diff --git a/src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.targets b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets similarity index 100% rename from src/MongoDB.Libmongocrypt/MongoDB.Libmongocrypt.targets rename to src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets diff --git a/src/MongoDB.Libmongocrypt/MongoEncryptionCreateCollectionException.cs b/src/MongoDB.Driver.Encryption/MongoEncryptionCreateCollectionException.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/MongoEncryptionCreateCollectionException.cs rename to src/MongoDB.Driver.Encryption/MongoEncryptionCreateCollectionException.cs index 35a0363296d..7a39c041460 100644 --- a/src/MongoDB.Libmongocrypt/MongoEncryptionCreateCollectionException.cs +++ b/src/MongoDB.Driver.Encryption/MongoEncryptionCreateCollectionException.cs @@ -16,9 +16,8 @@ using System; using System.Runtime.Serialization; using MongoDB.Bson; -using MongoDB.Driver.Encryption; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Represents an encryption exception. diff --git a/src/MongoDB.Libmongocrypt/MongoEncryptionException.cs b/src/MongoDB.Driver.Encryption/MongoEncryptionException.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/MongoEncryptionException.cs rename to src/MongoDB.Driver.Encryption/MongoEncryptionException.cs index d50adf70ef6..ab40ae545fa 100644 --- a/src/MongoDB.Libmongocrypt/MongoEncryptionException.cs +++ b/src/MongoDB.Driver.Encryption/MongoEncryptionException.cs @@ -15,9 +15,8 @@ using System; using System.Runtime.Serialization; -using MongoDB.Driver; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Represents an encryption exception. diff --git a/src/MongoDB.Libmongocrypt/MongocryptdFactory.cs b/src/MongoDB.Driver.Encryption/MongocryptdFactory.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/MongocryptdFactory.cs rename to src/MongoDB.Driver.Encryption/MongocryptdFactory.cs index cd896752178..660aded1e3c 100644 --- a/src/MongoDB.Libmongocrypt/MongocryptdFactory.cs +++ b/src/MongoDB.Driver.Encryption/MongocryptdFactory.cs @@ -18,11 +18,9 @@ using System.Collections.Generic; using System.Diagnostics; using System.IO; -using MongoDB.Driver; using MongoDB.Driver.Core.Events; -using MongoDB.Shared; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal class MongocryptdFactory { diff --git a/src/MongoDB.Libmongocrypt/OperatingSystemHelper.cs b/src/MongoDB.Driver.Encryption/OperatingSystemHelper.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/OperatingSystemHelper.cs rename to src/MongoDB.Driver.Encryption/OperatingSystemHelper.cs index 8afd12e535e..12aec3204da 100644 --- a/src/MongoDB.Libmongocrypt/OperatingSystemHelper.cs +++ b/src/MongoDB.Driver.Encryption/OperatingSystemHelper.cs @@ -16,7 +16,7 @@ using System; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal enum OperatingSystemPlatform { diff --git a/src/MongoDB.Libmongocrypt/PinnedBinary.cs b/src/MongoDB.Driver.Encryption/PinnedBinary.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/PinnedBinary.cs rename to src/MongoDB.Driver.Encryption/PinnedBinary.cs index f63e42ed5ba..1456951f8d8 100644 --- a/src/MongoDB.Libmongocrypt/PinnedBinary.cs +++ b/src/MongoDB.Driver.Encryption/PinnedBinary.cs @@ -16,7 +16,7 @@ using System; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A handle to a binary that must be either in unsafe code or pinned by the GC. diff --git a/src/MongoDB.Libmongocrypt/RewrapManyDataKeyOptions.cs b/src/MongoDB.Driver.Encryption/RewrapManyDataKeyOptions.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/RewrapManyDataKeyOptions.cs rename to src/MongoDB.Driver.Encryption/RewrapManyDataKeyOptions.cs index 98fc43fdb04..ac8bcc1cfd1 100644 --- a/src/MongoDB.Libmongocrypt/RewrapManyDataKeyOptions.cs +++ b/src/MongoDB.Driver.Encryption/RewrapManyDataKeyOptions.cs @@ -14,10 +14,9 @@ */ using MongoDB.Bson; -using MongoDB.Driver; using MongoDB.Driver.Core.Misc; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Rewrap many data keys options. diff --git a/src/MongoDB.Libmongocrypt/RewrapManyDataKeyResult.cs b/src/MongoDB.Driver.Encryption/RewrapManyDataKeyResult.cs similarity index 95% rename from src/MongoDB.Libmongocrypt/RewrapManyDataKeyResult.cs rename to src/MongoDB.Driver.Encryption/RewrapManyDataKeyResult.cs index 4dae2175490..c594f6d9203 100644 --- a/src/MongoDB.Libmongocrypt/RewrapManyDataKeyResult.cs +++ b/src/MongoDB.Driver.Encryption/RewrapManyDataKeyResult.cs @@ -13,9 +13,7 @@ * limitations under the License. */ -using MongoDB.Driver; - -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// Rewrap many data keys result. diff --git a/src/MongoDB.Libmongocrypt/SecureRandomCallback.cs b/src/MongoDB.Driver.Encryption/SecureRandomCallback.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/SecureRandomCallback.cs rename to src/MongoDB.Driver.Encryption/SecureRandomCallback.cs index caf1bb04989..35bd949d5c9 100644 --- a/src/MongoDB.Libmongocrypt/SecureRandomCallback.cs +++ b/src/MongoDB.Driver.Encryption/SecureRandomCallback.cs @@ -17,7 +17,7 @@ using System; using System.Security.Cryptography; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal static class SecureRandomCallback { diff --git a/src/MongoDB.Libmongocrypt/SigningRSAESPKCSCallback.cs b/src/MongoDB.Driver.Encryption/SigningRSAESPKCSCallback.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/SigningRSAESPKCSCallback.cs rename to src/MongoDB.Driver.Encryption/SigningRSAESPKCSCallback.cs index d7882022b8d..62401350732 100644 --- a/src/MongoDB.Libmongocrypt/SigningRSAESPKCSCallback.cs +++ b/src/MongoDB.Driver.Encryption/SigningRSAESPKCSCallback.cs @@ -17,7 +17,7 @@ using System; using System.Security.Cryptography; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { internal static class SigningRSAESPKCSCallback { diff --git a/src/MongoDB.Libmongocrypt/Status.cs b/src/MongoDB.Driver.Encryption/Status.cs similarity index 98% rename from src/MongoDB.Libmongocrypt/Status.cs rename to src/MongoDB.Driver.Encryption/Status.cs index 080f7f651a6..cad6a1e8b6a 100644 --- a/src/MongoDB.Libmongocrypt/Status.cs +++ b/src/MongoDB.Driver.Encryption/Status.cs @@ -17,7 +17,7 @@ using System; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// A LibMongoCrypt Status diff --git a/src/MongoDB.Libmongocrypt/StatusSafeHandle.cs b/src/MongoDB.Driver.Encryption/StatusSafeHandle.cs similarity index 97% rename from src/MongoDB.Libmongocrypt/StatusSafeHandle.cs rename to src/MongoDB.Driver.Encryption/StatusSafeHandle.cs index 50ecc3c1bab..b99cabc819f 100644 --- a/src/MongoDB.Libmongocrypt/StatusSafeHandle.cs +++ b/src/MongoDB.Driver.Encryption/StatusSafeHandle.cs @@ -18,7 +18,7 @@ using System.Runtime.ConstrainedExecution; using System.Runtime.InteropServices; -namespace MongoDB.Libmongocrypt +namespace MongoDB.Driver.Encryption { /// /// SafeHandle to manage the lifetime of a mongocrypt_status_t. diff --git a/tests/MongoDB.Libmongocrypt.Tests/BasicTests.cs b/tests/MongoDB.Driver.Encryption.Tests/BasicTests.cs similarity index 99% rename from tests/MongoDB.Libmongocrypt.Tests/BasicTests.cs rename to tests/MongoDB.Driver.Encryption.Tests/BasicTests.cs index 12178ea8830..794d9927693 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/BasicTests.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/BasicTests.cs @@ -26,7 +26,7 @@ using Xunit.Abstractions; using MongoDB.TestHelpers.XunitExtensions; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { public class BasicTests { diff --git a/tests/MongoDB.Libmongocrypt.Tests/BsonUtil.cs b/tests/MongoDB.Driver.Encryption.Tests/BsonUtil.cs similarity index 98% rename from tests/MongoDB.Libmongocrypt.Tests/BsonUtil.cs rename to tests/MongoDB.Driver.Encryption.Tests/BsonUtil.cs index dced1295032..5706a029702 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/BsonUtil.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/BsonUtil.cs @@ -20,7 +20,7 @@ using MongoDB.Bson.Serialization.Serializers; using System.IO; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { class BsonUtil { diff --git a/tests/MongoDB.Libmongocrypt.Tests/CallbackUtils.cs b/tests/MongoDB.Driver.Encryption.Tests/CallbackUtils.cs similarity index 96% rename from tests/MongoDB.Libmongocrypt.Tests/CallbackUtils.cs rename to tests/MongoDB.Driver.Encryption.Tests/CallbackUtils.cs index ff28bcf6059..80dacbe3bc1 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/CallbackUtils.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/CallbackUtils.cs @@ -16,7 +16,7 @@ using System; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { internal static class CallbackUtils { diff --git a/tests/MongoDB.Libmongocrypt.Tests/CipherCallbacksTests.cs b/tests/MongoDB.Driver.Encryption.Tests/CipherCallbacksTests.cs similarity index 97% rename from tests/MongoDB.Libmongocrypt.Tests/CipherCallbacksTests.cs rename to tests/MongoDB.Driver.Encryption.Tests/CipherCallbacksTests.cs index 5e5d858f867..a93c85139bf 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/CipherCallbacksTests.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/CipherCallbacksTests.cs @@ -18,7 +18,7 @@ using System.Security.Cryptography; using Xunit; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { public class CipherCallbacksTests { diff --git a/tests/MongoDB.Libmongocrypt.Tests/HashCallbackTests.cs b/tests/MongoDB.Driver.Encryption.Tests/HashCallbackTests.cs similarity index 96% rename from tests/MongoDB.Libmongocrypt.Tests/HashCallbackTests.cs rename to tests/MongoDB.Driver.Encryption.Tests/HashCallbackTests.cs index dd926954464..1b011b6f7c1 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/HashCallbackTests.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/HashCallbackTests.cs @@ -17,7 +17,7 @@ using FluentAssertions; using Xunit; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { public class HashCallbackTests { diff --git a/tests/MongoDB.Libmongocrypt.Tests/HmacShaCallbacksTests.cs b/tests/MongoDB.Driver.Encryption.Tests/HmacShaCallbacksTests.cs similarity index 97% rename from tests/MongoDB.Libmongocrypt.Tests/HmacShaCallbacksTests.cs rename to tests/MongoDB.Driver.Encryption.Tests/HmacShaCallbacksTests.cs index fb301594f58..929edd75e46 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/HmacShaCallbacksTests.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/HmacShaCallbacksTests.cs @@ -17,7 +17,7 @@ using FluentAssertions; using Xunit; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { public class HmacShaCallbacksTests { diff --git a/tests/MongoDB.Libmongocrypt.Tests/MongoDB.Libmongocrypt.Tests.csproj b/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj similarity index 91% rename from tests/MongoDB.Libmongocrypt.Tests/MongoDB.Libmongocrypt.Tests.csproj rename to tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj index e390c0271bb..e909f69909e 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/MongoDB.Libmongocrypt.Tests.csproj +++ b/tests/MongoDB.Driver.Encryption.Tests/MongoDB.Driver.Encryption.Tests.csproj @@ -27,7 +27,7 @@ - + diff --git a/tests/MongoDB.Libmongocrypt.Tests/SigningRSAESPKCSCallbackTests.cs b/tests/MongoDB.Driver.Encryption.Tests/SigningRSAESPKCSCallbackTests.cs similarity index 98% rename from tests/MongoDB.Libmongocrypt.Tests/SigningRSAESPKCSCallbackTests.cs rename to tests/MongoDB.Driver.Encryption.Tests/SigningRSAESPKCSCallbackTests.cs index 9092151a179..a578c51f38a 100644 --- a/tests/MongoDB.Libmongocrypt.Tests/SigningRSAESPKCSCallbackTests.cs +++ b/tests/MongoDB.Driver.Encryption.Tests/SigningRSAESPKCSCallbackTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using Xunit; -namespace MongoDB.Libmongocrypt.Tests +namespace MongoDB.Driver.Encryption.Tests { public class SigningRSAESPKCSCallbackTests { diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/cmd.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/cmd.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/cmd.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/cmd.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/collection-info.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/collection-info.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/collection-info.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/collection-info.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/command-reply.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/command-reply.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/command-reply.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/command-reply.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-command-reply.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-command-reply.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-command-reply.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-command-reply.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-command.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-command.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-command.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-command.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-value.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-value.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/encrypted-value.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/encrypted-value.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/key-document.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/key-document.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/key-document.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/key-document.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/key-filter.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/key-filter.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/key-filter.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/key-filter.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/kms-decrypt-reply.txt b/tests/MongoDB.Driver.Encryption.Tests/test/example/kms-decrypt-reply.txt similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/kms-decrypt-reply.txt rename to tests/MongoDB.Driver.Encryption.Tests/test/example/kms-decrypt-reply.txt diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/kms-encrypt-reply.txt b/tests/MongoDB.Driver.Encryption.Tests/test/example/kms-encrypt-reply.txt similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/kms-encrypt-reply.txt rename to tests/MongoDB.Driver.Encryption.Tests/test/example/kms-encrypt-reply.txt diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/list-collections-filter.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/list-collections-filter.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/list-collections-filter.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/list-collections-filter.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/mongocryptd-command.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/mongocryptd-command.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/mongocryptd-command.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/mongocryptd-command.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/test/example/mongocryptd-reply.json b/tests/MongoDB.Driver.Encryption.Tests/test/example/mongocryptd-reply.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/test/example/mongocryptd-reply.json rename to tests/MongoDB.Driver.Encryption.Tests/test/example/mongocryptd-reply.json diff --git a/tests/MongoDB.Libmongocrypt.Tests/xunit.runner.json b/tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json similarity index 100% rename from tests/MongoDB.Libmongocrypt.Tests/xunit.runner.json rename to tests/MongoDB.Driver.Encryption.Tests/xunit.runner.json diff --git a/tests/MongoDB.Driver.Examples/ClientEncryptionExamples.cs b/tests/MongoDB.Driver.Examples/ClientEncryptionExamples.cs index 9332f3b47a0..852a6c3c2ba 100644 --- a/tests/MongoDB.Driver.Examples/ClientEncryptionExamples.cs +++ b/tests/MongoDB.Driver.Examples/ClientEncryptionExamples.cs @@ -20,7 +20,6 @@ using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; using MongoDB.TestHelpers.XunitExtensions; using Xunit; using Xunit.Abstractions; diff --git a/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs b/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs index 47638817c14..5dc3cc5848d 100644 --- a/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs +++ b/tests/MongoDB.Driver.Examples/ClientSideEncryption2Examples.cs @@ -23,7 +23,6 @@ using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; using MongoDB.Driver.Tests; -using MongoDB.Libmongocrypt; using MongoDB.TestHelpers.XunitExtensions; using Xunit; diff --git a/tests/MongoDB.Driver.Examples/ExplicitEncryptionExamples.cs b/tests/MongoDB.Driver.Examples/ExplicitEncryptionExamples.cs index eb982ebbc9a..40bf939ebb5 100644 --- a/tests/MongoDB.Driver.Examples/ExplicitEncryptionExamples.cs +++ b/tests/MongoDB.Driver.Examples/ExplicitEncryptionExamples.cs @@ -20,8 +20,6 @@ using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; -using MongoDB.Driver.Tests; -using MongoDB.Libmongocrypt; using MongoDB.TestHelpers.XunitExtensions; using Xunit; using Xunit.Abstractions; diff --git a/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj b/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj index 1715973a118..e218a6436a0 100644 --- a/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj +++ b/tests/MongoDB.Driver.Examples/MongoDB.Driver.Examples.csproj @@ -26,7 +26,7 @@ - + diff --git a/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs b/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs index 9ad76c83d39..89ced0d68c0 100644 --- a/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs +++ b/tests/MongoDB.Driver.TestHelpers/DriverTestConfiguration.cs @@ -26,7 +26,7 @@ using MongoDB.Driver.Core.Logging; using MongoDB.Driver.Core.Servers; using MongoDB.Driver.TestHelpers; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; namespace MongoDB.Driver.Tests { diff --git a/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj b/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj index fb6d73c1991..491068dd8bd 100644 --- a/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj +++ b/tests/MongoDB.Driver.TestHelpers/MongoDB.Driver.TestHelpers.csproj @@ -20,7 +20,7 @@ - + diff --git a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionOptionsTests.cs b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionOptionsTests.cs index 7c7b635f56c..841dd03a007 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionOptionsTests.cs @@ -17,7 +17,6 @@ using System.Collections.Generic; using FluentAssertions; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs index 9db824df772..eff917b3d9d 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/ClientEncryptionTests.cs @@ -28,9 +28,8 @@ using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; -using MongoDB.Driver.Encryption; using MongoDB.Driver.Tests.Specifications.client_side_encryption; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; using MongoDB.TestHelpers.XunitExtensions; using Moq; using Xunit; diff --git a/tests/MongoDB.Driver.Tests/Encryption/EncryptOptionsTests.cs b/tests/MongoDB.Driver.Tests/Encryption/EncryptOptionsTests.cs index 27b133d2930..77c0d4e8d89 100644 --- a/tests/MongoDB.Driver.Tests/Encryption/EncryptOptionsTests.cs +++ b/tests/MongoDB.Driver.Tests/Encryption/EncryptOptionsTests.cs @@ -16,7 +16,6 @@ using System; using FluentAssertions; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; using Xunit; namespace MongoDB.Driver.Tests.Encryption diff --git a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj index f52c103eae1..fe6c083808d 100644 --- a/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj +++ b/tests/MongoDB.Driver.Tests/MongoDB.Driver.Tests.csproj @@ -40,7 +40,7 @@ - + diff --git a/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs b/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs index 6b180929888..a6968a30875 100644 --- a/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs +++ b/tests/MongoDB.Driver.Tests/MongocryptdFactoryTests.cs @@ -19,7 +19,7 @@ using FluentAssertions; using MongoDB.Bson; using MongoDB.Bson.TestHelpers; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; using Xunit; namespace MongoDB.Driver.Tests diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/EncryptionTestHelper.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/EncryptionTestHelper.cs index 70fe3347dcc..f91f1d89b03 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/EncryptionTestHelper.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/EncryptionTestHelper.cs @@ -25,7 +25,6 @@ using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; using MongoDB.Driver.TestHelpers; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.Specifications.client_side_encryption { diff --git a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs index 8982498c5bb..de8b60bce07 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/client-side-encryption/prose-tests/ClientEncryptionProseTests.cs @@ -43,7 +43,6 @@ using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.Encryption; using MongoDB.Driver.TestHelpers; -using MongoDB.Libmongocrypt; using MongoDB.TestHelpers.XunitExtensions; using Xunit; using Xunit.Abstractions; diff --git a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs index 64d0df4a77c..d2e776f9ee0 100644 --- a/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs +++ b/tests/MongoDB.Driver.Tests/Specifications/sessions/SessionsProseTests.cs @@ -26,7 +26,7 @@ using MongoDB.Driver.Core.TestHelpers.Logging; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; using MongoDB.Driver.TestHelpers; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; using MongoDB.TestHelpers.XunitExtensions; using Xunit; using Xunit.Abstractions; diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedAddKeyAltNameOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedAddKeyAltNameOperation.cs index 157794f6764..7c55a2c8435 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedAddKeyAltNameOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedAddKeyAltNameOperation.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver.Core.Misc; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedCreateDataKeyOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedCreateDataKeyOperation.cs index 387896ba9b4..2dca756b767 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedCreateDataKeyOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedCreateDataKeyOperation.cs @@ -20,7 +20,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDecryptOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDecryptOperation.cs index 3b7ef757e63..dabf57145cb 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDecryptOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDecryptOperation.cs @@ -18,7 +18,7 @@ using System.Threading.Tasks; using MongoDB.Bson; using MongoDB.Driver.Core.Misc; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDeleteKeyOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDeleteKeyOperation.cs index 25693952dfc..3e4f0d2cb8f 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDeleteKeyOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedDeleteKeyOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEncryptOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEncryptOperation.cs index 65b12c17bd1..df4ba7ec593 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEncryptOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEncryptOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEntityMap.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEntityMap.cs index 017b6bbdbb0..210af3f0a87 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEntityMap.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedEntityMap.cs @@ -28,11 +28,10 @@ using MongoDB.Driver.Core.Servers; using MongoDB.Driver.Core.TestHelpers; using MongoDB.Driver.Core.TestHelpers.XunitExtensions; -using MongoDB.Driver.Encryption; using MongoDB.Driver.GridFS; using MongoDB.Driver.TestHelpers; using MongoDB.Driver.Tests.Specifications.client_side_encryption; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; using LogLevel = Microsoft.Extensions.Logging.LogLevel; namespace MongoDB.Driver.Tests.UnifiedTestOperations diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyByAltNameOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyByAltNameOperation.cs index 07aa06de940..dbe33847fc8 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyByAltNameOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyByAltNameOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyOperation.cs index fff45732bc1..c647ddff8c4 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeyOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeysOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeysOperation.cs index b5121fb881b..d83f2c385ad 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeysOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedGetKeysOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRemoveKeyAltNameOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRemoveKeyAltNameOperation.cs index d80c0fac29b..900dda2e8e3 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRemoveKeyAltNameOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRemoveKeyAltNameOperation.cs @@ -19,7 +19,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRewrapManyDataKeyOperation.cs b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRewrapManyDataKeyOperation.cs index dd78f0ec55d..1b2b2b16452 100644 --- a/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRewrapManyDataKeyOperation.cs +++ b/tests/MongoDB.Driver.Tests/UnifiedTestOperations/UnifiedRewrapManyDataKeyOperation.cs @@ -20,7 +20,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Misc; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; namespace MongoDB.Driver.Tests.UnifiedTestOperations { diff --git a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/InfrastructureUtilities.cs b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/InfrastructureUtilities.cs index 29ea3d19f79..f76b16ef3aa 100644 --- a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/InfrastructureUtilities.cs +++ b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/InfrastructureUtilities.cs @@ -21,7 +21,7 @@ using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.Logging; -using MongoDB.Libmongocrypt; +using MongoDB.Driver.Encryption; namespace MongoDB.Driver.SmokeTests.Sdk { diff --git a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/LibmongocryptTests.cs b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/LibmongocryptTests.cs index 3ed3092cafd..839e5290271 100644 --- a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/LibmongocryptTests.cs +++ b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/LibmongocryptTests.cs @@ -20,7 +20,6 @@ using MongoDB.Bson; using MongoDB.Driver.Core.Configuration; using MongoDB.Driver.Encryption; -using MongoDB.Libmongocrypt; using Xunit; using Xunit.Abstractions; diff --git a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj index 7b0bf54b2ee..d95ab30a7a3 100644 --- a/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj +++ b/tests/SmokeTests/MongoDB.Driver.SmokeTests.Sdk/MongoDB.Driver.SmokeTests.Sdk.csproj @@ -16,9 +16,9 @@ - + - +