Skip to content

Commit d349307

Browse files
authored
Release GCM 2.5.0 (1) (#1593)
**Changes:** - Update MSAL and Avalonia (#1591) - Fix issue with diagnostic messages (#1590) - Address CVE-2024-32478 (this issue only affected the Linux Debian package)
2 parents df86716 + d9ac33c commit d349307

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

src/linux/Packaging.Linux/pack.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -126,6 +126,6 @@ if [ ! -f "$LINK_TO/git-credential-manager" ]; then
126126
"$LINK_TO/git-credential-manager" || exit 1
127127
fi
128128

129-
dpkg-deb -Zxz --build "$DEBROOT" "$DEBPKG" || exit 1
129+
dpkg-deb -Zxz --root-owner-group --build "$DEBROOT" "$DEBPKG" || exit 1
130130

131131
echo $MESSAGE

src/shared/Core/Core.csproj

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,25 +13,25 @@
1313
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
1414
<Reference Include="System.Net.Http" />
1515
<Reference Include="System.Web" />
16-
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.54.0" />
17-
<PackageReference Include="Avalonia.Win32" Version="11.0.4" />
16+
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.60.3" />
17+
<PackageReference Include="Avalonia.Win32" Version="11.0.10" />
1818
</ItemGroup>
1919

2020
<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
21-
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
21+
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
2222
</ItemGroup>
2323

2424
<ItemGroup>
25-
<PackageReference Include="Microsoft.Identity.Client" Version="4.54.0" />
26-
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.28.0" />
25+
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
26+
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.60.3" />
2727
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
28-
<PackageReference Include="Avalonia" Version="11.0.4" />
29-
<PackageReference Include="Avalonia.Skia" Version="11.0.4" />
30-
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
28+
<PackageReference Include="Avalonia" Version="11.0.10" />
29+
<PackageReference Include="Avalonia.Skia" Version="11.0.10" />
30+
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
3131
</ItemGroup>
3232

3333
<ItemGroup Condition="'$(Configuration)' == 'Debug'">
34-
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
34+
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
3535
</ItemGroup>
3636

3737
</Project>

src/shared/Core/Diagnostics/GitDiagnostic.cs

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,9 +19,16 @@ protected override Task<bool> RunInternalAsync(StringBuilder log, IList<string>
1919
log.AppendLine($"Git version is '{gitVersion.OriginalString}'");
2020

2121
log.Append("Locating current repository...");
22-
string thisRepo =CommandContext.Git.GetCurrentRepository();
22+
if (!CommandContext.Git.IsInsideRepository())
23+
{
24+
log.AppendLine("Not inside a Git repository.");
25+
}
26+
else
27+
{
28+
string thisRepo = CommandContext.Git.GetCurrentRepository();
29+
log.AppendLine($"Git repository at '{thisRepo}'");
30+
}
2331
log.AppendLine(" OK");
24-
log.AppendLine(thisRepo is null ? "Not inside a Git repository." : $"Git repository at '{thisRepo}'");
2532

2633
log.Append("Listing all Git configuration...");
2734
ChildProcess configProc = CommandContext.Git.CreateProcess("config --list --show-origin");

0 commit comments

Comments
 (0)