Native AOT

.github/workflows/dotnet.yml

@@ -45,18 +45,19 @@ jobs:
         uses: microsoft/setup-msbuild@main
         with:
           msbuild-architecture: x64
-      - name: Setup .NET 8
+      - name: Setup .NET 9
         uses: actions/setup-dotnet@main
         with:
-          dotnet-version: 8.x
+          dotnet-version: 9.x
+          dotnet-quality: 'preview'
       - name: Setup Windows 11 SDK (10.0.22621.0)
         uses: GuillaumeFalourd/setup-windows10-sdk-action@main
         with:
             sdk-version: 22621
       - name: Restore
-        run: msbuild SUBSTitute.sln /t:restore
+        run: dotnet restore SUBSTitute.sln
       - name: Build
-        run: msbuild SUBSTitute.sln /p:Configuration=${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} /p:VersionSuffix=ci /p:RestorePackages=false
+        run: dotnet build SUBSTitute.sln --configuration ${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} --no-restore -p:VersionSuffix=ci
   sonarcloud:
     name: SonarCloud
     runs-on: windows-latest
@@ -66,10 +67,11 @@ jobs:
         uses: actions/checkout@main
         with:
           fetch-depth: 0
-      - name: Setup .NET 8
+      - name: Setup .NET 9
         uses: actions/setup-dotnet@main
         with:
-          dotnet-version: 8.x
+          dotnet-version: 9.x
+          dotnet-quality: 'preview'
       - name: Setup Windows 11 SDK (10.0.22621.0)
         uses: GuillaumeFalourd/setup-windows10-sdk-action@main
         with:
@@ -109,5 +111,5 @@ jobs:
         run: |
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"sungaila_SUBSTitute" /o:"sungaila" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml
           dotnet restore SUBSTitute.sln
-          dotnet build  SUBSTitute.sln --configuration ${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} --no-restore
+          dotnet build SUBSTitute.sln --configuration ${{ github.event_name != 'workflow_dispatch' && 'Debug' || inputs.build_configuration }} --no-restore
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"

README.md

@@ -3,8 +3,14 @@
 # SUBSTitute
 A GUI for mapping directories to virtual drives (see *SUBST* command). It is built on top of **.NET 8.0** and **Windows UI Library 3 (WinUI 3)**.
 
-<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot5_en-us.png" width="800" alt="Screenshot from version 2.0.0">
+<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot5_en-us.png" width="800" alt="Screenshot from version 2.1.1">
+<span style="white-space:nowrap">
+<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot1_en-us.png" width="200" alt="Screenshot from version 2.1.1">
+<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot2_en-us.png" width="200" alt="Screenshot from version 2.1.1">
+<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot3_en-us.png" width="200" alt="Screenshot from version 2.1.1">
+<img src="https://raw.githubusercontent.com/sungaila/SUBSTitute/master/etc/screenshot4_en-us.png" width="200" alt="Screenshot from version 2.1.1">
+</span>
 <br>
 <a href="https://apps.microsoft.com/detail/9NGPRNJJKLBG?launch=true">
-	<img alt="Get it from Microsoft Store" src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/>
+	<img alt="Get it from Microsoft Store" src="https://get.microsoft.com/images/en-us%20dark.svg" width="200"/
 </a>

nuget.config

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="nuget.org" value="https://api.nuget.org/v3/index.json" />
+    <add key="CommunityToolkit Main" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-MainLatest/nuget/v3/index.json" />
+    <add key="CommunityToolkit Labs" value="https://pkgs.dev.azure.com/dotnet/CommunityToolkit/_packaging/CommunityToolkit-Labs/nuget/v3/index.json" />
+  </packageSources>
+</configuration>

src/App.manifest

@@ -2,7 +2,7 @@
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
   <assemblyIdentity type="win32"
                     name="Sungaila.SUBSTitute"
