diff --git a/MicroWin/AppState.cs b/MicroWin/AppState.cs
index bab98c5..861cb39 100755
--- a/MicroWin/AppState.cs
+++ b/MicroWin/AppState.cs
@@ -7,11 +7,11 @@ namespace MicroWin
 
     public static class AppState
     {
-        public static string IsoPath { get; set; }
+        public static string? IsoPath { get; set; }
         public static string TempRoot => Path.Combine(Path.GetTempPath(), "microwin");
         public static string MountPath => $"{Path.Combine(TempRoot, "mount")}";
         public static string ScratchPath => $"{Path.Combine(TempRoot, "scratch")}";
-        public static int SelectedImageIndex { get; set; } = 0;
+        public static int? SelectedImageIndex { get; set; } = 0;
         public static List<UserAccount> UserAccounts { get; set; } = [];
         /// <summary>
         /// Determines whether to encode passwords with Base64
@@ -20,7 +20,7 @@ public static class AppState
         public static bool AddReportingToolShortcut { get; set; } = true;
         public static bool CopyUnattendToFileSystem { get; set; }
         public static DriverExportMode DriverExportMode { get; set; } = DriverExportMode.NoExport;
-        public static string SaveISO { get; set; }
+        public static string? SaveISO { get; set; }
 
         public static string Version => "v1.99.2";
     }
diff --git a/MicroWin/Classes/UserAccount.cs b/MicroWin/Classes/UserAccount.cs
index 6283ec6..bafba2b 100644
--- a/MicroWin/Classes/UserAccount.cs
+++ b/MicroWin/Classes/UserAccount.cs
@@ -8,8 +8,8 @@ namespace MicroWin.Classes
 {
     public class UserAccount
     {
-        public string Name { get; set; }
-        public string Password { get; set; }
-        public string Role { get; set; }
+        public string Name { get; set; } = "";
+        public string Password { get; set; } = "";
+        public string Role { get; set; } = "";
     }
 }
diff --git a/MicroWin/MainForm.cs b/MicroWin/MainForm.cs
index 18838c3..ca0382c 100755
--- a/MicroWin/MainForm.cs
+++ b/MicroWin/MainForm.cs
@@ -18,6 +18,7 @@
 using System.IO;
 using System.Linq;
 using System.Net.Http;
+using System.Runtime.Versioning;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -35,20 +36,21 @@ public partial class MainForm : Form
         ];
 
         private bool BusyCannotClose = false;
-        private DismImageInfoCollection imageInfo;
+        private DismImageInfoCollection? imageInfo;
 
-        private DismImageInfo installImageInfo;
+        private DismImageInfo? installImageInfo;
 
         public MainForm()
         {
             InitializeComponent();
         }
 
+        [SupportedOSPlatform("Windows")]
         private void SetColorMode()
         {
-            RegistryKey colorRk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
-            int colorVal = (int)colorRk.GetValue("AppsUseLightTheme", 1);
-            colorRk.Close();
+            RegistryKey? colorRk = Registry.CurrentUser.OpenSubKey("SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Themes\\Personalize");
+            int? colorVal = (int?)colorRk?.GetValue("AppsUseLightTheme", 1);
+            colorRk?.Close();
             if (colorVal == 0)
             {
                 BackColor = Color.FromArgb(35, 38, 41);
@@ -77,6 +79,7 @@ private void SetColorMode()
             WindowHelper.ToggleDarkTitleBar(Handle, colorVal == 0);
         }
 
+        [SupportedOSPlatform("Windows")]
         private void ChangePage(WizardPage.Page newPage)
         {
             DynaLog.logMessage("Changing current page of the wizard...");
@@ -125,6 +128,7 @@ private void ChangePage(WizardPage.Page newPage)
             }
         }
 
+        [SupportedOSPlatform("Windows")]
         private bool VerifyOptionsInPage(WizardPage.Page wizardPage)
         {
             switch (wizardPage)
@@ -143,7 +147,7 @@ private bool VerifyOptionsInPage(WizardPage.Page wizardPage)
                         return false;
                     }
                     // Store information about the selected image only. We can access it later if we see fit
-                    installImageInfo = imageInfo.ElementAtOrDefault(AppState.SelectedImageIndex - 1);
+                    installImageInfo = imageInfo?.ElementAtOrDefault(AppState.SelectedImageIndex - 1 ?? 0);
                     break;
                 case WizardPage.Page.UserAccountsPage:
                     // Default to "User" if no name is set
