Enable nullable, analyzers, and code style enforcement

.git-blame-ignore-revs

@@ -15,3 +15,6 @@ ccd9b352d4066839cbe2dff010df6ab464ea871e
 
 # Apply dotnet format across the solution.
 2fea688003a3947a656d91e0532cd2dff2a737c6
+
+# Convert to file-scoped namespaces and drop redundant usings.
+f089e7856c50b437f6583ba069a3ed553d1f7d61

Directory.Build.props

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project>
+  <PropertyGroup>
+    <LangVersion>latest</LangVersion>
+    <Nullable>enable</Nullable>
+    <AnalysisLevel>latest-recommended</AnalysisLevel>
+    <EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
+    <CodeAnalysisRuleSet>$(MSBuildThisFileDirectory)build/Source.ruleset</CodeAnalysisRuleSet>
+  </PropertyGroup>
+
+  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+  </PropertyGroup>
+</Project>

build/AspNet.ruleset

@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Autofac Examples ASP.NET Rules" Description="Analyzer rules for example projects hosted in ASP.NET." ToolsVersion="16.0">
+  <Include Path="Source.ruleset" Action="Default" />
+  <Rules AnalyzerId="Microsoft.CodeAnalysis.Analyzers" RuleNamespace="Microsoft.CodeAnalysis.Analyzers">
+    <!-- Remove underscores from member name - Web Forms generates _Default for
+         Default.aspx, and AutoEventWireup requires the Page_Load name. -->
+    <Rule Id="CA1707" Action="None" />
+    <!-- Change names to avoid reserved word overlaps - Global.asax expects a type named Global. -->
+    <Rule Id="CA1716" Action="None" />
+    <!-- Use LoggerMessage delegates - the right call in production, and noise wrapped around a two-line sample. -->
+    <Rule Id="CA1848" Action="None" />
+    <!-- Argument evaluation may be unnecessary if logging is disabled - same tradeoff as CA1848. -->
+    <Rule Id="CA1873" Action="None" />
+    <!-- Set ViewStateUserKey - wants a per-user value to key on, and these samples have no user identity. -->
+    <Rule Id="CA5368" Action="None" />
+  </Rules>
+</RuleSet>

build/Source.ruleset

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<RuleSet Name="Autofac Examples Rules" Description="Analyzer rules for all example projects." ToolsVersion="16.0">
+  <!-- Rule severities come from AnalysisLevel in Directory.Build.props. This file
+       records deliberate deviations from that baseline, of which there are
+       currently none that apply to every project. Anything ASP.NET specific
+       belongs in AspNet.ruleset instead. -->
+</RuleSet>

src/AspNetCoreChildLifetimeScope/AspNetCoreChildLifetimeScope.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <CodeAnalysisRuleSet>../../build/AspNet.ruleset</CodeAnalysisRuleSet>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

src/AspNetCoreExample/AspNetCoreExample.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <CodeAnalysisRuleSet>../../build/AspNet.ruleset</CodeAnalysisRuleSet>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

