Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Version bump to 1.15.0 #681

Merged
merged 1 commit into from
Mar 23, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion customer-samples/ConsoleApp/Alpine3.10.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY --from=build /app/out .

# Set up Datadog APM
RUN apk --no-cache update && apk add curl
ARG TRACER_VERSION=1.14.3
ARG TRACER_VERSION=1.15.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion customer-samples/ConsoleApp/Alpine3.9.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ COPY --from=build /app/out .

# Set up Datadog APM
RUN apk --no-cache update && apk add curl
ARG TRACER_VERSION=1.14.3
ARG TRACER_VERSION=1.15.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -L https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm-${TRACER_VERSION}-musl.tar.gz \
Expand Down
2 changes: 1 addition & 1 deletion customer-samples/ConsoleApp/Debian.dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ WORKDIR /app
COPY --from=build /app/out .

# Set up Datadog APM
ARG TRACER_VERSION=1.14.3
ARG TRACER_VERSION=1.15.0
RUN mkdir -p /var/log/datadog
RUN mkdir -p /opt/datadog
RUN curl -LO https://github.com/DataDog/dd-trace-dotnet/releases/download/v${TRACER_VERSION}/datadog-dotnet-apm_${TRACER_VERSION}_amd64.deb
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,11 +14,11 @@
<IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
<DefineSolutionProperties>false</DefineSolutionProperties>
<OutputName>datadog-dotnet-apm-1.14.3-prerelease-$(Platform)</OutputName>
<OutputName>datadog-dotnet-apm-1.15.0-$(Platform)</OutputName>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>InstallerVersion=1.14.3</DefineConstants>
<DefineConstants>InstallerVersion=1.15.0</DefineConstants>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
Expand Down
2 changes: 1 addition & 1 deletion docker/package.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -euxo pipefail

DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null && pwd )"
VERSION=1.14.3
VERSION=1.15.0

mkdir -p $DIR/../deploy/linux
cp $DIR/../integrations.json $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/
Expand Down
2 changes: 1 addition & 1 deletion reproductions/AutomapperTest/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
FROM mcr.microsoft.com/dotnet/core/runtime:2.1-stretch-slim AS base
ARG TRACER_VERSION=1.14.3
ARG TRACER_VERSION=1.15.0
RUN mkdir -p /opt/datadog
RUN mkdir -p /var/log/datadog/dotnet
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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<RootNamespace>Datadog.Trace.AspNet.Loader</RootNamespace>

<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<IsPackable>false</IsPackable>

<!-- Allow the GenerateAssemblyInfo task in the .NET SDK to generate all
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net45</TargetFrameworks>

<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<Title>Datadog APM Tracing for ASP.NET</Title>
<Description>
DEPRECATED. This package exists only for backwards compatibility. If your project references this package ("Datadog.Trace.AspNet") or "Datadog.Trace.ClrProfiler.Managed", you can remove them both.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>Datadog.Trace.ClrProfiler</RootNamespace>

<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<IsPackable>false</IsPackable>

<!-- Allow the GenerateAssemblyInfo task in the .NET SDK to generate all
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
</PropertyGroup>

</Project>
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ private static void TryLoadManagedAssembly()
{
try
{
var assembly = Assembly.Load("Datadog.Trace.ClrProfiler.Managed, Version=1.14.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
var assembly = Assembly.Load("Datadog.Trace.ClrProfiler.Managed, Version=1.15.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

if (assembly != null)
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>Datadog.Trace.ClrProfiler</RootNamespace>

<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<Title>Datadog APM - ClrProfiler</Title>
<Description>
DEPRECATED. This package exists only for backwards compatibility. If your project references this package ("Datadog.Trace.ClrProfiler.Managed") or "Datadog.Trace.AspNet", you can remove them both.
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
cmake_minimum_required (VERSION 3.8)
cmake_policy(SET CMP0015 NEW)

project("Datadog.Trace.ClrProfiler.Native" VERSION 1.14.3)
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.15.0)

add_compile_options(-std=c++11 -fPIC -fms-extensions)
add_compile_options(-DBIT64 -DPAL_STDCPP_COMPAT -DPLATFORM_UNIX -DUNICODE)
Expand Down
8 changes: 4 additions & 4 deletions src/Datadog.Trace.ClrProfiler.Native/Resource.rc
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,14,3,0
PRODUCTVERSION 1,14,3,0
FILEVERSION 1,15,0,0
PRODUCTVERSION 1,15,0,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
Expand All @@ -68,12 +68,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "Datadog, Inc."
VALUE "FileDescription", "Datadog CLR Profiler"
VALUE "FileVersion", "1.14.3.0"
VALUE "FileVersion", "1.15.0.0"
VALUE "InternalName", "Datadog.Trace.ClrProfiler.Native.DLL"
VALUE "LegalCopyright", "Copyright (C) 2017-2019"
VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.DLL"
VALUE "ProductName", "Datadog .NET Tracer"
VALUE "ProductVersion", "1.14.3"
VALUE "ProductVersion", "1.15.0"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/version.h
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#pragma once

constexpr auto PROFILER_VERSION = "1.14.3";
constexpr auto PROFILER_VERSION = "1.15.0";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<Title>Datadog APM - OpenTracing</Title>
<Description>Provides OpenTracing support for Datadog APM</Description>
<Authors>lucas.pimentel.datadog;colinhigginsdatadog;zachmontoyadd</Authors>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace/Datadog.Trace.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.14.3-prerelease</Version>
<Version>1.15.0</Version>
<Title>Datadog APM</Title>
<Description>Manual instrumentation library for Datadog APM</Description>
</PropertyGroup>
Expand Down
6 changes: 3 additions & 3 deletions tools/Datadog.Core.Tools/TracerVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,16 +13,16 @@ public class TracerVersion
/// <summary>
/// The minor portion of the current version.
/// </summary>
public const int Minor = 14;
public const int Minor = 15;

/// <summary>
/// The patch portion of the current version.
/// </summary>
public const int Patch = 3;
public const int Patch = 0;

/// <summary>
/// Whether the current release is a pre-release
/// </summary>
public const bool IsPreRelease = true;
public const bool IsPreRelease = false;
}
}