Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/codeql.yml
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ jobs:
global-json-file: global.json

- name: Initialize CodeQL
uses: github/codeql-action/init@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
uses: github/codeql-action/init@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
with:
languages: csharp
build-mode: manual
Expand Down Expand Up @@ -97,6 +97,6 @@ jobs:
done

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@2892aa5e19bbd11bc0cff5427e3b750a04d9e3c2 # v4.38.2
uses: github/codeql-action/analyze@24c54180a607b1449ed407dd24f251e4e9147c8d # v4.38.3
with:
category: "/language:csharp"
2 changes: 1 addition & 1 deletion .github/workflows/wasm-smoke-gates.yml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ jobs:
global-json-file: global.json

- name: Setup Node
uses: actions/setup-node@820762786026740c76f36085b0efc47a31fe5020 # v7.0.0
uses: actions/setup-node@949feb2413d6458794dcd2491c4babbbce0c15c1 # v7.1.0
with:
node-version: "26.10.0"

Expand Down
18 changes: 9 additions & 9 deletions SalmonEgg/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,14 +13,14 @@
<ItemGroup>
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageVersion Include="CommunityToolkit.Labs.WinUI.Controls.MarkdownTextBlock" Version="0.1.251217-build.2433" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="10.0.13" />
<PackageVersion Include="MinVer" Version="8.0.0" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.12" />
<PackageVersion Include="Microsoft.Extensions.Localization" Version="10.0.13" />
<PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.13" />
<PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.13" />
<PackageVersion Include="Microsoft.Graph" Version="6.8.0" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.90.1" />
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.90.1" />
<PackageVersion Include="Microsoft.Identity.Client" Version="4.91.0" />
<PackageVersion Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.91.0" />
<!-- Stay on Windows App SDK 1.8 line until Uno 6.7 + WinUI packaging are validated on 2.x.
WinUI must equal the exact version the meta-package pins in its nuspec. -->
<PackageVersion Include="Microsoft.WindowsAppSDK" Version="1.8.260921001" />
Expand All @@ -32,8 +32,8 @@
<PackageVersion Include="OpenTelemetry.Exporter.OpenTelemetryProtocol" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Extensions.Hosting" Version="1.19.1" />
<PackageVersion Include="OpenTelemetry.Instrumentation.Runtime" Version="1.19.0" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.12" />
<PackageVersion Include="System.Security.Permissions" Version="10.0.12" />
<PackageVersion Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
<PackageVersion Include="System.Security.Permissions" Version="10.0.13" />
<PackageVersion Include="Uno.WinUI.Lottie" Version="6.7.135" />
<PackageVersion Include="Uno.Extensions.Reactive" Version="7.3.6" />
<PackageVersion Include="Uno.Extensions.Reactive.WinUI" Version="7.3.6" />
Expand All @@ -49,4 +49,4 @@
Version="0.95.1"
Condition="'$(TargetFramework)' == 'net10.0-desktop'" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion SalmonEgg/SalmonEgg/Controls/XtermTerminalView.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,12 +137,12 @@ private static void OnSessionChanged(DependencyObject d, DependencyPropertyChang

view._sessionGeneration++;
view.DetachSession(e.OldValue as IInteractiveTerminalSession);
view.AttachSession(e.NewValue as IInteractiveTerminalSession);
view._sessionHasLiveOutput = false;
view.ClearPendingCommands(static _ => true);
view._guiLocalTerminalSmokeCommandSent = false;
view._guiLocalTerminalSmokeCommand = Environment.GetEnvironmentVariable(GuiLocalTerminalSmokeCommandEnvVar);
_ = view.ResetTerminalBridgeAsync();
view.AttachSession(e.NewValue as IInteractiveTerminalSession);
}

private async Task InitializeTerminalAsync()
Expand Down
4 changes: 2 additions & 2 deletions SalmonEgg/SalmonEgg/SalmonEgg.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<RuntimeIdentifier>browser-wasm</RuntimeIdentifier>
<PlatformTarget></PlatformTarget>
<!-- Override Uno's net10 default to the latest patched Windows compatibility stack. -->
<WindowsCompatibilityVersion>10.0.12</WindowsCompatibilityVersion>
<WindowsCompatibilityVersion>10.0.13</WindowsCompatibilityVersion>
<!-- Reduce hash-mismatch startup failures caused by stale browser/service-worker caches. -->
<StaticWebAssetFingerprintingEnabled>false</StaticWebAssetFingerprintingEnabled>
<StaticWebAssetsFingerprintContent>false</StaticWebAssetsFingerprintContent>
Expand Down Expand Up @@ -563,4 +563,4 @@
</ItemGroup>
</Target>

