Reverse Profiler to protobuf 3.7.0 (#2521)

* Reverse to protobuf 3.7.0 to avoid unexpected new dependency (System.Memory.dll) (#2513) * Bump profiler version to 2.4.3.1 * Run Profiler pipeline on PRs to hotfix branches Co-authored-by: chrisnas <chrisnas@users.noreply.github.com> Co-authored-by: Christophe Nasarre <christophe.nasarre@datadoghq.com>
DataDog · Mar 2, 2022 · 7ecab19 · 7ecab19
1 parent fa24ae2
commit 7ecab19
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 13 deletions.
diff --git a/.github/workflows/profiler-pipeline.yml b/.github/workflows/profiler-pipeline.yml
@@ -15,6 +15,8 @@ name: profiler pipeline
     branches:
       - master
       - profiler-vnext
+      - release/**
+      - hotfix/**
     paths-ignore:
       - docs/**
       - LICENCE

diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Managed/Datadog.Profiler.Managed.csproj b/profiler/src/ProfilerEngine/Datadog.Profiler.Managed/Datadog.Profiler.Managed.csproj
@@ -60,7 +60,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Google.Protobuf" Version="3.19.4" />
+    <PackageReference Include="Google.Protobuf" Version="3.7.0" />
   </ItemGroup>
 
   <ItemGroup Condition=" $(TargetFramework.StartsWith('net4')) ">

diff --git a/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc b/profiler/src/ProfilerEngine/Datadog.Profiler.Native.Windows/Resource.rc
@@ -90,11 +90,12 @@ NETCOREAPP20_Datadog_AutoInstrumentation_ManagedLoader_pdb SYMBOLS          "net
 // ------- version info -------------------------------------------------------
 // Alpha 1.0.2
 // Beta 1.1.1
-// GA 1.2.0
+// Beta 2.?.?.x once integrated into Tracer repository (where x = beta version such as 1 or 2)
+// GA ???
 //
 VS_VERSION_INFO VERSIONINFO
-FILEVERSION             1, 1, 1, 1
-PRODUCTVERSION          1, 1, 1, 1
+FILEVERSION             2, 4, 3, 1
+PRODUCTVERSION          2, 4, 3, 1
 FILEFLAGSMASK           VS_FF_PRERELEASE
 FILEOS                  VOS_NT
 FILETYPE                VFT_DLL
@@ -105,12 +106,12 @@ BEGIN
         BEGIN
             VALUE "CompanyName", "Datadog"
             VALUE "FileDescription", "Continuous Profiler for .NET Applications"
-            VALUE "FileVersion", "1.1.1.1"
+            VALUE "FileVersion", "2.4.3.1"
             VALUE "InternalName", "Native Profiler Engine"
             VALUE "LegalCopyright", "(c) Datadog 2020-2022"
             VALUE "OriginalFilename", "Datadog.Profiler.Native.dll"
             VALUE "ProductName", "Continuous Profiler for .NET Applications"
-            VALUE "ProductVersion", "1.1.1.1"
+            VALUE "ProductVersion", "2.4.3.1"
         END
     END
     BLOCK "VarFileInfo"

diff --git a/profiler/src/ProfilerEngine/ProductVersion.props b/profiler/src/ProfilerEngine/ProductVersion.props
@@ -5,16 +5,18 @@
 
   <!-- * * * * * * * * * * * INPUTS. Update this section EVERY time the component is shipped/released! * * * * * * * * * * *                -->
   <PropertyGroup>
-    <ProductVersionMajor>1</ProductVersionMajor>
-    <ProductVersionMinor>1</ProductVersionMinor>
-    <ProductVersionBuild>1</ProductVersionBuild>
+    <ProductVersionMajor>2</ProductVersionMajor>
+    <ProductVersionMinor>4</ProductVersionMinor>
+    <ProductVersionBuild>3</ProductVersionBuild>
+    <BetaVersion>1</BetaVersion>
     <!-- Alpha 1.0.2                                                                                                                        -->
     <!-- Beta 1.1.1                                                                                                                         -->
-    <!-- GA 1.2.0                                                                                                                           -->
+    <!-- Beta 2.?.?.x once in Tracer repository (where x is the beta number ex: 1 or 2 when ready)                                          -->
+    <!-- GA ?.?.?                                                                                                                           -->
     <ProductVersion>$(ProductVersionMajor).$(ProductVersionMinor).$(ProductVersionBuild)</ProductVersion>
 
     <!-- ProductVersionPrerelease format examples: alpha.1, alpha.2, beta.1, beta.2; EMPTY for stable releases.                             -->
-    <ProductVersionPrerelease>beta.$(ProductVersionBuild)</ProductVersionPrerelease>
+    <ProductVersionPrerelease>beta.$(BetaVersion)</ProductVersionPrerelease>
   </PropertyGroup>
   <!-- * * * * * * * * * * * END OF INPUTS.  * * * * * * * * * * *                                                                          -->
 
@@ -32,8 +34,8 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <AssemblyVersion>$(ProductVersion).1</AssemblyVersion>
-    <FileVersion>$(ProductVersion).1</FileVersion>
+    <AssemblyVersion>$(ProductVersion).$(BetaVersion)</AssemblyVersion>
+    <FileVersion>$(ProductVersion).$(BetaVersion)</FileVersion>
     <InformationalVersion>$(ProductVersion)$(ProductSuffix)</InformationalVersion>
 
     <!-- May need to add 'PackageVersion' here if and when we build NuGet packages. -->