Skip to content

Bump version to 1.25.2-prerelease #1333

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Apr 2, 2021
Merged

Bump version to 1.25.2-prerelease #1333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build/docker/package.sh
View file
Open in desktop
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.25.1
VERSION=1.25.2

cd "$DIR/../.."
mkdir -p deploy/linux
Expand Down
542 changes: 271 additions & 271 deletions integrations.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion samples/AutomaticTraceIdInjection/Log4NetExample/Log4NetExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.25.1-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.25.2-prerelease" />
<PackageReference Include="log4net" Version="2.0.12" />
<PackageReference Include="log4net.Ext.Json" Version="2.0.8.3" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion samples/AutomaticTraceIdInjection/NLog40Example/NLog40Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.25.1-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.25.2-prerelease" />
<PackageReference Include="NLog" Version="4.0.0" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/AutomaticTraceIdInjection/NLog45Example/NLog45Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.25.1-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.25.2-prerelease" />
<PackageReference Include="NLog" Version="4.5.11" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/AutomaticTraceIdInjection/NLog46Example/NLog46Example.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.25.1-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.25.2-prerelease" />
<PackageReference Include="NLog" Version="4.6.7" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion samples/AutomaticTraceIdInjection/SerilogExample/SerilogExample.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Datadog.Trace" Version="1.25.1-prerelease" />
<PackageReference Include="Datadog.Trace" Version="1.25.2-prerelease" />
<PackageReference Include="Serilog" Version="2.9.0" />
<PackageReference Include="Serilog.Formatting.Compact" Version="1.1.0" />
<PackageReference Include="Serilog.Sinks.File" Version="4.1.0" />
Expand Down
2 changes: 1 addition & 1 deletion samples/ConsoleApp/Alpine3.10.dockerfile
View file
Open in desktop
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.25.1
ARG TRACER_VERSION=1.25.2
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 samples/ConsoleApp/Alpine3.9.dockerfile
View file
Open in desktop
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.25.1
ARG TRACER_VERSION=1.25.2
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 samples/ConsoleApp/Debian.dockerfile
View file
Open in desktop
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.25.1
ARG TRACER_VERSION=1.25.2
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
2 changes: 1 addition & 1 deletion src/Datadog.Trace.AspNet/Datadog.Trace.AspNet.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFrameworks>net45</TargetFrameworks>

<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM Tracing for ASP.NET</Title>
<PackageDescription>
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
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Managed.Core/Datadog.Trace.ClrProfiler.Managed.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>Datadog.Trace.ClrProfiler</RootNamespace>

<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</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.ClrProfiler.Managed.Loader/Datadog.Trace.ClrProfiler.Managed.Loader.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<OutputPath>..\bin\ProfilerResources\</OutputPath>

<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>