src/AspNetCoreExample/Services/IValuesService.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-
-namespace AspNetCoreExample.Services;
+namespace AspNetCoreExample.Services;
 
 public interface IValuesService
 {

src/AspNetCoreExample/Services/ValuesService.cs

@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using Microsoft.Extensions.Logging;
-
-namespace AspNetCoreExample.Services;
+namespace AspNetCoreExample.Services;
 
 public class ValuesService : IValuesService
 {
@@ -14,14 +11,14 @@ public ValuesService(ILogger<ValuesService> logger)
 
     public IEnumerable<string> FindAll()
     {
-        _logger.LogDebug("{method} called", nameof(FindAll));
+        _logger.LogDebug("{Method} called", nameof(FindAll));
 
         return new[] { "value1", "value2" };
     }
 
     public string Find(int id)
     {
-        _logger.LogDebug("{method} called with {id}", nameof(Find), id);
+        _logger.LogDebug("{Method} called with {Id}", nameof(Find), id);
 
         return $"value{id}";
     }

src/AspNetCoreNoStartupExample/AspNetCoreNoStartupExample.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
+    <CodeAnalysisRuleSet>../../build/AspNet.ruleset</CodeAnalysisRuleSet>
     <TargetFramework>net10.0</TargetFramework>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

src/AspNetCoreNoStartupExample/AutofacModule.cs

@@ -1,6 +1,5 @@
 using AspNetCoreNoStartupExample.Services;
 using Autofac;
-using Microsoft.Extensions.Logging;
 
 namespace AspNetCoreNoStartupExample;
 

src/AspNetCoreNoStartupExample/Services/ValuesService.cs

@@ -1,6 +1,4 @@
-using Microsoft.Extensions.Logging;
-
-namespace AspNetCoreNoStartupExample.Services;
+namespace AspNetCoreNoStartupExample.Services;
 
 public class ValuesService : IValuesService
 {

src/AttributeMetadataExample/AppenderMetadata.cs

@@ -2,7 +2,7 @@
 
 public class AppenderMetadata
 {
-    public string AppenderName
+    public string? AppenderName
     {
         get; set;
     }

src/AttributeMetadataExample/AppenderNameAttribute.cs

@@ -1,5 +1,4 @@
-using System;
-using System.ComponentModel.Composition;
+using System.ComponentModel.Composition;
 
 namespace AttributeMetadataExample;
 

src/AttributeMetadataExample/AttributeMetadataAppender.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace AttributeMetadataExample;
+namespace AttributeMetadataExample;
 
 [AppenderName("attributed")]
 public class AttributeMetadataAppender : ILogAppender

src/AttributeMetadataExample/InterfaceManualMetadataAdapter.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace AttributeMetadataExample;
+namespace AttributeMetadataExample;
 
 public class InterfaceManualMetadataAdapter : ILogAppender
 {

src/AttributeMetadataExample/Log.cs

@@ -1,6 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-using Autofac.Features.Metadata;
+using Autofac.Features.Metadata;
 
 namespace AttributeMetadataExample;
 
@@ -15,7 +13,7 @@ public Log(IEnumerable<Meta<ILogAppender>> appenders)
 
     public void Write(string destination, string message)
     {
-        var appender = _appenders.First(a => a.Metadata["AppenderName"].Equals(destination));
+        var appender = _appenders.First(a => destination.Equals(a.Metadata["AppenderName"]));
         appender.Value.Write(message);
     }
 }

src/AttributeMetadataExample/Program.cs

@@ -1,5 +1,4 @@
-using System;
-using System.Diagnostics;
+using System.Diagnostics;
 using Autofac;
 using Autofac.Extras.AttributeMetadata;
 using Autofac.Features.AttributeFilters;

src/AttributeMetadataExample/StringManualMetadataAppender.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace AttributeMetadataExample;
+namespace AttributeMetadataExample;
 
 public class StringManualMetadataAppender : ILogAppender
 {

src/AttributeMetadataExample/TypedManualMetadataAppender.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace AttributeMetadataExample;
+namespace AttributeMetadataExample;
 
 public class TypedManualMetadataAppender : ILogAppender
 {

src/ConfigurationExample/Program.cs

@@ -1,7 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Diagnostics;
-using System.IO;
+using System.Diagnostics;
 using System.Reflection;
 using System.Runtime.Loader;
 using Autofac;
@@ -35,7 +32,7 @@ public static void Main()
         // https://github.com/dotnet/core-setup/blob/master/Documentation/design-docs/corehost.md
         //
         // To verify, try commenting this out and you'll see that the config system can't load the external plugin type.
-        var executionFolder = Path.GetDirectoryName(typeof(Program).Assembly.Location);
+        var executionFolder = Path.GetDirectoryName(typeof(Program).Assembly.Location) ?? AppContext.BaseDirectory;
         AssemblyLoadContext.Default.Resolving += (AssemblyLoadContext context, AssemblyName assembly) => context.LoadFromAssemblyPath(Path.Combine(executionFolder, $"{assembly.Name}.dll"));
 
         var config = new ConfigurationBuilder()

src/ConfigurationExampleInterface/IPlugin.cs

@@ -1,20 +1,19 @@
-namespace ConfigurationExampleInterface
+namespace ConfigurationExampleInterface;
+
+/// <summary>
+/// Simple plugin interface used to illustrate assembly loading/plugin handling
+/// via configuration. See the "ConfigurationExample" project for usage.
+/// </summary>
+public interface IPlugin
 {
     /// <summary>
-    /// Simple plugin interface used to illustrate assembly loading/plugin handling
-    /// via configuration. See the "ConfigurationExample" project for usage.
+    /// Gets the name of the plugin.
     /// </summary>
-    public interface IPlugin
+    /// <value>
+    /// A <see cref="string"/> with the plugin name. Likely just the type name for illustrative purposes.
+    /// </value>
+    string Name
     {
-        /// <summary>
-        /// Gets the name of the plugin.
-        /// </summary>
-        /// <value>
-        /// A <see cref="string"/> with the plugin name. Likely just the type name for illustrative purposes.
-        /// </value>
-        string Name
-        {
-            get;
-        }
+        get;
     }
 }

src/ConfigurationExamplePlugin/ExternalPlugin.cs

@@ -1,25 +1,24 @@
 using ConfigurationExampleInterface;
 
-namespace ConfigurationExamplePlugin
+namespace ConfigurationExamplePlugin;
+
+/// <summary>
+/// Implementation of the plugin interface that will be loaded from an external assembly. See the "ConfigurationExample"
+/// project for more details.
+/// </summary>
+public class ExternalPlugin : IPlugin
 {
     /// <summary>
-    /// Implementation of the plugin interface that will be loaded from an external assembly. See the "ConfigurationExample"
-    /// project for more details.
+    /// Gets the name of the plugin.
     /// </summary>
-    public class ExternalPlugin : IPlugin
+    /// <value>
+    /// Always returns <c>ExternalPlugin</c>.
+    /// </value>
+    public string Name
     {
-        /// <summary>
-        /// Gets the name of the plugin.
-        /// </summary>
-        /// <value>
-        /// Always returns <c>ExternalPlugin</c>.
-        /// </value>
-        public string Name
+        get
         {
-            get
-            {
-                return "ExternalPlugin";
-            }
+            return "ExternalPlugin";
         }
     }
 }

src/GenericHostBuilderExample/HostedService.cs

@@ -1,14 +1,11 @@
-using System.Threading;
-using System.Threading.Tasks;
-using Microsoft.Extensions.Hosting;
+using Microsoft.Extensions.Hosting;
 
 namespace GenericHostBuilderExample;
 
-internal class HostedService : IHostedService
+internal sealed class HostedService : IHostedService
 {
     private readonly ILogger _logger;
 
-    // ReSharper disable once UnusedMember.Global
     public HostedService(ILogger logger)
     {
         _logger = logger;

src/GenericHostBuilderExample/ILogger.cs

@@ -1,6 +1,4 @@
-using System.Threading.Tasks;
-
-namespace GenericHostBuilderExample;
+namespace GenericHostBuilderExample;
 
 internal interface ILogger
 {

src/GenericHostBuilderExample/Logger.cs

@@ -1,9 +1,6 @@
-using System;
-using System.Threading.Tasks;
+namespace GenericHostBuilderExample;
 
-namespace GenericHostBuilderExample;
-
-internal class Logger : ILogger
+internal sealed class Logger : ILogger
 {
     public async Task Log(string value)
     {

src/GenericHostBuilderExample/Program.cs

@@ -1,5 +1,4 @@
-using System.Threading.Tasks;
-using Autofac;
+using Autofac;
 using Autofac.Extensions.DependencyInjection;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;

src/MultitenantExample.ConsoleApplication/BaseDependency.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace MultitenantExample.ConsoleApplication;
+namespace MultitenantExample.ConsoleApplication;
 
 /// <summary>
 /// Base class for dependencies. Used simply to avoid redundant code; it's not

src/MultitenantExample.ConsoleApplication/IDependency.cs

@@ -1,6 +1,4 @@
-using System;
-
-namespace MultitenantExample.ConsoleApplication;
+namespace MultitenantExample.ConsoleApplication;
 
 /// <summary>
 /// Demonstration dependency interface that allows you to inspect the unique

src/MultitenantExample.ConsoleApplication/ManualTenantIdentificationStrategy.cs

@@ -25,7 +25,7 @@ public class ManualTenantIdentificationStrategy : ITenantIdentificationStrategy
     /// <see cref="MultitenantExample.ConsoleApplication.ManualTenantIdentificationStrategy.TryIdentifyTenant"/>
     /// when the current tenant ID is requested.
     /// </value>
-    public object CurrentTenantId
+    public object? CurrentTenantId
     {
         get; set;
     }
@@ -38,9 +38,9 @@ public object CurrentTenantId
     /// <returns>
     /// This implementation always returns <see langword="true"/>.
     /// </returns>
-    public bool TryIdentifyTenant(out object tenantId)
+    public bool TryIdentifyTenant(out object? tenantId)
     {
-        if (CurrentTenantId.ToString() == "0")
+        if (CurrentTenantId?.ToString() == "0")
         {
             // 0 is the "default tenant ID"
             tenantId = null;