Skip to content

Commit f1b7ac7

Browse files
authored
Merge pull request #32 from digma-ai/fixed-DiagnosticSource-version
Use System.Diagnostics.DiagnosticSource version 9.0.0
2 parents e83e930 + 7d09dca commit f1b7ac7

File tree

4 files changed

+15
-29
lines changed

4 files changed

+15
-29
lines changed

src/OpenTelemetry.AutoInstrumentation.Digma/OpenTelemetry.AutoInstrumentation.Digma.csproj

Lines changed: 2 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -11,35 +11,9 @@
1111

1212
<ItemGroup>
1313
<PackageReference Include="Lib.Harmony" Version="2.3.5" />
14-
<!-- <PackageReference Include="System.Diagnostics.DiagnosticSource" Version="*" />-->
14+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.0" PrivateAssets="all" />
1515
</ItemGroup>
1616

17-
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
18-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
19-
</ItemGroup>
20-
21-
<ItemGroup Condition="'$(TargetFramework)' == 'net47'">
22-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
23-
</ItemGroup>
24-
25-
<ItemGroup Condition="'$(TargetFramework)' == 'net9.0'">
26-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
27-
</ItemGroup>
28-
29-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
30-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
31-
</ItemGroup>
32-
33-
<ItemGroup Condition="'$(TargetFramework)' == 'net7.0'">
34-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
35-
</ItemGroup>
36-
37-
<ItemGroup Condition="'$(TargetFramework)' == 'net6.0'">
38-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="8.0.1" />
39-
</ItemGroup>
40-
41-
<ItemGroup Condition="'$(TargetFramework)' == 'net5.0'">
42-
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="6.0.2" />
43-
</ItemGroup>
17+
4418

4519
</Project>

src/OpenTelemetry.AutoInstrumentation.Digma/Plugin.cs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
using HarmonyLib;
99
using OpenTelemetry.AutoInstrumentation.Digma.Utils;
1010

11+
1112
namespace OpenTelemetry.AutoInstrumentation.Digma;
1213

1314
public class Plugin

src/OpenTelemetry.AutoInstrumentation.Digma/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ For now, this dll only fix the behaviour of `System.Data.SqlClient` to always ex
55
Builds the artifacts for all the specified frameworks. If the desired framework is not there, edit the csproj file and
66
add it to the `<TargetFrameworks>` section.
77
```
8-
dotnet pack -c Release
8+
./publish_all.sh
99
```
1010

1111
### Install:
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
#!/bin/bash
2+
3+
frameworks=$(sed -n 's|.*<TargetFrameworks>\(.*\)</TargetFrameworks>.*|\1|p' OpenTelemetry.AutoInstrumentation.Digma.csproj)
4+
IFS=';' read -ra targets <<< "$frameworks"
5+
6+
for tfm in "${targets[@]}"; do
7+
echo "Publishing for $tfm..."
8+
dotnet publish -c Release -f $tfm -o "bin/Publish/$tfm"
9+
done
10+
11+
zip -r bin/Publish/OpenTelemetry.AutoInstrumentation.Digma.zip bin/Publish

0 commit comments

Comments
 (0)