Skip to content

Commit ba97391

Browse files
Use dotnet format from SDK
- Use `dotnet format` from the .NET SDK instead of the `dotnet-format` tool which is deprecated and does not understand modern C# features like primary constructors. - Fix warnings from `dotnet format`. - Explicitly set the line endings to use for files. - Downgrade `csharp_style_namespace_declarations` to a suggestion to avoid forcing adoption on existing files now and creating additional code churn.
1 parent 461fe5e commit ba97391

16 files changed

+6
-21
lines changed

.editorconfig

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
# All files
66
[*]
77
charset = utf-8
8+
end_of_line = crlf
89
indent_style = space
910
indent_size = 2
1011
insert_final_newline = true
@@ -106,7 +107,7 @@ csharp_style_prefer_index_operator = false:none
106107
csharp_style_prefer_range_operator = false:none
107108
csharp_style_pattern_local_over_anonymous_function = true:suggestion
108109
csharp_style_deconstructed_variable_declaration = true:suggestion
109-
csharp_style_namespace_declarations = file_scoped:warning
110+
csharp_style_namespace_declarations = file_scoped:suggestion
110111

111112
# Space preferences
112113
csharp_space_after_cast = false

.gitattributes

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
* text=auto

.github/workflows/dotnet-format.yml

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,5 @@ jobs:
2323
with:
2424
persist-credentials: false
2525

26-
- name: Install format tool
27-
run: dotnet tool install -g dotnet-format
28-
2926
- name: dotnet format
30-
run: dotnet-format --folder --check
27+
run: dotnet format --verify-no-changes

src/Grafana.OpenTelemetry.Base/ExporterSettings/OtlpExporter.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//
55

66
using System;
7-
using Microsoft.Extensions.Configuration;
87
using OpenTelemetry.Exporter;
98
using OpenTelemetry.Logs;
109
using OpenTelemetry.Metrics;

src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetryResourceDetector.cs

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,7 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
using System;
76
using System.Collections.Generic;
8-
using System.Diagnostics;
97
using System.Reflection;
108
using OpenTelemetry.Resources;
119

src/Grafana.OpenTelemetry.Base/GrafanaOpenTelemetrySettings.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
using System;
77
using System.Collections.Generic;
8-
using System.Linq;
98
using System.Reflection;
109
using Microsoft.Extensions.Configuration;
1110

src/Grafana.OpenTelemetry.Base/Instrumentations/OwinInitializer.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
using System;
76
using OpenTelemetry.Trace;
87

98
namespace Grafana.OpenTelemetry

src/Grafana.OpenTelemetry.Base/ReflectionHelper.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
using System;
76
using System.Linq;
87
using System.Reflection;
98

src/Grafana.OpenTelemetry.Base/ResourceDetectors/ContainerResource.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
// SPDX-License-Identifier: Apache-2.0
44
//
55

6-
using OpenTelemetry.Resources;
7-
86
#if NET8_0_OR_GREATER
97

8+
using OpenTelemetry.Resources;
9+
1010
namespace Grafana.OpenTelemetry
1111
{
1212
internal class ContainerResourceInitializer : ResourceDetectorInitializer

tests/Grafana.OpenTelemetry.Tests/GrafanaCloudConfigurationHelperTest.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
//
55

66
using System;
7-
using Grafana.OpenTelemetry;
87
using Xunit;
98

109
namespace Grafana.OpenTelemetry.Tests

0 commit comments

Comments
 (0)