diff --git a/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj b/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj index 170eafef7e..e892920743 100644 --- a/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj +++ b/src/Agent/NewRelic.Api.Agent/NewRelic.Api.Agent.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs index 5e4db37f88..6ddf958c89 100644 --- a/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs +++ b/src/Agent/NewRelic/Agent/Core/Attributes/AttributeValueCollection.cs @@ -477,56 +477,4 @@ private bool SetValueImplInternal(AttributeValue attribVal) } } } - - public class NoOpAttributeValueCollection : IAttributeValueCollection - { - public AttributeDestinations[] TargetModelTypes { get; } = new[] { AttributeDestinations.None }; - public AttributeDestinations TargetModelTypesAsFlags => AttributeDestinations.None; - - public bool IsImmutable => false; - - public int Count => 0; - - private static IEnumerable _emptyAttribValues = new List(); - private static IDictionary _emptyAttribDic = new ReadOnlyDictionary(new Dictionary()); - - public void MakeImmutable() - { - } - - public IEnumerable GetAttributeValues(AttributeClassification classification) - { - return _emptyAttribValues; - } - - public void AddRange(IAttributeValueCollection fromCollection) - { - return; - } - - public bool TrySetValue(AttributeDefinition attribDef, TOutput value) - { - return false; - } - - public bool TrySetValue(AttributeDefinition attribDef, Lazy lazyImpl) - { - return false; - } - - public bool TrySetValue(IAttributeValue attrib) - { - return false; - } - - public IDictionary GetAttributeValuesDic(AttributeClassification classification) - { - return _emptyAttribDic; - } - - public IDictionary GetAllAttributeValuesDic() - { - return _emptyAttribDic; - } - } } diff --git a/src/Agent/NewRelic/Agent/Core/Core.csproj b/src/Agent/NewRelic/Agent/Core/Core.csproj index d0a8c083bd..7d993d9d02 100644 --- a/src/Agent/NewRelic/Agent/Core/Core.csproj +++ b/src/Agent/NewRelic/Agent/Core/Core.csproj @@ -38,7 +38,7 @@ all runtime; build; native; contentfiles; analyzers; buildtransitive - + @@ -93,16 +93,12 @@ - - + - - - - - + + @@ -111,6 +107,10 @@ + + + + @@ -123,15 +123,6 @@ - - - - - - - - - diff --git a/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj b/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj index 0e074d01e8..d57f465cd5 100644 --- a/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj +++ b/tests/Agent/Benchmarking/Benchmarking/Benchmarking.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj index 15b370d528..e9f7980f41 100644 --- a/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj +++ b/tests/Agent/Benchmarking/BenchmarkingTests/BenchmarkingTests.csproj @@ -9,13 +9,13 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj b/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj index 46b7d303a4..0b17176a48 100644 --- a/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj +++ b/tests/Agent/Benchmarking/ConcurrentBenchmarking/ConcurrentBenchmarking.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj index 4dcdfdafb9..f9a11a1061 100644 --- a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj +++ b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj index 7ec38830dd..32672ae802 100644 --- a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj +++ b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/NetCore3Collectible/NetCore3Collectible.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj b/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj index 774f0bc0bf..233735e16d 100644 --- a/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj +++ b/tests/Agent/IntegrationTests/Applications/AgentApiExecutor/AgentApiExecutor.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj b/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj index 874b7f1f5c..6ea08715c6 100644 --- a/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj +++ b/tests/Agent/IntegrationTests/Applications/ApiAppNameChange/ApiAppNameChange.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj index cc650680e7..d35eb41e34 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreBasicWebApiApplication/AspNetCoreBasicWebApiApplication.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj index a24fa0aa3f..9ff16566e3 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreDistTracingApplication/AspNetCoreDistTracingApplication.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj index 2df0082370..df4ed751eb 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj index ce8367ecd7..ac43d4563e 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcAsyncApplication/AspNetCoreMvcAsyncApplication.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj index 4ab50862dc..5d7ff25058 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj index 11ad958156..adc872e870 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcCoreFrameworkApplication/AspNetCoreMvcCoreFrameworkApplication.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj index 4e574c7888..bc7a8596cf 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkApplication/AspNetCoreMvcFrameworkApplication.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj index c71bb5e81e..efa7de6e8d 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcFrameworkAsyncApplication/AspNetCoreMvcFrameworkAsyncApplication.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj index b2ced69049..b1a8c4f8c3 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcRejitApplication/AspNetCoreMvcRejitApplication.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj index 7401da19a2..f8154d87ea 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreWebApiCustomAttributesApplication/AspNetCoreWebApiCustomAttributesApplication.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj b/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj index df7480be02..0b5632d1be 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicAspWebService/BasicAspWebService.csproj @@ -86,7 +86,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj index 8fd1e2fed2..8314a08cf9 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicMvcApplication/BasicMvcApplication.csproj @@ -113,7 +113,7 @@ 2.0.1 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj index 524a5fdf86..c08ff732e7 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicWebApplication/BasicWebApplication.csproj @@ -104,7 +104,7 @@ 3.0.0 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj index e0565f79ac..7125ce9984 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicWebFormsApplication/BasicWebFormsApplication.csproj @@ -90,7 +90,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj b/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj index 03eb37a551..6158f55510 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicWebService/BasicWebService.csproj @@ -89,7 +89,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj index a3c857358a..c5499a43c4 100644 --- a/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/ConsoleAsyncApplication/ConsoleAsyncApplication.csproj @@ -34,7 +34,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj index 6d18579f20..c60da507f7 100644 --- a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj +++ b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoader/ConsoleInstrumentationLoader.csproj @@ -53,7 +53,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj index f35e5488fc..efa47b1009 100644 --- a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj +++ b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj @@ -12,7 +12,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj index ba4f9f88d4..a4c0a922b4 100644 --- a/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/ConsoleOtherTransactionWrapperApplication/ConsoleOtherTransactionWrapperApplication.csproj @@ -37,7 +37,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj index 6a222588fd..9b238a0915 100644 --- a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj +++ b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj @@ -11,7 +11,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj b/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj index 1a3ffc0400..b495050b01 100644 --- a/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/DistributedTracingApiApplication/DistributedTracingApiApplication.csproj @@ -10,7 +10,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj b/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj index f02009cfe8..a01d5ceef2 100644 --- a/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj +++ b/tests/Agent/IntegrationTests/Applications/MockNewRelic/MockNewRelic.csproj @@ -9,7 +9,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj index 282bc40a3f..adf032ff69 100644 --- a/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/MvcAsyncApplication/MvcAsyncApplication.csproj @@ -76,7 +76,7 @@ 3.2.4 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj index 410eafa8e4..6cc8c36e0d 100644 --- a/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj @@ -8,7 +8,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj b/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj index c8f7df44f7..d966c8de0a 100644 --- a/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/OpenRastaWebApplication/OpenRastaWebApplication.csproj @@ -95,7 +95,7 @@ 2.0.30506 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj index e479e589ba..bd9b198557 100644 --- a/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj +++ b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj @@ -22,7 +22,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj index ad3565433c..9a61f12e7a 100644 --- a/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj +++ b/tests/Agent/IntegrationTests/Applications/Owin3WebApi/Owin3WebApi.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj index 4432faada4..54613dcd30 100644 --- a/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj +++ b/tests/Agent/IntegrationTests/Applications/Owin4WebApi/Owin4WebApi.csproj @@ -13,7 +13,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj index 5413526c8d..237cbb03e7 100644 --- a/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj +++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingClient/OwinRemotingClient.csproj @@ -63,7 +63,7 @@ 2.0.2 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj index fe78d364e8..63cf8d72a5 100644 --- a/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj +++ b/tests/Agent/IntegrationTests/Applications/OwinRemotingServer/OwinRemotingServer.csproj @@ -70,7 +70,7 @@ 2.0.2 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj b/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj index 236d8f5080..01e275607f 100644 --- a/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/RejitMvcApplication/RejitMvcApplication.csproj @@ -79,7 +79,7 @@ 2.0.1 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj index a1f4c51e6e..c9958a0f4e 100644 --- a/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj index 943ff5986d..23f8c0db3d 100644 --- a/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/ServiceStackApplication/ServiceStackApplication.csproj @@ -58,7 +58,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj b/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj index 4dead342ff..a6f3dbed90 100644 --- a/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj +++ b/tests/Agent/IntegrationTests/Applications/ThreadProfileStressTest/ThreadProfileStressTest.csproj @@ -53,7 +53,7 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj index 6961ee4a01..0abc2eec21 100644 --- a/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/WebApiAsyncApplication/WebApiAsyncApplication.csproj @@ -92,7 +92,7 @@ 5.2.4 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj index 10cbb47b65..a695daee69 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj @@ -10,13 +10,13 @@ - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj b/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj index 10cd25ded5..57bad0d359 100644 --- a/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj +++ b/tests/Agent/IntegrationTests/HostedWebCore/HostedWebCore.csproj @@ -110,7 +110,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj b/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj index 746905d701..64bfe9c511 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers.Test/IntegrationTestHelpers.Test.csproj @@ -46,12 +46,12 @@ - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all - 2.4.0 + 2.6.1 diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs index 39f84ae0f5..8867a9ac52 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/AssemblySetup.cs @@ -16,7 +16,7 @@ static AssemblySetUp() Contract.ContractFailed += new EventHandler((sender, eventArgs) => { eventArgs.SetHandled(); - Assert.True(false, string.Format("{0}: {1} {2}", eventArgs.FailureKind, eventArgs.Message, eventArgs.Condition)); + Assert.Fail(string.Format("{0}: {1} {2}", eventArgs.FailureKind, eventArgs.Message, eventArgs.Condition)); }); } diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj index 3dbc97cc4e..a474197090 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj @@ -5,16 +5,16 @@ NewRelic.Agent.IntegrationTestHelpers - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - - - + + + + diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs index 516168fa98..58d4f33c70 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteService.cs @@ -333,7 +333,7 @@ protected virtual void WaitForAppServerToStartListening(Process process, bool ca CapturedOutput.WriteProcessOutputToLog("[RemoteService]: WaitForAppServerToStartListening"); } - Assert.True(false, "Remote process never generated a .pid file!"); + Assert.Fail("Remote process never generated a .pid file!"); } // set the application name in app.config (agent will trump names set in newrelic.config with the process name, which is undesirable) diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs index 7eec2a37fa..df10206325 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/RemoteServiceFixtures/RemoteWebApplication.cs @@ -253,7 +253,7 @@ private void WaitForHostedWebCoreToStartListening(Process process, bool captureS CapturedOutput.WriteProcessOutputToLog("[RemoteWebApplication]: WaitForHostedWebCoreToStartListening"); } - Assert.True(false, "Remote process never generated a .pid file!"); + Assert.Fail("Remote process never generated a .pid file!"); } } } diff --git a/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs b/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs index 10aac0423a..13451bd834 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/SubprocessLogValidator.cs @@ -36,7 +36,7 @@ enum ValidatorState private static void Fail(string msg) { - Assert.True(false, "Hosted Web Core log failed validation: " + msg); + Assert.Fail("Hosted Web Core log failed validation: " + msg); } public static void ValidateHostedWebCoreConsoleOutput(string log, ITestOutputHelper testLogger) diff --git a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj index 743b9eb3fc..84e6441180 100644 --- a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj @@ -34,7 +34,8 @@ - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -42,12 +43,18 @@ - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs index ee7c99a440..ea8fccd9f9 100644 --- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs +++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/BasicMvcApplicationTestFixture.cs @@ -124,7 +124,7 @@ public void WaitForStartup() } } - Assert.True(false, @"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds."); + Assert.Fail(@"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds."); } public void GetWithStatusCode(int statusCode) diff --git a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs index 0c545f6e97..de8f5ef2ea 100644 --- a/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs +++ b/tests/Agent/IntegrationTests/IntegrationTests/RemoteServiceFixtures/CustomAttributesWebApi.cs @@ -60,7 +60,7 @@ public void WaitForStartup() } } - Assert.True(false, @"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds."); + Assert.Fail(@"Did not receive a stable response (less than 1 second) after 5 minutes of attempts every 6 seconds."); } public void Get() diff --git a/tests/Agent/IntegrationTests/Models/Models.csproj b/tests/Agent/IntegrationTests/Models/Models.csproj index ee1c70c4b3..6252c57da7 100644 --- a/tests/Agent/IntegrationTests/Models/Models.csproj +++ b/tests/Agent/IntegrationTests/Models/Models.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Shared/Shared.csproj b/tests/Agent/IntegrationTests/Shared/Shared.csproj index 7a0e67bee0..6b5c58e136 100644 --- a/tests/Agent/IntegrationTests/Shared/Shared.csproj +++ b/tests/Agent/IntegrationTests/Shared/Shared.csproj @@ -19,7 +19,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj index a78f78dabc..2523bb068a 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/MultiFunctionApplicationHelpers/MultiFunctionApplicationHelpers.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj index fa546358e8..f6821b60c8 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj @@ -5,7 +5,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj index 20e0d11339..b8cb5a14ef 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj @@ -18,7 +18,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj index 0738952432..0d9df2ec90 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationFW/ConsoleMultiFunctionApplicationFW.csproj @@ -29,7 +29,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj b/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj index b7d3245a78..420a120e39 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/WcfAppIisHosted/WcfAppIisHosted.csproj @@ -41,7 +41,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj index 883ffea867..2fb2572434 100644 --- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj +++ b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcApplication/BasicMvcApplication.csproj @@ -1,4 +1,4 @@ - + @@ -83,7 +83,7 @@ 3.2.0 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all @@ -180,4 +180,4 @@ - + \ No newline at end of file diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj index c4b50700de..649c68f701 100644 --- a/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj +++ b/tests/Agent/IntegrationTests/UnboundedApplications/BasicMvcCoreApplication/BasicMvcCoreApplication.csproj @@ -7,7 +7,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj b/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj index f4b7784330..d0789670d1 100644 --- a/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj +++ b/tests/Agent/IntegrationTests/UnboundedApplications/MongoDBApplication/MongoDBApplication.csproj @@ -76,7 +76,7 @@ 2.2.29 - 17.6.40 + 17.7.30 runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj index b263ec2eb2..9f847cb938 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj @@ -45,7 +45,8 @@ - + + all runtime; build; native; contentfiles; analyzers; buildtransitive @@ -53,12 +54,18 @@ - - - - - - + + + + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + + + all + runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj b/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj index a45737fc9b..ad19091156 100644 --- a/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj +++ b/tests/Agent/NewRelic.Testing.Assertions/NewRelic.Testing.Assertions.csproj @@ -3,13 +3,14 @@ netstandard2.0 - + all - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive + diff --git a/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs b/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs index e8e111ee93..ef71f3db41 100644 --- a/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs +++ b/tests/Agent/NewRelic.Testing.Assertions/NrAssert.cs @@ -6,6 +6,7 @@ using System.Collections.Generic; using System.Diagnostics; using System.Linq; +using NUnit.Framework; namespace NewRelic.Testing.Assertions { @@ -30,30 +31,19 @@ public static T Throws(Action action) where T : Exception throw new TestFailureException($"Expected exception of type '{typeof(T)}' was not thrown."); } + /// + /// OBSOLETE + /// Please use NUnit.Framework.Assert.Multiple() instead. + /// This method just passes through to Assert.Multiple(). + /// + /// public static void Multiple(params Action[] actions) { - var exceptions = new List>(); - for(var i = 0; i < actions.Length; i++) + Assert.Multiple(() => { - try - { - actions[i](); - } - catch (TestFailureException testEx) - { - exceptions.Add(new Tuple(i, testEx)); - } - catch (Exception ex) - { - exceptions.Add(new Tuple(i, ex)); - } - } - - if (!exceptions.Any()) - return; - - var details = FormatExceptions(exceptions); - throw new TestFailureException(details); + foreach (var action in actions) + action(); + }); } private static string FormatException(Exception exception) diff --git a/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj b/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj index 25e54eeaa2..a7f32bb6f1 100644 --- a/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj +++ b/tests/Agent/UnitTests/AsyncLocalTests/AsyncLocalTests.csproj @@ -8,12 +8,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj index 7472411812..3486ad8fd6 100644 --- a/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj +++ b/tests/Agent/UnitTests/CompositeTests/CompositeTests.csproj @@ -7,13 +7,13 @@ $(SolutionDir)test.runsettings - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj index 49a8d10cfb..161007237b 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj +++ b/tests/Agent/UnitTests/Core.UnitTest/Core.UnitTest.csproj @@ -10,12 +10,12 @@ 8.0 - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj index b3dae4d6c5..95ef5e07a0 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/NewRelic.Agent.Extensions.Tests.csproj @@ -7,11 +7,11 @@ $(SolutionDir)test.runsettings - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj index 79e2357c41..dcbb694701 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj +++ b/tests/Agent/UnitTests/NewRelic.Agent.TestUtilities/NewRelic.Agent.TestUtilities.csproj @@ -5,12 +5,12 @@ NewRelic.Agent.TestUtilities - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + diff --git a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj index 4c33ad2ac4..084bac5f7c 100644 --- a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj +++ b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NewRelic.Testing.Assertions.UnitTests.csproj @@ -19,12 +19,12 @@ pdbonly - + all - - - + + + all diff --git a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs index 5e9e54cd9a..aa5537df9c 100644 --- a/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Testing.Assertions.UnitTests/NrAssertTests.cs @@ -9,143 +9,7 @@ namespace NewRelic.Testing.Assertions.UnitTests [TestFixture] public class NrAssertTests { - #region Multiple - - [Test] - public void Multiple_DoesNotThrow_IfAllAssertionsPass() - { - NrAssert.Multiple( - () => Assert.IsTrue(true), - () => Assert.IsFalse(false) - ); - - // Getting to the end of this test without throwing constitutes success, no further assertions needed - } - - [Test] - public void Multiple_Throws_IfAnyAssertionFails() - { - TestFailureException expectedException = null; - - try - { - NrAssert.Multiple( - () => Assert.IsTrue(true), - () => Assert.IsTrue(false) - ); - } - catch (TestFailureException ex) - { - expectedException = ex; - } - - Assert.NotNull(expectedException); - Assert.IsTrue(expectedException.Message.IndexOf("assertion", StringComparison.InvariantCultureIgnoreCase) > -1); - } - - [Test] - public void Multiple_ContainsAllAssertionFailures_IfMultipleAssertionsFail() - { - TestFailureException expectedException = null; - - try - { - NrAssert.Multiple( - () => Assert.IsTrue(false), - () => Assert.IsTrue(true), - () => Assert.IsTrue(false) - ); - } - catch (TestFailureException ex) - { - expectedException = ex; - } - - Assert.NotNull(expectedException); - - var failure1Index = expectedException.Message.IndexOf("assertion", StringComparison.InvariantCultureIgnoreCase); - var failure2Index = expectedException.Message.IndexOf("assertion", failure1Index + 1, StringComparison.InvariantCultureIgnoreCase); - - Assert.IsTrue(failure1Index > -1); - Assert.IsTrue(failure2Index > -1); - } - - [Test] - public void Multiple_Throws_IfAnyActionThrows() - { - TestFailureException expectedException = null; - - try - { - NrAssert.Multiple( - () => Assert.IsTrue(true), - () => { throw new IndexOutOfRangeException(); } - ); - } - catch (TestFailureException ex) - { - expectedException = ex; - } - - Assert.NotNull(expectedException); - Assert.IsTrue(expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase) > -1); - } - - [Test] - public void Multiple_ContainsAllExceptions_IfMultipleActionsThrow() - { - TestFailureException expectedException = null; - - try - { - NrAssert.Multiple( - () => { throw new IndexOutOfRangeException(); }, - () => Assert.IsTrue(true), - () => { throw new NullReferenceException(); } - ); - } - catch (TestFailureException ex) - { - expectedException = ex; - } - - Assert.NotNull(expectedException); - - var exception1Index = expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase); - var exception2Index = expectedException.Message.IndexOf("NullReferenceException", exception1Index + 1, StringComparison.InvariantCultureIgnoreCase); - - Assert.IsTrue(exception1Index > -1); - Assert.IsTrue(exception2Index > -1); - } - - [Test] - public void Multiple_ContainsAllExceptionsAndAssertionFailures_IfAssertionsFailureAndThrowAtTheSameTime() - { - TestFailureException expectedException = null; - - try - { - NrAssert.Multiple( - () => { throw new IndexOutOfRangeException(); }, - () => Assert.IsTrue(true), - () => Assert.IsTrue(false) - ); - } - catch (TestFailureException ex) - { - expectedException = ex; - } - - Assert.NotNull(expectedException); - - var exceptionIndex = expectedException.Message.IndexOf("IndexOutOfRangeException", StringComparison.InvariantCultureIgnoreCase); - var failureIndex = expectedException.Message.IndexOf("assertion", exceptionIndex + 1, StringComparison.InvariantCultureIgnoreCase); - - Assert.IsTrue(exceptionIndex > -1); - Assert.IsTrue(failureIndex > -1); - } - - #endregion Multiple + // Note: Intentionally not testing `NrAssert.Multiple()`, as it's now just a pass-through to `NUnit.Framework.Assert.Multiple()` #region Throws diff --git a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj index 5066807312..0fa097750f 100644 --- a/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj +++ b/tests/Agent/UnitTests/ParsingTests/ParsingTests.csproj @@ -7,11 +7,11 @@ $(SolutionDir)test.runsettings - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj b/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj index a451d4f536..ab9370df85 100644 --- a/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj +++ b/tests/AwsLambda/UnitTests/AwsLambdaOpenTracerTests/AwsLambdaOpenTracerTests.csproj @@ -11,12 +11,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj b/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj index cf7bb68590..950e27bae1 100644 --- a/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj +++ b/tests/AwsLambda/UnitTests/AwsLambdaWrapperTests/AwsLambdaWrapperTests.csproj @@ -25,11 +25,11 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all diff --git a/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj b/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj index 480e84acf5..2eb966dac0 100644 --- a/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj +++ b/tests/NewRelic.Core.Tests/NewRelic.Core.Tests.csproj @@ -4,12 +4,12 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all