Skip to content

Commit fb4947e

Browse files
version bump to 1.3.0 (#369)
* version bump to 1.3.0 * split nuget versions, only bump Datadog.Trace.ClrProfiler.Managed * consolidate <TargetFrameworks> in src folder * list net45 first so it becomes the default in most IDEs
1 parent cf8326c commit fb4947e

File tree

10 files changed

+40
-44
lines changed

10 files changed

+40
-44
lines changed

docker/package.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
set -euxo pipefail
33

44
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
5-
VERSION=1.2.0
5+
VERSION=1.3.0
66

77
mkdir -p $DIR/../deploy/linux
88
cp $DIR/../integrations.json $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/

integrations.json

Lines changed: 31 additions & 31 deletions
Large diffs are not rendered by default.

reproductions/AutomapperTest/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base
2-
ARG TRACER_VERSION=1.2.0
2+
ARG TRACER_VERSION=1.3.0
33
RUN mkdir -p /opt/datadog
44
RUN mkdir -p /var/log/datadog
55
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v$TRACER_VERSION/datadog-dotnet-apm-$TRACER_VERSION.tar.gz | tar xzf - -C /opt/datadog

src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;net461;netstandard2.0;</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
64
<RootNamespace>Datadog.Trace.ClrProfiler</RootNamespace>
75

86
<!-- NuGet -->
7+
<Version>1.3.0</Version>
98
<Title>Datadog APM - ClrProfiler</Title>
109
<Description>Automatic instrumentation library used by .NET Tracer for Datadog APM. Requires separate native library that implements the CLR Profiling API.</Description>
1110
<Authors>lucas.pimentel.datadog</Authors>

src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
cmake_minimum_required (VERSION 3.8)
22
cmake_policy(SET CMP0015 NEW)
33

4-
project("Datadog.Trace.ClrProfiler.Native" VERSION 0.4.0)
4+
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.3.0)
55

66
add_compile_options(-std=c++11 -fPIC -fms-extensions)
77
add_compile_options(-DBIT64 -DPAL_STDCPP_COMPAT -DPLATFORM_UNIX -DUNICODE)
0 Bytes
Binary file not shown.
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#pragma once
22

3-
constexpr auto PROFILER_VERSION = "1.2.0";
3+
constexpr auto PROFILER_VERSION = "1.3.0";

src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">netstandard2.0;net45;net461</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
6-
74
<!-- NuGet -->
5+
<Version>1.2.0</Version>
86
<Title>Datadog APM - OpenTracing</Title>
97
<Description>Provides OpenTracing support for Datadog APM</Description>
108
<Authors>lucas.pimentel.datadog;bmermet</Authors>

src/Datadog.Trace/Datadog.Trace.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net45;net461;netstandard2.0</TargetFrameworks>
5-
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
6-
74
<!-- NuGet -->
5+
<Version>1.2.0</Version>
86
<Title>Datadog APM</Title>
97
<Description>Manual instrumentation library for Datadog APM</Description>
108
<Authors>lucas.pimentel.datadog;bmermet</Authors>

src/Directory.Build.props

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,12 @@
22
<Import Project="..\Directory.Build.props" />
33

44
<PropertyGroup>
5+
<TargetFrameworks Condition="'$(OS)' == 'Windows_NT'">net45;net461;netstandard2.0</TargetFrameworks>
6+
<TargetFrameworks Condition="'$(OS)' != 'Windows_NT'">netstandard2.0</TargetFrameworks>
57
<GenerateDocumentationFile>true</GenerateDocumentationFile>
68
<LangVersion>7.3</LangVersion>
79

810
<!-- NuGet packages -->
9-
<Version>1.2.0</Version>
1011
<IsPackable>true</IsPackable>
1112
<PackageIconUrl>https://github.com/DataDog/dd-trace-dotnet/raw/master/datadog-logo-64x64.png</PackageIconUrl>
1213
<PackageProjectUrl>https://docs.datadoghq.com/tracing/setup/dotnet/</PackageProjectUrl>

0 commit comments

Comments
 (0)