cleanup AdditionalDeps/runtime folder

open-telemetry · Oct 6, 2022 · fa0fec1 · fa0fec1
1 parent fdca153
commit fa0fec1
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 13 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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,