Skip to content

Commit

Permalink
Update version to v1.11.0 (DataDog#591)
Browse files Browse the repository at this point in the history
  • Loading branch information
zacharycmontoya authored Dec 11, 2019
1 parent 18e6271 commit 69a0d9e
Show file tree
Hide file tree
Showing 14 changed files with 91 additions and 91 deletions.
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.10.3-prerelease-$(Platform)</OutputName>
<OutputName>datadog-dotnet-apm-1.11.0-$(Platform)</OutputName>
</PropertyGroup>

<PropertyGroup>
<DefineConstants>InstallerVersion=1.10.3</DefineConstants>
<DefineConstants>InstallerVersion=1.11.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.10.3
VERSION=1.11.0

mkdir -p $DIR/../deploy/linux
cp $DIR/../integrations.json $DIR/../src/Datadog.Trace.ClrProfiler.Native/bin/Debug/x64/
Expand Down
144 changes: 72 additions & 72 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.10.3
ARG TRACER_VERSION=1.11.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.10.3-prerelease</Version>
<Version>1.11.0</Version>
<Title>Datadog APM Tracing for ASP.NET</Title>
<Description>Provides tracing for ASP.NET web applications.</Description>

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.10.3-prerelease</Version>
<Version>1.11.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 bool TryLoadManagedAssembly()
{
try
{
Assembly.Load(new AssemblyName("Datadog.Trace.ClrProfiler.Managed, Version=1.10.3.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"));
Assembly.Load(new AssemblyName("Datadog.Trace.ClrProfiler.Managed, Version=1.11.0.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb"));
return true;
}
catch
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.10.3-prerelease</Version>
<Version>1.11.0</Version>
<Title>Datadog APM - ClrProfiler</Title>
<Description>OBSOLETE. This package is deprecated and exists only for backwards compatibility.
Users who need manual instrumentation should reference the "Datadog.Trace" package.
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.10.3)
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.11.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,10,3,0
PRODUCTVERSION 1,10,3,0
FILEVERSION 1,11,0,0
PRODUCTVERSION 1,11,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.10.3.0"
VALUE "FileVersion", "1.11.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.10.3"
VALUE "ProductVersion", "1.11.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.10.3";
constexpr auto PROFILER_VERSION = "1.11.0";
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.10.3-prerelease</Version>
<Version>1.11.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.10.3-prerelease</Version>
<Version>1.11.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 = 10;
public const int Minor = 11;

/// <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;
}
}

0 comments on commit 69a0d9e

Please sign in to comment.