@@ -164,6 +168,7 @@ private bool VerifyOptionsInPage(WizardPage.Page wizardPage)
             return true;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void MainForm_Load(object sender, EventArgs e)
         {
             Text = $"MicroWin .NET ({swStatus} 0.2)";
@@ -193,6 +198,7 @@ private void MainForm_Load(object sender, EventArgs e)
             DriverExportCombo.SelectedIndexChanged += DriverExportCombo_SelectedIndexChanged;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void Next_Button_Click(object sender, EventArgs e)
         {
             if (CurrentWizardPage.wizardPage == WizardPage.Page.FinishPage)
@@ -204,22 +210,26 @@ private void Next_Button_Click(object sender, EventArgs e)
                 ChangePage(CurrentWizardPage.wizardPage + 1);
             }
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void Back_Button_Click(object sender, EventArgs e)
         {
             ChangePage(CurrentWizardPage.wizardPage - 1);
         }
 
+        [SupportedOSPlatform("Windows")]
         private void isoPickerBtn_Click(object sender, EventArgs e)
         {
             isoPickerOFD.ShowDialog(this);
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void isoPickerOFD_FileOk(object sender, System.ComponentModel.CancelEventArgs e)
         {
             isoPathTB.Text = isoPickerOFD.FileName;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void InvokeIsoExtractionUIUpdate(string status, int progress)
         {
             if (InvokeRequired)
@@ -236,6 +246,7 @@ private void InvokeIsoExtractionUIUpdate(string status, int progress)
             }
         }
 
+        [SupportedOSPlatform("Windows")]
         private void LoadWimData()
         {
             string wimPath = Path.Combine(AppState.MountPath, "sources", "install.wim");
@@ -248,11 +259,23 @@ private void LoadWimData()
                     return;
 
                 lvVersions.Items.Clear();
-                lvVersions.Items.AddRange(imageInfo.Select(image => new ListViewItem([image.ImageIndex.ToString(), 
-                    image.ImageName, image.ImageDescription, 
-                    image.Architecture.ToString(), 
-                    image.CustomizedInfo?.ModifiedTime.ToString("dd/MM/yyyy HH:mm:ss")])).ToArray());
-                if (imageInfo.Any())
+
+                var items = imageInfo.Select(image =>
+                {
+                    string modified = image.CustomizedInfo?.ModifiedTime.ToString("dd/MM/yyyy HH:mm:ss") ?? "N/A";
+                    return new ListViewItem(new[]
+                    {
+                        image.ImageIndex.ToString(),
+                        image.ImageName ?? string.Empty,
+                        image.ImageDescription ?? string.Empty,
+                        image.Architecture.ToString(),
+                        modified
+                    });
+                }).ToArray();
+
+                lvVersions.Items.AddRange(items);
+
+                if (imageInfo.Any() && lvVersions.Items.Count > 0)
                 {
                     // Get and select Pro automatically
                     lvVersions.SelectedIndexChanged -= lvVersions_SelectedIndexChanged;
@@ -269,6 +292,7 @@ private void LoadWimData()
             }
         }
 
+        [SupportedOSPlatform("Windows")]
         private async void isoPathTB_TextChanged(object sender, EventArgs e)
         {
             if (File.Exists(isoPathTB.Text))
@@ -284,10 +308,10 @@ await Task.Run(() => {
                     var iso = new IsoManager();
                     InvokeIsoExtractionUIUpdate("Mounting ISO...", 5);
 
-                    char drive = iso.MountAndGetDrive(AppState.IsoPath);
+                    char? drive = iso.MountAndGetDrive(AppState.IsoPath);
                     if (drive != '\0')
                     {
-                        iso.ExtractIso(drive.ToString(), AppState.MountPath, (p) => {
+                        iso.ExtractIso(drive?.ToString(), AppState.MountPath, (p) => {
                             // Update the bar based on the 0-100 value from IsoManager
                             InvokeIsoExtractionUIUpdate($"Extracting: {p}%", p);
                         });
@@ -305,10 +329,11 @@ await Task.Run(() => {
             }
         }
 
-        private void lvVersions_SelectedIndexChanged(object sender, EventArgs e)
+        [SupportedOSPlatform("Windows")]
+        private void lvVersions_SelectedIndexChanged(object? sender, EventArgs e)
         {
             if (lvVersions.SelectedItems.Count == 1)
-                AppState.SelectedImageIndex = lvVersions.FocusedItem.Index + 1;
+                AppState.SelectedImageIndex = lvVersions.FocusedItem?.Index + 1;
         }
 
         private void lnkImmersiveAccounts_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -321,46 +346,55 @@ private void lnkLusrMgr_LinkClicked(object sender, LinkLabelLinkClickedEventArgs
             Process.Start(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "system32", "lusrmgr.msc"));
         }
 
+        [SupportedOSPlatform("Windows")]
         private void usrNameTB_TextChanged(object sender, EventArgs e)
         {
             AppState.UserAccounts[0].Name = usrNameTB.Text;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void b64CB_CheckedChanged(object sender, EventArgs e)
         {
             AppState.EncodeWithB64 = b64CB.Checked;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void usrPasswordTB_TextChanged(object sender, EventArgs e)
         {
             AppState.UserAccounts[0].Password = usrPasswordTB.Text;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void usrNameCurrentSysNameBtn_Click(object sender, EventArgs e)
         {
             usrNameTB.Text = Environment.UserName;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void usrPasswordRevealCB_CheckedChanged(object sender, EventArgs e)
         {
             usrPasswordTB.PasswordChar = usrPasswordRevealCB.Checked ? '\0' : '*';
         }
 
-        private void DriverExportCombo_SelectedIndexChanged(object sender, EventArgs e)
+        [SupportedOSPlatform("Windows")]
+        private void DriverExportCombo_SelectedIndexChanged(object? sender, EventArgs e)
         {
             AppState.DriverExportMode = (DriverExportMode)DriverExportCombo.SelectedIndex;
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void ReportToolCB_CheckedChanged(object sender, EventArgs e)
         {
             AppState.AddReportingToolShortcut = ReportToolCB.Checked;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void UnattendCopyCB_CheckedChanged(object sender, EventArgs e)
         {
             AppState.CopyUnattendToFileSystem = UnattendCopyCB.Checked;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void UpdateCurrentStatus(string text, bool resetBar = true)
         {
             if (InvokeRequired)
@@ -377,7 +411,8 @@ private void UpdateCurrentStatus(string text, bool resetBar = true)
                 if (resetBar) pbCurrent.Value = 0; 
             }
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void UpdateCurrentProgressBar(int value)
         {
             int safeValue = Math.Max(0, Math.Min(value, 100));
@@ -385,19 +420,22 @@ private void UpdateCurrentProgressBar(int value)
             else pbCurrent.Value = safeValue;
         }
 
+        [SupportedOSPlatform("Windows")]
         private void UpdateOverallStatus(string text)
         {
             if (this.InvokeRequired) this.Invoke(new Action(() => { lblOverallStatus.Text = text; }));
             else { lblOverallStatus.Text = text; }
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void UpdateOverallProgressBar(int value)
         {
             int safeValue = Math.Max(0, Math.Min(value, 100));
             if (this.InvokeRequired) this.Invoke(new Action(() => pbOverall.Value = safeValue));
             else pbOverall.Value = safeValue;
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private void WriteLogMessage(string message)
         {
             string fullMsg = $"[{DateTime.UtcNow.ToString("yyyy/MM/dd HH:mm:ss")} UTC] {message}{Environment.NewLine}";
@@ -410,7 +448,8 @@ private void WriteLogMessage(string message)
                 logTB.AppendText(fullMsg);
             }
         }
-
+        
+        [SupportedOSPlatform("Windows")]
         private async void RunDeployment()
         {
             // Clear old results and write the cool banner
@@ -439,7 +478,7 @@ await Task.Run(async () => {
                 UpdateOverallStatus("Customizing install image...");
                 UpdateOverallProgressBar(0);
                 UpdateCurrentStatus("Mounting install image...");
-                DismManager.MountImage(installwimPath, AppState.SelectedImageIndex, AppState.ScratchPath, (p) => UpdateCurrentProgressBar(p), (msg) => WriteLogMessage(msg));
+                DismManager.MountImage(installwimPath, AppState.SelectedImageIndex ?? 1, AppState.ScratchPath, (p) => UpdateCurrentProgressBar(p), (msg) => WriteLogMessage(msg));
 
                 WriteLogMessage("Creating unattended answer file...");
                 UnattendGenerator.CreateUnattend($"{Path.Combine(AppState.ScratchPath, "Windows", "Panther")}");
@@ -503,7 +542,7 @@ await Task.Run(async () => {
                 WriteLogMessage("Setting execution policies...");
                 RegistryHelper.AddRegistryItem("HKLM\\zSOFTWARE\\Microsoft\\PowerShell\\1\\ShellIds\\Microsoft.PowerShell", new RegistryItem("ExecutionPolicy", ValueKind.REG_SZ, "RemoteSigned"));
 
-                if (VersionComparer.IsBetweenVersionRange(installImageInfo.ProductVersion, VersionComparer.VERCONST_WIN11_24H2, VersionComparer.VERCONST_WIN11_25H2))
+                if (VersionComparer.IsBetweenVersionRange(installImageInfo?.ProductVersion, VersionComparer.VERCONST_WIN11_24H2, VersionComparer.VERCONST_WIN11_25H2))
                 {
                     // TODO for now this is here only to show if the image is within that version range. Add the code to add AppRuntime.CBS as a dependency of FileExp.
                     WriteLogMessage("TEST: Touching up fileexp...");
@@ -564,11 +603,11 @@ await Task.Run(async () => {
                 // Old Setup should only be imposed on 24H2 and later (builds 26040 and later). Get this information
                 bool shouldUsePanther = false;
 
-                DismImageInfoCollection bootImageInfo = DismManager.GetImageInformation(bootwimPath);
+                DismImageInfoCollection? bootImageInfo = DismManager.GetImageInformation(bootwimPath);
                 if (bootImageInfo is not null)
                 {
                     // Get the second index then get version
-                    DismImageInfo setupImage = bootImageInfo.ElementAtOrDefault(1);
+                    DismImageInfo? setupImage = bootImageInfo.ElementAtOrDefault(1);
                     shouldUsePanther = VersionComparer.IsNewerThanVersion(setupImage?.ProductVersion, new(10, 0, 26040, 0));
                 }
 
@@ -642,12 +681,20 @@ await Task.Run(async () => {
 
         private void lnkUseDT_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            Process.Start("https://github.com/CodingWonders/DISMTools");
+            Process.Start(new ProcessStartInfo("https://github.com/CodingWonders/DISMTools")
+            {
+                UseShellExecute = true,
+                Verb = "open"
+            });
         }
 
         private void lnkUseNtLite_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
         {
-            Process.Start("https://ntlite.com");
+            Process.Start(new ProcessStartInfo("https://ntlite.com")
+            {
+                UseShellExecute = true,
+                Verb = "open"
+            });
         }
 
         private void lnkOpenIsoLoc_LinkClicked(object sender, LinkLabelLinkClickedEventArgs e)
@@ -656,6 +703,7 @@ private void lnkOpenIsoLoc_LinkClicked(object sender, LinkLabelLinkClickedEventA
                 $"/select,\"{AppState.SaveISO}\"");
         }
 
+        [SupportedOSPlatform("Windows")]
         private void MainForm_SizeChanged(object sender, EventArgs e)
         {
             if (BusyCannotClose)
diff --git a/MicroWin/MicroWin.csproj b/MicroWin/MicroWin.csproj
index 6abd4cf..0ee3295 100755
--- a/MicroWin/MicroWin.csproj
+++ b/MicroWin/MicroWin.csproj
@@ -1,165 +1,36 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{6D6B29A3-5603-487C-837F-AC4FDAA97A73}</ProjectGuid>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>MicroWin</RootNamespace>
-    <AssemblyName>MicroWin</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFramework>net10.0-windows</TargetFramework>
+    <UseWindowsForms>true</UseWindowsForms>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
+    <LangVersion>14.0</LangVersion>
     <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <LangVersion>latest</LangVersion>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile />
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <Prefer32Bit>false</Prefer32Bit>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignManifests>false</SignManifests>
-  </PropertyGroup>
-  <PropertyGroup>
-    <ApplicationManifest>app.manifest</ApplicationManifest>
-  </PropertyGroup>
-  <PropertyGroup>
     <StartupObject>MicroWin.Program</StartupObject>
+    <ApplicationManifest>app.manifest</ApplicationManifest>
+    <!-- Disable auto-generated assembly attributes to avoid duplication with Properties/AssemblyInfo.cs -->
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
+
   <ItemGroup>
-    <Reference Include="Microsoft.Dism, Version=1.0.0.0, Culture=neutral, PublicKeyToken=5bba90053b345501, processorArchitecture=MSIL">
-      <HintPath>..\packages\Microsoft.Dism.4.0.7\lib\net40\Microsoft.Dism.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Management" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <!-- Migrate Microsoft.Dism to PackageReference; keep pinned version from assessment -->
+    <PackageReference Include="Microsoft.Dism" Version="4.0.7" />
+    <PackageReference Include="System.Management" Version="10.0.5" />
   </ItemGroup>
+
   <ItemGroup>
-    <Compile Include="Classes\DriverExportMode.cs" />
-    <Compile Include="Classes\UserAccount.cs" />
-    <Compile Include="functions\dism\DismManager.cs" />
-    <Compile Include="functions\dism\ImageModificationTask.cs" />
-    <Compile Include="functions\dism\OsFeatureDisabler.cs" />
-    <Compile Include="functions\dism\OsPackageRemover.cs" />
-    <Compile Include="functions\dism\StoreAppRemover.cs" />
-    <Compile Include="functions\dism\UnattendGenerator.cs" />
-    <Compile Include="functions\Helpers\DeleteFiles\DeleteFile.cs" />
-    <Compile Include="functions\Helpers\DesktopWindowManager\WindowHelper.cs" />
-    <Compile Include="functions\Helpers\DriverHelpers\DriverExportHelper.cs" />
-    <Compile Include="functions\Helpers\DriverHelpers\DriverInstallHelper.cs" />
-    <Compile Include="functions\Helpers\DynaLog\DynaLog.cs" />
-    <Compile Include="functions\Helpers\PropertyCheckers\VersionComparer.cs" />
-    <Compile Include="functions\Helpers\RegistryHelpers\RegistryHelper.cs" />
-    <Compile Include="functions\Helpers\RegistryHelpers\RegistryItem.cs" />
-    <Compile Include="functions\Helpers\RegistryHelpers\ValueKind.cs" />
-    <Compile Include="functions\iso\IsoManager.cs" />
-    <Compile Include="functions\OSCDIMG\OscdimgUtilities.cs" />
-    <Compile Include="functions\UI\WizardPage.cs" />
-    <Compile Include="MainForm.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="MainForm.Designer.cs">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </Compile>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="AppState.cs" />
-    <EmbeddedResource Include="MainForm.resx">
-      <DependentUpon>MainForm.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="app.manifest" />
-    <None Include="packages.config" />
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
+    <!-- Keep native/tools files as content so they remain in the output and/or source tree -->
+    <None Include="tools\oscdimg.exe" />
     <None Include="tools\FirstStartup.ps1" />
     <None Include="tools\RemoveTempDir.bat" />
+    <None Include="app.manifest" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
-      <Visible>False</Visible>
-      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="Resources\user_creation_lusrmgr.png" />
-    <Content Include="Resources\user_creation_settings.png" />
-    <Content Include="tools\oscdimg.exe" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
-    <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
-    </PropertyGroup>
-    <Error Condition="!Exists('..\packages\Microsoft.UI.Xaml.2.8.7\build\Microsoft.UI.Xaml.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.UI.Xaml.2.8.7\build\Microsoft.UI.Xaml.props'))" />
-  </Target>
-</Project>
\ No newline at end of file
+
+  <!-- Resource files are included implicitly by the SDK; explicit EmbeddedResource entries removed to avoid duplicates -->
+
+  <!-- Keep packages.config in the repository, but it's no longer used by SDK-style projects. -->
+
+</Project>
diff --git a/MicroWin/Program.cs b/MicroWin/Program.cs
index ccd06b5..259d287 100755
--- a/MicroWin/Program.cs
+++ b/MicroWin/Program.cs
@@ -1,4 +1,6 @@
 using System;
+using System.Runtime.Versioning;
+using System.Windows;
 using System.Windows.Forms;
 
 namespace MicroWin
@@ -6,10 +8,12 @@ namespace MicroWin
     static class Program
     {
         [STAThread]
+        [SupportedOSPlatform("Windows")]
         static void Main()
         {
             Application.EnableVisualStyles();
             Application.SetCompatibleTextRenderingDefault(false);
+            Application.SetHighDpiMode(HighDpiMode.PerMonitorV2);
             Application.Run(new MainForm());
         }
     }
diff --git a/MicroWin/app.manifest b/MicroWin/app.manifest
index 11b8499..68c968a 100644
--- a/MicroWin/app.manifest
+++ b/MicroWin/app.manifest
@@ -52,13 +52,6 @@
        
        Hace que la aplicación sea compatible con rutas de acceso largas. Consulte https://docs.microsoft.com/windows/win32/fileio/maximum-file-path-limitation -->
   
-  <asmv3:application>
-    <asmv3:windowsSettings>
-      <dpiAware xmlns="http://schemas.microsoft.com/SMI/2005/WindowsSettings">true</dpiAware>
-      <dpiAwareness xmlns="http://schemas.microsoft.com/SMI/2016/WindowsSettings">PerMonitorV2</dpiAwareness>
-    </asmv3:windowsSettings>
-  </asmv3:application>
-  
 
   <!-- Habilitar los temas para los controles y cuadros de diálogo comunes de Windows (Windows XP y versiones posteriores) -->
   <!--
diff --git a/MicroWin/functions/Helpers/DesktopWindowManager/WindowHelper.cs b/MicroWin/functions/Helpers/DesktopWindowManager/WindowHelper.cs
index 8e474c7..4881f6e 100644
--- a/MicroWin/functions/Helpers/DesktopWindowManager/WindowHelper.cs
+++ b/MicroWin/functions/Helpers/DesktopWindowManager/WindowHelper.cs
@@ -1,15 +1,16 @@
 using System;
 using System.Collections.Generic;
+using System.Drawing;
 using System.Linq;
+using System.Runtime.InteropServices;
+using System.Runtime.Versioning;
 using System.Text;
 using System.Threading.Tasks;
-using System.Runtime.InteropServices;
 using System.Windows.Forms;
-using System.Drawing;
-using System.Runtime.Remoting.Messaging;
 
 namespace MicroWin.functions.Helpers.DesktopWindowManager
 {
+    [SupportedOSPlatform("Windows")]
     public class WindowHelper
     {
         public sealed class NativeMethods
diff --git a/MicroWin/functions/Helpers/DriverHelpers/DriverExportHelper.cs b/MicroWin/functions/Helpers/DriverHelpers/DriverExportHelper.cs
index 9d42338..22924f5 100644
--- a/MicroWin/functions/Helpers/DriverHelpers/DriverExportHelper.cs
+++ b/MicroWin/functions/Helpers/DriverHelpers/DriverExportHelper.cs
@@ -29,7 +29,7 @@ private static int RunDismProcess(string arguments)
             return dismProc.ExitCode;
         }
 
-        private static bool CopyRecursive(string SourceDirectory, string DestinationDirectory)
+        private static bool CopyRecursive(string? SourceDirectory, string DestinationDirectory)
         {
             if (!Directory.Exists(SourceDirectory))
                 return false;
@@ -74,9 +74,9 @@ private static bool CopyRecursive(string SourceDirectory, string DestinationDire
             return true;
         }
 
-        private static DismDriverPackageCollection GetOnlineDrivers()
+        private static DismDriverPackageCollection? GetOnlineDrivers()
         {
-            DismDriverPackageCollection drivers = null;
+            DismDriverPackageCollection? drivers = null;
             try
             {
                 DismApi.Initialize(DismLogLevel.LogErrors);
@@ -118,7 +118,7 @@ public static bool ExportDrivers(string DestinationDir)
 
         public static bool ExportDrivers(string DestinationDir, string ClassName)
         {
-            DismDriverPackageCollection onlineDrivers = GetOnlineDrivers();
+            DismDriverPackageCollection? onlineDrivers = GetOnlineDrivers();
             if (onlineDrivers is null)
                 return false;
 
diff --git a/MicroWin/functions/Helpers/DriverHelpers/DriverInstallHelper.cs b/MicroWin/functions/Helpers/DriverHelpers/DriverInstallHelper.cs
index 65aa00a..43f10c4 100644
--- a/MicroWin/functions/Helpers/DriverHelpers/DriverInstallHelper.cs
+++ b/MicroWin/functions/Helpers/DriverHelpers/DriverInstallHelper.cs
@@ -1,6 +1,7 @@
 using Microsoft.Dism;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Text;
@@ -25,13 +26,13 @@ public static void InstallDrivers(string mountPath, string driverSource)
 					}
 					catch (Exception ex)
 					{
-						// TODO log
+						Debug.WriteLine(ex);
 					}
 				}
 			}
 			catch (Exception ex)
 			{
-				// TODO log
+				Debug.WriteLine(ex);
 			}
 			finally
 			{
diff --git a/MicroWin/functions/Helpers/DynaLog/DynaLog.cs b/MicroWin/functions/Helpers/DynaLog/DynaLog.cs
index aba549d..835d56f 100644
--- a/MicroWin/functions/Helpers/DynaLog/DynaLog.cs
+++ b/MicroWin/functions/Helpers/DynaLog/DynaLog.cs
@@ -154,7 +154,7 @@ public static void logMessage(string message, bool getParentCaller = false)
                 {
                     fileLength = new FileInfo(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logs", "MW_DynaLog.log")).Length;
                 }
-                string messagePrefix = $"[{DateTime.UtcNow.ToString("MM/dd/yyyy HH:mm:ss", CultureInfo.InvariantCulture)}] [PID {Process.GetCurrentProcess().Id}] [{new StackFrame(1).GetMethod().Name}{(getParentCaller ? $" ({new StackFrame(2).GetMethod().Name})" : "")}] ";
+                string messagePrefix = $"[{DateTime.UtcNow.ToString("MM/dd/yyyy HH:mm:ss", CultureInfo.InvariantCulture)}] [PID {Process.GetCurrentProcess().Id}] [{new StackFrame(1)?.GetMethod()?.Name}{(getParentCaller ? $" ({new StackFrame(2)?.GetMethod()?.Name})" : "")}] ";
                 string messageLine = $"{messagePrefix}{message.Replace("\n", $"\n{messagePrefix}").Trim()}";
                 File.AppendAllText(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "logs", "MW_DynaLog.log"), $"{(fileLength > 0 ? "\n" : "")}{messageLine}");
             }
diff --git a/MicroWin/functions/Helpers/PropertyCheckers/VersionComparer.cs b/MicroWin/functions/Helpers/PropertyCheckers/VersionComparer.cs
index 840d6c4..a4d72e8 100644
--- a/MicroWin/functions/Helpers/PropertyCheckers/VersionComparer.cs
+++ b/MicroWin/functions/Helpers/PropertyCheckers/VersionComparer.cs
@@ -16,17 +16,17 @@ public static class VersionComparer
         public static readonly Version VERCONST_WIN11_25H2 = new(10, 0, 26200, 6584);
         public static readonly Version VERCONST_WIN11_26H1 = new(10, 0, 28000, 1575);
 
-        public static bool IsNewerThanVersion(Version versionToCompare, Version minimumThreshold)
+        public static bool IsNewerThanVersion(Version? versionToCompare, Version? minimumThreshold)
         {
             return versionToCompare >= minimumThreshold;
         }
 
-        public static bool IsOlderThanVersion(Version versionToCompare, Version maximumThreshold)
+        public static bool IsOlderThanVersion(Version? versionToCompare, Version? maximumThreshold)
         {
             return versionToCompare < maximumThreshold;
         }
 
-        public static bool IsBetweenVersionRange(Version versionToCompare, Version lowerBound, Version upperBound)
+        public static bool IsBetweenVersionRange(Version? versionToCompare, Version? lowerBound, Version? upperBound)
         {
             return (versionToCompare >= lowerBound) && (versionToCompare < upperBound);
         }
diff --git a/MicroWin/functions/Helpers/RegistryHelpers/RegistryHelper.cs b/MicroWin/functions/Helpers/RegistryHelpers/RegistryHelper.cs
index 043d83c..fe0cda9 100644
--- a/MicroWin/functions/Helpers/RegistryHelpers/RegistryHelper.cs
+++ b/MicroWin/functions/Helpers/RegistryHelpers/RegistryHelper.cs
@@ -1,15 +1,17 @@
-using System;
+using Microsoft.Win32;
+using MicroWin.functions.Helpers.Loggers;
+using System;
 using System.Collections.Generic;
+using System.Diagnostics;
+using System.IO;
 using System.Linq;
+using System.Runtime.Versioning;
 using System.Text;
 using System.Threading.Tasks;
-using System.Diagnostics;
-using System.IO;
-using Microsoft.Win32;
-using MicroWin.functions.Helpers.Loggers;
 
 namespace MicroWin.functions.Helpers.RegistryHelpers
 {
+    [SupportedOSPlatform("Windows")]
     public static class RegistryHelper
     {
         /// <summary>
@@ -73,7 +75,7 @@ public static bool RegistryValueExists(string keyPath, string valueName = "")
         /// </summary>
         /// <param name="valueKind">The registry value kind from the Win32 namespace</param>
         /// <returns>The value kind for the native namespace.</returns>
-        private static ValueKind GetValueKindEnumValue(RegistryValueKind valueKind)
+        private static ValueKind GetValueKindEnumValue(RegistryValueKind? valueKind)
         {
             switch (valueKind)
             {
@@ -153,17 +155,17 @@ private static string GetValueKindString(ValueKind kind)
         /// <param name="keyPath">The path to the key containing the value to query</param>
         /// <param name="valueName">The name of the value to query</param>
         /// <returns>A <see cref="RegistryItem"/> object containing the registry value name, kind, and data.</returns>
-        public static RegistryItem QueryRegistryValue(string keyPath, string valueName = "")
+        public static RegistryItem? QueryRegistryValue(string keyPath, string valueName = "")
         {
-            RegistryItem item = null;
-            RegistryKey registryKey = null;
+            RegistryItem? item = null;
+            RegistryKey? registryKey = null;
 
             // This is an exemption from the rule of no .NET API. We can safely query stuff with it
             try
             {
                 registryKey = Registry.LocalMachine.OpenSubKey(keyPath, false);
-                object regValueData = registryKey.GetValue(valueName != "" ? valueName : null);
-                RegistryValueKind regValueKind = registryKey.GetValueKind(valueName != "" ? valueName : null);
+                object? regValueData = registryKey?.GetValue(valueName != "" ? valueName : null);
+                RegistryValueKind? regValueKind = registryKey?.GetValueKind(valueName != "" ? valueName : null);
                 item = new RegistryItem(valueName, GetValueKindEnumValue(regValueKind), regValueData);
             }
             catch (Exception)
@@ -215,7 +217,7 @@ public static bool AddRegistryItem(string keyPath, RegistryItem value)
                 regArgs += $"/v \"{value.Name.Replace("\"", "")}\" ";
             }
 
-            regArgs += $"/t {GetValueKindString(value.Kind)} /d \"{value.Data.ToString()}\"";
+            regArgs += $"/t {GetValueKindString(value.Kind)} /d \"{value?.Data?.ToString()}\"";
 
             return RunRegProcess(regArgs) == ERROR_SUCCESS;
         }
diff --git a/MicroWin/functions/Helpers/RegistryHelpers/RegistryItem.cs b/MicroWin/functions/Helpers/RegistryHelpers/RegistryItem.cs
index e43df51..528ee21 100644
--- a/MicroWin/functions/Helpers/RegistryHelpers/RegistryItem.cs
+++ b/MicroWin/functions/Helpers/RegistryHelpers/RegistryItem.cs
@@ -16,7 +16,7 @@ public class RegistryItem
         /// <summary>
         /// The data of the registry value
         /// </summary>
-        public object Data { get; set; }
+        public object? Data { get; set; }
 
         /// <summary>
         /// Creates a <see cref="RegistryItem"/> instance with name, kind, and data
@@ -25,7 +25,7 @@ public class RegistryItem
         /// <param name="name">The name of the registry item</param>
         /// <param name="kind">The kind of the registry item</param>
         /// <param name="data">The data of the registry item</param>
-        public RegistryItem(string name, ValueKind kind, object data)
+        public RegistryItem(string name, ValueKind kind, object? data)
         {
             Name = name;
             Kind = kind;
diff --git a/MicroWin/functions/OSCDIMG/OscdimgUtilities.cs b/MicroWin/functions/OSCDIMG/OscdimgUtilities.cs
index 34ad15e..fb5eda6 100644
--- a/MicroWin/functions/OSCDIMG/OscdimgUtilities.cs
+++ b/MicroWin/functions/OSCDIMG/OscdimgUtilities.cs
@@ -4,15 +4,17 @@
 using System.Diagnostics;
 using System.IO;
 using System.Net.Http;
+using System.Runtime.Versioning;
 using System.Windows.Forms;
 
 namespace MicroWin.OSCDIMG
 {
+    [SupportedOSPlatform("Windows")]
     public static class OscdimgUtilities
     {
-        public static string peToolsPath;
-        public static string adkKitsRoot => GetKitsRoot(false);
-        public static string adkKitsRoot_WOW64Environ => GetKitsRoot(true);
+        public static string peToolsPath = "";
+        public static string adkKitsRoot => GetKitsRoot(false) ?? "";
+        public static string adkKitsRoot_WOW64Environ => GetKitsRoot(true) ?? "";
 
         public static string expectedADKPath => Path.Combine(adkKitsRoot, "Assessment and Deployment Kit");
         public static string expectedADKPath_WOW64Environ => Path.Combine(adkKitsRoot_WOW64Environ, "Assessment and Deployment Kit");
@@ -60,10 +62,10 @@ public static void startInstall()
             DynaLog.logMessage($"Process exited with code {oscdimgProc.ExitCode}.");
         }
 
-        public static string GetKitsRoot(bool wow64environment)
+        public static string? GetKitsRoot(bool wow64environment)
         {
-            string adk10KitsRoot = string.Empty;
-            string regPath;
+            string? adk10KitsRoot = string.Empty;
+            string? regPath;
 
             // if we set the wow64 bit on and we're on a 32-bit system, then we prematurely return the value
             if (wow64environment && !Environment.Is64BitOperatingSystem) 
@@ -85,7 +87,7 @@ public static string GetKitsRoot(bool wow64environment)
             }
 
             try {
-                adk10KitsRoot = RegistryHelper.QueryRegistryValue(regPath, "KitsRoot10").Data.ToString() ; // Get-ItemPropertyValue -Path $regPath -Name "KitsRoot10" -ErrorAction Stop
+                adk10KitsRoot = RegistryHelper.QueryRegistryValue(regPath, "KitsRoot10")?.Data?.ToString() ; // Get-ItemPropertyValue -Path $regPath -Name "KitsRoot10" -ErrorAction Stop
             } catch {
                 // Add logging
             }
diff --git a/MicroWin/functions/dism/DismManager.cs b/MicroWin/functions/dism/DismManager.cs
index b83f672..57f0ae6 100755
--- a/MicroWin/functions/dism/DismManager.cs
+++ b/MicroWin/functions/dism/DismManager.cs
@@ -20,7 +20,7 @@ public static void MountImage(string wimPath, int index, string mountPath, Actio
             if (!File.Exists(wimPath))
                 return;
 
-            DismImageInfoCollection imageInfo = GetImageInformation(wimPath);
+            DismImageInfoCollection? imageInfo = GetImageInformation(wimPath);
             if (imageInfo is null || (index < 1 || index > imageInfo.Count))
                 return;
 
@@ -71,9 +71,9 @@ public static void MountImage(string wimPath, int index, string mountPath, Actio
             }
         }
 
-        private static DismMountedImageInfoCollection GetMountedImages()
+        private static DismMountedImageInfoCollection? GetMountedImages()
         {
-            DismMountedImageInfoCollection mountedImages = null;
+            DismMountedImageInfoCollection? mountedImages = null;
 
             try
             {
@@ -99,9 +99,9 @@ private static DismMountedImageInfoCollection GetMountedImages()
             return mountedImages;
         }
 
-        public static DismImageInfoCollection GetImageInformation(string wimFile)
+        public static DismImageInfoCollection? GetImageInformation(string wimFile)
         {
-            DismImageInfoCollection imageInfo = null;
+            DismImageInfoCollection? imageInfo = null;
 
             try
             {
@@ -137,7 +137,7 @@ public static void UnmountAndSave(string mountPath, Action<int> progress, Action
             }
 
             // To be sure, we'll check the mounted images for this one.
-            DismMountedImageInfoCollection mountedImages = GetMountedImages();
+            DismMountedImageInfoCollection? mountedImages = GetMountedImages();
             if ((mountedImages is null) || (!mountedImages.Any(image => image.MountPath == mountPath)))
             {
                 return;
@@ -178,7 +178,7 @@ public static void UnmountAndDiscard(string mountPath)
             }
 
             // To be sure, we'll check the mounted images for this one.
-            DismMountedImageInfoCollection mountedImages = GetMountedImages();
+            DismMountedImageInfoCollection? mountedImages = GetMountedImages();
             if ((mountedImages is null) || (!mountedImages.Any(image => image.MountPath == mountPath)))
             {
                 return;
diff --git a/MicroWin/functions/dism/OsFeatureDisabler.cs b/MicroWin/functions/dism/OsFeatureDisabler.cs
index de4ea96..92b4db2 100644
--- a/MicroWin/functions/dism/OsFeatureDisabler.cs
+++ b/MicroWin/functions/dism/OsFeatureDisabler.cs
@@ -33,7 +33,7 @@ public override void RunTask(Action<int> pbReporter, Action<string> curOpReporte
         private void DisableFeatures(Action<int> pbReporter, Action<string> curOpReporter, Action<string> logWriter)
         {
             curOpReporter.Invoke("Getting image features...");
-            DismFeatureCollection allFeatures = GetFeatureList();
+            DismFeatureCollection? allFeatures = GetFeatureList();
 
             if (allFeatures is null) return;
 
@@ -58,7 +58,9 @@ private void DisableFeatures(Action<int> pbReporter, Action<string> curOpReporte
                     pbReporter.Invoke((int)(((double)idx / featuresToDisable.ToList().Count) * 100));
                     try
                     {
+#pragma warning disable CS8625
                         DismApi.DisableFeature(session, featureToDisable, null, true);
+#pragma warning restore CS8625
                     }
                     catch (Exception ex)
                     {
@@ -83,9 +85,9 @@ private void DisableFeatures(Action<int> pbReporter, Action<string> curOpReporte
             }
         }
 
-        private DismFeatureCollection GetFeatureList()
+        private DismFeatureCollection? GetFeatureList()
         {
-            DismFeatureCollection featureList = null;
+            DismFeatureCollection? featureList = null;
 
             try
             {
diff --git a/MicroWin/functions/dism/OsPackageRemover.cs b/MicroWin/functions/dism/OsPackageRemover.cs
index e2b65b0..09944a8 100644
--- a/MicroWin/functions/dism/OsPackageRemover.cs
+++ b/MicroWin/functions/dism/OsPackageRemover.cs
@@ -43,7 +43,7 @@ public override void RunTask(Action<int> pbReporter, Action<string> curOpReporte
         private void RemoveUnwantedPackages(Action<int> pbReporter, Action<string> curOpReporter, Action<string> logWriter)
         {
             curOpReporter.Invoke("Getting image packages...");
-            DismPackageCollection allPackages = GetPackageList();
+            DismPackageCollection? allPackages = GetPackageList();
 
             if (allPackages is null) return;
 
@@ -92,9 +92,9 @@ private void RemoveUnwantedPackages(Action<int> pbReporter, Action<string> curOp
             }
         }
 
-        private DismPackageCollection GetPackageList()
+        private DismPackageCollection? GetPackageList()
         {
-            DismPackageCollection packages = null;
+            DismPackageCollection? packages = null;
 
             try
             {
diff --git a/MicroWin/functions/dism/StoreAppRemover.cs b/MicroWin/functions/dism/StoreAppRemover.cs
index ee0b0b2..8eff88b 100644
--- a/MicroWin/functions/dism/StoreAppRemover.cs
+++ b/MicroWin/functions/dism/StoreAppRemover.cs
@@ -41,7 +41,7 @@ public override void RunTask(Action<int> pbReporter, Action<string> curOpReporte
         private void RemoveStoreApps(Action<int> pbReporter, Action<string> curOpReporter, Action<string> logWriter)
         {
             curOpReporter.Invoke("Getting image AppX packages...");
-            DismAppxPackageCollection allStoreApps = GetStoreAppsList();
+            DismAppxPackageCollection? allStoreApps = GetStoreAppsList();
             if (allStoreApps is null) return;
 
             logWriter.Invoke($"Amount of AppX packages in image: {allStoreApps.Count}");
@@ -88,9 +88,9 @@ private void RemoveStoreApps(Action<int> pbReporter, Action<string> curOpReporte
             }
         }
 
-        private DismAppxPackageCollection GetStoreAppsList()
+        private DismAppxPackageCollection? GetStoreAppsList()
         {
-            DismAppxPackageCollection storeApps = null;
+            DismAppxPackageCollection? storeApps = null;
 
             try
             {
diff --git a/MicroWin/functions/iso/IsoManager.cs b/MicroWin/functions/iso/IsoManager.cs
index a8adba1..a059ce9 100755
--- a/MicroWin/functions/iso/IsoManager.cs
+++ b/MicroWin/functions/iso/IsoManager.cs
@@ -1,15 +1,17 @@
 using System;
 using System.IO;
 using System.Management;
+using System.Runtime.Versioning;
 using System.Threading;
 
 namespace MicroWin.functions.iso
 {
+    [SupportedOSPlatform("Windows")]
     public class IsoManager
     {
         private const string WmiScope = "root\\Microsoft\\Windows\\Storage";
         
-        public char MountAndGetDrive(string isoPath)
+        public char? MountAndGetDrive(string isoPath)
         {
             Console.WriteLine($"[DEBUG] Attempting to mount: {isoPath}");
 
@@ -26,16 +28,16 @@ public char MountAndGetDrive(string isoPath)
             isoObject.InvokeMethod("Mount", inParams, null);
 
             string volumeQuery = String.Format("ASSOCIATORS OF {{{0}}} WHERE ASSOCCLASS = MSFT_DiskImageToVolume RESULTCLASS = MSFT_Volume", isoObjectPath);
-            char driveLetter = '\0';
+            char? driveLetter = '\0';
 
             using ManagementObjectSearcher query = new(WmiScope, volumeQuery);
             while (driveLetter == '\0')
             {
                 Thread.Sleep(50);
                 using ManagementObjectCollection queryCollection = query.Get();
-                foreach (ManagementBaseObject item in queryCollection)
+                foreach (ManagementBaseObject? item in queryCollection)
                 {
-                    driveLetter = item["DriveLetter"].ToString()[0];
+                    driveLetter = item["DriveLetter"]?.ToString()?[0];
                 }
             }
 
@@ -47,7 +49,7 @@ private string BuildIsoObjectPath(string isoPath)
             return String.Format("MSFT_DiskImage.ImagePath={0},StorageType=1", $"\"{isoPath.Replace("\\", "\\\\")}\"");
         }
 
-        public void ExtractIso(string driveLetter, string destination, Action<int> progressCallback)
+        public void ExtractIso(string? driveLetter, string destination, Action<int> progressCallback)
         {
             string source = $"{driveLetter}:\\";
             Console.WriteLine($"[DEBUG] Starting extraction from {source} to {destination}");
@@ -62,9 +64,9 @@ public void ExtractIso(string driveLetter, string destination, Action<int> progr
             {
                 try
                 {
-                    string destFile = file.Replace(source, $"{destination}\\");
-                    string destDir = Path.GetDirectoryName(destFile);
-                    if (!Directory.Exists(destDir)) Directory.CreateDirectory(destDir);
+                    string? destFile = file.Replace(source, $"{destination}\\");
+                    string? destDir = Path.GetDirectoryName(destFile);
+                    if (!Directory.Exists(destDir)) Directory.CreateDirectory(destDir ?? "");
 
                     File.Copy(file, destFile, true);
                     copiedFiles++;
diff --git a/TestProjects/UnattendedWriter/UnattendedWriter.csproj b/TestProjects/UnattendedWriter/UnattendedWriter.csproj
index 3386687..c534eb9 100644
--- a/TestProjects/UnattendedWriter/UnattendedWriter.csproj
+++ b/TestProjects/UnattendedWriter/UnattendedWriter.csproj
@@ -1,53 +1,22 @@
 <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{8ACD4575-9D60-4412-ABF2-B5422E33C74D}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>UnattendedWriter</RootNamespace>
-    <AssemblyName>UnattendedWriter</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFramework>net10.0</TargetFramework>
+    <Nullable>enable</Nullable>
+    <ImplicitUsings>enable</ImplicitUsings>
     <Deterministic>true</Deterministic>
+    <LangVersion>14.0</LangVersion>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
+
   <ItemGroup>
     <None Include="App.config" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-</Project>
\ No newline at end of file
+
+  <!-- Disable auto-generation of assembly attributes (they are provided in Properties/AssemblyInfo.cs) -->
+  <PropertyGroup>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+  </PropertyGroup>
+
+</Project>