Enable nullable reference type

jsakamoto · Dec 13, 2023 · 64db869 · 64db869
1 parent ca49aa4
commit 64db869
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 10 deletions.
diff --git a/Toolbelt.Blazor.Gamepad/Gamepad.cs b/Toolbelt.Blazor.Gamepad/Gamepad.cs
@@ -43,7 +43,7 @@ public class Gamepad
 
     private ValueTask<object> LastRefreshTask = default;
 
-    private DotNetObjectReference<Gamepad> _ObjectRefOfThis;
+    private DotNetObjectReference<Gamepad>? _ObjectRefOfThis;
 
     internal Gamepad(JSInvoker jsInvoker, string id, int index, bool connected)
     {

diff --git a/Toolbelt.Blazor.Gamepad/GamepadExtensions.cs b/Toolbelt.Blazor.Gamepad/GamepadExtensions.cs
@@ -23,11 +23,11 @@ public static IServiceCollection AddGamepadList(this IServiceCollection services
     /// </summary>
     /// <param name="services">The Microsoft.Extensions.DependencyInjection.IServiceCollection to add the service to.</param>
     /// <param name="configure"></param>
-    public static IServiceCollection AddGamepadList(this IServiceCollection services, Action<GamepadOptions> configure)
+    public static IServiceCollection AddGamepadList(this IServiceCollection services, Action<GamepadOptions>? configure)
     {
         var options = new GamepadOptions();
         configure?.Invoke(options);
-        services.AddScoped(serviceProvider => new GamepadList(serviceProvider.GetService<IJSRuntime>(), options));
+        services.AddScoped(serviceProvider => new GamepadList(serviceProvider.GetRequiredService<IJSRuntime>(), options));
         return services;
     }
 }
diff --git a/Toolbelt.Blazor.Gamepad/GamepadList.cs b/Toolbelt.Blazor.Gamepad/GamepadList.cs
@@ -10,7 +10,9 @@ public class GamepadList : IAsyncDisposable
 {
     private readonly IJSRuntime JSRuntime;
 
-    private JSInvoker JSInvoker;
+    private IJSObjectReference? JSModule;
+
+    private JSInvoker? JSInvoker;
 
     private readonly GamepadOptions Options;
 
@@ -52,7 +54,7 @@ public async ValueTask<IReadOnlyList<Gamepad>> GetGamepadsAsync()
         return this._Gamepads;
     }
 
-    private async ValueTask<JSInvoker> GetJSInvokerAsync()
+    private async ValueTask<JSInvoker?> GetJSInvokerAsync()
     {
         if (this.JSInvoker != null) return this.JSInvoker;
 
@@ -85,12 +87,10 @@ private string GetVersionText()
         var assembly = this.GetType().Assembly;
         var version = assembly
             .GetCustomAttribute<AssemblyInformationalVersionAttribute>()?
-            .InformationalVersion ?? assembly.GetName().Version.ToString();
+            .InformationalVersion ?? assembly.GetName().Version?.ToString() ?? "0.0.0";
         return version;
     }
 
-    private IJSObjectReference JSModule;
-
     public async ValueTask DisposeAsync()
     {
         if (this.JSModule != null) await this.JSModule.DisposeAsync();

diff --git a/Toolbelt.Blazor.Gamepad/JSInvoker.cs b/Toolbelt.Blazor.Gamepad/JSInvoker.cs
@@ -1,5 +1,4 @@
-#nullable enable
-using Microsoft.JSInterop;
+using Microsoft.JSInterop;
 
 namespace Toolbelt.Blazor.Gamepad;
 

diff --git a/Toolbelt.Blazor.Gamepad/Toolbelt.Blazor.Gamepad.csproj b/Toolbelt.Blazor.Gamepad/Toolbelt.Blazor.Gamepad.csproj
@@ -2,6 +2,7 @@
 
   <PropertyGroup>
     <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <Nullable>enable</Nullable>
     <IsPackable>true</IsPackable>
     <ImplicitUsings>enable</ImplicitUsings>
     <WarningsAsErrors>$(WarningsAsErrors);nullable</WarningsAsErrors>