CSHARP-5313: rename libmongocrypt project (mongodb#1483)

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

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
 {

benchmarks/MongoDB.Driver.Benchmarks/MongoDB.Driver.Benchmarks.csproj

@@ -31,7 +31,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\MongoDB.Driver\MongoDB.Driver.csproj" />
-    <ProjectReference Include="..\..\src\MongoDB.Libmongocrypt\MongoDB.Libmongocrypt.csproj" />
+    <ProjectReference Include="..\..\src\MongoDB.Driver.Encryption\MongoDB.Driver.Encryption.csproj" />
     <ProjectReference Include="..\..\tests\MongoDB.Driver.TestHelpers\MongoDB.Driver.TestHelpers.csproj" />
   </ItemGroup>
 </Project>

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);
 

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:

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

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"

src/MongoDB.Libmongocrypt/AssemblyInfo.cs → 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")]

src/MongoDB.Libmongocrypt/AutoEncryptionLibMongoController.cs → 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
     {

src/MongoDB.Libmongocrypt/Binary.cs → src/MongoDB.Driver.Encryption/Binary.cs

@@ -18,7 +18,7 @@
 using System.IO;
 using System.Runtime.InteropServices;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// A pointer and length pair the contains raw bytes to pass or retrieve from libmongocrypt.

src/MongoDB.Libmongocrypt/BinarySafeHandle.cs → 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
 {
     /// <summary>
     /// SafeHandle to manage the lifetime of a mongocrypt_binary_t.

src/MongoDB.Libmongocrypt/CheckableSafeHandle.cs → 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
 {
     /// <summary>
     /// SafeHandle to manage the lifetime of a mongocrypt_ctx_t.

src/MongoDB.Libmongocrypt/CipherCallbacks.cs → 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
     {

src/MongoDB.Libmongocrypt/ClientEncryption.cs → 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
 {
     /// <summary>
     /// Explicit client encryption.

src/MongoDB.Libmongocrypt/ClientEncryptionOptions.cs → 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
 {
     /// <summary>
     /// Client encryption options.

src/MongoDB.Libmongocrypt/ContextSafeHandle.cs → src/MongoDB.Driver.Encryption/ContextSafeHandle.cs

@@ -16,7 +16,7 @@
 
 using System.Runtime.ConstrainedExecution;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// SafeHandle to manage the lifetime of a mongocrypt_ctx_t.

src/MongoDB.Libmongocrypt/CreateEncryptedCollectionResult.cs → src/MongoDB.Driver.Encryption/CreateEncryptedCollectionResult.cs

@@ -15,7 +15,7 @@
 
 using MongoDB.Bson;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Represents the result of a create encrypted collection.

src/MongoDB.Libmongocrypt/CryptClient.cs → src/MongoDB.Driver.Encryption/CryptClient.cs

@@ -17,7 +17,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// CryptClient represents a session with libmongocrypt.

src/MongoDB.Libmongocrypt/CryptClientFactory.cs → 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
 {
     /// <summary>
     /// A factory for CryptClients.

src/MongoDB.Libmongocrypt/CryptContext.cs → src/MongoDB.Driver.Encryption/CryptContext.cs

@@ -17,7 +17,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// A encryption or decryption session. It may not be reused.

src/MongoDB.Libmongocrypt/CryptException.cs → src/MongoDB.Driver.Encryption/CryptException.cs

@@ -16,7 +16,7 @@
 
 using System;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// An exception from libmongocrypt.

src/MongoDB.Libmongocrypt/CryptOptions.cs → src/MongoDB.Driver.Encryption/CryptOptions.cs

@@ -19,7 +19,7 @@
 using System.Collections.ObjectModel;
 using System.Linq;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Options to configure mongocrypt with.

src/MongoDB.Libmongocrypt/DataKeyOptions.cs → 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
 {
     /// <summary>
     /// Options for creating a data key.

src/MongoDB.Libmongocrypt/EncryptOptions.cs → 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
 {
     /// <summary>
     /// Range options.

src/MongoDB.Libmongocrypt/EncryptionAlgorithm.cs → src/MongoDB.Driver.Encryption/EncryptionAlgorithm.cs

@@ -13,7 +13,7 @@
 * limitations under the License.
 */
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Represents an encryption algorithm.

src/MongoDB.Libmongocrypt/ExplicitEncryptionLibMongoCryptController.cs → 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
     {

src/MongoDB.Libmongocrypt/ExtensionManagerExtensions.cs → src/MongoDB.Driver.Encryption/ExtensionManagerExtensions.cs

@@ -13,9 +13,7 @@
  * limitations under the License.
  */
 
-using MongoDB.Driver;
-
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// IExtensionManager extensions.

src/MongoDB.Libmongocrypt/HashCallback.cs → 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
     {

src/MongoDB.Libmongocrypt/HmacShaCallbacks.cs → 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
     {

src/MongoDB.Libmongocrypt/IStatus.cs → src/MongoDB.Driver.Encryption/IStatus.cs

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Interface for checking the status of the various libmongocrypt options.

src/MongoDB.Libmongocrypt/KmsCredentials.cs → src/MongoDB.Driver.Encryption/KmsCredentials.cs

@@ -16,7 +16,7 @@
 
 using System;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// KMS Credentials.

src/MongoDB.Libmongocrypt/KmsKeyId.cs → src/MongoDB.Driver.Encryption/KmsKeyId.cs

@@ -17,7 +17,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Represent a kms key.

src/MongoDB.Libmongocrypt/KmsRequest.cs → src/MongoDB.Driver.Encryption/KmsRequest.cs

@@ -17,7 +17,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// Contains a KMS request to make to a remote server.

src/MongoDB.Libmongocrypt/KmsRequestCollection.cs → src/MongoDB.Driver.Encryption/KmsRequestCollection.cs

@@ -17,7 +17,7 @@
 using System.Collections;
 using System.Collections.Generic;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// A collection of kms requests to make.

src/MongoDB.Libmongocrypt/LibMongoCryptControllerBase.cs → 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
     {

src/MongoDB.Libmongocrypt/LibmongocryptExtensionsMethods.cs → 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
     {

src/MongoDB.Libmongocrypt/Library.cs → src/MongoDB.Driver.Encryption/Library.cs

@@ -17,7 +17,7 @@
 using System;
 using System.Runtime.InteropServices;
 
-namespace MongoDB.Libmongocrypt
+namespace MongoDB.Driver.Encryption
 {
     /// <summary>
     /// The low-level interface to libmongocrypt.