Skip to content

Commit 3d10c13

Browse files
Segregated build files
1 parent 4ffd760 commit 3d10c13

File tree

7 files changed

+70
-25
lines changed

7 files changed

+70
-25
lines changed

tracer/build/_build/CodeGenerators/CallSitesGenerator.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System.IO;
44
using System.Linq;
55
using System.Text;
6-
using Datadog.Trace.ClrProfiler;
76
using Mono.Cecil;
87
using Nuke.Common.IO;
98

tracer/build/_build/CodeGenerators/InstrumentationCategory.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,13 @@
66

77
using System;
88

9-
namespace Datadog.Trace.ClrProfiler;
9+
namespace CodeGenerators;
1010

1111
[Flags]
1212
internal enum InstrumentationCategory : uint
1313
{
14-
None = 0,
14+
// NOTE : When modifying this file make sure to update the InstrumentationCategory enum in the ClrProfiler folder inside the Datadog.Trace project
15+
1516
Tracing = 1,
1617
AppSec = 2,
1718
Iast = 4,

tracer/build/_build/CodeGenerators/TargetFrameworks.cs

+18-16
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,23 @@
66

77
using System;
88

9-
namespace Datadog.Trace.ClrProfiler
9+
namespace CodeGenerators;
10+
11+
[Flags]
12+
internal enum TargetFrameworks : uint
1013
{
11-
[Flags]
12-
internal enum TargetFrameworks : uint
13-
{
14-
None = 0,
15-
NET461 = 1,
16-
NET462 = 2,
17-
NETSTANDARD2_0 = 4,
18-
NETCOREAPP2_1 = 8,
19-
NETCOREAPP3_0 = 16,
20-
NETCOREAPP3_1 = 32,
21-
NET5_0 = 64,
22-
NET6_0 = 128,
23-
NET7_0 = 256,
24-
NET8_0 = 512
25-
}
14+
None = 0, // For CodeGenerator only
15+
16+
// NOTE : When modifying this file make sure to update the TargetFrameworks enum in the ClrProfiler folder inside the Datadog.Trace project
17+
18+
NET461 = 1,
19+
NET462 = 2,
20+
NETSTANDARD2_0 = 4,
21+
NETCOREAPP2_1 = 8,
22+
NETCOREAPP3_0 = 16,
23+
NETCOREAPP3_1 = 32,
24+
NET5_0 = 64,
25+
NET6_0 = 128,
26+
NET7_0 = 256,
27+
NET8_0 = 512
2628
}

tracer/src/Datadog.Trace.SourceGenerators/Datadog.Trace.SourceGenerators.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
<PackageReference Include="System.Reflection.Emit.Lightweight" Version="4.3.0" />
1515
</ItemGroup>
1616
<ItemGroup>
17-
<Compile Include="..\..\build\_build\CodeGenerators\InstrumentationCategory.cs" Link="InstrumentationDefinitions\InstrumentationCategory.cs" />
17+
<Compile Include="..\Datadog.Trace\ClrProfiler\InstrumentationCategory.cs" Link="InstrumentationDefinitions\InstrumentationCategory.cs" />
1818
<Compile Include="..\Datadog.Trace\Vendors\MessagePack\Attributes.cs">
1919
<Link>MessagePack\Attributes.cs</Link>
2020
</Compile>
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
// <copyright file="InstrumentationCategory.cs" company="Datadog">
2+
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
3+
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
4+
// </copyright>
5+
#nullable enable
6+
7+
using System;
8+
9+
namespace Datadog.Trace.ClrProfiler;
10+
11+
[Flags]
12+
internal enum InstrumentationCategory : uint
13+
{
14+
// NOTE : When modifying this file make sure to update the InstrumentationCategory enum in the CodeGenerator folder inside the _build project
15+
16+
Tracing = 1,
17+
AppSec = 2,
18+
Iast = 4,
19+
Rasp = 8,
20+
21+
IastRasp = Iast | Rasp,
22+
}
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
// <copyright file="TargetFrameworks.cs" company="Datadog">
2+
// Unless explicitly stated otherwise all files in this repository are licensed under the Apache 2 License.
3+
// This product includes software developed at Datadog (https://www.datadoghq.com/). Copyright 2017 Datadog, Inc.
4+
// </copyright>
5+
#nullable enable
6+
7+
using System;
8+
9+
namespace Datadog.Trace.ClrProfiler;
10+
11+
[Flags]
12+
internal enum TargetFrameworks : uint
13+
{
14+
// NOTE : When modifying this file make sure to update the TargetFrameworks enum in the CodeGenerator folder inside the _build project
15+
16+
NET461 = 1,
17+
NET462 = 2,
18+
NETSTANDARD2_0 = 4,
19+
NETCOREAPP2_1 = 8,
20+
NETCOREAPP3_0 = 16,
21+
NETCOREAPP3_1 = 32,
22+
NET5_0 = 64,
23+
NET6_0 = 128,
24+
NET7_0 = 256,
25+
NET8_0 = 512
26+
}

tracer/src/Datadog.Trace/Datadog.Trace.csproj

-5
Original file line numberDiff line numberDiff line change
@@ -71,11 +71,6 @@
7171
<None Remove="AppSec\Waf\ConfigFiles\apisecurity-config.json" />
7272
</ItemGroup>
7373

74-
<ItemGroup>
75-
<Compile Include="..\..\build\_build\CodeGenerators\InstrumentationCategory.cs" Link="ClrProfiler\InstrumentationCategory.cs" />
76-
<Compile Include="..\..\build\_build\CodeGenerators\TargetFrameworks.cs" Link="ClrProfiler\TargetFrameworks.cs" />
77-
</ItemGroup>
78-
7974
<!-- Below this point is reserved for vendor items -->
8075
<!--Newtonsoft.Json-->
8176
<!-- Modifications: Original condition was only for net45, but we include net461 here so that net45 and net461 generate the same Newtonsoft.Json -->

0 commit comments

Comments
 (0)