From 92ec2543425d6c81e43b03651e15d810b67eaf88 Mon Sep 17 00:00:00 2001 From: Austin Tan Date: Mon, 16 Nov 2020 14:30:45 -0800 Subject: [PATCH] Extracting package versions to common.props (#1538) * Most of the common props stuff * remove coverlet from Zpages Test * Clean up other mention of coverlet in comment * Moving appropriate package versions to nonprod * Common.props removal of packagevers * reverting some changes to a grpc package * Fixing tabs and adding one more packagae referecne Co-authored-by: Cijo Thomas Co-authored-by: Eddy Nakamura --- build/Common.nonprod.props | 6 +++++- examples/AspNet/Examples.AspNet.csproj | 6 +++--- test/Directory.Build.targets | 4 ---- .../OpenTelemetry.Exporter.ZPages.Tests.csproj | 4 ---- .../OpenTelemetry.Extensions.Hosting.Tests.csproj | 2 +- .../OpenTelemetry.Instrumentation.Grpc.Tests.csproj | 8 ++++---- 6 files changed, 13 insertions(+), 17 deletions(-) diff --git a/build/Common.nonprod.props b/build/Common.nonprod.props index dfa7f4fe8bd..28877f3bb99 100644 --- a/build/Common.nonprod.props +++ b/build/Common.nonprod.props @@ -27,8 +27,12 @@ [2.3.1,3.0) [3.13.0,4.0) [2.27.0,3.0) - [2.27.0,3.0) + [2.30.0, 3.0) + [2.32.0,3.0) [2.25.0,3.0) + [5.2.7,6.0) + [5.2.7,6.0) + [3.2.7,4.0) [3.1.6,5.0) [5.0.0,6.0) [5.0.0,6.0) diff --git a/examples/AspNet/Examples.AspNet.csproj b/examples/AspNet/Examples.AspNet.csproj index baaa8b4b719..9cf2240027b 100644 --- a/examples/AspNet/Examples.AspNet.csproj +++ b/examples/AspNet/Examples.AspNet.csproj @@ -76,9 +76,9 @@ - - - + + + diff --git a/test/Directory.Build.targets b/test/Directory.Build.targets index 190528a75fb..396aed1f53c 100644 --- a/test/Directory.Build.targets +++ b/test/Directory.Build.targets @@ -1,8 +1,4 @@ - diff --git a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj index 6c010b41d91..8e19752f4c1 100644 --- a/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj +++ b/test/OpenTelemetry.Exporter.ZPages.Tests/OpenTelemetry.Exporter.ZPages.Tests.csproj @@ -13,10 +13,6 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - diff --git a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj index 05a5e880162..06e5ae590b5 100644 --- a/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj +++ b/test/OpenTelemetry.Extensions.Hosting.Tests/OpenTelemetry.Extensions.Hosting.Tests.csproj @@ -20,6 +20,6 @@ runtime; build; native; contentfiles; analyzers - + diff --git a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj index 82266b47305..63048a410ab 100644 --- a/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj +++ b/test/OpenTelemetry.Instrumentation.Grpc.Tests/OpenTelemetry.Instrumentation.Grpc.Tests.csproj @@ -18,10 +18,10 @@ - - - - + + + +