<!-- Hide warnings for EOL .NET Core targets (e.g. netcoreapp2.0) -->
<CheckEolTargetFramework>false</CheckEolTargetFramework>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Managed.Loader/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ private static void TryLoadManagedAssembly()
{
try
{
var assembly = Assembly.Load("Datadog.Trace.ClrProfiler.Managed, Version=1.25.1.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
var assembly = Assembly.Load("Datadog.Trace.ClrProfiler.Managed, Version=1.25.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

if (assembly != null)
{
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Managed/Datadog.Trace.ClrProfiler.Managed.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<RootNamespace>Datadog.Trace.ClrProfiler</RootNamespace>

<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM - ClrProfiler</Title>
<PackageDescription>
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
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ cmake_policy(SET CMP0015 NEW)
# Project definition
# ******************************************************

project("Datadog.Trace.ClrProfiler.Native" VERSION 1.25.1)
project("Datadog.Trace.ClrProfiler.Native" VERSION 1.25.2)

# ******************************************************
# Environment detection
Expand Down
8 changes: 4 additions & 4 deletions src/Datadog.Trace.ClrProfiler.Native/Resource.rc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,8 +50,8 @@ END
//

VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,25,1,0
PRODUCTVERSION 1,25,1,0
FILEVERSION 1,25,2,0
PRODUCTVERSION 1,25,2,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.25.1.0"
VALUE "FileVersion", "1.25.2.0"
VALUE "InternalName", "Datadog.Trace.ClrProfiler.Native.DLL"
VALUE "LegalCopyright", "Copyright 2017 Datadog, Inc."
VALUE "OriginalFilename", "Datadog.Trace.ClrProfiler.Native.DLL"
VALUE "ProductName", "Datadog .NET Tracer"
VALUE "ProductVersion", "1.25.1"
VALUE "ProductVersion", "1.25.2"
END
END
BLOCK "VarFileInfo"
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/dd_profiler_constants.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ namespace trace {
WStr("ISymWrapper")
};

inline WSTRING managed_profiler_full_assembly_version = WStr("Datadog.Trace.ClrProfiler.Managed, Version=1.25.1.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");
inline WSTRING managed_profiler_full_assembly_version = WStr("Datadog.Trace.ClrProfiler.Managed, Version=1.25.2.0, Culture=neutral, PublicKeyToken=def86d061d0d2eeb");

inline WSTRING calltarget_modification_action = WStr("CallTargetModification");

Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.ClrProfiler.Native/version.h
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
#pragma once

constexpr auto PROFILER_VERSION = "1.25.1";
constexpr auto PROFILER_VERSION = "1.25.2";
2 changes: 1 addition & 1 deletion src/Datadog.Trace.MSBuild/Datadog.Trace.MSBuild.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
</PropertyGroup>

<!-- For VS testing purposes only, copy all implementation assemblies to the
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.OpenTracing/Datadog.Trace.OpenTracing.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM - OpenTracing</Title>
<Description>Provides OpenTracing support for Datadog APM</Description>
<PackageTags>$(PackageTags);OpenTracing</PackageTags>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Standalone.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM Auto-instrumentation Runner</Title>
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace.Tools.Runner/Datadog.Trace.Tools.Runner.Tool.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM Auto-instrumentation Runner</Title>
<Copyright>Copyright 2020 Datadog, Inc.</Copyright>
<OutputType>Exe</OutputType>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace/Datadog.Trace.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<!-- NuGet -->
<Version>1.25.1-prerelease</Version>
<Version>1.25.2-prerelease</Version>
<Title>Datadog APM</Title>
<Description>Manual instrumentation library for Datadog APM</Description>
</PropertyGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Datadog.Trace/TracerConstants.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@ internal static class TracerConstants
/// </summary>
public const ulong MaxTraceId = 9_223_372_036_854_775_807;

public static readonly string AssemblyVersion = "1.25.1.0";
public static readonly string AssemblyVersion = "1.25.2.0";
}
}
4 changes: 2 additions & 2 deletions src/WindowsInstaller/WindowsInstaller.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,9 +17,9 @@
<IntermediateOutputPath>obj\$(Configuration)\$(Platform)\</IntermediateOutputPath>
<SuppressPdbOutput>True</SuppressPdbOutput>
<DefineSolutionProperties>false</DefineSolutionProperties>
<OutputName>datadog-dotnet-apm-1.25.1-prerelease-$(Platform)</OutputName>
<OutputName>datadog-dotnet-apm-1.25.2-prerelease-$(Platform)</OutputName>
<TracerHomeDirectory Condition="'$(TracerHomeDirectory)' == ''">$(MSBuildThisFileDirectory)..\bin\tracer-home</TracerHomeDirectory>
<DefineConstants>InstallerVersion=1.25.1;TracerHomeDirectory=$(TracerHomeDirectory)</DefineConstants>
<DefineConstants>InstallerVersion=1.25.2;TracerHomeDirectory=$(TracerHomeDirectory)</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
<DefineConstants>$(DefineConstants);Debug</DefineConstants>
Expand Down
2 changes: 1 addition & 1 deletion test/test-applications/regression/AutomapperTest/Dockerfile
View file
Open in desktop
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.25.1
ARG TRACER_VERSION=1.25.2
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
2 changes: 1 addition & 1 deletion tools/Datadog.Core.Tools/TracerVersion.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public class TracerVersion
/// <summary>
/// The patch portion of the current version.
/// </summary>
public const int Patch = 1;
public const int Patch = 2;

/// <summary>
/// Whether the current release is a pre-release
Expand Down