Clean up after metrics to main merge (#2175)

This commit is contained in:
Cijo Thomas 2021-07-22 10:00:44 -07:00 committed by GitHub
parent 7c611c8537
commit 4b2e200ffb
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 20 deletions

View File

@ -8,6 +8,12 @@
</PackageReference>
</ItemGroup>
<!-- Temporarily disable public API check till metrics get close to Release
<PackageReference Include="Microsoft.CodeAnalysis.PublicApiAnalyzers" Version="$(MicrosoftCodeAnalysisAnalyzersPkgVer)" Condition=" $(OS) == 'Windows_NT'">
<PrivateAssets>All</PrivateAssets>
</PackageReference>
-->
<ItemGroup Condition="'$(MinVerTagPrefix)' == 'core-' AND '$(CheckAPICompatibility)' == 'true'">
<PackageReference Include="Microsoft.DotNet.ApiCompat" Version="6.0.0-beta.21308.1" PrivateAssets="All" />
<ResolvedMatchingContract Include="..\LastMajorVersionBinaries\$(AssemblyName)\$(OTelPreviousStableVer)\lib\$(TargetFramework)\$(AssemblyName).dll" />

View File

@ -1,17 +1,9 @@
# Changelog
## Experimental - Metrics
Note: the metrics work is happening in the [metrics feature
branch](https://github.com/open-telemetry/opentelemetry-dotnet/tree/metrics),
please check the latest changes
[here](https://github.com/open-telemetry/opentelemetry-dotnet/blob/metrics/src/OpenTelemetry.Api/CHANGELOG.md#experimental---metrics).
* Removed existing Metrics code as the spec is completely being re-written.
([#2030](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2030))
## Unreleased
* Add Metrics support.
* Removes .NET Framework 4.5.2 support. The minimum .NET Framework
version supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
@ -87,6 +79,8 @@ Released 2021-Jan-29
* Relax System.Diagnostics.DiagnosticSource version requirement to allow
versions >=5.0. Previously only versions up to 6.0 (excluding 6.0) was
allowed.
* Metrics removed as it is not part 1.0.0 release. See issue [#1501](https://github.com/open-telemetry/opentelemetry-dotnet/pull/1655)
for details on Metric release plans.
## 1.0.0-rc1.1

View File

@ -1,17 +1,9 @@
# Changelog
## Experimental - Metrics
Note: the metrics work is happening in the [metrics feature
branch](https://github.com/open-telemetry/opentelemetry-dotnet/tree/metrics),
please check the latest changes
[here](https://github.com/open-telemetry/opentelemetry-dotnet/blob/metrics/src/OpenTelemetry/CHANGELOG.md#experimental---metrics).
* Removed existing Metrics code as the spec is completely being re-written.
([#2030](https://github.com/open-telemetry/opentelemetry-dotnet/pull/2030))
## Unreleased
* Add Metrics support.
* Removes .NET Framework 4.5.2, .NET 4.6 support. The minimum .NET Framework
version supported is .NET 4.6.1. ([#2138](https://github.com/open-telemetry/opentelemetry-dotnet/issues/2138))
@ -164,6 +156,9 @@ Released 2021-Jan-29
[#1501](https://github.com/open-telemetry/opentelemetry-dotnet/issues/1501)
for details on Metric release plans.
* Fix Resource attribute telemetry.sdk.version to have correct file version.
* Metrics removed as it is not part 1.0.0 release. See issue
[#1501](https://github.com/open-telemetry/opentelemetry-dotnet/issues/1501)
for details on Metric release plans.
## 1.0.0-rc1.1