Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Release GCM 2.5.0 (1) #1593

Merged
merged 7 commits into from
Apr 18, 2024
Merged

Release GCM 2.5.0 (1) #1593

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
f8baadc
msal: update to latest version 4.60.3
mjcheetham Apr 17, 2024
f9e29ec
avalonia: update Avalonia to 11.0.10
mjcheetham Apr 17, 2024
25f0950
Update MSAL and Avalonia dependencies (#1591)
mjcheetham Apr 17, 2024
eb6cd02
diagnose: avoid poluting stderr stream in Git diagnostic
mjcheetham Apr 17, 2024
8f00c5e
diagnose: avoid poluting stderr stream in Git diagnostic (#1590)
mjcheetham Apr 17, 2024
9a51308
linux: ensure Debian package files are owned by root
mjcheetham Apr 18, 2024
d9ac33c
Merge pull request from GHSA-3c3g-h9rx-f7vq
Apr 18, 2024
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
2 changes: 1 addition & 1 deletion src/linux/Packaging.Linux/pack.sh
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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