</Project>
</Project>
6 changes: 3 additions & 3 deletions src/SalmonEgg.Application/SalmonEgg.Application.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
<ProjectReference Include="..\SalmonEgg.Acp\SalmonEgg.Acp.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.12" />
<PackageReference Include="FluentValidation" Version="12.2.0" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.13" />
<PackageReference Include="Serilog" Version="4.4.0" />
</ItemGroup>
<PropertyGroup>
<TargetFramework>net10.0</TargetFramework>
<Nullable>enable</Nullable>
<LangVersion>latest</LangVersion>
</PropertyGroup>
</Project>
</Project>
8 changes: 4 additions & 4 deletions src/SalmonEgg.Cli/SalmonEgg.Cli.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,14 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.13" />
<PackageReference Include="MinVer" Version="8.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.12" />
<PackageReference Include="System.CommandLine" Version="2.0.12" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="10.0.13" />
<PackageReference Include="System.CommandLine" Version="2.0.13" />
</ItemGroup>

<ItemGroup>
<InternalsVisibleTo Include="SalmonEgg.Cli.Tests" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.13" />
<PackageReference Include="Porta.Pty" Version="2.2.3" />
<PackageReference Include="Serilog" Version="4.4.0" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.12" />
<PackageReference Include="System.Security.Cryptography.ProtectedData" Version="10.0.13" />
</ItemGroup>

<PropertyGroup>
Expand All @@ -22,4 +22,4 @@
<InternalsVisibleTo Include="SalmonEgg.Infrastructure.Tests" />
</ItemGroup>

</Project>
</Project>
4 changes: 2 additions & 2 deletions src/SalmonEgg.Infrastructure/SalmonEgg.Infrastructure.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="10.0.13" />
<PackageReference Include="Polly" Version="8.8.0" />
<PackageReference Include="Serilog" Version="4.4.0" />
<PackageReference Include="Serilog.Enrichers.Environment" Version="3.0.1" />
Expand Down Expand Up @@ -37,4 +37,4 @@
<InternalsVisibleTo Include="SalmonEgg.TerminalAuth.Windows.Tests" />
</ItemGroup>

</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@

<ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.4.2" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.12" />
<PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="10.0.13" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="10.0.13" />
<PackageReference Include="Uno.Extensions.Reactive" Version="7.3.6" />
<PackageReference Include="Uno.Extensions.Reactive.Messaging" Version="7.3.6" />
</ItemGroup>
Expand All @@ -18,4 +18,4 @@
<ProjectReference Include="..\SalmonEgg.Domain\SalmonEgg.Domain.csproj" />
<ProjectReference Include="..\SalmonEgg.Application\SalmonEgg.Application.csproj" />
</ItemGroup>
</Project>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
<ProjectReference Include="../../src/SalmonEgg.Infrastructure.Desktop/SalmonEgg.Infrastructure.Desktop.csproj" />
</ItemGroup>
</Project>
2 changes: 1 addition & 1 deletion tests/SalmonEgg.Acp.Tests/SalmonEgg.Acp.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="FsCheck" Version="3.4.0" />
<PackageReference Include="Moq" Version="4.21.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="5.9.0" />
<PackageReference Include="Moq" Version="4.21.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/SalmonEgg.Cli.Tests/SalmonEgg.Cli.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion tests/SalmonEgg.Domain.Tests/SalmonEgg.Domain.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

<ItemGroup>
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
<PackageReference Include="FlaUI.Core" Version="5.0.0" />
<PackageReference Include="FlaUI.UIA3" Version="5.0.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

<ItemGroup>
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
<PackageReference Include="FsCheck" Version="3.4.0" />
<PackageReference Include="Moq" Version="4.21.0" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
<ItemGroup>
<PackageReference Include="coverlet.MTP" Version="10.1.0" />
<PackageReference Include="Moq" Version="4.21.0" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.1" />
<PackageReference Include="xunit.v3.mtp-v2" Version="4.0.2" />
<Using Include="Xunit" />
<ProjectReference Include="../../src/SalmonEgg.Infrastructure.Desktop/SalmonEgg.Infrastructure.Desktop.csproj" />
<None Update="Fixtures/TerminalAuthAgent.ps1" CopyToOutputDirectory="PreserveNewest" />
Expand Down
Loading