Skip to content

Commit

Permalink
Bump version to 1.13 (#643)
Browse files Browse the repository at this point in the history
  • Loading branch information
colin-higgins authored Feb 14, 2020
1 parent 8187def commit eabd2a3
Show file tree
Hide file tree
Showing 17 changed files with 84 additions and 84 deletions.
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.12.0
ARG TRACER_VERSION=1.13.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.12.0
ARG TRACER_VERSION=1.13.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.12.0
ARG TRACER_VERSION=1.13.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.12.0-$(Platform)</OutputName>
<OutputName>datadog-dotnet-apm-1.13.0-$(Platform)</OutputName>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>InstallerVersion=1.12.0</DefineConstants>
<DefineConstants>InstallerVersion=1.13.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.12.0
VERSION=1.13.0

mkdir -p $DIR/../deploy/linux
cp $DIR/../integrations.json $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/
Expand Down
128 changes: 64 additions & 64 deletions integrations.json

Large diffs are not rendered by default.

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.12.0
ARG TRACER_VERSION=1.13.0
RUN mkdir -p /opt/datadog
RUN mkdir -p /var/log/datadog
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
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.12.0</Version>
<Version>1.13.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 @@ -7,7 +7,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>1.12.0</Version>
<Version>1.13.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.12.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
var assembly = Assembly.Load("Datadog.Trace.ClrProfiler.Managed, Version=1.13.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.12.0</Version>
<Version>1.13.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.12.0)
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.13.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,12,0,0
PRODUCTVERSION 1,12,0,0
FILEVERSION 1,13,0,0
PRODUCTVERSION 1,13,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.12.0.0"
VALUE "FileVersion", "1.13.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.12.0"
VALUE "ProductVersion", "1.13.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.12.0";
constexpr auto PROFILER_VERSION = "1.13.0";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.12.0</Version>
<Version>1.13.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.12.0</Version>
<Version>1.13.0</Version>
<Title>Datadog APM</Title>
<Description>Manual instrumentation library for Datadog APM</Description>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion tools/Datadog.Core.Tools/TracerVersion.cs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ public class TracerVersion
/// <summary>
/// The minor portion of the current version.
/// </summary>
public const int Minor = 12;
public const int Minor = 13;

/// <summary>
/// The patch portion of the current version.
Expand Down

0 comments on commit eabd2a3

Please sign in to comment.