diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index a976a30d2c..9d2d068d14 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -249,20 +249,22 @@ shipped through CI. SDK](https://www.nuget.org/packages/OpenTelemetry) or the [OpenTelemetry API](https://www.nuget.org/packages/OpenTelemetry.Api) Include the necessary package in your project. You can choose the version that you want to depend - on. Usually, it is a good idea to use the latest stable version. For example: + on. Usually, it is a good idea to use the latest stable version. This is defined + centrally using [Central Package Management](https://learn.microsoft.com/nuget/consume-packages/central-package-management). + For example: ```xml - + ``` * If your component relies on new features not yet part of the stable release, - you can refer to the latest pre-release version. + you can refer to the latest pre-release version and override the version. ```xml - + ``` diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000000..c0b82e22a9 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,146 @@ + + + + true + + + + + 1.13.0 + 1.12.0-beta.1 + 1.12.0 + 1.12.0 + 1.12.0 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index 1391862566..c30d9b02c5 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -19,31 +19,17 @@ true - - - [0.13.12,0.14) - 2.4.1 - 6.1.0 - 8.0.1 - 8.0.1 - [17.14.1,18.0) - $(OpenTelemetryCoreLatestVersion) + net9.0;net8.0 - [2.8.2,3.0) - [2.9.3,3.0) - [1.7.0,2.0) - - - - - + + + + + diff --git a/build/Common.prod.props b/build/Common.prod.props index 7d57493221..c07ecad49d 100644 --- a/build/Common.prod.props +++ b/build/Common.prod.props @@ -21,9 +21,8 @@ - - - + + diff --git a/build/Common.props b/build/Common.props index e02ecc592f..bf59930975 100644 --- a/build/Common.props +++ b/build/Common.props @@ -75,8 +75,8 @@ - - - - + + $(DefineConstants);EXPOSE_EXPERIMENTAL_FEATURES + + diff --git a/build/Common.targets b/build/Common.targets index 37e016c07d..8c119d5413 100644 --- a/build/Common.targets +++ b/build/Common.targets @@ -1,23 +1,2 @@ - - - - - - - - - diff --git a/build/scripts/post-release.psm1 b/build/scripts/post-release.psm1 index 2ba9244be7..7ed60fa7b8 100644 --- a/build/scripts/post-release.psm1 +++ b/build/scripts/post-release.psm1 @@ -288,24 +288,24 @@ function CreateOpenTelemetryCoreLatestVersionUpdatePullRequest { $tagPrefix = $match.Groups[1].Value $version = $match.Groups[2].Value - $isPrerelease = ($version.Contains('-alpha.') -or $version.Contains('-beta.') -or $version.Contains('-rc.')) + $isPrerelease = $version.Contains('-') if ($tagPrefix.StartsWith('core-') -eq $true) { $changelogEntry = "Updated OpenTelemetry core component version(s) to" $propertyName = "OpenTelemetryCoreLatestVersion" - $propertyVersion = "[$version,2.0)" + $propertyVersion = $version if ($isPrerelease -eq $true) { $propertyName = "OpenTelemetryCoreLatestPrereleaseVersion" - $propertyVersion = "[$version]" + $propertyVersion = "$version" } } elseif ($tagPrefix.StartsWith('coreunstable-') -eq $true) { $changelogEntry = "Updated OpenTelemetry core unstable component version(s) to" $propertyName = "OpenTelemetryCoreUnstableLatestVersion" - $propertyVersion = "[$version]" + $propertyVersion = "$version" } else { @@ -331,9 +331,9 @@ function CreateOpenTelemetryCoreLatestVersionUpdatePullRequest { $projectsAndDependenciesBefore = GetCoreDependenciesForProjects - (Get-Content build/Common.props) ` + (Get-Content Directory.Packages.props) ` -replace "<$propertyName>.*<\/$propertyName>", "<$propertyName>$propertyVersion" | - Set-Content build/Common.props + Set-Content Directory.Packages.props $projectsAndDependenciesAfter = GetCoreDependenciesForProjects @@ -380,7 +380,7 @@ Merge once packages are available on NuGet and the build passes. ## Changes -* Sets ``$propertyName`` in ``Common.props`` to ``$version``. +* Sets ``$propertyName`` in ``Directory.Packages.props`` to ``$version``. "@ $createPullRequestResponse = gh pr create ` diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj index 49942bee82..69e9a5e34c 100644 --- a/examples/AspNet/Examples.AspNet.csproj +++ b/examples/AspNet/Examples.AspNet.csproj @@ -49,15 +49,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/examples/InfluxDB/Examples.InfluxDB/Examples.InfluxDB.csproj b/examples/InfluxDB/Examples.InfluxDB/Examples.InfluxDB.csproj index d21749c659..fef360e370 100644 --- a/examples/InfluxDB/Examples.InfluxDB/Examples.InfluxDB.csproj +++ b/examples/InfluxDB/Examples.InfluxDB/Examples.InfluxDB.csproj @@ -7,7 +7,7 @@ - + diff --git a/examples/enrichment/Examples.Enrichment/Examples.Enrichment.csproj b/examples/enrichment/Examples.Enrichment/Examples.Enrichment.csproj index 735516af62..c0d8ebfe41 100644 --- a/examples/enrichment/Examples.Enrichment/Examples.Enrichment.csproj +++ b/examples/enrichment/Examples.Enrichment/Examples.Enrichment.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/examples/event-counters/Examples.EventCounters/Examples.EventCounters.csproj b/examples/event-counters/Examples.EventCounters/Examples.EventCounters.csproj index 78eb2b9eda..123201a36b 100644 --- a/examples/event-counters/Examples.EventCounters/Examples.EventCounters.csproj +++ b/examples/event-counters/Examples.EventCounters/Examples.EventCounters.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj index a1d4774eb7..5a44087096 100644 --- a/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj +++ b/examples/grpc.core/Examples.GrpcCore.AspNetCore/Examples.GrpcCore.AspNetCore.csproj @@ -5,11 +5,11 @@ - - - - - + + + + + diff --git a/examples/kafka/Examples.ConfluentKafka.csproj b/examples/kafka/Examples.ConfluentKafka.csproj index 3f60ecbc1b..89e9ab36c1 100644 --- a/examples/kafka/Examples.ConfluentKafka.csproj +++ b/examples/kafka/Examples.ConfluentKafka.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/examples/owin/Examples.Owin.csproj b/examples/owin/Examples.Owin.csproj index b1f1da9a0f..1562523b35 100644 --- a/examples/owin/Examples.Owin.csproj +++ b/examples/owin/Examples.Owin.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/examples/process-instrumentation/process-instrumentation.csproj b/examples/process-instrumentation/process-instrumentation.csproj index 1e45f4bf86..10a4a64091 100644 --- a/examples/process-instrumentation/process-instrumentation.csproj +++ b/examples/process-instrumentation/process-instrumentation.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/redis/Examples.StackExchangeRedis/Examples.StackExchangeRedis.csproj b/examples/redis/Examples.StackExchangeRedis/Examples.StackExchangeRedis.csproj index 6687d84436..acc9c2e522 100644 --- a/examples/redis/Examples.StackExchangeRedis/Examples.StackExchangeRedis.csproj +++ b/examples/redis/Examples.StackExchangeRedis/Examples.StackExchangeRedis.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/runtime-instrumentation/runtime-instrumentation.csproj b/examples/runtime-instrumentation/runtime-instrumentation.csproj index 40c7117f90..6ac63211ca 100644 --- a/examples/runtime-instrumentation/runtime-instrumentation.csproj +++ b/examples/runtime-instrumentation/runtime-instrumentation.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj index 8786127849..9888620640 100644 --- a/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj +++ b/examples/wcf/client-core/Examples.Wcf.Client.DotNet.csproj @@ -6,10 +6,10 @@ - - - - + + + + diff --git a/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj b/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj index 25cd5c57b3..06f2774538 100644 --- a/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj +++ b/examples/wcf/client-netframework/Examples.Wcf.Client.NetFramework.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/wcf/server-aspnetframework/Examples.Wcf.Server.AspNetFramework.csproj b/examples/wcf/server-aspnetframework/Examples.Wcf.Server.AspNetFramework.csproj index 836974962c..94576a1fed 100644 --- a/examples/wcf/server-aspnetframework/Examples.Wcf.Server.AspNetFramework.csproj +++ b/examples/wcf/server-aspnetframework/Examples.Wcf.Server.AspNetFramework.csproj @@ -43,10 +43,10 @@ - - - - + + + + diff --git a/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj b/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj index 2ad352a183..05aac90ce0 100644 --- a/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj +++ b/examples/wcf/server-netframework/Examples.Wcf.Server.NetFramework.csproj @@ -6,7 +6,7 @@ - + diff --git a/examples/wcf/shared/Examples.Wcf.Shared.csproj b/examples/wcf/shared/Examples.Wcf.Shared.csproj index 2d75ee7fb4..17123c1694 100644 --- a/examples/wcf/shared/Examples.Wcf.Shared.csproj +++ b/examples/wcf/shared/Examples.Wcf.Shared.csproj @@ -4,20 +4,19 @@ $(DefaultTargetFrameworkForExampleApps);$(NetFrameworkMinimumSupportedVersion) - - - + + + + - - + + + - - - - - + + diff --git a/opentelemetry-dotnet-contrib.sln b/opentelemetry-dotnet-contrib.sln index e5474a63d2..1d2523396a 100644 --- a/opentelemetry-dotnet-contrib.sln +++ b/opentelemetry-dotnet-contrib.sln @@ -12,6 +12,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution .markdownlint.yaml = .markdownlint.yaml CODEOWNERS = CODEOWNERS CONTRIBUTING.md = CONTRIBUTING.md + Directory.Build.props = Directory.Build.props + Directory.Packages.props = Directory.Packages.props global.json = global.json LICENSE.TXT = LICENSE.TXT NuGet.config = NuGet.config diff --git a/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props b/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props deleted file mode 100644 index 5570a7a1fe..0000000000 --- a/src/OpenTelemetry.Exporter.Geneva/Common.GenevaExporter.props +++ /dev/null @@ -1,9 +0,0 @@ - - - $(OpenTelemetryCoreLatestVersion) - - - - $(DefineConstants);EXPOSE_EXPERIMENTAL_FEATURES - - diff --git a/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj b/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj index eaff1df44f..4428fadff0 100644 --- a/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj +++ b/src/OpenTelemetry.Exporter.Geneva/OpenTelemetry.Exporter.Geneva.csproj @@ -1,7 +1,5 @@ - - $(NetMinimumSupportedVersion);$(NetStandardMinimumSupportedVersion) @@ -17,13 +15,13 @@ - - + + - + diff --git a/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj b/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj index 2ce6e466e5..32596331c0 100644 --- a/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj +++ b/src/OpenTelemetry.Exporter.InfluxDB/OpenTelemetry.Exporter.InfluxDB.csproj @@ -15,11 +15,13 @@ - - + + + - - + + + diff --git a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj index 7e671d211d..92f01ce617 100644 --- a/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj +++ b/src/OpenTelemetry.Exporter.Instana/OpenTelemetry.Exporter.Instana.csproj @@ -10,17 +10,17 @@ - + + - + diff --git a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj index 2ad73ee57d..762a05d063 100644 --- a/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj +++ b/src/OpenTelemetry.Exporter.OneCollector/OpenTelemetry.Exporter.OneCollector.csproj @@ -14,21 +14,20 @@ in the future (hopefully .NET 9) see https://github.com/dotnet/runtime/issues/92509 --> $(NoWarn);SYSLIB1100;SYSLIB1101 1.11.1 - $(SystemTextJsonLatestNet6OutOfBandPkgVer) false - - $(OpenTelemetryCoreLatestVersion) - $(DefineConstants);EXPOSE_EXPERIMENTAL_FEATURES - - - + + + + + + - + diff --git a/src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj b/src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj index 8e429369e5..91e417727a 100644 --- a/src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj +++ b/src/OpenTelemetry.Extensions.AWS/OpenTelemetry.Extensions.AWS.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/OpenTelemetry.Extensions.Enrichment.AspNetCore/OpenTelemetry.Extensions.Enrichment.AspNetCore.csproj b/src/OpenTelemetry.Extensions.Enrichment.AspNetCore/OpenTelemetry.Extensions.Enrichment.AspNetCore.csproj index ec59ed9901..ddcda1d3b9 100644 --- a/src/OpenTelemetry.Extensions.Enrichment.AspNetCore/OpenTelemetry.Extensions.Enrichment.AspNetCore.csproj +++ b/src/OpenTelemetry.Extensions.Enrichment.AspNetCore/OpenTelemetry.Extensions.Enrichment.AspNetCore.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/OpenTelemetry.Extensions.Enrichment.Http/OpenTelemetry.Extensions.Enrichment.Http.csproj b/src/OpenTelemetry.Extensions.Enrichment.Http/OpenTelemetry.Extensions.Enrichment.Http.csproj index 686a0b4beb..510e47f3d0 100644 --- a/src/OpenTelemetry.Extensions.Enrichment.Http/OpenTelemetry.Extensions.Enrichment.Http.csproj +++ b/src/OpenTelemetry.Extensions.Enrichment.Http/OpenTelemetry.Extensions.Enrichment.Http.csproj @@ -19,8 +19,8 @@ - - + + diff --git a/src/OpenTelemetry.Extensions.Enrichment/OpenTelemetry.Extensions.Enrichment.csproj b/src/OpenTelemetry.Extensions.Enrichment/OpenTelemetry.Extensions.Enrichment.csproj index 8bf5176816..85a793a88f 100644 --- a/src/OpenTelemetry.Extensions.Enrichment/OpenTelemetry.Extensions.Enrichment.csproj +++ b/src/OpenTelemetry.Extensions.Enrichment/OpenTelemetry.Extensions.Enrichment.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj b/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj index 74b07e5117..d45e50ba01 100644 --- a/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj +++ b/src/OpenTelemetry.Extensions/OpenTelemetry.Extensions.csproj @@ -20,7 +20,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj b/src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj index bbf63a41fd..894afb8ad7 100644 --- a/src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj +++ b/src/OpenTelemetry.Instrumentation.AWS/OpenTelemetry.Instrumentation.AWS.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/OpenTelemetry.Instrumentation.AWSLambda/OpenTelemetry.Instrumentation.AWSLambda.csproj b/src/OpenTelemetry.Instrumentation.AWSLambda/OpenTelemetry.Instrumentation.AWSLambda.csproj index 5f1b68195b..7ea5c8ca44 100644 --- a/src/OpenTelemetry.Instrumentation.AWSLambda/OpenTelemetry.Instrumentation.AWSLambda.csproj +++ b/src/OpenTelemetry.Instrumentation.AWSLambda/OpenTelemetry.Instrumentation.AWSLambda.csproj @@ -5,7 +5,6 @@ AWS Lambda tracing wrapper for OpenTelemetry .NET. $(PackageTags);AWS Lambda Instrumentation.AWS- - $(SystemTextJsonLatestNet6OutOfBandPkgVer) INSTRUMENTATION_AWSLAMBDA;$(DefineConstants) @@ -18,11 +17,16 @@ - - - - - + + + + + + + + + + diff --git a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj index 3d6554f219..1630f19edf 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.csproj @@ -33,7 +33,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj index 5535ef31b1..31810855d2 100644 --- a/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNet/OpenTelemetry.Instrumentation.AspNet.csproj @@ -40,9 +40,9 @@ - - - + + + diff --git a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj index 9e7ef2b0d3..22ed570cfd 100644 --- a/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj +++ b/src/OpenTelemetry.Instrumentation.AspNetCore/OpenTelemetry.Instrumentation.AspNetCore.csproj @@ -31,18 +31,18 @@ - + - - - - - - + + + + + + - + diff --git a/src/OpenTelemetry.Instrumentation.Cassandra/OpenTelemetry.Instrumentation.Cassandra.csproj b/src/OpenTelemetry.Instrumentation.Cassandra/OpenTelemetry.Instrumentation.Cassandra.csproj index 436d5f79dd..8c192ee9fe 100644 --- a/src/OpenTelemetry.Instrumentation.Cassandra/OpenTelemetry.Instrumentation.Cassandra.csproj +++ b/src/OpenTelemetry.Instrumentation.Cassandra/OpenTelemetry.Instrumentation.Cassandra.csproj @@ -14,10 +14,10 @@ - - - - + + + + diff --git a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj index 1d1ebed7ac..b7cb7a3c4b 100644 --- a/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj +++ b/src/OpenTelemetry.Instrumentation.ConfluentKafka/OpenTelemetry.Instrumentation.ConfluentKafka.csproj @@ -23,9 +23,9 @@ - - - + + + diff --git a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj index df75e3f75f..bc6308efdd 100644 --- a/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj +++ b/src/OpenTelemetry.Instrumentation.ElasticsearchClient/OpenTelemetry.Instrumentation.ElasticsearchClient.csproj @@ -7,7 +7,6 @@ Elasticsearch instrumentation for OpenTelemetry .NET. $(PackageTags);distributed-tracing Instrumentation.ElasticsearchClient- - $(SystemTextJsonMinimumOutOfBandPkgVer) - + + + + + diff --git a/src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj b/src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj index 0f1181812e..0c4256c37c 100644 --- a/src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj +++ b/src/OpenTelemetry.Instrumentation.Http/OpenTelemetry.Instrumentation.Http.csproj @@ -29,10 +29,10 @@ - - - - + + + + diff --git a/src/OpenTelemetry.Instrumentation.Owin/OpenTelemetry.Instrumentation.Owin.csproj b/src/OpenTelemetry.Instrumentation.Owin/OpenTelemetry.Instrumentation.Owin.csproj index 33cbafe5a5..011cad8a69 100644 --- a/src/OpenTelemetry.Instrumentation.Owin/OpenTelemetry.Instrumentation.Owin.csproj +++ b/src/OpenTelemetry.Instrumentation.Owin/OpenTelemetry.Instrumentation.Owin.csproj @@ -27,10 +27,10 @@ - - - - + + + + diff --git a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj index 21b579ebf6..03f2f542cb 100644 --- a/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj +++ b/src/OpenTelemetry.Instrumentation.Process/OpenTelemetry.Instrumentation.Process.csproj @@ -15,7 +15,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj b/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj index 739d2c89c3..747ebaaa71 100644 --- a/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj +++ b/src/OpenTelemetry.Instrumentation.Quartz/OpenTelemetry.Instrumentation.Quartz.csproj @@ -14,7 +14,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj b/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj index a3c4a6b008..1bb0138109 100644 --- a/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj +++ b/src/OpenTelemetry.Instrumentation.Runtime/OpenTelemetry.Instrumentation.Runtime.csproj @@ -11,7 +11,7 @@ - + diff --git a/src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/OpenTelemetry.Instrumentation.ServiceFabricRemoting.csproj b/src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/OpenTelemetry.Instrumentation.ServiceFabricRemoting.csproj index c41b8892c3..e6e69337cc 100644 --- a/src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/OpenTelemetry.Instrumentation.ServiceFabricRemoting.csproj +++ b/src/OpenTelemetry.Instrumentation.ServiceFabricRemoting/OpenTelemetry.Instrumentation.ServiceFabricRemoting.csproj @@ -26,10 +26,10 @@ - - - - + + + + diff --git a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj index fa725abfdd..5d34dd0ea9 100644 --- a/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj +++ b/src/OpenTelemetry.Instrumentation.SqlClient/OpenTelemetry.Instrumentation.SqlClient.csproj @@ -35,9 +35,9 @@ - - - + + + diff --git a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj index 0dce5ff029..c05922ba21 100644 --- a/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj +++ b/src/OpenTelemetry.Instrumentation.StackExchangeRedis/OpenTelemetry.Instrumentation.StackExchangeRedis.csproj @@ -28,11 +28,11 @@ - - - - - + + + + + diff --git a/src/OpenTelemetry.Instrumentation.Wcf/OpenTelemetry.Instrumentation.Wcf.csproj b/src/OpenTelemetry.Instrumentation.Wcf/OpenTelemetry.Instrumentation.Wcf.csproj index 4740930b36..c54d599cac 100644 --- a/src/OpenTelemetry.Instrumentation.Wcf/OpenTelemetry.Instrumentation.Wcf.csproj +++ b/src/OpenTelemetry.Instrumentation.Wcf/OpenTelemetry.Instrumentation.Wcf.csproj @@ -15,18 +15,21 @@ - + - + - - - - + + + + + + + diff --git a/src/OpenTelemetry.OpAmp.Client/OpenTelemetry.OpAmp.Client.csproj b/src/OpenTelemetry.OpAmp.Client/OpenTelemetry.OpAmp.Client.csproj index e10fcafda3..57f04caed7 100644 --- a/src/OpenTelemetry.OpAmp.Client/OpenTelemetry.OpAmp.Client.csproj +++ b/src/OpenTelemetry.OpAmp.Client/OpenTelemetry.OpAmp.Client.csproj @@ -14,16 +14,13 @@ - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - + + - - + + diff --git a/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj index 9842dfffb2..ac6d9e5640 100644 --- a/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj +++ b/src/OpenTelemetry.Resources.AWS/OpenTelemetry.Resources.AWS.csproj @@ -6,7 +6,6 @@ $(TargetFrameworks);$(NetFrameworkMinimumSupportedVersion) OpenTelemetry Resource Detectors for AWS ElasticBeanstalk, EC2, ECS, EKS. Resources.AWS- - $(SystemTextJsonLatestNet6OutOfBandPkgVer) RESOURCES_AWS;$(DefineConstants) @@ -15,11 +14,16 @@ - + + - - + + + + + + diff --git a/src/OpenTelemetry.Resources.Azure/OpenTelemetry.Resources.Azure.csproj b/src/OpenTelemetry.Resources.Azure/OpenTelemetry.Resources.Azure.csproj index d69f5a3e24..c0e6089a1a 100644 --- a/src/OpenTelemetry.Resources.Azure/OpenTelemetry.Resources.Azure.csproj +++ b/src/OpenTelemetry.Resources.Azure/OpenTelemetry.Resources.Azure.csproj @@ -5,7 +5,6 @@ OpenTelemetry Resource Detectors for Azure cloud environments. $(PackageTags);ResourceDetector Resources.Azure- - $(SystemTextJsonMinimumOutOfBandPkgVer) - + diff --git a/test/OpenTelemetry.Contrib.Shared.Benchmarks/OpenTelemetry.Contrib.Shared.Benchmarks.csproj b/test/OpenTelemetry.Contrib.Shared.Benchmarks/OpenTelemetry.Contrib.Shared.Benchmarks.csproj index 52ff5d6411..9ab52495ff 100644 --- a/test/OpenTelemetry.Contrib.Shared.Benchmarks/OpenTelemetry.Contrib.Shared.Benchmarks.csproj +++ b/test/OpenTelemetry.Contrib.Shared.Benchmarks/OpenTelemetry.Contrib.Shared.Benchmarks.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj b/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj index 4dd7c2fdb0..6eb6051508 100644 --- a/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj +++ b/test/OpenTelemetry.Contrib.Shared.Tests/OpenTelemetry.Contrib.Shared.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + @@ -31,9 +31,7 @@ - - SqlProcessorTestCases.json - + diff --git a/test/OpenTelemetry.Exporter.Geneva.Benchmarks/OpenTelemetry.Exporter.Geneva.Benchmarks.csproj b/test/OpenTelemetry.Exporter.Geneva.Benchmarks/OpenTelemetry.Exporter.Geneva.Benchmarks.csproj index 6c83c7a14b..da858d3720 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Benchmarks/OpenTelemetry.Exporter.Geneva.Benchmarks.csproj +++ b/test/OpenTelemetry.Exporter.Geneva.Benchmarks/OpenTelemetry.Exporter.Geneva.Benchmarks.csproj @@ -1,7 +1,5 @@ - - $(SupportedNetTargets) $(TargetFrameworks);net48;net472;net471;net47;net462 @@ -10,8 +8,8 @@ - - + + diff --git a/test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj b/test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj index d78dacb3e9..828b610c27 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj +++ b/test/OpenTelemetry.Exporter.Geneva.Stress/OpenTelemetry.Exporter.Geneva.Stress.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj b/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj index dad4892a09..b02da88880 100644 --- a/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Geneva.Tests/OpenTelemetry.Exporter.Geneva.Tests.csproj @@ -1,7 +1,5 @@ - - $(SupportedNetTargets) $(TargetFrameworks);net48;net472;net471;net47;net462 @@ -10,12 +8,12 @@ - - - - - - + + + + + + @@ -29,9 +27,7 @@ - - Proto - + diff --git a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj index 58420201b6..e1b65c5e1f 100644 --- a/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj +++ b/test/OpenTelemetry.Exporter.Instana.Tests/OpenTelemetry.Exporter.Instana.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj index 1aa3195078..5ff524a72e 100644 --- a/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj +++ b/test/OpenTelemetry.Exporter.OneCollector.Benchmarks/OpenTelemetry.Exporter.OneCollector.Benchmarks.csproj @@ -9,7 +9,7 @@ - + @@ -17,7 +17,7 @@ - + diff --git a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests.csproj b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests.csproj index 0b705548a5..76d50f58e8 100644 --- a/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests/OpenTelemetry.Extensions.Enrichment.AspNetCore.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/OpenTelemetry.Extensions.Enrichment.Http.Tests.csproj b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/OpenTelemetry.Extensions.Enrichment.Http.Tests.csproj index dbef00ecee..589d0df105 100644 --- a/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/OpenTelemetry.Extensions.Enrichment.Http.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Enrichment.Http.Tests/OpenTelemetry.Extensions.Enrichment.Http.Tests.csproj @@ -14,6 +14,6 @@ - + diff --git a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj index 0099fdb3eb..3fb222cb44 100644 --- a/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Enrichment.Tests/OpenTelemetry.Extensions.Enrichment.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj index 4372bf3b0e..6ce71544a8 100644 --- a/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Tests/OpenTelemetry.Extensions.Tests.csproj @@ -16,8 +16,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj b/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj index 19266cd495..01172baa06 100644 --- a/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AWS.Tests/OpenTelemetry.Instrumentation.AWS.Tests.csproj @@ -9,20 +9,20 @@ - - - - - - - + + + + + + + - + diff --git a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj index f82fd66b20..3949f9b0c1 100644 --- a/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AWSLambda.Tests/OpenTelemetry.Instrumentation.AWSLambda.Tests.csproj @@ -10,7 +10,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj index 526236c90d..48c8525ef4 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests/OpenTelemetry.Instrumentation.AspNet.TelemetryHttpModule.Tests.csproj @@ -11,8 +11,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj index 43ac89acff..31c795fcf2 100644 --- a/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNet.Tests/OpenTelemetry.Instrumentation.AspNet.Tests.csproj @@ -7,7 +7,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj b/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj index f006beaa0b..ea0aa66c99 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks/OpenTelemetry.Instrumentation.AspNetCore.Benchmarks.csproj @@ -10,8 +10,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj index c7000df4f0..fe9ef429fc 100644 --- a/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.AspNetCore.Tests/OpenTelemetry.Instrumentation.AspNetCore.Tests.csproj @@ -5,20 +5,12 @@ Unit test project for OpenTelemetry ASP.NET Core instrumentation. - - - - - - - - - - - - - + + + + + @@ -34,10 +26,7 @@ - - RoutingTestCases.json - Always - + diff --git a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj index 757032a71f..063a4e9732 100644 --- a/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Cassandra.Tests/OpenTelemetry.Instrumentation.Cassandra.Tests.csproj @@ -6,9 +6,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetry.Instrumentation.ConfluentKafka.Tests.csproj b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetry.Instrumentation.ConfluentKafka.Tests.csproj index 03e6599485..a415abe1a0 100644 --- a/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetry.Instrumentation.ConfluentKafka.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.ConfluentKafka.Tests/OpenTelemetry.Instrumentation.ConfluentKafka.Tests.csproj @@ -19,10 +19,10 @@ - - - - + + + + diff --git a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj index 1fc4a3e23c..197ad715c0 100644 --- a/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests/OpenTelemetry.Instrumentation.ElasticsearchClient.Tests.csproj @@ -8,9 +8,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj index 0e0eb10d76..b5f79a647b 100644 --- a/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests/OpenTelemetry.Instrumentation.EntityFrameworkCore.Tests.csproj @@ -6,15 +6,15 @@ - - - - - - - - - + + + + + + + + + diff --git a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj index 70942ae401..746e86558c 100644 --- a/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.EventCounters.Tests/OpenTelemetry.Instrumentation.EventCounters.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj index bc2e9fcf01..6739b13339 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.GrpcCore.Tests/OpenTelemetry.Instrumentation.GrpcCore.Tests.csproj @@ -5,8 +5,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/OpenTelemetry.Instrumentation.GrpcNetClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/OpenTelemetry.Instrumentation.GrpcNetClient.Tests.csproj index de04519bb7..b11b937fea 100644 --- a/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/OpenTelemetry.Instrumentation.GrpcNetClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.GrpcNetClient.Tests/OpenTelemetry.Instrumentation.GrpcNetClient.Tests.csproj @@ -11,19 +11,19 @@ - - - - - - - - - + + + + + + + + + - + diff --git a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj index ac0eb98721..a12781ff1c 100644 --- a/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Hangfire.Tests/OpenTelemetry.Instrumentation.Hangfire.Tests.csproj @@ -10,10 +10,10 @@ - - - - + + + + diff --git a/test/OpenTelemetry.Instrumentation.Http.Benchmarks/OpenTelemetry.Instrumentation.Http.Benchmarks.csproj b/test/OpenTelemetry.Instrumentation.Http.Benchmarks/OpenTelemetry.Instrumentation.Http.Benchmarks.csproj index 2e8a6e4f1c..9fb08a9036 100644 --- a/test/OpenTelemetry.Instrumentation.Http.Benchmarks/OpenTelemetry.Instrumentation.Http.Benchmarks.csproj +++ b/test/OpenTelemetry.Instrumentation.Http.Benchmarks/OpenTelemetry.Instrumentation.Http.Benchmarks.csproj @@ -9,8 +9,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj index 901e687acc..aae7ff00fa 100644 --- a/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Http.Tests/OpenTelemetry.Instrumentation.Http.Tests.csproj @@ -17,18 +17,16 @@ - - + - - + + + - - PreserveNewest - + diff --git a/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj b/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj index ea99af551e..b272d87d6d 100644 --- a/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Owin.Tests/OpenTelemetry.Instrumentation.Owin.Tests.csproj @@ -6,8 +6,8 @@ - - + + diff --git a/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj b/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj index bae293c282..4b1320e75e 100644 --- a/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Process.Tests/OpenTelemetry.Instrumentation.Process.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj index e81b647794..b7fef34b83 100644 --- a/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Quartz.Tests/OpenTelemetry.Instrumentation.Quartz.Tests.csproj @@ -7,9 +7,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj b/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj index 68e46c3e90..0d009f6560 100644 --- a/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Runtime.Tests/OpenTelemetry.Instrumentation.Runtime.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests.csproj b/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests.csproj index 79b9bbf971..8d6d99836f 100644 --- a/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests/OpenTelemetry.Instrumentation.ServiceFabricRemoting.Tests.csproj @@ -12,8 +12,8 @@ - - + + @@ -22,9 +22,7 @@ - - - - + + diff --git a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj index 6b00d72779..344a903a0c 100644 --- a/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.SqlClient.Tests/OpenTelemetry.Instrumentation.SqlClient.Tests.csproj @@ -19,9 +19,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj index 71ae753f08..7a4d861afa 100644 --- a/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests/OpenTelemetry.Instrumentation.StackExchangeRedis.Tests.csproj @@ -18,9 +18,9 @@ - - - + + + diff --git a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj index 64ee92e89b..7a938b4150 100644 --- a/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Wcf.Tests/OpenTelemetry.Instrumentation.Wcf.Tests.csproj @@ -11,21 +11,21 @@ - + - + - - - + + + - + diff --git a/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj index 8e2510fc3b..0655b3ccde 100644 --- a/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj +++ b/test/OpenTelemetry.Resources.AWS.Tests/OpenTelemetry.Resources.AWS.Tests.csproj @@ -11,32 +11,13 @@ - + - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + - - PreserveNewest - - - PreserveNewest - - - PreserveNewest - + diff --git a/test/OpenTelemetry.Resources.Gcp.Tests/OpenTelemetry.Resources.Gcp.Tests.csproj b/test/OpenTelemetry.Resources.Gcp.Tests/OpenTelemetry.Resources.Gcp.Tests.csproj index 6dbe2abd1b..ae58150ec8 100644 --- a/test/OpenTelemetry.Resources.Gcp.Tests/OpenTelemetry.Resources.Gcp.Tests.csproj +++ b/test/OpenTelemetry.Resources.Gcp.Tests/OpenTelemetry.Resources.Gcp.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj b/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj index 6892d723eb..29eef2b9dd 100644 --- a/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj +++ b/test/OpenTelemetry.Sampler.AWS.Tests/OpenTelemetry.Sampler.AWS.Tests.csproj @@ -6,7 +6,7 @@ - + diff --git a/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj b/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj index ae0043309a..2435e61666 100644 --- a/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj +++ b/test/TestApp.AspNetCore/TestApp.AspNetCore.csproj @@ -5,8 +5,8 @@ - - + +