Skip to content

Commit

Permalink
Release GCM 2.5.0 (1) (#1593)
Browse files Browse the repository at this point in the history
**Changes:**

- Update MSAL and Avalonia (#1591)
- Fix issue with diagnostic messages (#1590)
- Address CVE-2024-32478 (this issue only affected the Linux Debian
package)
  • Loading branch information
mjcheetham authored Apr 18, 2024
2 parents df86716 + d9ac33c commit d349307
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 12 deletions.
2 changes: 1 addition & 1 deletion src/linux/Packaging.Linux/pack.sh
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,6 @@ if [ ! -f "$LINK_TO/git-credential-manager" ]; then
"$LINK_TO/git-credential-manager" || exit 1
fi

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

echo $MESSAGE
18 changes: 9 additions & 9 deletions src/shared/Core/Core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -13,25 +13,25 @@
<ItemGroup Condition="'$(TargetFramework)' == 'net472'">
<Reference Include="System.Net.Http" />
<Reference Include="System.Web" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.54.0" />
<PackageReference Include="Avalonia.Win32" Version="11.0.4" />
<PackageReference Include="Microsoft.Identity.Client.Broker" Version="4.60.3" />
<PackageReference Include="Avalonia.Win32" Version="11.0.10" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' != 'net472'">
<PackageReference Include="Avalonia.Desktop" Version="11.0.4" />
<PackageReference Include="Avalonia.Desktop" Version="11.0.10" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Microsoft.Identity.Client" Version="4.54.0" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="2.28.0" />
<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
<PackageReference Include="Microsoft.Identity.Client.Extensions.Msal" Version="4.60.3" />
<PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
<PackageReference Include="Avalonia" Version="11.0.4" />
<PackageReference Include="Avalonia.Skia" Version="11.0.4" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.4" />
<PackageReference Include="Avalonia" Version="11.0.10" />
<PackageReference Include="Avalonia.Skia" Version="11.0.10" />
<PackageReference Include="Avalonia.Themes.Fluent" Version="11.0.10" />
</ItemGroup>

<ItemGroup Condition="'$(Configuration)' == 'Debug'">
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.4" />
<PackageReference Include="Avalonia.Diagnostics" Version="11.0.10" />
</ItemGroup>

</Project>
11 changes: 9 additions & 2 deletions src/shared/Core/Diagnostics/GitDiagnostic.cs
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,16 @@ protected override Task<bool> RunInternalAsync(StringBuilder log, IList<string>
log.AppendLine($"Git version is '{gitVersion.OriginalString}'");

log.Append("Locating current repository...");
string thisRepo =CommandContext.Git.GetCurrentRepository();
if (!CommandContext.Git.IsInsideRepository())
{
log.AppendLine("Not inside a Git repository.");
}
else
{
string thisRepo = CommandContext.Git.GetCurrentRepository();
log.AppendLine($"Git repository at '{thisRepo}'");
}
log.AppendLine(" OK");
log.AppendLine(thisRepo is null ? "Not inside a Git repository." : $"Git repository at '{thisRepo}'");

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

1 comment on commit d349307

@ThePlenkov
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Hi! I would like to install this release, but dotnet tool says 2.4.1 is the latest version.

Do you know why? Thank you!

Please sign in to comment.