diff --git a/src/MongoDB.Driver.Encryption/LibraryLoader.cs b/src/MongoDB.Driver.Encryption/LibraryLoader.cs
index a99ec1e8c4b..b617fdeae99 100644
--- a/src/MongoDB.Driver.Encryption/LibraryLoader.cs
+++ b/src/MongoDB.Driver.Encryption/LibraryLoader.cs
@@ -181,11 +181,11 @@ static LinuxLibrary()
var osArchitecture = RuntimeInformation.OSArchitecture.ToString().ToLower();
#pragma warning restore CA1304
- var finalpath = IsAlpine() ? $"alpine/{osArchitecture}" : $"{osArchitecture}";
+ var runtimeSuffix = IsAlpine() ? $"musl-{osArchitecture}" : $"{osArchitecture}";
__suffixPaths = new []{
- $"../../runtimes/linux/native/{finalpath}",
- $"runtimes/linux/native/{finalpath}",
+ $"../../runtimes/linux-{runtimeSuffix}/native/",
+ $"runtimes/linux-{runtimeSuffix}/native/",
string.Empty
};
@@ -246,8 +246,8 @@ private class WindowsLibrary : ISharedLibraryLoader
{
private static readonly string[] __suffixPaths =
{
- @"..\..\runtimes\win\native\",
- @".\runtimes\win\native\",
+ @"..\..\runtimes\win-x64\native\",
+ @".\runtimes\win-x64\native\",
string.Empty
};
diff --git a/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj
index 5c2a90e15bc..26212166925 100644
--- a/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj
+++ b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.csproj
@@ -14,16 +14,15 @@
- r1.15
- 059d538126eb2a1cd90103147bc9b1be0d46de92
+ r1.15/2807bca63631a5b6b8affcb7f4402e351166659e
+ BeforeTargets="BeforeBuild" Condition="!Exists('$(MSBuildProjectDirectory)/$(LibMongoCryptVersionPath)/runtimes/osx/native/libmongocrypt.dylib')">
- https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/macos/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
lib/libmongocrypt.dylib
- runtimes/osx/native
+ $(LibMongoCryptVersionPath)/runtimes/osx/native
-
+
- https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
nocrypto/lib/libmongocrypt.so
- runtimes/linux/native/x64
+ $(LibMongoCryptVersionPath)/runtimes/linux-x64/native/
-
+
- https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/ubuntu1804-arm64/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
nocrypto/lib/libmongocrypt.so
- runtimes/linux/native/arm64
+ $(LibMongoCryptVersionPath)/runtimes/linux-arm64/native/
-
+
+
+
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-amd64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
+ nocrypto/lib/libmongocrypt.so
+ $(LibMongoCryptVersionPath)/runtimes/linux-musl-x64/native/
+
+
+
+
+
+
- https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/alpine-arm64-earthly/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
nocrypto/lib/libmongocrypt.so
- runtimes/linux/native/alpine
+ $(LibMongoCryptVersionPath)/runtimes/linux-musl-arm64/native/
-
+
- https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/$(LibMongoCryptVersion)/$(LibMongoCryptCommit)/libmongocrypt.tar.gz
+ https://mciuploads.s3.amazonaws.com/libmongocrypt-release/windows-test/$(LibMongoCryptVersionPath)/libmongocrypt.tar.gz
bin/mongocrypt.dll
- runtimes/win/native
+ $(LibMongoCryptVersionPath)/runtimes/win-x64/native
-
- Always
+
+ PreserveNewest
+ runtimes\osx\native\libmongocrypt.dylib
true
runtimes\osx\native
-
- Always
+
+ PreserveNewest
+ runtimes\linux-x64\native\libmongocrypt.so
+ true
+ runtimes\linux-x64\native
+
+
+
+ PreserveNewest
+ runtimes\linux-arm64\native\libmongocrypt.so
true
- runtimes\linux\native\x64
+ runtimes\linux-arm64\native
-
- Always
+
+ PreserveNewest
+ runtimes\linux-musl-arm64\native\libmongocrypt.so
true
- runtimes\linux\native\arm64
+ runtimes\linux-musl-arm64\native
-
- Always
+
+ PreserveNewest
+ runtimes\linux-musl-x64\native\libmongocrypt.so
true
- runtimes\linux\native\alpine
+ runtimes\linux-musl-x64\native
-
- Always
+
+ PreserveNewest
+ runtimes\win-x64\native\mongocrypt.dll
true
- runtimes\win\native
+ runtimes\win-x64\native
diff --git a/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets
index 8a051c696cd..5b7af703ef5 100644
--- a/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets
+++ b/src/MongoDB.Driver.Encryption/MongoDB.Driver.Encryption.targets
@@ -1,8 +1,8 @@
-
-
- Always
+
+
+ PreserveNewest
mongocrypt.dll