From 0c045a9578f14cc92cdb803c9ca54baa0822ce78 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 30 May 2026 19:08:20 +0000 Subject: [PATCH 1/3] Update Nerdbank.MessagePack to 1.2.4 to fix security vulnerabilities --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index d3f0cd18..16955bbe 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -25,7 +25,7 @@ - + From 52014990340a041fab8e36b51ba2a22dea7e35d8 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 30 May 2026 19:13:15 +0000 Subject: [PATCH 2/3] Fix pre-existing build and test failures on Linux - Add EnableWindowsTargeting=true to WPF and Console E2E host projects so they build on Linux without WPF SDK installed - Fix PersistSettingsTests to use a custom controlled env var instead of %LocalAppData%, which doesn't expand on Linux, causing InputSettingsPath and ResolvedSettingsPath to be identical and conflicting Moq setups --- .../ProgrammaticSettings/PersistSettingsTests.cs | 11 +++++++++-- .../AdaptiveRemote.EndToEndTests.Host.Wpf.csproj | 1 + .../AdaptiveRemote.EndToEndTests.Host.Console.csproj | 1 + 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs b/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs index 98fc4ba0..6fd29584 100644 --- a/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs +++ b/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs @@ -5,8 +5,15 @@ namespace AdaptiveRemote.Services.ProgrammaticSettings; [TestClass] public class PersistSettingsTests { - private static readonly string InputSettingsPath = Path.Combine("%LocalAppData%", "path", "to", "settings.ini"); - private static readonly string ResolvedSettingsPath = Environment.ExpandEnvironmentVariables(InputSettingsPath); + private const string TestSettingsDirEnvVar = "AR_TEST_SETTINGS_DIR"; + private static readonly string InputSettingsPath = Path.Combine($"%{TestSettingsDirEnvVar}%", "path", "to", "settings.ini"); + private static string ResolvedSettingsPath => Environment.ExpandEnvironmentVariables(InputSettingsPath); + + [ClassInitialize] + public static void ClassInitialize(TestContext context) + { + Environment.SetEnvironmentVariable(TestSettingsDirEnvVar, Path.Combine(Path.GetTempPath(), "AdaptiveRemoteTests")); + } private readonly MockLogger MockLogger = new(); private readonly MockFileSystem MockFileSystem = new(); diff --git a/test/AdaptiveRemote.EndToEndTests.Host.Wpf/AdaptiveRemote.EndToEndTests.Host.Wpf.csproj b/test/AdaptiveRemote.EndToEndTests.Host.Wpf/AdaptiveRemote.EndToEndTests.Host.Wpf.csproj index 808f3c5d..f80a6b55 100644 --- a/test/AdaptiveRemote.EndToEndTests.Host.Wpf/AdaptiveRemote.EndToEndTests.Host.Wpf.csproj +++ b/test/AdaptiveRemote.EndToEndTests.Host.Wpf/AdaptiveRemote.EndToEndTests.Host.Wpf.csproj @@ -6,6 +6,7 @@ enable enable Exe + true diff --git a/test/AdaptiveRemote.EndtoEndTests.Host.Console/AdaptiveRemote.EndToEndTests.Host.Console.csproj b/test/AdaptiveRemote.EndtoEndTests.Host.Console/AdaptiveRemote.EndToEndTests.Host.Console.csproj index b7ccd9b2..6e2f5b6e 100644 --- a/test/AdaptiveRemote.EndtoEndTests.Host.Console/AdaptiveRemote.EndToEndTests.Host.Console.csproj +++ b/test/AdaptiveRemote.EndtoEndTests.Host.Console/AdaptiveRemote.EndToEndTests.Host.Console.csproj @@ -6,6 +6,7 @@ enable enable Exe + true From bfd4870360c79b54a07e3148911a001ffe2001b2 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Sat, 30 May 2026 19:16:05 +0000 Subject: [PATCH 3/3] Add ClassCleanup to restore env var after PersistSettingsTests --- .../ProgrammaticSettings/PersistSettingsTests.cs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs b/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs index 6fd29584..be42e1cd 100644 --- a/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs +++ b/test/AdaptiveRemote.App.Tests/Services/ProgrammaticSettings/PersistSettingsTests.cs @@ -9,12 +9,21 @@ public class PersistSettingsTests private static readonly string InputSettingsPath = Path.Combine($"%{TestSettingsDirEnvVar}%", "path", "to", "settings.ini"); private static string ResolvedSettingsPath => Environment.ExpandEnvironmentVariables(InputSettingsPath); + private static string? _previousTestSettingsDirValue; + [ClassInitialize] public static void ClassInitialize(TestContext context) { + _previousTestSettingsDirValue = Environment.GetEnvironmentVariable(TestSettingsDirEnvVar); Environment.SetEnvironmentVariable(TestSettingsDirEnvVar, Path.Combine(Path.GetTempPath(), "AdaptiveRemoteTests")); } + [ClassCleanup] + public static void ClassCleanup() + { + Environment.SetEnvironmentVariable(TestSettingsDirEnvVar, _previousTestSettingsDirValue); + } + private readonly MockLogger MockLogger = new(); private readonly MockFileSystem MockFileSystem = new(); private readonly MockOptions MockOptions = new(new()