diff --git a/Common.props b/Common.props index 2ff0ccc89..173c2d47a 100644 --- a/Common.props +++ b/Common.props @@ -7,7 +7,7 @@ - + diff --git a/build/ProjectsHelper.cs b/build/ProjectsHelper.cs index 1bec53d93..26aa7c907 100644 --- a/build/ProjectsHelper.cs +++ b/build/ProjectsHelper.cs @@ -12,10 +12,10 @@ public static class ProjectsHelper private const string TestApplicationSelector = "TestApplication.*"; private const string TestLibrarySelector = "TestLibrary.*"; - private readonly static AbsolutePath SrcDirectory = NukeBuild.RootDirectory / "src"; - private readonly static AbsolutePath TestDirectory = NukeBuild.RootDirectory / "test"; - private readonly static AbsolutePath TestIntegrationApps = TestDirectory / "test-applications" / "integrations"; - private readonly static AbsolutePath TestNuGetPackagesApps = TestDirectory / "test-applications" / "nuget-packages"; + private static readonly AbsolutePath SrcDirectory = NukeBuild.RootDirectory / "src"; + private static readonly AbsolutePath TestDirectory = NukeBuild.RootDirectory / "test"; + private static readonly AbsolutePath TestIntegrationApps = TestDirectory / "test-applications" / "integrations"; + private static readonly AbsolutePath TestNuGetPackagesApps = TestDirectory / "test-applications" / "nuget-packages"; public static IEnumerable GetManagedSrcProjects(this Solution solution) { diff --git a/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.cs b/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.cs index 56eb005f6..19c165af6 100644 --- a/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.cs +++ b/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator.cs @@ -15,6 +15,7 @@ // namespace OpenTelemetry.AutoInstrumentation.CallTarget.Handlers.Continuations; + #if NET6_0_OR_GREATER internal class ValueTaskContinuationGenerator : ContinuationGenerator { diff --git a/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.cs b/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.cs index aeb667e55..ffee116d3 100644 --- a/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.cs +++ b/src/OpenTelemetry.AutoInstrumentation/CallTarget/Handlers/Continuations/ValueTaskContinuationGenerator`1.cs @@ -17,6 +17,7 @@ #pragma warning disable SA1649 // File name must match first type name namespace OpenTelemetry.AutoInstrumentation.CallTarget.Handlers.Continuations; + #if NET6_0_OR_GREATER internal class ValueTaskContinuationGenerator : ContinuationGenerator { diff --git a/src/OpenTelemetry.AutoInstrumentation/Configurations/ServiceNameConfigurator.cs b/src/OpenTelemetry.AutoInstrumentation/Configurations/ServiceNameConfigurator.cs index ec1209dac..e6870d9ba 100644 --- a/src/OpenTelemetry.AutoInstrumentation/Configurations/ServiceNameConfigurator.cs +++ b/src/OpenTelemetry.AutoInstrumentation/Configurations/ServiceNameConfigurator.cs @@ -19,6 +19,7 @@ using System.Reflection; using System.Runtime.CompilerServices; namespace OpenTelemetry.AutoInstrumentation.Configurations; + internal static class ServiceNameConfigurator { internal static string GetFallbackServiceName() diff --git a/test/IntegrationTests/WcfTestsBase.cs b/test/IntegrationTests/WcfTestsBase.cs index 03f49f651..6fab991dc 100644 --- a/test/IntegrationTests/WcfTestsBase.cs +++ b/test/IntegrationTests/WcfTestsBase.cs @@ -21,6 +21,7 @@ using Xunit.Abstractions; using static OpenTelemetry.Proto.Trace.V1.Span.Types; namespace IntegrationTests; + public abstract class WcfTestsBase : TestHelper, IDisposable { private readonly string _testAppName; diff --git a/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsMutation.cs b/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsMutation.cs index 04d78e0c2..4095cb267 100644 --- a/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsMutation.cs +++ b/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsMutation.cs @@ -13,7 +13,7 @@ namespace StarWars; /// "name": "Boba Fett" /// } /// } -/// } +/// }. /// public class StarWarsMutation : ObjectGraphType { diff --git a/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsSubscription.cs b/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsSubscription.cs index 750e0e171..90ab29767 100644 --- a/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsSubscription.cs +++ b/test/test-applications/integrations/TestApplication.GraphQL/StarWars/StarWarsSubscription.cs @@ -10,7 +10,7 @@ namespace StarWars; /// This is an example JSON request for a subscription /// { /// "query": "subscription HumanAddedSub{ humanAdded { name } }", -/// } +/// }. /// internal class StarWarsSubscription : ObjectGraphType { diff --git a/test/test-applications/integrations/TestApplication.Logs/Startup.cs b/test/test-applications/integrations/TestApplication.Logs/Startup.cs index eac945c8d..7d0b15bd6 100644 --- a/test/test-applications/integrations/TestApplication.Logs/Startup.cs +++ b/test/test-applications/integrations/TestApplication.Logs/Startup.cs @@ -14,13 +14,8 @@ // limitations under the License. // -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Configuration; -using Microsoft.Extensions.DependencyInjection; -using Microsoft.Extensions.Hosting; - namespace TestApplication.Logs; + public class Startup { public Startup(IConfiguration configuration) diff --git a/tools/DependencyListGenerator/DotNetOutdated/Models/TargetFramework.cs b/tools/DependencyListGenerator/DotNetOutdated/Models/TargetFramework.cs index 73a35e049..88f6a5079 100644 --- a/tools/DependencyListGenerator/DotNetOutdated/Models/TargetFramework.cs +++ b/tools/DependencyListGenerator/DotNetOutdated/Models/TargetFramework.cs @@ -1,6 +1,7 @@ using NuGet.Frameworks; namespace DependencyListGenerator.DotNetOutdated.Models; + public class TargetFramework { public TargetFramework(NuGetFramework name) diff --git a/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs b/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs index a148a5c0a..5c64e41ab 100644 --- a/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs +++ b/tools/LibraryVersionsGenerator/Models/GraphQLVersion.cs @@ -24,11 +24,11 @@ internal class GraphQLVersion : PackageVersion } [PackageDependency("GraphQL.MicrosoftDI", "GraphQLMicrosoftDI")] - required public string MicrosoftDIVersion { get; set; } + public required string MicrosoftDIVersion { get; set; } [PackageDependency("GraphQL.Server.Transports.AspNetCore", "GraphQLServerTransportsAspNetCore")] - required public string ServerTransportsAspNetCoreVersion { get; set; } + public required string ServerTransportsAspNetCoreVersion { get; set; } [PackageDependency("GraphQL.Server.Ui.Playground", "GraphQLServerUIPlayground")] - required public string ServerUIPlayground { get; set; } + public required string ServerUIPlayground { get; set; } } diff --git a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs index 71efeaf8c..72bafc0f8 100644 --- a/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs +++ b/tools/LibraryVersionsGenerator/PackageVersionDefinitions.cs @@ -222,12 +222,12 @@ internal static class PackageVersionDefinitions internal record PackageVersionDefinition { - required public string IntegrationName { get; init; } + public required string IntegrationName { get; init; } - required public string NugetPackageName { get; init; } + public required string NugetPackageName { get; init; } - required public string TestApplicationName { get; init; } + public required string TestApplicationName { get; init; } - required public IReadOnlyCollection Versions { get; init; } + public required IReadOnlyCollection Versions { get; init; } } }