Skip to content

Commit efcbc44

Browse files
adelinowonaadelinowona
authored
CSHARP-5313: rename libmongocrypt project (#1483)
1 parent 033aa5d commit efcbc44

File tree

105 files changed

+82
-125
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+82
-125
lines changed

‎CSharpDriver.sln‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "FaasTests", "FaasTests", "{
5454
EndProject
5555
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MongoDB.Driver.LambdaTest", "tests\FaasTests\LambdaTests\MongoDB.Driver.LambdaTest\MongoDB.Driver.LambdaTest.csproj", "{33B11279-DA4A-46EA-99BF-9DEDCAC50D95}"
5656
EndProject
57-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Libmongocrypt", "src\MongoDB.Libmongocrypt\MongoDB.Libmongocrypt.csproj", "{642518BC-D28A-4ABC-851C-BC18CC34EEDA}"
57+
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Driver.Encryption", "src\MongoDB.Driver.Encryption\MongoDB.Driver.Encryption.csproj", "{642518BC-D28A-4ABC-851C-BC18CC34EEDA}"
5858
EndProject
59-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MongoDB.Libmongocrypt.Tests", "tests\MongoDB.Libmongocrypt.Tests\MongoDB.Libmongocrypt.Tests.csproj", "{AB4AD0CB-756C-444F-9F37-26DA35148934}"
59+
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}"
6060
EndProject
6161
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}"
6262
EndProject

‎benchmarks/MongoDB.Driver.Benchmarks/LibmongocryptBindingBenchmark.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222
using MongoDB.Driver;
2323
using MongoDB.Driver.Encryption;
2424
using MongoDB.Driver.TestHelpers;
25-
using MongoDB.Libmongocrypt;
2625

