From daaf9f1932cc65e8196204c3e1cd5b601bb62b36 Mon Sep 17 00:00:00 2001
From: Matt Nadareski <mnadareski@outlook.com>
Date: Wed, 11 Oct 2023 11:16:34 -0400
Subject: [PATCH] Enable nullability in MPF

---
 CHANGELIST.md   |  1 +
 MPF/App.xaml.cs | 13 ++-----------
 MPF/MPF.csproj  |  4 ++++
 3 files changed, 7 insertions(+), 11 deletions(-)

diff --git a/CHANGELIST.md b/CHANGELIST.md
index 3d9c5780..29fdf73d 100644
--- a/CHANGELIST.md
+++ b/CHANGELIST.md
@@ -10,6 +10,7 @@
 - Enable nullability in Check
 - Remove all but .NET 6 for AppVeyor packaging
 - Place message boxes at center of main window (Deterous)
+- Enable nullability in MPF
 
 ### 2.7.0 (2023-10-11)
 
diff --git a/MPF/App.xaml.cs b/MPF/App.xaml.cs
index 06df55c6..6f64ef8a 100644
--- a/MPF/App.xaml.cs
+++ b/MPF/App.xaml.cs
@@ -1,16 +1,7 @@
-using System.Windows;
-
-namespace MPF
+namespace MPF
 {
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
-    /// <remarks>
-    /// This application is not fully MVVM. The following steps are needed to get there:
-    /// - Use commands instead of event handlers, where at all possible
-    /// - Reduce the amount of manual UI adjustments needed, instead binding to the view models
-    /// </remarks>
-    public partial class App : Application
-    {
-    }
+    public partial class App : System.Windows.Application { }
 }
diff --git a/MPF/MPF.csproj b/MPF/MPF.csproj
index 75823f0b..1b05f073 100644
--- a/MPF/MPF.csproj
+++ b/MPF/MPF.csproj
@@ -15,6 +15,10 @@
     <InternalsVisibleTo>MPF.Test</InternalsVisibleTo>
   </PropertyGroup>
 
+	<PropertyGroup Condition="'$(TargetFramework)'!='net48'">
+		<Nullable>enable</Nullable>
+	</PropertyGroup>
+
   <ItemGroup>
     <Resource Include="Images\Icon.ico" />
   </ItemGroup>