diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt index 9d29b043fe..2952a925fb 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_alpine-linux.verified.txt @@ -48,41 +48,6 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/arm64/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net6.0/microsoft.extensions.configuration/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net6.0/microsoft.extensions.logging/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net6.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net6.0/microsoft.extensions.options/8.0.0/lib/net6.0/Microsoft.Extensions.Options.dll, - /store/arm64/net6.0/microsoft.extensions.primitives/8.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net6.0/System.Diagnostics.DiagnosticSource.dll, - /store/arm64/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net7.0/microsoft.extensions.configuration/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net7.0/microsoft.extensions.logging/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net7.0/microsoft.extensions.options/8.0.0/lib/net7.0/Microsoft.Extensions.Options.dll, - /store/arm64/net7.0/microsoft.extensions.primitives/8.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net7.0/System.Diagnostics.DiagnosticSource.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/arm64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, /store/x64/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, /store/x64/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux_arm64.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux_arm64.verified.txt new file mode 100644 index 0000000000..c047b89c91 --- /dev/null +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux_arm64.verified.txt @@ -0,0 +1,86 @@ +[ + /AdditionalDeps/shared/Microsoft.NETCore.App/6.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /AdditionalDeps/shared/Microsoft.NETCore.App/7.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /AdditionalDeps/shared/Microsoft.NETCore.App/8.0.0/OpenTelemetry.AutoInstrumentation.AdditionalDeps.deps.json, + /LICENSE, + /instrument.sh, + /linux-arm64/OpenTelemetry.AutoInstrumentation.Native.so, + /net/Google.Protobuf.dll, + /net/Grpc.Core.Api.dll, + /net/Grpc.Net.Client.dll, + /net/Grpc.Net.Common.dll, + /net/MongoDB.Driver.Core.Extensions.DiagnosticSources.dll, + /net/OpenTelemetry.Api.ProviderBuilderExtensions.dll, + /net/OpenTelemetry.Api.dll, + /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.dll, + /net/OpenTelemetry.AutoInstrumentation.AspNetCoreBootstrapper.pdb, + /net/OpenTelemetry.AutoInstrumentation.Loader.dll, + /net/OpenTelemetry.AutoInstrumentation.Loader.pdb, + /net/OpenTelemetry.AutoInstrumentation.StartupHook.dll, + /net/OpenTelemetry.AutoInstrumentation.StartupHook.pdb, + /net/OpenTelemetry.AutoInstrumentation.dll, + /net/OpenTelemetry.AutoInstrumentation.pdb, + /net/OpenTelemetry.Exporter.Console.dll, + /net/OpenTelemetry.Exporter.OpenTelemetryProtocol.dll, + /net/OpenTelemetry.Exporter.Prometheus.HttpListener.dll, + /net/OpenTelemetry.Exporter.Zipkin.dll, + /net/OpenTelemetry.Extensions.Propagators.dll, + /net/OpenTelemetry.Instrumentation.AspNetCore.dll, + /net/OpenTelemetry.Instrumentation.EntityFrameworkCore.dll, + /net/OpenTelemetry.Instrumentation.GrpcNetClient.dll, + /net/OpenTelemetry.Instrumentation.Http.dll, + /net/OpenTelemetry.Instrumentation.Process.dll, + /net/OpenTelemetry.Instrumentation.Quartz.dll, + /net/OpenTelemetry.Instrumentation.Runtime.dll, + /net/OpenTelemetry.Instrumentation.SqlClient.dll, + /net/OpenTelemetry.Instrumentation.StackExchangeRedis.dll, + /net/OpenTelemetry.Instrumentation.Wcf.dll, + /net/OpenTelemetry.ResourceDetectors.Azure.dll, + /net/OpenTelemetry.ResourceDetectors.Container.dll, + /net/OpenTelemetry.ResourceDetectors.Host.dll, + /net/OpenTelemetry.ResourceDetectors.Process.dll, + /net/OpenTelemetry.ResourceDetectors.ProcessRuntime.dll, + /net/OpenTelemetry.Shims.OpenTracing.dll, + /net/OpenTelemetry.dll, + /net/OpenTracing.dll, + /net/System.Private.ServiceModel.dll, + /net/System.Security.Permissions.dll, + /net/System.ServiceModel.Primitives.dll, + /net/System.ServiceModel.dll, + /net/ruleEngine.json, + /store/arm64/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net6.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net6.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, + /store/arm64/net6.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, + /store/arm64/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, + /store/arm64/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net7.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net7.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net7.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, + /store/arm64/net7.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, + /store/arm64/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net8.0/System.Diagnostics.DiagnosticSource.dll, + /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, + /store/arm64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, + /store/arm64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, + /store/arm64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, + /store/arm64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, + /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, + /store/arm64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, + /store/arm64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll +] \ No newline at end of file diff --git a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt b/test/IntegrationTests/BuildTests.DistributionStructure_linux_x64.verified.txt similarity index 60% rename from test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt rename to test/IntegrationTests/BuildTests.DistributionStructure_linux_x64.verified.txt index b8c1726e10..1478539831 100644 --- a/test/IntegrationTests/BuildTests.DistributionStructure_linux.verified.txt +++ b/test/IntegrationTests/BuildTests.DistributionStructure_linux_x64.verified.txt @@ -48,41 +48,6 @@ /net/System.ServiceModel.Primitives.dll, /net/System.ServiceModel.dll, /net/ruleEngine.json, - /store/arm64/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net6.0/microsoft.extensions.configuration/8.0.0/lib/net6.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net6.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net6.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net6.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net6.0/microsoft.extensions.logging.configuration/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net6.0/microsoft.extensions.logging/8.0.0/lib/net6.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net6.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net6.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net6.0/microsoft.extensions.options/8.0.0/lib/net6.0/Microsoft.Extensions.Options.dll, - /store/arm64/net6.0/microsoft.extensions.primitives/8.0.0/lib/net6.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net6.0/system.diagnostics.diagnosticsource/8.0.0/lib/net6.0/System.Diagnostics.DiagnosticSource.dll, - /store/arm64/net7.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.configuration.binder/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net7.0/microsoft.extensions.configuration/8.0.0/lib/net7.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net7.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net7.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net7.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net7.0/microsoft.extensions.logging.configuration/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net7.0/microsoft.extensions.logging/8.0.0/lib/net7.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net7.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net7.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net7.0/microsoft.extensions.options/8.0.0/lib/net7.0/Microsoft.Extensions.Options.dll, - /store/arm64/net7.0/microsoft.extensions.primitives/8.0.0/lib/net7.0/Microsoft.Extensions.Primitives.dll, - /store/arm64/net7.0/system.diagnostics.diagnosticsource/8.0.0/lib/net7.0/System.Diagnostics.DiagnosticSource.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, - /store/arm64/net8.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.dependencyinjection/8.0.0/lib/net8.0/Microsoft.Extensions.DependencyInjection.dll, - /store/arm64/net8.0/microsoft.extensions.logging.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Abstractions.dll, - /store/arm64/net8.0/microsoft.extensions.logging.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.Configuration.dll, - /store/arm64/net8.0/microsoft.extensions.logging/8.0.0/lib/net8.0/Microsoft.Extensions.Logging.dll, - /store/arm64/net8.0/microsoft.extensions.options.configurationextensions/8.0.0/lib/net8.0/Microsoft.Extensions.Options.ConfigurationExtensions.dll, - /store/arm64/net8.0/microsoft.extensions.options/8.0.0/lib/net8.0/Microsoft.Extensions.Options.dll, - /store/arm64/net8.0/microsoft.extensions.primitives/8.0.0/lib/net8.0/Microsoft.Extensions.Primitives.dll, /store/x64/net6.0/microsoft.extensions.configuration.abstractions/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Abstractions.dll, /store/x64/net6.0/microsoft.extensions.configuration.binder/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.Binder.dll, /store/x64/net6.0/microsoft.extensions.configuration/8.0.0/lib/net8.0/Microsoft.Extensions.Configuration.dll, diff --git a/test/IntegrationTests/BuildTests.cs b/test/IntegrationTests/BuildTests.cs index 4bb0e1ccb2..d1799bcdae 100644 --- a/test/IntegrationTests/BuildTests.cs +++ b/test/IntegrationTests/BuildTests.cs @@ -61,7 +61,7 @@ private static string GetSystemName() return "alpine-linux"; } - return "linux"; + return $"linux_{GetPlatform()}"; } if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows)) @@ -71,4 +71,14 @@ private static string GetSystemName() return "unknown"; } + + private static string GetPlatform() + { + return RuntimeInformation.ProcessArchitecture switch + { + Architecture.X64 => "x64", + Architecture.Arm64 => "arm64", + _ => throw new PlatformNotSupportedException() + }; + } }