diff --git a/Directory.Packages.props b/Directory.Packages.props index 9166f1b40c..579e0eaa1d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,25 +7,25 @@ - + - + - - - + + + - + @@ -33,19 +33,19 @@ - + - - + + - - - - + + + + diff --git a/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj b/tests/Agent/IntegrationTests/ApplicationHelperLibraries/ApplicationLifecycle/ApplicationLifecycle.csproj index fe839f13f4..a28e47030c 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 45f89f91d1..9bbd0b11cd 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 c4d1d0f7ad..58bbd5ff11 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 964dc0ad8e..535c21f491 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 0879b08005..77aaf2b9ef 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 e8c10e587f..68fe60757d 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 0d126b969e..af38ea9efa 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreFeatures/AspNetCoreFeatures.csproj @@ -5,7 +5,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 5e75b7f723..b87b6f0052 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 210c2d839b..fac5ad139c 100644 --- a/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/AspNetCoreMvcBasicRequestsApplication/AspNetCoreMvcBasicRequestsApplication.csproj @@ -6,7 +6,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 d9c642e567..972db8d0a1 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 7fb7de107f..164df9461e 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 667fffcdea..37f3f2e785 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 7d5b230b72..f0a0a2faf3 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 ff4530e3fd..4a002667b0 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/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj index e86cf4d08d..ba6216a177 100644 --- a/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/BasicAspNetCoreRazorApplication/BasicAspNetCoreRazorApplication.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/BlazorSignalRApplication/BlazorSignalRApplication.csproj b/tests/Agent/IntegrationTests/Applications/BlazorSignalRApplication/BlazorSignalRApplication.csproj index cfafc996ea..d95185ae05 100644 --- a/tests/Agent/IntegrationTests/Applications/BlazorSignalRApplication/BlazorSignalRApplication.csproj +++ b/tests/Agent/IntegrationTests/Applications/BlazorSignalRApplication/BlazorSignalRApplication.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationLoaderCore/ConsoleInstrumentationLoaderCore.csproj index d1ea667654..6d25a08694 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/ConsoleInstrumentationStartup/ConsoleInstrumentationStartup.csproj b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationStartup/ConsoleInstrumentationStartup.csproj index ea05c113d2..970eca8e7e 100644 --- a/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationStartup/ConsoleInstrumentationStartup.csproj +++ b/tests/Agent/IntegrationTests/Applications/ConsoleInstrumentationStartup/ConsoleInstrumentationStartup.csproj @@ -6,7 +6,7 @@ - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj b/tests/Agent/IntegrationTests/Applications/CustomAttributesWebApi/CustomAttributesWebApi.csproj index c52eba21e6..5744d33957 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 405b9b658b..b6e5709329 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/LambdaSelfExecutingAssembly/LambdaSelfExecutingAssembly.csproj b/tests/Agent/IntegrationTests/Applications/LambdaSelfExecutingAssembly/LambdaSelfExecutingAssembly.csproj index 261a9e9406..7e33ff08f1 100644 --- a/tests/Agent/IntegrationTests/Applications/LambdaSelfExecutingAssembly/LambdaSelfExecutingAssembly.csproj +++ b/tests/Agent/IntegrationTests/Applications/LambdaSelfExecutingAssembly/LambdaSelfExecutingAssembly.csproj @@ -43,7 +43,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 d3b48cef4d..c3ca2dadd1 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/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj b/tests/Agent/IntegrationTests/Applications/NetCoreAsyncApplication/NetCoreAsyncApplication.csproj index 2e59c51395..255550d66a 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/Owin2WebApi/Owin2WebApi.csproj b/tests/Agent/IntegrationTests/Applications/Owin2WebApi/Owin2WebApi.csproj index a75440beb0..bed26bf232 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 0390a4d551..6afc5d9306 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 79efde0907..4aa01b30cf 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/SerilogSumologicApplication/SerilogSumologicApplication.csproj b/tests/Agent/IntegrationTests/Applications/SerilogSumologicApplication/SerilogSumologicApplication.csproj index b4060204df..b696b8680c 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/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj index e5cced0bc1..05c509b5e2 100644 --- a/tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj +++ b/tests/Agent/IntegrationTests/ContainerApplications/AwsSdkTestApp/AwsSdkTestApp.csproj @@ -8,8 +8,8 @@ - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj index b3f3e62791..a0a03787b2 100644 --- a/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj +++ b/tests/Agent/IntegrationTests/ContainerApplications/KafkaTestApp/KafkaTestApp.csproj @@ -5,10 +5,10 @@ . - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ContainerApplications/MemcachedTestApp/MemcachedTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/MemcachedTestApp/MemcachedTestApp.csproj index eecebfd8ec..d3053f7688 100644 --- a/tests/Agent/IntegrationTests/ContainerApplications/MemcachedTestApp/MemcachedTestApp.csproj +++ b/tests/Agent/IntegrationTests/ContainerApplications/MemcachedTestApp/MemcachedTestApp.csproj @@ -5,10 +5,10 @@ . - + - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/SmokeTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/SmokeTestApp.csproj index fa073db218..e22d1377f6 100644 --- a/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/SmokeTestApp.csproj +++ b/tests/Agent/IntegrationTests/ContainerApplications/SmokeTestApp/SmokeTestApp.csproj @@ -5,8 +5,8 @@ . - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ContainerApplications/W3CTestApp/W3CTestApp.csproj b/tests/Agent/IntegrationTests/ContainerApplications/W3CTestApp/W3CTestApp.csproj index 03269198e1..1d9cb5736c 100644 --- a/tests/Agent/IntegrationTests/ContainerApplications/W3CTestApp/W3CTestApp.csproj +++ b/tests/Agent/IntegrationTests/ContainerApplications/W3CTestApp/W3CTestApp.csproj @@ -5,8 +5,8 @@ . - - + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj index 8d4306313c..d311f72719 100644 --- a/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/ContainerIntegrationTests/ContainerIntegrationTests.csproj @@ -10,15 +10,15 @@ - - + + 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 2175d9f082..24c528d353 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/IntegrationTestHelpers.csproj b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj index 0c17b2beaf..fe0d2afc7e 100644 --- a/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj +++ b/tests/Agent/IntegrationTests/IntegrationTestHelpers/IntegrationTestHelpers.csproj @@ -5,14 +5,14 @@ NewRelic.Agent.IntegrationTestHelpers - + all runtime; build; native; contentfiles; analyzers; buildtransitive - - + + diff --git a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj index e5772e8629..504cf4dd21 100644 --- a/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/IntegrationTests/IntegrationTests.csproj @@ -36,10 +36,10 @@ - - - - + + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/IntegrationTests/Models/Models.csproj b/tests/Agent/IntegrationTests/Models/Models.csproj index 8496e3522e..c0e2043f63 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 7561d735fb..c71308d772 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/NetStandardTestLibrary/NetStandardTestLibrary.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/NetStandardTestLibrary/NetStandardTestLibrary.csproj index 310126127d..dba511a749 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/Common/SharedApplicationHelpers/SharedApplicationHelpers.csproj b/tests/Agent/IntegrationTests/SharedApplications/Common/SharedApplicationHelpers/SharedApplicationHelpers.csproj index 3307c5c29e..9ab88e654b 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/Common/SharedApplicationHelpers/SharedApplicationHelpers.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/Common/SharedApplicationHelpers/SharedApplicationHelpers.csproj @@ -13,7 +13,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 29d94cf8f6..01e8ec5063 100644 --- a/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj +++ b/tests/Agent/IntegrationTests/SharedApplications/ConsoleMultiFunctionApplicationCore/ConsoleMultiFunctionApplicationCore.csproj @@ -13,7 +13,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 c15a70023f..0ce4ee0dc2 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 efbe81cd70..a963e60476 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/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj index ab8e2d5b7a..0fcd90c20f 100644 --- a/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj +++ b/tests/Agent/IntegrationTests/UnboundedIntegrationTests/UnboundedIntegrationTests.csproj @@ -34,9 +34,9 @@ runtime; build; native; contentfiles; analyzers; buildtransitive - - - + + + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeFilterTests.cs b/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeFilterTests.cs index a1e0e7048a..d8ff83efd8 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeFilterTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Attributes/AttributeFilterTests.cs @@ -368,12 +368,11 @@ private static string TestCaseData } } - public static IEnumerable TestCases + public static IEnumerable TestCases { get { - return JsonConvert.DeserializeObject>(TestCaseData) - .Select(testCase => new[] { testCase }); + return JsonConvert.DeserializeObject>(TestCaseData); } } diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs index 471dec2695..96fc3cfd13 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/CatMapTests.cs @@ -309,15 +309,14 @@ public override string ToString() } } - public static IEnumerable TestCases + public static IEnumerable TestCases { get { var testCases = JsonConvert.DeserializeObject>(JsonTestCaseData); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/PathHashTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/PathHashTests.cs index e303cecdde..f691b903f5 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/PathHashTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/PathHashTests.cs @@ -95,15 +95,14 @@ public override string ToString() } } - public static IEnumerable TestCases + public static IEnumerable TestCases { get { var testCases = JsonConvert.DeserializeObject>(JsonTestCaseData); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs index 125d0e8d77..9f43fac4d4 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/RumTests/RumClientConfigTests.cs @@ -245,15 +245,14 @@ public class ExpectedBrowserMonitoringConfigurationData public string ObfuscatedUserAttributes { get; set; } } - public static IEnumerable TestCases + public static IEnumerable TestCases { get { var testCases = JsonConvert.DeserializeObject>(JsonTestCaseData); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } diff --git a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs index a74f9cbc8e..bf2c845e5b 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/CrossAgentTests/ServerSentEvent/ServerSentEventTests.cs @@ -210,7 +210,7 @@ public void Test(TestCase testCase) assertAction(); } - public static IEnumerable TestCases + public static IEnumerable TestCases { get { @@ -222,8 +222,7 @@ public static IEnumerable TestCases var testCases = JsonConvert.DeserializeObject>(jsonString); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } diff --git a/tests/Agent/UnitTests/Core.UnitTest/Metrics/MetricNameServiceTest.cs b/tests/Agent/UnitTests/Core.UnitTest/Metrics/MetricNameServiceTest.cs index 0c81df9d5e..3a41191933 100644 --- a/tests/Agent/UnitTests/Core.UnitTest/Metrics/MetricNameServiceTest.cs +++ b/tests/Agent/UnitTests/Core.UnitTest/Metrics/MetricNameServiceTest.cs @@ -382,7 +382,7 @@ public class TestCase public string Expected { get; set; } } - private static IEnumerable CrossAgentRegexRuleTestCases + private static IEnumerable CrossAgentRegexRuleTestCases { get { @@ -561,12 +561,11 @@ private static IEnumerable CrossAgentRegexRuleTestCases var testCases = JsonConvert.DeserializeObject>(json); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } - private static IEnumerable CrossAgentWhitelistRuleTestCases + private static IEnumerable CrossAgentWhitelistRuleTestCases { get { @@ -951,8 +950,7 @@ private static IEnumerable CrossAgentWhitelistRuleTestC var testCases = JsonConvert.DeserializeObject>(json); Assert.That(testCases, Is.Not.Null); return testCases - .Where(testCase => testCase != null) - .Select(testCase => new[] { testCase }); + .Where(testCase => testCase != null); } } diff --git a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Reflection/VisibilityBypasserTests.cs b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Reflection/VisibilityBypasserTests.cs index 9200a27fe4..edbac15977 100644 --- a/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Reflection/VisibilityBypasserTests.cs +++ b/tests/Agent/UnitTests/NewRelic.Agent.Extensions.Tests/Reflection/VisibilityBypasserTests.cs @@ -701,5 +701,8 @@ public void try_generate_parameterless_static_method_caller_failure() // Assert Assert.That(success, Is.False); - Assert.That(accessor, Is.Null); + // compare the delegate reference, do not let NUnit evaluate it: + // NUnit is replacing ActualValueDelegate with Func (nunit/nunit#4824), + // after which an un-cast Func actual would be invoked, not compared. + Assert.That((Delegate)accessor, Is.Null); } } \ No newline at end of file diff --git a/tests/Agent/UnitTests/PublicApiChangeTests/ModuleInitializer.cs b/tests/Agent/UnitTests/PublicApiChangeTests/ModuleInitializer.cs new file mode 100644 index 0000000000..5f96952af0 --- /dev/null +++ b/tests/Agent/UnitTests/PublicApiChangeTests/ModuleInitializer.cs @@ -0,0 +1,21 @@ +// Copyright 2020 New Relic, Inc. All rights reserved. +// SPDX-License-Identifier: Apache-2.0 + +using System.Runtime.CompilerServices; + +namespace PublicApiChangeTests; + +public static class ModuleInitializer +{ + // The verified snapshot is checked out with CRLF on Windows (the root .gitattributes + // marks *.txt as text) and carries a trailing newline. Verify tolerated both silently + // through 31.0.1; later versions reject them unless tolerance is opted into. Both + // settings are global and throw if set after the first verify, so a module + // initializer is the only place they can go. + [ModuleInitializer] + public static void Init() + { + VerifierSettings.FixNewlinesOnRead(); + VerifierSettings.IgnoreTrailingNewline(); + } +}