Merge branch 'main' into dean/updater

Author: deansheather

.github/workflows/ci.yaml

@@ -21,7 +21,7 @@ jobs:
           cache: true
           cache-dependency-path: '**/packages.lock.json'
       - name: dotnet restore
-        run: dotnet restore --locked-mode
+        run: dotnet restore --locked-mode /p:BuildWithNetFrameworkHostedCompiler=true
       - name: dotnet format
         run: dotnet format --verify-no-changes --no-restore
 
@@ -75,7 +75,7 @@ jobs:
           cache: true
           cache-dependency-path: '**/packages.lock.json'
       - name: dotnet restore
-        run: dotnet restore --locked-mode
+        run: dotnet restore --locked-mode /p:BuildWithNetFrameworkHostedCompiler=true
       # This doesn't call `dotnet publish` on the entire solution, just the
       # projects we care about building. Doing a full publish includes test
       # libraries and stuff which is pointless.

App/App.xaml.cs

@@ -204,20 +204,21 @@ protected override void OnLaunched(LaunchActivatedEventArgs args)
         }, CancellationToken.None);
 
         // Initialize file sync.
-        var syncSessionCts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
-        var syncSessionController = _services.GetRequiredService<ISyncSessionController>();
-        _ = syncSessionController.RefreshState(syncSessionCts.Token).ContinueWith(t =>
+        // We're adding a 5s delay here to avoid race conditions when loading the mutagen binary.
+        _ = Task.Delay(5000).ContinueWith((_) =>
         {
-            if (t.IsCanceled || t.Exception != null)
-            {
-                _logger.LogError(t.Exception, "failed to refresh sync state (canceled = {canceled})", t.IsCanceled);
-#if DEBUG
-                Debugger.Break();
-#endif
-            }
-
-            syncSessionCts.Dispose();
-        }, CancellationToken.None);
+            var syncSessionCts = new CancellationTokenSource(TimeSpan.FromSeconds(10));
+            var syncSessionController = _services.GetRequiredService<ISyncSessionController>();
+            syncSessionController.RefreshState(syncSessionCts.Token).ContinueWith(
+                t =>
+                {
+                    if (t.IsCanceled || t.Exception != null)
+                    {
+                        _logger.LogError(t.Exception, "failed to refresh sync state (canceled = {canceled})", t.IsCanceled);
+                    }
+                    syncSessionCts.Dispose();
+                }, CancellationToken.None);
+        });
     }
 
     public void OnActivated(object? sender, AppActivationArguments args)

App/Services/RpcController.cs

@@ -313,7 +313,7 @@ private void SpeakerOnError(Exception e)
         Debug.WriteLine($"Error: {e}");
         try
         {
-            Reconnect(CancellationToken.None).Wait();
+            using var _ = Reconnect(CancellationToken.None);
         }
         catch
         {

App/ViewModels/FileSyncListViewModel.cs

@@ -143,9 +143,9 @@ public void Initialize(Window window, DispatcherQueue dispatcherQueue)
 
         var rpcModel = _rpcController.GetState();
         var credentialModel = _credentialManager.GetCachedCredentials();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
         var syncSessionState = _syncSessionController.GetState();
         UpdateSyncSessionState(syncSessionState);
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void RpcControllerStateChanged(object? sender, RpcModel rpcModel)
@@ -159,7 +159,8 @@ private void RpcControllerStateChanged(object? sender, RpcModel rpcModel)
         }
 
         var credentialModel = _credentialManager.GetCachedCredentials();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
+        var syncSessionState = _syncSessionController.GetState();
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void CredentialManagerCredentialsChanged(object? sender, CredentialModel credentialModel)
@@ -173,7 +174,8 @@ private void CredentialManagerCredentialsChanged(object? sender, CredentialModel
         }
 
         var rpcModel = _rpcController.GetState();
-        MaybeSetUnavailableMessage(rpcModel, credentialModel);
+        var syncSessionState = _syncSessionController.GetState();
+        MaybeSetUnavailableMessage(rpcModel, credentialModel, syncSessionState);
     }
 
     private void SyncSessionStateChanged(object? sender, SyncSessionControllerStateModel syncSessionState)
