Skip to content

Commit 2fddc12

Browse files
martincostellomartincostello
committed
Enable deterministic builds
- Enable deterministic builds for binaries/packages. - Centralise common settings in `Directory.Build.props`. - Refactor some MSBuild conditions to not need changing for .NET 9 and beyond.
1 parent a646c7d commit 2fddc12

File tree

4 files changed

+40
-47
lines changed

4 files changed

+40
-47
lines changed

‎Directory.Build.props‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
<Project>
2+
<PropertyGroup>
3+
<Authors>Grafana Labs</Authors>
4+
<ChecksumAlgorithm>SHA256</ChecksumAlgorithm>
5+
<Company>Grafana Labs</Company>
6+
<ContinuousIntegrationBuild Condition=" '$(CI)' != '' ">true</ContinuousIntegrationBuild>
7+
<Copyright>Copyright (c) Grafana Labs</Copyright>
8+
<Deterministic>true</Deterministic>
9+
<EmbedUntrackedSources>true</EmbedUntrackedSources>
10+
<GenerateDocumentationFile>false</GenerateDocumentationFile>
11+
<NeutralLanguage>en-US</NeutralLanguage>
12+
<Nullable>disable</Nullable>
13+
<PackageIcon>Grafana_icon.png</PackageIcon>
14+
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
15+
<PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
16+
<PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
17+
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
18+
<PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
19+
<PublishRepositoryUrl>true</PublishRepositoryUrl>
20+
<RepositoryType>git</RepositoryType>
21+
<RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
22+
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
23+
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
24+
</PropertyGroup>
25+
<ItemGroup>
26+
<None Include="$(MSBuildThisFileDirectory)/internal/img/$(PackageIcon)" Pack="True" PackagePath="" />
27+
</ItemGroup>
28+
</Project>

‎src/Grafana.OpenTelemetry.Base/Grafana.OpenTelemetry.Base.csproj‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
5-
<Nullable>disable</Nullable>
6-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7-
8-
<!-- NuGet packaging properties -->
94
<Description>Minimal Grafana distribution of OpenTelemetry .NET</Description>
10-
<Authors>Grafana Labs</Authors>
11-
<Copyright>Copyright (c) Grafana Labs</Copyright>
12-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
13-
<PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
14-
<PackageIcon>Grafana_icon.png</PackageIcon>
15-
<PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
16-
<PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
17-
<RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
18-
<RepositoryType>git</RepositoryType>
5+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
197
</PropertyGroup>
208

219
<ItemGroup>
@@ -52,18 +40,14 @@
5240
<PackageReference Include="OpenTelemetry.Resources.ProcessRuntime" Version="0.1.0-beta.2" />
5341
</ItemGroup>
5442

43+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
44+
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.0.0-beta.9" />
45+
</ItemGroup>
46+
5547
<ItemGroup>
5648
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
5749
<_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
5850
</AssemblyAttribute>
5951
</ItemGroup>
6052

61-
<ItemGroup>
62-
<None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
63-
</ItemGroup>
64-
65-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
66-
<PackageReference Include="OpenTelemetry.Resources.Container" Version="1.0.0-beta.9" />
67-
</ItemGroup>
68-
6953
</Project>

‎src/Grafana.OpenTelemetry/Grafana.OpenTelemetry.csproj‎

Lines changed: 6 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,21 +1,9 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
5-
<Nullable>disable</Nullable>
6-
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
7-
8-
<!-- NuGet packaging properties -->
94
<Description>Full Grafana distribution of OpenTelemetry .NET</Description>
10-
<Authors>Grafana Labs</Authors>
11-
<Copyright>Copyright (c) Grafana Labs</Copyright>
12-
<PackageLicenseExpression>Apache-2.0</PackageLicenseExpression>
13-
<PackageTags>OpenTelemetry;Grafana;Metrics;Logs;Traces;Observability;Monitoring</PackageTags>
14-
<PackageIcon>Grafana_icon.png</PackageIcon>
15-
<PackageReleaseNotes>https://github.com/grafana/grafana-opentelemetry-dotnet/blob/main/CHANGELOG.md</PackageReleaseNotes>
16-
<PackageProjectUrl>https://grafana.com/docs/grafana-cloud/monitor-applications/application-observability/</PackageProjectUrl>
17-
<RepositoryUrl>https://github.com/grafana/grafana-opentelemetry-dotnet</RepositoryUrl>
18-
<RepositoryType>git</RepositoryType>
5+
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
6+
<TargetFrameworks>net8.0;netstandard2.0;net462</TargetFrameworks>
197
</PropertyGroup>
208

219
<!--
@@ -70,18 +58,14 @@
7058
<PackageReference Include="OpenTelemetry.Instrumentation.Owin" Version="1.0.0-rc.6" />
7159
</ItemGroup>
7260

61+
<ItemGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">
62+
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.10.0-beta.1" />
63+
</ItemGroup>
64+
7365
<ItemGroup>
7466
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
7567
<_Parameter1>Grafana.OpenTelemetry.Tests</_Parameter1>
7668
</AssemblyAttribute>
7769
</ItemGroup>
7870

79-
<ItemGroup>
80-
<None Include="../../internal/img/Grafana_icon.png" Pack="true" Visible="false" PackagePath="" />
81-
</ItemGroup>
82-
83-
<ItemGroup Condition="'$(TargetFramework)' == 'net8.0'">
84-
<PackageReference Include="OpenTelemetry.Instrumentation.AWSLambda" Version="1.10.0-beta.1" />
85-
</ItemGroup>
86-
8771
</Project>

‎tests/Grafana.OpenTelemetry.Tests/Grafana.OpenTelemetry.Tests.csproj‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22

33
<PropertyGroup>
44
<TargetFrameworks>net8.0;net462</TargetFrameworks>
5-
<Nullable>disable</Nullable>
6-
75
<IsPackable>false</IsPackable>
86
<IsTestProject>true</IsTestProject>
97
</PropertyGroup>
@@ -18,7 +16,6 @@
1816
<PackageReference Include="xunit.runner.visualstudio" Version="2.5.3">
1917
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2018
<PrivateAssets>all</PrivateAssets>
21-
<NoWarn>NU1701</NoWarn>
2219
</PackageReference>
2320
</ItemGroup>
2421

0 commit comments

Comments
 (0)