Merge branch 'main' into fix-test_tracestate_duplicated_keys

open-telemetry · Oct 19, 2023 · d1ee774 · d1ee774
2 parents d7ad2c4 + aa32b11
commit d1ee774
Show file tree

Hide file tree

Showing 99 changed files with 3 additions and 3,301 deletions.
diff --git a/build/Common.prod.props b/build/Common.prod.props
@@ -77,8 +77,11 @@
     <!-- Note: This selects the correct PublicApiAnalyzers files based on $(ExposeExperimentalFeatures) -->
     <ItemGroup>
       <AdditionalFiles Include=".publicApi\Stable\$(TargetFramework)\PublicAPI.*.txt" />
+      <AdditionalFiles Include=".publicApi\Stable\PublicAPI.*.txt" />
       <AdditionalFiles Include=".publicApi\Experimental\$(TargetFramework)\PublicAPI.*.txt" Condition="'$(ExposeExperimentalFeatures)' == 'true'" />
+      <AdditionalFiles Include=".publicApi\Experimental\PublicAPI.*.txt" Condition="'$(ExposeExperimentalFeatures)' == 'true'" />
       <AdditionalFiles Include=".publicApi\$(TargetFramework)\PublicAPI.*.txt" />
+      <AdditionalFiles Include=".publicApi\PublicAPI.*.txt" />
     </ItemGroup>
 
     <!-- Note: The '$(BuildNumber)' != '' check here is to reduce log spam in

diff --git a/...perimental/net6.0/PublicAPI.Unshipped.txt → ...cApi/Experimental/PublicAPI.Unshipped.txt b/...perimental/net6.0/PublicAPI.Unshipped.txt → ...cApi/Experimental/PublicAPI.Unshipped.txt
diff --git a/...etry.Api.ProviderBuilderExtensions/.publicApi/Experimental/net462/PublicAPI.Unshipped.txt b/...etry.Api.ProviderBuilderExtensions/.publicApi/Experimental/net462/PublicAPI.Unshipped.txt
diff --git a/...etry.Api.ProviderBuilderExtensions/.publicApi/Experimental/net8.0/PublicAPI.Unshipped.txt b/...etry.Api.ProviderBuilderExtensions/.publicApi/Experimental/net8.0/PublicAPI.Unshipped.txt
diff --git a/....ProviderBuilderExtensions/.publicApi/Experimental/netstandard2.0/PublicAPI.Unshipped.txt b/....ProviderBuilderExtensions/.publicApi/Experimental/netstandard2.0/PublicAPI.Unshipped.txt
diff --git a/...icApi/Stable/net462/PublicAPI.Shipped.txt → ...s/.publicApi/Stable/PublicAPI.Shipped.txt b/...icApi/Stable/net462/PublicAPI.Shipped.txt → ...s/.publicApi/Stable/PublicAPI.Shipped.txt
diff --git a/...Api/Stable/net462/PublicAPI.Unshipped.txt → ....publicApi/Stable/PublicAPI.Unshipped.txt b/...Api/Stable/net462/PublicAPI.Unshipped.txt → ....publicApi/Stable/PublicAPI.Unshipped.txt
diff --git a/...penTelemetry.Api.ProviderBuilderExtensions/.publicApi/Stable/net6.0/PublicAPI.Shipped.txt b/...penTelemetry.Api.ProviderBuilderExtensions/.publicApi/Stable/net6.0/PublicAPI.Shipped.txt
diff --git a/...penTelemetry.Api.ProviderBuilderExtensions/.publicApi/Stable/net8.0/PublicAPI.Shipped.txt b/...penTelemetry.Api.ProviderBuilderExtensions/.publicApi/Stable/net8.0/PublicAPI.Shipped.txt