diff --git a/build/nuke/Build.Steps.cs b/build/nuke/Build.Steps.cs index c59fd2fa74..957219269e 100644 --- a/build/nuke/Build.Steps.cs +++ b/build/nuke/Build.Steps.cs @@ -372,7 +372,8 @@ partial class Build // Major and Minor version are extracted from framework and default value of 0 is appended for patch. .SetOutput(AdditionalDepsDirectory / "shared" / "Microsoft.NETCore.App" / framework.ToString().Substring(framework.ToString().Length - 3) + ".0"))); - AdditionalDepsDirectory.GlobFiles("**/*.dll", "**/*.pdb", "**/*.xml").ForEach(DeleteFile); + AdditionalDepsDirectory.GlobFiles("**/*.dll", "**/*.pdb", "**/*.xml", "**/*.dylib", "**/*.so").ForEach(DeleteFile); + AdditionalDepsDirectory.GlobDirectories("**/runtimes").ForEach(DeleteDirectory); AdditionalDepsDirectory.GlobFiles("**/*deps.json") .ForEach(file => { diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt index 15daef6500..83c10c58eb 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt @@ -1,10 +1,6 @@ [ /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/runtimes/linux/native/libmongocrypt.so, - /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/runtimes/osx/native/libmongocrypt.dylib, /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/runtimes/linux/native/libmongocrypt.so, - /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/runtimes/osx/native/libmongocrypt.dylib, /OpenTelemetry.AutoInstrumentation.Native.so, /integrations.json, /netcoreapp3.1/Google.Protobuf.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt index 313bc14430..942b3fa3ac 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_osx.verified.txt @@ -1,10 +1,6 @@ [ /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/runtimes/linux/native/libmongocrypt.so, - /AdditionalDeps/shared/Microsoft.NETCore.App/3.1.0/runtimes/osx/native/libmongocrypt.dylib, /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/runtimes/linux/native/libmongocrypt.so, - /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/runtimes/osx/native/libmongocrypt.dylib, /OpenTelemetry.AutoInstrumentation.Native.dylib, /integrations.json, /netcoreapp3.1/Google.Protobuf.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt index b4575f1006..69012ccc78 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_windows.verified.txt @@ -1,10 +1,6 @@ [ \AdditionalDeps\shared\Microsoft.NETCore.App\3.1.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - \AdditionalDeps\shared\Microsoft.NETCore.App\3.1.0\runtimes\linux\native\libmongocrypt.so, - \AdditionalDeps\shared\Microsoft.NETCore.App\3.1.0\runtimes\osx\native\libmongocrypt.dylib, \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, - \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\runtimes\linux\native\libmongocrypt.so, - \AdditionalDeps\shared\Microsoft.NETCore.App\6.0.0\runtimes\osx\native\libmongocrypt.dylib, \integrations.json, \net462\Google.Protobuf.dll, \net462\Grpc.Core.Api.dll,