Merge branch 'main' into cijothomas/removenet461_apisdk

open-telemetry · Apr 15, 2022 · a415b87 · a415b87
2 parents 15c369a + 503d2b0
commit a415b87
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/build/Common.props b/build/Common.props
@@ -39,7 +39,7 @@
     <MicrosoftNETFrameworkReferenceAssembliesPkgVer>[1.0.0,2.0)</MicrosoftNETFrameworkReferenceAssembliesPkgVer>
     <MicrosoftSourceLinkGitHubPkgVer>[1.0.0,2.0)</MicrosoftSourceLinkGitHubPkgVer>
     <OpenTracingPkgVer>[0.12.1,0.13)</OpenTracingPkgVer>
-    <OTelPreviousStableVer>1.1.0</OTelPreviousStableVer>
+    <OTelPreviousStableVer>1.2.0</OTelPreviousStableVer>
     <StackExchangeRedisPkgVer>[2.1.58,3.0)</StackExchangeRedisPkgVer>
     <StyleCopAnalyzersPkgVer>[1.2.0-beta.354,2.0)</StyleCopAnalyzersPkgVer>
     <SystemCollectionsImmutablePkgVer>1.4.0</SystemCollectionsImmutablePkgVer>

diff --git a/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj b/src/OpenTelemetry.Exporter.InMemory/OpenTelemetry.Exporter.InMemory.csproj
@@ -12,6 +12,16 @@
     <NoWarn>$(NoWarn),1591</NoWarn>
   </PropertyGroup>
 
+  <!--Do not run ApiCompat as this package was left out from the
+  1.2.0 stable release. This is only temporary, and this package
+  is expected to always version together with core packages.
+  Remove this property once we have released the 1.3.0 stable version
+  of this package. See https://github.com/open-telemetry/opentelemetry-dotnet/issues/3192
+  -->
+  <PropertyGroup>
+    <RunApiCompat>false</RunApiCompat>
+  </PropertyGroup>
+
   <ItemGroup>
     <ProjectReference Include="$(RepoRoot)\src\OpenTelemetry\OpenTelemetry.csproj" />
   </ItemGroup>