-                    version="2.1.0.0" />
+                    version="2.1.1.0" />
 
   <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
     <application>

src/App.xaml

@@ -6,6 +6,7 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
+                <ResourceDictionary Source="ThirdParty/DataTable/DataColumn.xaml" />
                 <!--  Other merged dictionaries here  -->
             </ResourceDictionary.MergedDictionaries>
             <!--  Other app resources here  -->

src/Commands/AddDriveCommands.cs

@@ -46,7 +46,7 @@ public static class AddDriveCommands
             parameter.SelectedLetter = parameter.AvailableLetters.FirstOrDefault();
         });
 
-        public static readonly IRelayCommand<AddDriveViewModel> AddVirtualDrive = new AsyncRelayCommand<AddDriveViewModel>(async parameter =>
+        public static readonly IRelayCommand<AddDriveViewModel> AddVirtualDrive = new RelayCommand<AddDriveViewModel>(parameter =>
         {
             parameter!.CancelClose = false;
 
@@ -55,7 +55,7 @@ public static class AddDriveCommands
 
             var selectedPath = Path.GetFullPath(parameter.SelectedPath.Trim('\"'));
 
-            _ = await StorageFolder.GetFolderFromPathAsync(selectedPath);
+            _ = StorageFolder.GetFolderFromPathAsync(selectedPath).GetAwaiter().GetResult();
 
             if (parameter.IsPermanent)
             {

src/Commands/MappingCommands.cs

@@ -61,21 +61,29 @@ internal static DriveViewModel GetDriveViewModel(MappingViewModel mappingViewMod
 
             Task.Run(async () =>
             {
-                // get the disk label and file system
+                string? driveName = null;
+                string? driveFormat = null;
+
                 try
                 {
-                    var folder = await StorageFolder.GetFolderFromPathAsync(driveInfo.Name);
-                    var properties = await folder.GetBasicPropertiesAsync();
-                    var prop = await properties.RetrievePropertiesAsync(["System.Volume.FileSystem"]);
-                    var filesystem = prop.First().Value as string;
-
-                    App.MainWindow?.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
-                    {
-                        result.Label = folder.DisplayName;
-                        result.DriveFormat = filesystem ?? string.Empty;
-                    });
+                    driveName = (await StorageFolder.GetFolderFromPathAsync(driveInfo.Name)).DisplayName;
                 }
                 catch { }
+
+                try
+                {
+                    driveFormat = driveInfo.DriveFormat;
+                }
+                catch (IOException ex) when (ex.HResult == -2147024875)
+                {
+                    // ERROR_NOT_READY: Device not ready
+                }
+
+                App.MainWindow?.DispatcherQueue.TryEnqueue(DispatcherQueuePriority.Low, () =>
+                {
+                    result.Label = driveName ?? string.Empty;
+                    result.DriveFormat = driveFormat ?? string.Empty;
+                });
             });
 
             return result;

src/Converters/ElementThemeToIntConverter.cs

@@ -0,0 +1,35 @@
+using Microsoft.UI.Xaml;
+using Microsoft.UI.Xaml.Data;
+using System;
+
+namespace Sungaila.SUBSTitute.Converters
+{
+    public partial class ElementThemeToIntConverter : IValueConverter
+    {
+        public object? Convert(object value, Type targetType, object parameter, string language)
+        {
+            if (value is not ElementTheme theme)
+                return DependencyProperty.UnsetValue;
+
+            return theme switch
+            {
+                ElementTheme.Light => 0,
+                ElementTheme.Dark => 1,
+                _ => 2
+            };
+        }
+
+        public object ConvertBack(object value, Type targetType, object parameter, string language)
+        {
+            if (value is not int selectedIndex)
+                return DependencyProperty.UnsetValue;
+
+            return selectedIndex switch
+            {
+                0 => ElementTheme.Light,
+                1 => ElementTheme.Dark,
+                _ => ElementTheme.Default
+            };
+        }
+    }
+}