@@ -189,7 +191,7 @@ private void SyncSessionStateChanged(object? sender, SyncSessionControllerStateM
         UpdateSyncSessionState(syncSessionState);
     }
 
-    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel)
+    private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel credentialModel, SyncSessionControllerStateModel syncSessionState)
     {
         var oldMessage = UnavailableMessage;
         if (rpcModel.RpcLifecycle != RpcLifecycle.Connected)
@@ -205,6 +207,10 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
         {
             UnavailableMessage = "Please start Coder Connect from the tray window to access file sync.";
         }
+        else if (syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        {
+            UnavailableMessage = "Sync session controller is not initialized. Please wait...";
+        }
         else
         {
             UnavailableMessage = null;
@@ -219,6 +225,13 @@ private void MaybeSetUnavailableMessage(RpcModel rpcModel, CredentialModel crede
 
     private void UpdateSyncSessionState(SyncSessionControllerStateModel syncSessionState)
     {
+        // This should never happen.
+        if (syncSessionState == null)
+            return;
+        if (syncSessionState.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        {
+            MaybeSetUnavailableMessage(_rpcController.GetState(), _credentialManager.GetCachedCredentials(), syncSessionState);
+        }
         Error = syncSessionState.DaemonError;
         Sessions = syncSessionState.SyncSessions.Select(s => new SyncSessionViewModel(this, s)).ToList();
     }

App/ViewModels/TrayWindowDisconnectedViewModel.cs

@@ -1,8 +1,9 @@
-using System.Threading.Tasks;
 using Coder.Desktop.App.Models;
 using Coder.Desktop.App.Services;
 using CommunityToolkit.Mvvm.ComponentModel;
 using CommunityToolkit.Mvvm.Input;
+using System;
+using System.Threading.Tasks;
 
 namespace Coder.Desktop.App.ViewModels;
 
@@ -11,6 +12,8 @@ public partial class TrayWindowDisconnectedViewModel : ObservableObject
     private readonly IRpcController _rpcController;
 
     [ObservableProperty] public partial bool ReconnectButtonEnabled { get; set; } = true;
+    [ObservableProperty] public partial string ErrorMessage { get; set; } = string.Empty;
+    [ObservableProperty] public partial bool ReconnectFailed { get; set; } = false;
 
     public TrayWindowDisconnectedViewModel(IRpcController rpcController)
     {
@@ -26,6 +29,16 @@ private void UpdateFromRpcModel(RpcModel rpcModel)
     [RelayCommand]
     public async Task Reconnect()
     {
-        await _rpcController.Reconnect();
+        try
+        {
+            ReconnectFailed = false;
+            ErrorMessage = string.Empty;
+            await _rpcController.Reconnect();
+        }
+        catch (Exception ex)
+        {
+            ErrorMessage = ex.Message;
+            ReconnectFailed = true;
+        }
     }
 }

App/Views/Pages/TrayWindowDisconnectedPage.xaml

@@ -30,6 +30,19 @@
 
         <controls:HorizontalRule />
 
+        <TextBlock FontWeight="semibold"
+                   TextWrapping="Wrap"
+                   Foreground="Red"
+                   Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
+                   Text="Reconnect failed"/>
+
+        <TextBlock
+            TextWrapping="Wrap"
+            Margin="0,0,0,10"
+            Foreground="Red"
+            Visibility="{x:Bind ViewModel.ReconnectFailed, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}"
+            Text="{x:Bind ViewModel.ErrorMessage, Mode=OneWay}" />
+
         <HyperlinkButton
             HorizontalContentAlignment="Left"
             HorizontalAlignment="Stretch"

App/Views/TrayWindow.xaml.cs

@@ -124,8 +124,7 @@ public TrayWindow(IRpcController rpcController, ICredentialManager credentialMan
     private void SetPageByState(RpcModel rpcModel, CredentialModel credentialModel,
         SyncSessionControllerStateModel syncSessionModel)
     {
-        if (credentialModel.State == CredentialState.Unknown ||
-            syncSessionModel.Lifecycle == SyncSessionControllerLifecycle.Uninitialized)
+        if (credentialModel.State == CredentialState.Unknown)
         {
             SetRootFrame(_loadingPage);
             return;

Installer/Program.cs

@@ -119,6 +119,9 @@ public class BootstrapperOptions : SharedOptions
     [Option('w', "windows-app-sdk-path", Required = true, HelpText = "Path to the Windows App Sdk package to embed")]
     public string WindowsAppSdkPath { get; set; }
 
+    [Option('t', "theme-xml-path", Required = false, HelpText = "Path to the theme .xml file to use for the installer")]
+    public string ThemeXmlPath { get; set; }
+
     public new void Validate()
     {
         base.Validate();
@@ -130,6 +133,8 @@ public class BootstrapperOptions : SharedOptions
         if (!SystemFile.Exists(WindowsAppSdkPath))
             throw new ArgumentException($"Windows App Sdk package not found at '{WindowsAppSdkPath}'",
                 nameof(WindowsAppSdkPath));
+        if (ThemeXmlPath != null && !SystemFile.Exists(ThemeXmlPath))
+            throw new ArgumentException($"Theme XML file not found at '{ThemeXmlPath}'", nameof(ThemeXmlPath));
     }
 }
 
@@ -415,6 +420,20 @@ private static int BuildBundle(BootstrapperOptions opts)
         bundle.Application.LicensePath = opts.LicenseFile;
         bundle.Application.LogoFile = opts.LogoPng;
 
+        if (opts.ThemeXmlPath != null)
+        {
+            bundle.Application.ThemeFile = opts.ThemeXmlPath;
+            bundle.Application.Payloads =
+            [
+                new ExePackagePayload
+                {
+                    Name = "icon.ico",
+                    SourceFile = opts.IconFile,
+                    Compressed = true,
+                },
+            ];
+        }
+
         // Set the default install folder, which will eventually be passed into
         // the MSI.
         bundle.Variables =

scripts/Get-WindowsAppSdk.ps1

@@ -10,7 +10,6 @@ function Download-File([string] $url, [string] $outputPath, [string] $etagFile)
     # We use `curl.exe` here because `Invoke-WebRequest` is notoriously slow.
     & curl.exe `
         --progress-bar `
-        -v `
         --show-error `
         --fail `
         --location `
@@ -31,4 +30,4 @@ $windowsAppSdkFullVersion = "1.6.250228001"
 $windowsAppSdkPath = Join-Path $PSScriptRoot "files\windows-app-sdk-$($arch).exe"
 $windowsAppSdkUri = "https://aka.ms/windowsappsdk/$($windowsAppSdkMajorVersion)/$($windowsAppSdkFullVersion)/windowsappruntimeinstall-$($arch).exe"
 $windowsAppSdkEtagFile = $windowsAppSdkPath + ".etag"
-Download-File $windowsAppSdkUri $windowsAppSdkPath $windowsAppSdkEtagFile
+Download-File $windowsAppSdkUri $windowsAppSdkPath $windowsAppSdkEtagFile

scripts/Publish.ps1

@@ -113,7 +113,7 @@ if (Test-Path $buildPath) {
 New-Item -ItemType Directory -Path $buildPath -Force
 
 # Build in release mode
-& dotnet.exe restore
+& dotnet.exe restore /p:BuildWithNetFrameworkHostedCompiler=true
 if ($LASTEXITCODE -ne 0) { throw "Failed to dotnet restore" }
 $servicePublishDir = Join-Path $buildPath "service"
 & dotnet.exe publish .\Vpn.Service\Vpn.Service.csproj -c Release -a $arch -o $servicePublishDir /p:Version=$version
@@ -189,6 +189,7 @@ $windowsAppSdkPath = Join-Path $scriptRoot "files\windows-app-sdk-$($arch).exe"
     --icon-file "App\coder.ico" `
     --msi-path $msiOutputPath `
     --windows-app-sdk-path $windowsAppSdkPath `
+    --theme-xml-path "scripts\files\RtfThemeLarge.xml" `
     --logo-png "scripts\files\logo.png"
 if ($LASTEXITCODE -ne 0) { throw "Failed to build bootstrapper" }