2726
namespace MongoDB.Benchmarks
2827
{

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131

3232
<ItemGroup>
3333
<ProjectReference Include="..\..\src\MongoDB.Driver\MongoDB.Driver.csproj" />
34-
<ProjectReference Include="..\..\src\MongoDB.Libmongocrypt\MongoDB.Libmongocrypt.csproj" />
34+
<ProjectReference Include="..\..\src\MongoDB.Driver.Encryption\MongoDB.Driver.Encryption.csproj" />
3535
<ProjectReference Include="..\..\tests\MongoDB.Driver.TestHelpers\MongoDB.Driver.TestHelpers.csproj" />
3636
</ItemGroup>
3737
</Project>

‎build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ Task("PackageNugetPackages")
285285
{
286286
"MongoDB.Bson",
287287
"MongoDB.Driver",
288-
"MongoDB.Libmongocrypt"
288+
"MongoDB.Driver.Encryption"
289289
};
290290

291291
foreach (var project in projects)
@@ -365,7 +365,7 @@ Task("SmokeTests")
365365

366366
DotNetTool(
367367
testProject.FullPath,
368-
"add package MongoDB.Libmongocrypt",
368+
"add package MongoDB.Driver.Encryption",
369369
$"--no-restore --version [{buildConfig.PackageVersion}]",
370370
toolSettings);
371371

‎evergreen/evergreen.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -944,8 +944,8 @@ functions:
944944
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.${PACKAGE_VERSION}.snupkg"
945945
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.nupkg"
946946
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Authentication.AWS.${PACKAGE_VERSION}.snupkg"
947-
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg"
948-
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg"
947+
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg"
948+
- "mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg"
949949

950950
cleanup:
951951
- command: shell.exec
@@ -1111,15 +1111,15 @@ functions:
11111111
params:
11121112
aws_key: ${aws_key}
11131113
aws_secret: ${aws_secret}
1114-
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg
1115-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.nupkg
1114+
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg
1115+
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.nupkg
11161116
bucket: mciuploads
11171117
- command: s3.get
11181118
params:
11191119
aws_key: ${aws_key}
11201120
aws_secret: ${aws_secret}
1121-
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg
1122-
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Libmongocrypt.${PACKAGE_VERSION}.snupkg
1121+
local_file: mongo-csharp-driver/artifacts/nuget/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg
1122+
remote_file: ${UPLOAD_BUCKET}/${revision}/MongoDB.Driver.Encryption.${PACKAGE_VERSION}.snupkg
11231123
bucket: mciuploads
11241124

11251125
build-apidocs:

‎evergreen/export-libmongocrypt-path.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ set -o errexit # Exit the script with error if any of the commands fail
55
# Environment variables used as input:
66
# OS The current operating system
77

8-
LIBMONGOCRYPT_DIR="$(pwd)/src/MongoDB.Libmongocrypt"
8+
LIBMONGOCRYPT_DIR="$(pwd)/src/MongoDB.Driver.Encryption"
99

1010
# export the LIBMONGOCRYPT_PATH variable based on OS
1111
if [[ "$OS" =~ Ubuntu|ubuntu ]]; then

‎evergreen/push-packages.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ if [ "$PACKAGES_SOURCE" = "https://api.nuget.org/v3/index.json" ] && [[ ! "$PACK
5555
exit 1
5656
fi
5757

58-
PACKAGES=("MongoDB.Bson" "MongoDB.Driver" "MongoDB.Driver.Authentication.AWS" "MongoDB.Libmongocrypt")
58+
PACKAGES=("MongoDB.Bson" "MongoDB.Driver" "MongoDB.Driver.Authentication.AWS" "MongoDB.Driver.Encryption")
5959

6060
for package in ${PACKAGES[*]}; do
6161
dotnet nuget verify ./artifacts/nuget/"$package"."$PACKAGE_VERSION".nupkg --certificate-fingerprint "$NUGET_SIGN_CERTIFICATE_FINGERPRINT"

‎src/MongoDB.Libmongocrypt/AssemblyInfo.cs‎ renamed to ‎src/MongoDB.Driver.Encryption/AssemblyInfo.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
using System.Runtime.CompilerServices;
22

3-
[assembly: InternalsVisibleTo("MongoDB.Libmongocrypt.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
3+
[assembly: InternalsVisibleTo("MongoDB.Driver.Encryption.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]
44
[assembly: InternalsVisibleTo("MongoDB.Driver.Tests, PublicKey=002400000480000094000000060200000024000052534131000400000100010035287f0d3883c0a075c88e0cda3ce93b621003ecbd5e920d4a8c7238564f4d2f4f68116aca28c9b21341dc3a877679c14556192b2b2f5fe2c11d624e0894d308ff7b94bf6fd72aef1b41017ffe2572e99019d1c61963e68cd0ed67734a42cb333b808e3867cbe631937214e32e409fb1fa62fdb69d494c2530e64a40e417d6ee")]

‎src/MongoDB.Libmongocrypt/AutoEncryptionLibMongoController.cs‎ renamed to ‎src/MongoDB.Driver.Encryption/AutoEncryptionLibMongoController.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,9 @@
1919
using System.Threading;
2020
using System.Threading.Tasks;
2121
using MongoDB.Bson;
22-
using MongoDB.Driver;
2322
using MongoDB.Driver.Core.Servers;
24-
using MongoDB.Driver.Encryption;
2523

26-
namespace MongoDB.Libmongocrypt
24+
namespace MongoDB.Driver.Encryption
2725
{
2826
internal sealed class AutoEncryptionLibMongoCryptController : LibMongoCryptControllerBase, IAutoEncryptionLibMongoCryptController
2927
{

‎src/MongoDB.Libmongocrypt/Binary.cs‎ renamed to ‎src/MongoDB.Driver.Encryption/Binary.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
using System.IO;
1919
using System.Runtime.InteropServices;
2020

21-
namespace MongoDB.Libmongocrypt
21+
namespace MongoDB.Driver.Encryption
2222
{
2323
/// <summary>
2424
/// A pointer and length pair the contains raw bytes to pass or retrieve from libmongocrypt.

0 commit comments

Comments
 (0)