Segregated build files

DataDog · Nov 11, 2024 · 3d10c13 · 3d10c13
1 parent 4ffd760
commit 3d10c13
Show file tree

Hide file tree

Showing 7 changed files with 70 additions and 25 deletions.
diff --git a/tracer/build/_build/CodeGenerators/CallSitesGenerator.cs b/tracer/build/_build/CodeGenerators/CallSitesGenerator.cs
@@ -3,7 +3,6 @@
 using System.IO;
 using System.Linq;
 using System.Text;
-using Datadog.Trace.ClrProfiler;
 using Mono.Cecil;
 using Nuke.Common.IO;
 

diff --git a/tracer/build/_build/CodeGenerators/InstrumentationCategory.cs b/tracer/build/_build/CodeGenerators/InstrumentationCategory.cs
@@ -6,12 +6,13 @@
 
 using System;
 
-namespace Datadog.Trace.ClrProfiler;
+namespace CodeGenerators;
 
 [Flags]
 internal enum InstrumentationCategory : uint
 {
-    None = 0,
+    // NOTE : When modifying this file make sure to update the InstrumentationCategory enum in the ClrProfiler folder inside the Datadog.Trace project
+
     Tracing = 1,
     AppSec = 2,
     Iast = 4,

diff --git a/tracer/build/_build/CodeGenerators/TargetFrameworks.cs b/tracer/build/_build/CodeGenerators/TargetFrameworks.cs
@@ -6,21 +6,23 @@
 
 using System;
 
-namespace Datadog.Trace.ClrProfiler
+namespace CodeGenerators;
+
+[Flags]
+internal enum TargetFrameworks : uint
 {
-    [Flags]
-    internal enum TargetFrameworks : uint
-    {
-        None = 0,
-        NET461 = 1,
-        NET462 = 2,
-        NETSTANDARD2_0 = 4,
-        NETCOREAPP2_1 = 8,
-        NETCOREAPP3_0 = 16,
-        NETCOREAPP3_1 = 32,
-        NET5_0 = 64,
-        NET6_0 = 128,
-        NET7_0 = 256,
-        NET8_0 = 512
-    }
+    None = 0, // For CodeGenerator only
+
+    // NOTE : When modifying this file make sure to update the TargetFrameworks enum in the ClrProfiler folder inside the Datadog.Trace project
+
+    NET461 = 1,
+    NET462 = 2,
+    NETSTANDARD2_0 = 4,
+    NETCOREAPP2_1 = 8,
+    NETCOREAPP3_0 = 16,
+    NETCOREAPP3_1 = 32,
+    NET5_0 = 64,
+    NET6_0 = 128,
+    NET7_0 = 256,
+    NET8_0 = 512
 }
diff --git a/tracer/src/Datadog.Trace.SourceGenerators/Datadog.Trace.SourceGenerators.csproj b/tracer/src/Datadog.Trace.SourceGenerators/Datadog.Trace.SourceGenerators.csproj
@@ -14,7 +14,7 @@
     <PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
   </ItemGroup>
   <ItemGroup>    
-    <Compile Include="..\..\build\_build\CodeGenerators\InstrumentationCategory.cs" Link="InstrumentationDefinitions\InstrumentationCategory.cs" />    
+    <Compile Include="..\Datadog.Trace\ClrProfiler\InstrumentationCategory.cs" Link="InstrumentationDefinitions\InstrumentationCategory.cs" />    
     <Compile Include="..\Datadog.Trace\Vendors\MessagePack\Attributes.cs">
       <Link>MessagePack\Attributes.cs</Link>
     </Compile>

diff --git a/tracer/src/Datadog.Trace/ClrProfiler/InstrumentationCategory.cs b/tracer/src/Datadog.Trace/ClrProfiler/InstrumentationCategory.cs
@@ -0,0 +1,22 @@
+// <copyright file="InstrumentationCategory.cs" company="Datadog">
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
+// </copyright>
+#nullable enable
+
+using System;
+
+namespace Datadog.Trace.ClrProfiler;
+
+[Flags]
+internal enum InstrumentationCategory : uint
+{
+    // NOTE : When modifying this file make sure to update the InstrumentationCategory enum in the CodeGenerator folder inside the _build project
+
+    Tracing = 1,
+    AppSec = 2,
+    Iast = 4,
+    Rasp = 8,
+
+    IastRasp = Iast | Rasp,
+}
diff --git a/tracer/src/Datadog.Trace/ClrProfiler/TargetFrameworks.cs b/tracer/src/Datadog.Trace/ClrProfiler/TargetFrameworks.cs
@@ -0,0 +1,26 @@
+// <copyright file="TargetFrameworks.cs" company="Datadog">
+// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
+// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
+// </copyright>
+#nullable enable
+
+using System;
+
+namespace Datadog.Trace.ClrProfiler;
+
+[Flags]
+internal enum TargetFrameworks : uint
+{
+    // NOTE : When modifying this file make sure to update the TargetFrameworks enum in the CodeGenerator folder inside the _build project
+
+    NET461 = 1,
+    NET462 = 2,
+    NETSTANDARD2_0 = 4,
+    NETCOREAPP2_1 = 8,
+    NETCOREAPP3_0 = 16,
+    NETCOREAPP3_1 = 32,
+    NET5_0 = 64,
+    NET6_0 = 128,
+    NET7_0 = 256,
+    NET8_0 = 512
+}
diff --git a/tracer/src/Datadog.Trace/Datadog.Trace.csproj b/tracer/src/Datadog.Trace/Datadog.Trace.csproj
@@ -71,11 +71,6 @@
     <None Remove="AppSec\Waf\ConfigFiles\apisecurity-config.json" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\..\build\_build\CodeGenerators\InstrumentationCategory.cs" Link="ClrProfiler\InstrumentationCategory.cs" />
-    <Compile Include="..\..\build\_build\CodeGenerators\TargetFrameworks.cs" Link="ClrProfiler\TargetFrameworks.cs" />
-  </ItemGroup>
-
   <!-- Below this point is reserved for vendor items -->
   <!--Newtonsoft.Json-->
   <!-- Modifications: Original condition was only for net45, but we include net461 here so that net45 and net461 generate the same Newtonsoft.Json -->