From f8baadcc56f3cfb1ed3187979c17ca5bd6a55dcd Mon Sep 17 00:00:00 2001 From: Matthew John Cheetham Date: Wed, 17 Apr 2024 09:59:54 -0700 Subject: [PATCH 1/4] msal: update to latest version 4.60.3 Update the various MSAL.NET packages to the latest version of 4.60.3. --- src/shared/Core/Core.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj index fde8cb3a0..270ecacfe 100644 --- a/src/shared/Core/Core.csproj +++ b/src/shared/Core/Core.csproj @@ -13,7 +13,7 @@ - + @@ -22,8 +22,8 @@ - - + + From f9e29ec9268ddf3cca5f4a06a1bb9e58d000ab4f Mon Sep 17 00:00:00 2001 From: Matthew John Cheetham Date: Wed, 17 Apr 2024 10:00:26 -0700 Subject: [PATCH 2/4] avalonia: update Avalonia to 11.0.10 Update the various AvaloniaUI packages to the latest stable version of 11.0.10. --- src/shared/Core/Core.csproj | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj index 270ecacfe..9071b6f89 100644 --- a/src/shared/Core/Core.csproj +++ b/src/shared/Core/Core.csproj @@ -14,24 +14,24 @@ - + - + - - - + + + - + From eb6cd02503faf7a7f273603866170349a949ba8c Mon Sep 17 00:00:00 2001 From: Matthew John Cheetham Date: Wed, 17 Apr 2024 09:44:35 -0700 Subject: [PATCH 3/4] diagnose: avoid poluting stderr stream in Git diagnostic Avoid poluting the standard error stream with a 'fatal' Git error message during the Git diagnostic run as part of the `diagnose` command. When checking if we are inside of a Git repo we should be using an explicit check for `IGit::IsInsideRepository` rather than trying to get the current repo path and checking for null. --- src/shared/Core/Diagnostics/GitDiagnostic.cs | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/shared/Core/Diagnostics/GitDiagnostic.cs b/src/shared/Core/Diagnostics/GitDiagnostic.cs index e09f091dd..74c4c76b3 100644 --- a/src/shared/Core/Diagnostics/GitDiagnostic.cs +++ b/src/shared/Core/Diagnostics/GitDiagnostic.cs @@ -19,9 +19,16 @@ protected override Task RunInternalAsync(StringBuilder log, IList 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"); From 9a513087e6860b84193704ad6bb3862298d1b742 Mon Sep 17 00:00:00 2001 From: Matthew John Cheetham Date: Thu, 18 Apr 2024 14:42:45 -0700 Subject: [PATCH 4/4] linux: ensure Debian package files are owned by root Ensure that the files included in the Debian package are owned by the root user and not which ever user on the local system built the package. --- src/linux/Packaging.Linux/pack.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/linux/Packaging.Linux/pack.sh b/src/linux/Packaging.Linux/pack.sh index 249ffb8e8..14d26aee5 100755 --- a/src/linux/Packaging.Linux/pack.sh +++ b/src/linux/Packaging.Linux/pack.sh @@ -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