From c46aea7f9ebdcf080b267c331e959399456c6d82 Mon Sep 17 00:00:00 2001
From: Rob Stringer <41843577+Mycobee@users.noreply.github.com>
Date: Tue, 7 Nov 2023 15:15:52 -0700
Subject: [PATCH 01/27] Make install script compliant

---
 src/linux/Packaging.Linux/install-from-source.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/linux/Packaging.Linux/install-from-source.sh b/src/linux/Packaging.Linux/install-from-source.sh
index 98fe7bc4d..df586ce1c 100755
--- a/src/linux/Packaging.Linux/install-from-source.sh
+++ b/src/linux/Packaging.Linux/install-from-source.sh
@@ -26,7 +26,7 @@ if [ -z "$installPrefix" ]; then
 fi
 
 # Ensure install directory exists
-if [! -d "$installPrefix" ]; then
+if [ ! -d "$installPrefix" ]; then
     echo "The folder $installPrefix does not exist"
     exit
 fi

From f6375a9e45fe8d19aed68133a026c3e1d960bb96 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 8 Nov 2023 20:19:09 +0000
Subject: [PATCH 02/27] build(deps): bump azure/azure-code-signing-action from
 0.2.21 to 0.2.22

Bumps [azure/azure-code-signing-action](https://github.com/azure/azure-code-signing-action) from 0.2.21 to 0.2.22.
- [Release notes](https://github.com/azure/azure-code-signing-action/releases)
- [Commits](https://github.com/azure/azure-code-signing-action/compare/v0.2.21...v0.2.22)

---
updated-dependencies:
- dependency-name: azure/azure-code-signing-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 67e407c0a..cf0941fe0 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -177,7 +177,7 @@ jobs:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Sign payload files with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.2.21
+      uses: azure/azure-code-signing-action@v0.2.22
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing
@@ -204,7 +204,7 @@ jobs:
          -Destination $env:GITHUB_WORKSPACE\installers
 
     - name: Sign installers with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.2.21
+      uses: azure/azure-code-signing-action@v0.2.22
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing

From 10a5590c1eec43a1b6a31fbd2bcbcc9fc7f81d22 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Nov 2023 20:05:01 +0000
Subject: [PATCH 03/27] build(deps): bump actions/github-script from 6 to 7

Bumps [actions/github-script](https://github.com/actions/github-script) from 6 to 7.
- [Release notes](https://github.com/actions/github-script/releases)
- [Commits](https://github.com/actions/github-script/compare/v6...v7)

---
updated-dependencies:
- dependency-name: actions/github-script
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/maintainer-absence.yml | 2 +-
 .github/workflows/release.yml            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/maintainer-absence.yml b/.github/workflows/maintainer-absence.yml
index 33c93f0ba..433cb0f7e 100644
--- a/.github/workflows/maintainer-absence.yml
+++ b/.github/workflows/maintainer-absence.yml
@@ -18,7 +18,7 @@ jobs:
     name: create-issue
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             const startDate = new Date('${{ github.event.inputs.startDate }}');
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 67e407c0a..f31845e00 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -630,7 +630,7 @@ jobs:
             | sed -e 's/^"//' -e 's/"$//' | base64 -d >gcm-public.asc
           mv gcm-public.asc linux-artifacts
 
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v7
         with:
           script: |
             const fs = require('fs');

From 2e16a72ffdfeae07af080187cd052a96f01106a5 Mon Sep 17 00:00:00 2001
From: Hanjiang Yu <delacroix.yu@gmail.com>
Date: Fri, 24 Nov 2023 21:44:21 +0800
Subject: [PATCH 04/27] Use Avalonia 11 generated codes

---
 .../UI/Views/CredentialsView.axaml            |  8 ++---
 .../UI/Views/CredentialsView.axaml.cs         | 19 ++----------
 .../Core/UI/Controls/AboutWindow.axaml.cs     |  8 -----
 .../Core/UI/Controls/DialogWindow.axaml       |  2 +-
 .../Core/UI/Controls/DialogWindow.axaml.cs    | 11 -------
 .../Core/UI/Controls/ProgressWindow.axaml.cs  |  5 ---
 .../Core/UI/Views/CredentialsView.axaml       |  4 +--
 .../Core/UI/Views/CredentialsView.axaml.cs    | 11 -------
 .../Core/UI/Views/DefaultAccountView.axaml.cs |  5 ---
 .../Core/UI/Views/DeviceCodeView.axaml.cs     |  5 ---
 src/shared/Core/UI/Views/OAuthView.axaml.cs   |  5 ---
 .../Controls/HorizontalShadowDivider.axaml.cs |  5 ---
 .../GitHub/UI/Controls/SixDigitInput.axaml    | 12 +++----
 .../GitHub/UI/Controls/SixDigitInput.axaml.cs | 17 ++++------
 .../GitHub/UI/Views/CredentialsView.axaml     | 12 +++----
 .../GitHub/UI/Views/CredentialsView.axaml.cs  | 31 ++++---------------
 .../GitHub/UI/Views/DeviceCodeView.axaml.cs   |  5 ---
 .../UI/Views/SelectAccountView.axaml.cs       |  5 ---
 .../GitHub/UI/Views/TwoFactorView.axaml       |  2 +-
 .../GitHub/UI/Views/TwoFactorView.axaml.cs    |  9 ------
 .../GitLab/UI/Views/CredentialsView.axaml     | 12 +++----
 .../GitLab/UI/Views/CredentialsView.axaml.cs  | 27 +++-------------
 22 files changed, 44 insertions(+), 176 deletions(-)

diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
index f74161a5c..717500b7b 100644
--- a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
+++ b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml
@@ -29,7 +29,7 @@
                        Margin="0,10,0,0"/>
         </StackPanel>
 
-        <TabControl x:Name="authModesTabControl"
+        <TabControl x:Name="_authModesTabControl"
                     VerticalContentAlignment="Center"
                     AutoScrollToSelectedItem="True"
                     Width="288"
@@ -48,7 +48,7 @@
                     <TextBlock Text="Browser" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,15">
-                    <Button x:Name="oauthLoginButton" IsDefault="True"
+                    <Button x:Name="_oauthLoginButton" IsDefault="True"
                             HorizontalAlignment="Center" HorizontalContentAlignment="Center" VerticalContentAlignment="Center"
                             Command="{Binding OAuthCommand}"
                             Classes="accent" Height="40" Padding="15,5"
@@ -61,11 +61,11 @@
                     <TextBlock Text="Password/Token" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,15">
-                    <TextBox x:Name="userNameTextBox" Margin="0,0,0,10"
+                    <TextBox x:Name="_userNameTextBox" Margin="0,0,0,10"
                              HorizontalAlignment="Stretch"
                              Watermark="Email or username"
                              Text="{Binding UserName}" />
-                    <TextBox x:Name="passwordTextBox" Margin="0,0,0,10"
+                    <TextBox x:Name="_passwordTextBox" Margin="0,0,0,10"
                              HorizontalAlignment="Stretch"
                              Watermark="Password or token" PasswordChar="●"
                              Text="{Binding Password}" />
diff --git a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
index 89c0b172d..87e596b99 100644
--- a/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
+++ b/src/shared/Atlassian.Bitbucket/UI/Views/CredentialsView.axaml.cs
@@ -8,26 +8,11 @@ namespace Atlassian.Bitbucket.UI.Views
 {
     public partial class CredentialsView : UserControl, IFocusable
     {
-        private TabControl _tabControl;
-        private Button _oauthLoginButton;
-        private TextBox _userNameTextBox;
-        private TextBox _passwordTextBox;
-
         public CredentialsView()
         {
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _tabControl = this.FindControl<TabControl>("authModesTabControl");
-            _oauthLoginButton = this.FindControl<Button>("oauthLoginButton");
-            _userNameTextBox = this.FindControl<TextBox>("userNameTextBox");
-            _passwordTextBox = this.FindControl<TextBox>("passwordTextBox");
-        }
-
         public void SetFocus()
         {
             if (!(DataContext is CredentialsViewModel vm))
@@ -37,12 +22,12 @@ public void SetFocus()
 
             if (vm.ShowOAuth)
             {
-                _tabControl.SelectedIndex = 0;
+                _authModesTabControl.SelectedIndex = 0;
                 _oauthLoginButton.Focus();
             }
             else if (vm.ShowBasic)
             {
-                _tabControl.SelectedIndex = 1;
+                _authModesTabControl.SelectedIndex = 1;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
                     // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
diff --git a/src/shared/Core/UI/Controls/AboutWindow.axaml.cs b/src/shared/Core/UI/Controls/AboutWindow.axaml.cs
index 179d7153a..d03ee4871 100644
--- a/src/shared/Core/UI/Controls/AboutWindow.axaml.cs
+++ b/src/shared/Core/UI/Controls/AboutWindow.axaml.cs
@@ -14,14 +14,6 @@ public partial class AboutWindow : Window
         public AboutWindow()
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
         }
 
         private void ProjectButton_Click(object sender, RoutedEventArgs e)
diff --git a/src/shared/Core/UI/Controls/DialogWindow.axaml b/src/shared/Core/UI/Controls/DialogWindow.axaml
index ce8598fbd..42d4636eb 100644
--- a/src/shared/Core/UI/Controls/DialogWindow.axaml
+++ b/src/shared/Core/UI/Controls/DialogWindow.axaml
@@ -64,7 +64,7 @@
                           Content="Show Custom Chrome" Margin="5,0"/>
             </StackPanel>
 
-            <ContentControl x:Name="contentHolder" Margin="30,25,30,30"/>
+            <ContentControl x:Name="_contentHolder" Margin="30,25,30,30"/>
         </DockPanel>
     </Border>
 
diff --git a/src/shared/Core/UI/Controls/DialogWindow.axaml.cs b/src/shared/Core/UI/Controls/DialogWindow.axaml.cs
index 79501edb8..b6bc4fcc4 100644
--- a/src/shared/Core/UI/Controls/DialogWindow.axaml.cs
+++ b/src/shared/Core/UI/Controls/DialogWindow.axaml.cs
@@ -12,7 +12,6 @@ namespace GitCredentialManager.UI.Controls
     public partial class DialogWindow : Window
     {
         private readonly Control _view;
-        private ContentControl _contentHolder;
 
         public DialogWindow() : this(null)
         {
@@ -22,20 +21,10 @@ public DialogWindow() : this(null)
         public DialogWindow(Control view)
         {
             InitializeComponent();
-#if DEBUG
-            this.AttachDevTools();
-#endif
             _view = view;
             _contentHolder.Content = _view;
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _contentHolder = this.FindControl<ContentControl>("contentHolder");
-        }
-
         protected override void OnDataContextChanged(EventArgs e)
         {
             if (DataContext is WindowViewModel vm)
diff --git a/src/shared/Core/UI/Controls/ProgressWindow.axaml.cs b/src/shared/Core/UI/Controls/ProgressWindow.axaml.cs
index 7dc46dac6..1e30b751f 100644
--- a/src/shared/Core/UI/Controls/ProgressWindow.axaml.cs
+++ b/src/shared/Core/UI/Controls/ProgressWindow.axaml.cs
@@ -14,11 +14,6 @@ public ProgressWindow()
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     public static IntPtr ShowAndGetHandle(CancellationToken ct)
     {
         var tsc = new TaskCompletionSource<IntPtr>();
diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml b/src/shared/Core/UI/Views/CredentialsView.axaml
index 51659345f..9e85c4872 100644
--- a/src/shared/Core/UI/Views/CredentialsView.axaml
+++ b/src/shared/Core/UI/Views/CredentialsView.axaml
@@ -33,10 +33,10 @@
         </StackPanel>
 
         <StackPanel Margin="20,0">
-            <TextBox x:Name="userNameTextBox"
+            <TextBox x:Name="_userNameTextBox"
                      Watermark="Username" Margin="0,0,0,10"
                      Text="{Binding UserName}"/>
-            <TextBox x:Name="passwordTextBox"
+            <TextBox x:Name="_passwordTextBox"
                      Watermark="Password" Margin="0,0,0,20"
                      PasswordChar="●"
                      Text="{Binding Password}"/>
diff --git a/src/shared/Core/UI/Views/CredentialsView.axaml.cs b/src/shared/Core/UI/Views/CredentialsView.axaml.cs
index 8423176be..5ffb6e674 100644
--- a/src/shared/Core/UI/Views/CredentialsView.axaml.cs
+++ b/src/shared/Core/UI/Views/CredentialsView.axaml.cs
@@ -7,22 +7,11 @@ namespace GitCredentialManager.UI.Views
 {
     public partial class CredentialsView : UserControl, IFocusable
     {
-        private TextBox _userNameTextBox;
-        private TextBox _passwordTextBox;
-
         public CredentialsView()
         {
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _userNameTextBox = this.FindControl<TextBox>("userNameTextBox");
-            _passwordTextBox = this.FindControl<TextBox>("passwordTextBox");
-        }
-
         public void SetFocus()
         {
             if (!(DataContext is CredentialsViewModel vm))
diff --git a/src/shared/Core/UI/Views/DefaultAccountView.axaml.cs b/src/shared/Core/UI/Views/DefaultAccountView.axaml.cs
index 3593c0ddc..e1d22548f 100644
--- a/src/shared/Core/UI/Views/DefaultAccountView.axaml.cs
+++ b/src/shared/Core/UI/Views/DefaultAccountView.axaml.cs
@@ -9,10 +9,5 @@ public DefaultAccountView()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs b/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs
index 75b2858c2..630860a36 100644
--- a/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs
+++ b/src/shared/Core/UI/Views/DeviceCodeView.axaml.cs
@@ -9,10 +9,5 @@ public DeviceCodeView()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/src/shared/Core/UI/Views/OAuthView.axaml.cs b/src/shared/Core/UI/Views/OAuthView.axaml.cs
index d07b2a458..4f01b27e0 100644
--- a/src/shared/Core/UI/Views/OAuthView.axaml.cs
+++ b/src/shared/Core/UI/Views/OAuthView.axaml.cs
@@ -9,10 +9,5 @@ public OAuthView()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs b/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs
index 5f1e7f7c5..5a7fc6ba3 100644
--- a/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs
+++ b/src/shared/GitHub/UI/Controls/HorizontalShadowDivider.axaml.cs
@@ -9,10 +9,5 @@ public HorizontalShadowDivider()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml
index ceedbe9da..0f94006af 100644
--- a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml
+++ b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml
@@ -18,11 +18,11 @@
         </Style>
     </UserControl.Styles>
     <StackPanel Orientation="Horizontal">
-        <TextBox x:Name="one"/>
-        <TextBox x:Name="two"/>
-        <TextBox x:Name="three"/>
-        <TextBox x:Name="four"/>
-        <TextBox x:Name="five"/>
-        <TextBox x:Name="six" Margin="0"/>
+        <TextBox x:Name="_one"/>
+        <TextBox x:Name="_two"/>
+        <TextBox x:Name="_three"/>
+        <TextBox x:Name="_four"/>
+        <TextBox x:Name="_five"/>
+        <TextBox x:Name="_six" Margin="0"/>
     </StackPanel>
 </UserControl>
diff --git a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
index 524bc959e..e018232de 100644
--- a/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
+++ b/src/shared/GitHub/UI/Controls/SixDigitInput.axaml.cs
@@ -28,20 +28,15 @@ public partial class SixDigitInput : UserControl, IFocusable
         public SixDigitInput()
         {
             InitializeComponent();
-        }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
 
             _textBoxes = new[]
             {
-                this.FindControl<TextBox>("one"),
-                this.FindControl<TextBox>("two"),
-                this.FindControl<TextBox>("three"),
-                this.FindControl<TextBox>("four"),
-                this.FindControl<TextBox>("five"),
-                this.FindControl<TextBox>("six"),
+                _one,
+                _two,
+                _three,
+                _four,
+                _five,
+                _six,
             };
 
             foreach (TextBox textBox in _textBoxes)
diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml b/src/shared/GitHub/UI/Views/CredentialsView.axaml
index ccf96bf7b..9ea6f3fb8 100644
--- a/src/shared/GitHub/UI/Views/CredentialsView.axaml
+++ b/src/shared/GitHub/UI/Views/CredentialsView.axaml
@@ -39,7 +39,7 @@
                     Classes="hyperlink"/>
         </WrapPanel>
 
-        <TabControl x:Name="authModesTabControl"
+        <TabControl x:Name="_authModesTabControl"
                     VerticalContentAlignment="Center"
                     AutoScrollToSelectedItem="True">
             <TabControl.Styles>
@@ -62,7 +62,7 @@
                     <TextBlock Text="{Binding OAuthModeTitle}" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <Button x:Name="signInBrowserButton"
+                    <Button x:Name="_signInBrowserButton"
                             Content="Sign in with your browser"
                             IsDefault="True"
                             Command="{Binding SignInBrowserCommand}"
@@ -70,7 +70,7 @@
                             HorizontalAlignment="Center"
                             Margin="0,0,0,10"
                             Classes="accent"/>
-                    <Button x:Name="signInDeviceButton"
+                    <Button x:Name="_signInDeviceButton"
                             Content="Sign in with a code"
                             Command="{Binding SignInDeviceCommand}"
                             IsVisible="{Binding ShowDeviceLogin}"
@@ -85,7 +85,7 @@
                     <TextBlock Text="Token" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <TextBox x:Name="tokenTextBox"
+                    <TextBox x:Name="_tokenTextBox"
                              Watermark="Personal access token" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Token}"/>
@@ -103,10 +103,10 @@
                     <TextBlock Text="Password" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <TextBox x:Name="userNameTextBox"
+                    <TextBox x:Name="_userNameTextBox"
                              Watermark="Username or email" Margin="0,0,0,10"
                              Text="{Binding UserName}"/>
-                    <TextBox x:Name="passwordTextBox"
+                    <TextBox x:Name="_passwordTextBox"
                              Watermark="Password" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Password}"/>
diff --git a/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs b/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
index b6a8a3b03..b50edf1b5 100644
--- a/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
+++ b/src/shared/GitHub/UI/Views/CredentialsView.axaml.cs
@@ -8,30 +8,11 @@ namespace GitHub.UI.Views
 {
     public partial class CredentialsView : UserControl, IFocusable
     {
-        private TabControl _tabControl;
-        private Button _browserButton;
-        private Button _deviceButton;
-        private TextBox _tokenTextBox;
-        private TextBox _userNameTextBox;
-        private TextBox _passwordTextBox;
-
         public CredentialsView()
         {
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _tabControl = this.FindControl<TabControl>("authModesTabControl");
-            _browserButton = this.FindControl<Button>("signInBrowserButton");
-            _deviceButton = this.FindControl<Button>("signInDeviceButton");
-            _tokenTextBox = this.FindControl<TextBox>("tokenTextBox");
-            _userNameTextBox = this.FindControl<TextBox>("userNameTextBox");
-            _passwordTextBox = this.FindControl<TextBox>("passwordTextBox");
-        }
-
         public void SetFocus()
         {
             if (!(DataContext is CredentialsViewModel vm))
@@ -43,17 +24,17 @@ public void SetFocus()
             // and focus on the button/text box
             if (vm.ShowBrowserLogin)
             {
-                _tabControl.SelectedIndex = 0;
-                _browserButton.Focus();
+                _authModesTabControl.SelectedIndex = 0;
+                _signInBrowserButton.Focus();
             }
             else if (vm.ShowDeviceLogin)
             {
-                _tabControl.SelectedIndex = 0;
-                _deviceButton.Focus();
+                _authModesTabControl.SelectedIndex = 0;
+                _signInDeviceButton.Focus();
             }
             else if (vm.ShowTokenLogin)
             {
-                _tabControl.SelectedIndex = 1;
+                _authModesTabControl.SelectedIndex = 1;
                 // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
                 if (!PlatformUtils.IsMacOS())
                     _tokenTextBox.Focus();
@@ -61,7 +42,7 @@ public void SetFocus()
             }
             else if (vm.ShowBasicLogin)
             {
-                _tabControl.SelectedIndex = 2;
+                _authModesTabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
                     // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
diff --git a/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs b/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs
index 431ce82b2..92c7f55c6 100644
--- a/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs
+++ b/src/shared/GitHub/UI/Views/DeviceCodeView.axaml.cs
@@ -9,10 +9,5 @@ public DeviceCodeView()
         {
             InitializeComponent();
         }
-
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-        }
     }
 }
diff --git a/src/shared/GitHub/UI/Views/SelectAccountView.axaml.cs b/src/shared/GitHub/UI/Views/SelectAccountView.axaml.cs
index 5fb11dcb8..d3a338901 100644
--- a/src/shared/GitHub/UI/Views/SelectAccountView.axaml.cs
+++ b/src/shared/GitHub/UI/Views/SelectAccountView.axaml.cs
@@ -13,11 +13,6 @@ public SelectAccountView()
         InitializeComponent();
     }
 
-    private void InitializeComponent()
-    {
-        AvaloniaXamlLoader.Load(this);
-    }
-
     private void ListBox_OnDoubleTapped(object sender, TappedEventArgs e)
     {
         if (DataContext is SelectAccountViewModel { SelectedAccount: not null } vm)
diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml b/src/shared/GitHub/UI/Views/TwoFactorView.axaml
index d02598855..cb67d3b12 100644
--- a/src/shared/GitHub/UI/Views/TwoFactorView.axaml
+++ b/src/shared/GitHub/UI/Views/TwoFactorView.axaml
@@ -27,7 +27,7 @@
         <StackPanel Orientation="Vertical" VerticalAlignment="Center">
             <TextBlock Text="{Binding Description}" Margin="0,0,0,20"
                        TextWrapping="Wrap" TextAlignment="Center"/>
-            <controls:SixDigitInput x:Name="codeInput"
+            <controls:SixDigitInput x:Name="_codeInput"
                                     Text="{Binding Code}"
                                     Margin="0,0,0,20"
                                     HorizontalAlignment="Center"/>
diff --git a/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs b/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
index 1a9310816..e80edf32f 100644
--- a/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
+++ b/src/shared/GitHub/UI/Views/TwoFactorView.axaml.cs
@@ -8,20 +8,11 @@ namespace GitHub.UI.Views
 {
     public partial class TwoFactorView : UserControl, IFocusable
     {
-        private SixDigitInput _codeInput;
-
         public TwoFactorView()
         {
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _codeInput = this.FindControl<SixDigitInput>("codeInput");
-        }
-
         public void SetFocus()
         {
             // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml b/src/shared/GitLab/UI/Views/CredentialsView.axaml
index eac9318be..89b2e7899 100644
--- a/src/shared/GitLab/UI/Views/CredentialsView.axaml
+++ b/src/shared/GitLab/UI/Views/CredentialsView.axaml
@@ -52,7 +52,7 @@
                     Classes="hyperlink"/>
         </WrapPanel>
 
-        <TabControl x:Name="authModesTabControl"
+        <TabControl x:Name="_authModesTabControl"
                     VerticalContentAlignment="Center"
                     AutoScrollToSelectedItem="True">
             <TabControl.Styles>
@@ -70,7 +70,7 @@
                     <TextBlock Text="{Binding OAuthModeTitle}" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <Button x:Name="signInBrowserButton"
+                    <Button x:Name="_signInBrowserButton"
                             Content="Sign in with your browser"
                             IsDefault="True"
                             Command="{Binding SignInBrowserCommand}"
@@ -87,10 +87,10 @@
                     <TextBlock Text="Token" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <TextBox x:Name="patUserNameTextBox"
+                    <TextBox x:Name="_patUserNameTextBox"
                              Watermark="Username or email (optional)" Margin="0,0,0,10"
                              Text="{Binding TokenUserName}"/>
-                    <TextBox x:Name="tokenTextBox"
+                    <TextBox x:Name="_tokenTextBox"
                              Watermark="Personal access token" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Token}"/>
@@ -108,10 +108,10 @@
                     <TextBlock Text="Password" FontSize="12" />
                 </TabItem.Header>
                 <StackPanel Margin="0,10">
-                    <TextBox x:Name="userNameTextBox"
+                    <TextBox x:Name="_userNameTextBox"
                              Watermark="Username or email" Margin="0,0,0,10"
                              Text="{Binding UserName}"/>
-                    <TextBox x:Name="passwordTextBox"
+                    <TextBox x:Name="_passwordTextBox"
                              Watermark="Password" Margin="0,0,0,10"
                              PasswordChar="●"
                              Text="{Binding Password}"/>
diff --git a/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
index 86a2cd244..376d27e05 100644
--- a/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
+++ b/src/shared/GitLab/UI/Views/CredentialsView.axaml.cs
@@ -8,30 +8,11 @@ namespace GitLab.UI.Views
 {
     public partial class CredentialsView : UserControl, IFocusable
     {
-        private TabControl _tabControl;
-        private Button _browserButton;
-        private TextBox _tokenTextBox;
-        private TextBox _patUserNameTextBox;
-        private TextBox _userNameTextBox;
-        private TextBox _passwordTextBox;
-
         public CredentialsView()
         {
             InitializeComponent();
         }
 
-        private void InitializeComponent()
-        {
-            AvaloniaXamlLoader.Load(this);
-
-            _tabControl = this.FindControl<TabControl>("authModesTabControl");
-            _browserButton = this.FindControl<Button>("signInBrowserButton");
-            _patUserNameTextBox = this.FindControl<TextBox>("patUserNameTextBox");
-            _tokenTextBox = this.FindControl<TextBox>("tokenTextBox");
-            _userNameTextBox = this.FindControl<TextBox>("userNameTextBox");
-            _passwordTextBox = this.FindControl<TextBox>("passwordTextBox");
-        }
-
         public void SetFocus()
         {
             if (!(DataContext is CredentialsViewModel vm))
@@ -43,19 +24,19 @@ public void SetFocus()
             // and focus on the button/text box
             if (vm.ShowBrowserLogin)
             {
-                _tabControl.SelectedIndex = 0;
-                _browserButton.Focus();
+                _authModesTabControl.SelectedIndex = 0;
+                _signInBrowserButton.Focus();
             }
             else if (vm.ShowTokenLogin)
             {
-                _tabControl.SelectedIndex = 1;
+                _authModesTabControl.SelectedIndex = 1;
                 // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293
                 if (!PlatformUtils.IsMacOS())
                     _tokenTextBox.Focus();
             }
             else if (vm.ShowBasicLogin)
             {
-                _tabControl.SelectedIndex = 2;
+                _authModesTabControl.SelectedIndex = 2;
                 if (string.IsNullOrWhiteSpace(vm.UserName))
                 {
                     // Workaround: https://github.com/git-ecosystem/git-credential-manager/issues/1293

From 63b3d7354107838e97fdecb5d4827850d34d86e6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 27 Nov 2023 20:40:35 +0000
Subject: [PATCH 05/27] build(deps): bump DavidAnson/markdownlint-cli2-action

Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 13.0.0 to 14.0.0.
- [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases)
- [Commits](https://github.com/davidanson/markdownlint-cli2-action/compare/ed4dec634fd2ef689c7061d5647371d8248064f1...455b6612a7b7a80f28be9e019b70abdd11696e4e)

---
updated-dependencies:
- dependency-name: DavidAnson/markdownlint-cli2-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
index cbc4b241e..5f21bcd77 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/lint-docs.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: DavidAnson/markdownlint-cli2-action@ed4dec634fd2ef689c7061d5647371d8248064f1
+      - uses: DavidAnson/markdownlint-cli2-action@455b6612a7b7a80f28be9e019b70abdd11696e4e
         with:
           globs: |
             "**/*.md"

From 5ac30ce31400619344a632655c07af428c3de9d9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Dec 2023 21:02:05 +0000
Subject: [PATCH 06/27] build(deps): bump actions/setup-dotnet from 3.2.0 to
 4.0.0

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/v3.2.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/continuous-integration.yml |  6 +++---
 .github/workflows/release.yml                | 16 ++++++++--------
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 7562447fc..ac1633df2 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -19,7 +19,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 6.0.201
 
@@ -59,7 +59,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 6.0.201
 
@@ -100,7 +100,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 6.0.201
 
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 67e407c0a..67ca8fac1 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -35,7 +35,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -150,7 +150,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -190,7 +190,7 @@ jobs:
 
     # The Azure Code Signing action overrides the .NET version, so we reset it.
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -236,7 +236,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -314,7 +314,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -408,7 +408,7 @@ jobs:
         path: signed
 
     - name: Set up .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 7.0.x
 
@@ -521,7 +521,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@v3.2.0
+        uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 7.0.x
 
@@ -591,7 +591,7 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up .NET
-        uses: actions/setup-dotnet@v3.2.0
+        uses: actions/setup-dotnet@v4.0.0
         with:
           dotnet-version: 7.0.x
 

From c004ea6ead002461565732a720616f24e45e5302 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Dec 2023 20:25:29 +0000
Subject: [PATCH 07/27] build(deps): bump github/codeql-action from 2 to 3

Bumps [github/codeql-action](https://github.com/github/codeql-action) from 2 to 3.
- [Release notes](https://github.com/github/codeql-action/releases)
- [Changelog](https://github.com/github/codeql-action/blob/main/CHANGELOG.md)
- [Commits](https://github.com/github/codeql-action/compare/v2...v3)

---
updated-dependencies:
- dependency-name: github/codeql-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index f9b3edea2..27274d812 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -26,7 +26,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v2
+      uses: github/codeql-action/init@v3
       with:
         languages: ${{ matrix.language }}
 
@@ -34,4 +34,4 @@ jobs:
        dotnet build
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v2
+      uses: github/codeql-action/analyze@v3

From fcf5bdf09d422cbffe1574d68e30c5c0f64f7b69 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:28:17 +0000
Subject: [PATCH 08/27] build(deps): bump actions/download-artifact from 3 to 4

Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/download-artifact/releases)
- [Commits](https://github.com/actions/download-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/download-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ab251fe9c..c2f604219 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -339,7 +339,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Download payload
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: tmp.dotnet-tool-build
 
@@ -402,7 +402,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Download signed payload
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: dotnet-tool-payload-sign
         path: signed
@@ -435,7 +435,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Download unsigned package
-      uses: actions/download-artifact@v3
+      uses: actions/download-artifact@v4
       with:
         name: tmp.dotnet-tool-package-unsigned
         path: nupkg
@@ -526,7 +526,7 @@ jobs:
           dotnet-version: 7.0.x
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
         with:
           name: ${{ matrix.component.artifact }}
 
@@ -596,7 +596,7 @@ jobs:
           dotnet-version: 7.0.x
 
       - name: Download artifacts
-        uses: actions/download-artifact@v3
+        uses: actions/download-artifact@v4
 
       - name: Archive macOS payload and symbols
         run: |

From 9d636e15b2c6e3539d1df81748389e9edd3933b0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Jan 2024 20:54:34 +0000
Subject: [PATCH 09/27] build(deps): bump azure/azure-code-signing-action from
 0.2.22 to 0.3.0

Bumps [azure/azure-code-signing-action](https://github.com/azure/azure-code-signing-action) from 0.2.22 to 0.3.0.
- [Release notes](https://github.com/azure/azure-code-signing-action/releases)
- [Commits](https://github.com/azure/azure-code-signing-action/compare/v0.2.22...v0.3.0)

---
updated-dependencies:
- dependency-name: azure/azure-code-signing-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index ab251fe9c..4c700c670 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -177,7 +177,7 @@ jobs:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Sign payload files with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.2.22
+      uses: azure/azure-code-signing-action@v0.3.0
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing
@@ -204,7 +204,7 @@ jobs:
          -Destination $env:GITHUB_WORKSPACE\installers
 
     - name: Sign installers with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.2.22
+      uses: azure/azure-code-signing-action@v0.3.0
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing

From 4041a643792b81d1567c6cb3a00935ba9b028357 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 25 Jan 2024 11:39:24 +0000
Subject: [PATCH 10/27] azure-repos: fix org name in userinfo

Fix a bug in the Azure Repos host provider that prevented the Azure
DevOps organisation name from being pulled from the userinfo part of the
remote URL.

When creating the remote URL from Git input in multiple places we had
not been preserving the userinfo part that was subsequently passed to
the `CreateOrganizationUri` helper method to extract the org URL.

Also add an additional test for PAT mode to cover this use case.
---
 .../AzureReposHostProviderTests.cs            | 49 +++++++++++++++++--
 .../AzureReposHostProvider.cs                 | 20 ++++----
 2 files changed, 54 insertions(+), 15 deletions(-)

diff --git a/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs b/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
index e65674825..e8da8d79c 100644
--- a/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
+++ b/src/shared/Microsoft.AzureRepos.Tests/AzureReposHostProviderTests.cs
@@ -239,17 +239,14 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
         [Fact]
         public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_DevAzureUrlOrgName_ReturnsCredential()
         {
-
             var input = new InputArguments(new Dictionary<string, string>
             {
                 ["protocol"] = "https",
                 ["host"] = "dev.azure.com",
-                ["path"] = "org/project/_git/repo",
                 ["username"] = "org"
             });
 
             var expectedOrgUri = new Uri("https://dev.azure.com/org");
-            var remoteUri = new Uri("https://dev.azure.com/org/project/_git/repo");
             var authorityUrl = "https://login.microsoftonline.com/common";
             var expectedClientId = AzureDevOpsConstants.AadClientId;
             var expectedRedirectUri = AzureDevOpsConstants.AadRedirectUri;
@@ -385,7 +382,6 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_CachedAuthority_
         [Fact]
         public async Task AzureReposProvider_GetCredentialAsync_JwtMode_NoCachedAuthority_NoUser_ReturnsCredential()
         {
-
             var input = new InputArguments(new Dictionary<string, string>
             {
                 ["protocol"] = "https",
@@ -433,9 +429,52 @@ public async Task AzureReposProvider_GetCredentialAsync_JwtMode_NoCachedAuthorit
         }
 
         [Fact]
-        public async Task AzureReposProvider_GetCredentialAsync_PatMode_NoExistingPat_GeneratesCredential()
+        public async Task AzureReposProvider_GetCredentialAsync_PatMode_OrgInUserName_NoExistingPat_GeneratesCredential()
         {
+            var input = new InputArguments(new Dictionary<string, string>
+            {
+                ["protocol"] = "https",
+                ["host"] = "dev.azure.com",
+                ["username"] = "org"
+            });
+
+            var expectedOrgUri = new Uri("https://dev.azure.com/org");
+            var authorityUrl = "https://login.microsoftonline.com/common";
+            var expectedClientId = AzureDevOpsConstants.AadClientId;
+            var expectedRedirectUri = AzureDevOpsConstants.AadRedirectUri;
+            var expectedScopes = AzureDevOpsConstants.AzureDevOpsDefaultScopes;
+            var accessToken = "ACCESS-TOKEN";
+            var personalAccessToken = "PERSONAL-ACCESS-TOKEN";
+            var account = "john.doe";
+            var authResult = CreateAuthResult(account, accessToken);
+
+            var context = new TestCommandContext();
+
+            var azDevOpsMock = new Mock<IAzureDevOpsRestApi>(MockBehavior.Strict);
+            azDevOpsMock.Setup(x => x.GetAuthorityAsync(expectedOrgUri)).ReturnsAsync(authorityUrl);
+            azDevOpsMock.Setup(x => x.CreatePersonalAccessTokenAsync(expectedOrgUri, accessToken, It.IsAny<IEnumerable<string>>()))
+                        .ReturnsAsync(personalAccessToken);
+
+            var msAuthMock = new Mock<IMicrosoftAuthentication>(MockBehavior.Strict);
+            msAuthMock.Setup(x => x.GetTokenForUserAsync(authorityUrl, expectedClientId, expectedRedirectUri, expectedScopes, null, true))
+                      .ReturnsAsync(authResult);
+
+            var authorityCacheMock = new Mock<IAzureDevOpsAuthorityCache>(MockBehavior.Strict);
+
+            var userMgrMock = new Mock<IAzureReposBindingManager>(MockBehavior.Strict);
 
+            var provider = new AzureReposHostProvider(context, azDevOpsMock.Object, msAuthMock.Object, authorityCacheMock.Object, userMgrMock.Object);
+
+            ICredential credential = await provider.GetCredentialAsync(input);
+
+            Assert.NotNull(credential);
+            Assert.Equal(account, credential.Account);
+            Assert.Equal(personalAccessToken, credential.Password);
+        }
+
+        [Fact]
+        public async Task AzureReposProvider_GetCredentialAsync_PatMode_NoExistingPat_GeneratesCredential()
+        {
             var input = new InputArguments(new Dictionary<string, string>
             {
                 ["protocol"] = "https",
diff --git a/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs b/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
index 941b2bd53..55b1449d7 100644
--- a/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
+++ b/src/shared/Microsoft.AzureRepos/AzureReposHostProvider.cs
@@ -92,8 +92,8 @@ public async Task<ICredential> GetCredentialAsync(InputArguments input)
 
             if (UsePersonalAccessTokens())
             {
-                Uri remoteUri = input.GetRemoteUri();
-                string service = GetServiceName(remoteUri);
+                Uri remoteWithUserUri = input.GetRemoteUri(includeUser: true);
+                string service = GetServiceName(remoteWithUserUri);
                 string account = GetAccountNameForCredentialQuery(input);
 
                 _context.Trace.WriteLine($"Looking for existing credential in store with service={service} account={account}...");
@@ -219,8 +219,8 @@ private async Task<ICredential> GeneratePersonalAccessTokenAsync(InputArguments
                     "Unencrypted HTTP is not supported for Azure Repos. Ensure the repository remote URL is using HTTPS.");
             }
 
-            Uri remoteUri = input.GetRemoteUri();
-            Uri orgUri = UriHelpers.CreateOrganizationUri(remoteUri, out _);
+            Uri remoteUserUri = input.GetRemoteUri(includeUser: true);
+            Uri orgUri = UriHelpers.CreateOrganizationUri(remoteUserUri, out _);
 
             // Determine the MS authentication authority for this organization
             _context.Trace.WriteLine("Determining Microsoft Authentication Authority...");
@@ -257,17 +257,17 @@ private async Task<ICredential> GeneratePersonalAccessTokenAsync(InputArguments
 
         private async Task<IMicrosoftAuthenticationResult> GetAzureAccessTokenAsync(InputArguments input)
         {
-            Uri remoteUri = input.GetRemoteUri();
+            Uri remoteWithUserUri = input.GetRemoteUri(includeUser: true);
             string userName = input.UserName;
 
             // We should not allow unencrypted communication and should inform the user
-            if (StringComparer.OrdinalIgnoreCase.Equals(remoteUri.Scheme, "http"))
+            if (StringComparer.OrdinalIgnoreCase.Equals(remoteWithUserUri.Scheme, "http"))
             {
                 throw new Trace2Exception(_context.Trace2,
                     "Unencrypted HTTP is not supported for Azure Repos. Ensure the repository remote URL is using HTTPS.");
             }
 
-            Uri orgUri = UriHelpers.CreateOrganizationUri(remoteUri, out string orgName);
+            Uri orgUri = UriHelpers.CreateOrganizationUri(remoteWithUserUri, out string orgName);
 
             _context.Trace.WriteLine($"Determining Microsoft Authentication authority for Azure DevOps organization '{orgName}'...");
             if (TryGetAuthorityFromHeaders(input.WwwAuth, out string authAuthority))
@@ -306,8 +306,8 @@ private async Task<IMicrosoftAuthenticationResult> GetAzureAccessTokenAsync(Inpu
             //
             var icmp = StringComparer.OrdinalIgnoreCase;
             if (!string.IsNullOrWhiteSpace(userName) &&
-                (UriHelpers.IsVisualStudioComHost(remoteUri.Host) ||
-                 (UriHelpers.IsAzureDevOpsHost(remoteUri.Host) && !icmp.Equals(orgName, userName))))
+                (UriHelpers.IsVisualStudioComHost(remoteWithUserUri.Host) ||
+                 (UriHelpers.IsAzureDevOpsHost(remoteWithUserUri.Host) && !icmp.Equals(orgName, userName))))
             {
                 _context.Trace.WriteLine("Using username as specified in remote.");
             }
@@ -422,7 +422,7 @@ private static string GetServiceName(Uri remoteUri)
             {
                 // If we're given the full path for an older *.visualstudio.com-style URL then we should
                 // respect that in the service name.
-                return remoteUri.AbsoluteUri.TrimEnd('/');
+                return remoteUri.WithoutUserInfo().AbsoluteUri.TrimEnd('/');
             }
 
             throw new InvalidOperationException("Host is not Azure DevOps.");

From 3f80b6eefb1060a8472df174d0c05606a01ed168 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 25 Jan 2024 20:08:47 +0000
Subject: [PATCH 11/27] build(deps): bump DavidAnson/markdownlint-cli2-action

Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 14.0.0 to 15.0.0.
- [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases)
- [Commits](https://github.com/davidanson/markdownlint-cli2-action/compare/455b6612a7b7a80f28be9e019b70abdd11696e4e...510b996878fc0d1a46c8a04ec86b06dbfba09de7)

---
updated-dependencies:
- dependency-name: DavidAnson/markdownlint-cli2-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
index 5f21bcd77..fe8ce0d51 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/lint-docs.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: DavidAnson/markdownlint-cli2-action@455b6612a7b7a80f28be9e019b70abdd11696e4e
+      - uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7
         with:
           globs: |
             "**/*.md"

From 7d33f98b49cbc8e0beafdfb737910b4d16baf9cc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 29 Jan 2024 20:28:14 +0000
Subject: [PATCH 12/27] build(deps): bump lycheeverse/lychee-action from 1.8.0
 to 1.9.3

Bumps [lycheeverse/lychee-action](https://github.com/lycheeverse/lychee-action) from 1.8.0 to 1.9.3.
- [Release notes](https://github.com/lycheeverse/lychee-action/releases)
- [Commits](https://github.com/lycheeverse/lychee-action/compare/ec3ed119d4f44ad2673a7232460dc7dff59d2421...c053181aa0c3d17606addfe97a9075a32723548a)

---
updated-dependencies:
- dependency-name: lycheeverse/lychee-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
index 5f21bcd77..9b0992d9e 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/lint-docs.yml
@@ -35,7 +35,7 @@ jobs:
       - name: Run link checker
         # For any troubleshooting, see:
         # https://github.com/lycheeverse/lychee/blob/master/docs/TROUBLESHOOTING.md
-        uses: lycheeverse/lychee-action@ec3ed119d4f44ad2673a7232460dc7dff59d2421
+        uses: lycheeverse/lychee-action@c053181aa0c3d17606addfe97a9075a32723548a
 
         with:
           # user-agent: if a user agent is not specified, some websites (e.g.

From 79f3186652c5c3df9dc91fdfedc280d955b267fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 14 Dec 2023 20:28:20 +0000
Subject: [PATCH 13/27] build(deps): bump actions/upload-artifact from 3 to 4

Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 3 to 4.
- [Release notes](https://github.com/actions/upload-artifact/releases)
- [Commits](https://github.com/actions/upload-artifact/compare/v3...v4)

---
updated-dependencies:
- dependency-name: actions/upload-artifact
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/continuous-integration.yml |  6 +++---
 .github/workflows/release.yml                | 14 +++++++-------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index ac1633df2..4482f0b18 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -42,7 +42,7 @@ jobs:
         mv out/windows/Installer.Windows/bin/Release/net472/gcm*.exe artifacts/
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: win-x86
         path: |
@@ -80,7 +80,7 @@ jobs:
         mv out/linux/Packaging.Linux/Release/tar/*.tar.gz artifacts/
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-x64
         path: |
@@ -125,7 +125,7 @@ jobs:
         mv out/osx/Installer.Mac/pkg/Release/gcm*.pkg artifacts/
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: ${{ matrix.runtime }}
         path: |
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 5d439492a..124350066 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -130,7 +130,7 @@ jobs:
           --keychain-profile="$N4"
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: macos-${{ matrix.runtime }}-artifacts
         path: |
@@ -216,7 +216,7 @@ jobs:
         timestamp-digest: SHA256
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: windows-artifacts
         path: |
@@ -295,7 +295,7 @@ jobs:
           --detach-sig gcm-linux_amd64.$version.tar.gz
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: linux-artifacts
         path: |
@@ -323,7 +323,7 @@ jobs:
         src/shared/DotnetTool/layout.sh --configuration=Release
 
     - name: Upload .NET tool artifacts
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tmp.dotnet-tool-build
         path: |
@@ -388,7 +388,7 @@ jobs:
         unzip signed/payload.zip -d dotnet-tool-payload-sign
 
     - name: Upload signed payload
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dotnet-tool-payload-sign
         path: |
@@ -419,7 +419,7 @@ jobs:
           --publish-dir=$(pwd)/signed
 
     - name: Upload unsigned package
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: tmp.dotnet-tool-package-unsigned
         path: |
@@ -482,7 +482,7 @@ jobs:
         Remove-Item signed\gcm-nupkg.zip -Force
 
     - name: Publish signed package
-      uses: actions/upload-artifact@v3
+      uses: actions/upload-artifact@v4
       with:
         name: dotnet-tool-sign
         path: signed/*.nupkg

From 71cea45584850c0c727cce8445ec75a01b39e77d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 4 Mar 2024 20:34:20 +0000
Subject: [PATCH 14/27] build(deps): bump azure/login from 1 to 2

Bumps [azure/login](https://github.com/azure/login) from 1 to 2.
- [Release notes](https://github.com/azure/login/releases)
- [Commits](https://github.com/azure/login/compare/v1...v2)

---
updated-dependencies:
- dependency-name: azure/login
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 124350066..8bcc72268 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -170,7 +170,7 @@ jobs:
           -SymbolOutput $env:GITHUB_WORKSPACE\symbols
 
     - name: Log into Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         client-id: ${{ secrets.AZURE_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -248,7 +248,7 @@ jobs:
         dotnet test --configuration=LinuxRelease
 
     - name: Log into Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         client-id: ${{ secrets.AZURE_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -351,7 +351,7 @@ jobs:
         Get-ChildItem -Exclude payload.zip | Remove-Item -Recurse -Force
 
     - name: Log into Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         client-id: ${{ secrets.AZURE_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -448,7 +448,7 @@ jobs:
         Get-ChildItem -Exclude gcm-nupkg.zip | Remove-Item -Recurse -Force
 
     - name: Log into Azure
-      uses: azure/login@v1
+      uses: azure/login@v2
       with:
         client-id: ${{ secrets.AZURE_CLIENT_ID }}
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
@@ -617,7 +617,7 @@ jobs:
           zip -jr win-x86-payload-and-symbols/gcm-win-x86-$version-symbols.zip windows-artifacts/symbols
 
       - name: Log into Azure
-        uses: azure/login@v1
+        uses: azure/login@v2
         with:
           client-id: ${{ secrets.AZURE_CLIENT_ID }}
           tenant-id: ${{ secrets.AZURE_TENANT_ID }}

From 8b93d631e315ca0d2563f28ce582439e19c0ac46 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Thu, 14 Mar 2024 14:24:07 -0700
Subject: [PATCH 15/27] docs: add Azure Repos MI/SP docs

Add documentation about Managed Identities and Service Principals for
Azure Repos; how to configure them and use them with GCM.

This will be useful for those that wish to adopt them as alternatives to
PATs or other automated auth systems.
---
 docs/README.md       |   3 +-
 docs/azrepos-misp.md | 126 +++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 128 insertions(+), 1 deletion(-)
 create mode 100644 docs/azrepos-misp.md

diff --git a/docs/README.md b/docs/README.md
index 3c08cfdfc..716c106ee 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -11,18 +11,19 @@ The following are links to GCM user support documentation:
 - [Credential stores][gcm-credstores]
 - [Host provider specification][gcm-host-provider]
 - [Azure Repos OAuth tokens][gcm-azure-tokens]
+- [Azure Managed Identities and Service Principals][gcm-misp]
 - [GitLab support][gcm-gitlab]
 - [Generic OAuth support][gcm-oauth]
 
 [gcm-azure-tokens]: azrepos-users-and-tokens.md
 [gcm-config]: configuration.md
 [gcm-credstores]: credstores.md
-[gcm-dev]: development.md
 [gcm-enterprise-config]: enterprise-config.md
 [gcm-env]: environment.md
 [gcm-faq]: faq.md
 [gcm-gitlab]: gitlab.md
 [gcm-host-provider]: hostprovider.md
+[gcm-misp]: azrepos-misp.md
 [gcm-net-config]: netconfig.md
 [gcm-oauth]: generic-oauth.md
 [gcm-usage]: usage.md
diff --git a/docs/azrepos-misp.md b/docs/azrepos-misp.md
new file mode 100644
index 000000000..6c4c508fe
--- /dev/null
+++ b/docs/azrepos-misp.md
@@ -0,0 +1,126 @@
+# Azure Managed Identities and Service Principals
+
+Git Credential Manager supports Managed Identities and Service Principals for
+authentication with Azure Repos. This document provides an overview of Managed
+Identities and Service Principals and how to use them with GCM.
+
+## Managed Identities
+
+Azure Managed Identities can be used to authenticate and authorize applications
+and services to access Azure resources. Managed Identities are a secure way to
+access Azure resources without needing to store credentials in code or
+configuration files.
+
+There are two types of Managed Identities:
+
+**System-assigned**
+
+System-assigned Managed Identities are tied to a specific Azure resource, such
+as a Virtual Machine or App Service. When a system-assigned Managed Identity is
+enabled, Azure creates an identity for the resource in the Azure AD tenant
+that's trusted by the subscription. The lifecycle of the identity is tied to the
+resource to which it's assigned.
+
+**User-assigned**
+
+User-assigned Managed Identities are created as standalone Azure resources and
+can be assigned to one or more Azure resources. This allows you to use the same
+Managed Identity across multiple resources.
+
+You can read more about Managed Identities in the
+[Azure documentation][az-mi].
+
+### How to configure Managed Identities
+
+In order to use a Managed Identity with GCM, you need to ensure that the Managed
+Identity has the necessary permissions to access the Azure Repos repository.
+
+You can read more about how to configure Managed Identities in the
+[Azure Repos documentation][azdo-misp].
+
+Once you have configured the Managed Identity, you can use it with GCM by simply
+setting one of the following environment variables or Git configuration options:
+
+**Git configuration:** [`credential.azreposManagedIdentity`][gcm-mi-config]
+
+**Environment variable:** [`GCM_AZREPOS_MANAGEDIDENTITY`][gcm-mi-env]
+
+Value|Description
+-|-
+`system`|System-Assigned Managed Identity
+`[guid]`|User-Assigned Managed Identity with the specified client ID
+`id://[guid]`|User-Assigned Managed Identity with the specified client ID
+`resource://[guid]`|User-Assigned Managed Identity for the associated resource
+
+You can obtain the `[guid]` from the Azure Portal or by using the Azure CLI
+to inspect the Managed Identity or resource.
+
+## Service Principals
+
+Azure Service Principals are used to authenticate and authorize applications and
+services to access Azure resources. Service Principals are similar in many ways
+to Managed Identities (in fact Service Principals are used under the hood to
+implement Managed Identities), but they have expliclty defined credentials that
+are not managed by Azure.
+
+There are a number of different ways to create and configure Service Principals,
+including using the Azure Portal or Azure CLI. You can read more about Service
+Principals in the [Azure documentation][az-sp].
+
+### How to configure Service Principals
+
+Much like with Managed Identities, to use a Service Principal with GCM you first
+need to ensure that the principal has the necessary permissions to access the
+Azure Repos repository.
+
+You can read more about how to configure Service Principals in the
+[Azure Repos documentation][azdo-misp].
+
+Once you have configured the Service Principal, you can use it with GCM by
+setting one of the following environment variables or Git configuration options:
+
+**Git configuration:** [`credential.azreposServicePrincipal`][gcm-sp-config]
+
+**Environment variable:** [`GCM_AZREPOS_SERVICE_PRINCIPAL`][gcm-sp-env]
+
+The format of the value for these options must be in the format:
+
+```text
+{tenantId}/{clientId}
+```
+
+Where `{tenantId}` is the Azure tenant ID and `{clientId}` is the client ID of
+the Service Principal. These values can be found in the Azure Portal or by using
+the Azure CLI to inspect the Service Principal.
+
+#### Authentication with Service Principals
+
+When using a Service Principal with GCM, you will also need to provide the
+client secret or certificate that is associated with the Service Principal.
+
+You can provide the client secret or certificate to GCM by setting one of the
+following environment variables or Git configuration options.
+
+Type|Git Configuration|Environment Variable
+-|-|-
+Client Secret|[`credential.azreposServicePrincipalSecret`][gcm-sp-secret-config]|[`GCM_AZREPOS_SP_SECRET`][gcm-sp-secret-env]
+Certificate|[`credential.azreposServicePrincipalCertificateThumbprint`][gcm-sp-cert-config]|[`GCM_AZREPOS_SP_CERT_THUMBPRINT`][gcm-sp-cert-env]
+
+The value for these options should be the client secret or the thumbrint of the
+certificate that is associated with the Service Principal.
+
+The certificate itself should be installed on the machine where GCM is running
+and should be installed in personal store the certificate store for either the
+current user or the local machine.
+
+[az-mi]: https://learn.microsoft.com/en-us/entra/identity/managed-identities-azure-resources/overview
+[az-sp]: https://learn.microsoft.com/en-us/entra/identity-platform/app-objects-and-service-principals?tabs=browser
+[azdo-misp]: https://learn.microsoft.com/en-us/azure/devops/integrate/get-started/authentication/service-principal-managed-identity?view=azure-devops
+[gcm-mi-config]: https://gh.io/gcm/config#credentialazreposmanagedidentity
+[gcm-mi-env]: https://gh.io/gcm/env#GCM_AZREPOS_MANAGEDIDENTITY
+[gcm-sp-config]: https://gh.io/gcm/config#credentialazreposserviceprincipal
+[gcm-sp-env]: https://gh.io/gcm/env#GCM_AZREPOS_SERVICE_PRINCIPAL
+[gcm-sp-secret-config]: https://gh.io/gcm/config#credentialazreposserviceprincipalsecret
+[gcm-sp-secret-env]: https://gh.io/gcm/env#GCM_AZREPOS_SP_SECRET
+[gcm-sp-cert-config]: https://gh.io/gcm/config#credentialazreposserviceprincipalcertificatethumbprint
+[gcm-sp-cert-env]: https://gh.io/gcm/env#GCM_AZREPOS_SP_CERT_THUMBPRINT

From b28e11a084a49be4bb570d5a64af826532fb05fa Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Tue, 26 Mar 2024 14:07:02 -0700
Subject: [PATCH 16/27] azrepos: do not query local bindings if outside repo

Do not attempt to query for an organisation/user binding in the local
repository configuration if we're not currently inside of a repository!

This will prevent the warning message from Git's standard error stream
from flowing to our caller's stderr stream when GCM tries to use the
`--local` option in a `git config` call.
---
 .../AzureReposBindingManager.cs                    | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

diff --git a/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs b/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs
index db2670edf..7e26590bd 100644
--- a/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs
+++ b/src/shared/Microsoft.AzureRepos/AzureReposBindingManager.cs
@@ -93,11 +93,15 @@ public AzureReposBinding GetBinding(string orgName)
 
             _trace.WriteLine($"Looking up organization binding for '{orgName}'...");
 
-            // NOT using the short-circuiting OR operator here on purpose - we need both branches to be evaluated
-            if (config.TryGet(GitConfigurationLevel.Local, GitConfigurationType.Raw,
-                    orgKey, out string localUser) |
-                config.TryGet(GitConfigurationLevel.Global, GitConfigurationType.Raw,
-                    orgKey, out string globalUser))
+            string localUser = null;
+            bool hasLocal = _git.IsInsideRepository() && // Can only check local config if we are inside a repository
+                            config.TryGet(GitConfigurationLevel.Local, GitConfigurationType.Raw,
+                                orgKey, out localUser);
+
+            bool hasGlobal = config.TryGet(GitConfigurationLevel.Global, GitConfigurationType.Raw,
+                orgKey, out string globalUser);
+
+            if (hasLocal || hasGlobal)
             {
                 return new AzureReposBinding(orgName, globalUser, localUser);
             }

From 25e01a299fe8b0d29d9f2d08d107e5b0ff380684 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 27 Mar 2024 20:27:08 +0000
Subject: [PATCH 17/27] build(deps): bump azure/azure-code-signing-action from
 0.3.0 to 0.3.1

Bumps [azure/azure-code-signing-action](https://github.com/azure/azure-code-signing-action) from 0.3.0 to 0.3.1.
- [Release notes](https://github.com/azure/azure-code-signing-action/releases)
- [Commits](https://github.com/azure/azure-code-signing-action/compare/v0.3.0...v0.3.1)

---
updated-dependencies:
- dependency-name: azure/azure-code-signing-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/release.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 124350066..0e3d961f9 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -177,7 +177,7 @@ jobs:
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
     - name: Sign payload files with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.3.0
+      uses: azure/azure-code-signing-action@v0.3.1
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing
@@ -204,7 +204,7 @@ jobs:
          -Destination $env:GITHUB_WORKSPACE\installers
 
     - name: Sign installers with Azure Code Signing
-      uses: azure/azure-code-signing-action@v0.3.0
+      uses: azure/azure-code-signing-action@v0.3.1
       with:
         endpoint: https://wus2.codesigning.azure.net/
         code-signing-account-name: git-fundamentals-signing

From 9cd12fa6d2ab7ca00db0a3cdf985b6b7513c4741 Mon Sep 17 00:00:00 2001
From: Lessley <lessleydennington@gmail.com>
Date: Sun, 7 Apr 2024 19:57:17 -0600
Subject: [PATCH 18/27] release: sign .net tool with sign cli

Migrate .NET tool from using ESRP to using the Sign CLI tool for signing. This
tool is a fork of [1] that was set up to support Trusted Signing (previously
known as Azure Code Signing).

1: https://github.com/dotnet/sign
---
 .github/workflows/release.yml | 97 +++++++++++++++--------------------
 1 file changed, 41 insertions(+), 56 deletions(-)

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 124350066..81af37da3 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -331,7 +331,6 @@ jobs:
 
   dotnet-tool-payload-sign:
     name: Sign .NET tool payload
-    # ESRP service requires signing to run on Windows
     runs-on: windows-latest
     environment: release
     needs: dotnet-tool-build
@@ -343,13 +342,6 @@ jobs:
       with:
         name: tmp.dotnet-tool-build
 
-    - name: Zip unsigned payload
-      shell: pwsh
-      run: |
-        Compress-Archive -Path payload payload/payload.zip
-        cd payload
-        Get-ChildItem -Exclude payload.zip | Remove-Item -Recurse -Force
-
     - name: Log into Azure
       uses: azure/login@v1
       with:
@@ -357,35 +349,37 @@ jobs:
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-    - name: Set up ESRP client
-      shell: pwsh
+    - name: Download/extract Sign CLI tool
       env:
-        AZURE_VAULT: ${{ secrets.AZURE_VAULT }}
-        AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-        AZURE_STORAGE_CONTAINER: ${{ secrets.AZURE_STORAGE_CONTAINER }}
-        ESRP_TOOL: ${{ secrets.ESRP_TOOL }}
-        AUTH_CERT: ${{ secrets.AZURE_VAULT_AUTH_CERT_NAME }}
-        REQUEST_SIGNING_CERT: ${{ secrets.AZURE_VAULT_REQUEST_SIGNING_CERT_NAME }}
+        AST: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
+        ASC: ${{ secrets.AZURE_STORAGE_CONTAINER }}
+        SCT: ${{ secrets.SIGN_CLI_TOOL }}
       run: |
-        .github\set_up_esrp.ps1
+        az storage blob download --file sign-cli.zip --auth-mode login `
+          --account-name $env:AST --container-name $env:ASC --name $env:SCT
+        Expand-Archive -Path sign-cli.zip -DestinationPath .\sign-cli
 
-    - name: Run ESRP client
-      shell: pwsh
+    - name: Sign payload
       env:
-        AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }}
-        NUGET_KEY_CODE: ${{ secrets.NUGET_KEY_CODE }}
-        NUGET_OPERATION_CODE: ${{ secrets.NUGET_OPERATION_CODE }}
+        ACST: ${{ secrets.AZURE_TENANT_ID }}
+        ACSI: ${{ secrets.AZURE_CLIENT_ID }}
+        ACSS: ${{ secrets.AZURE_CLIENT_SECRET }}
       run: |
-        python .github\run_esrp_signing.py payload `
-         $env:NUGET_KEY_CODE $env:NUGET_OPERATION_CODE
+        ./sign-cli/sign.exe code azcodesign payload/* `
+          -acsu https://wus2.codesigning.azure.net/ `
+          -acsa git-fundamentals-signing `
+          -acscp git-fundamentals-windows-signing `
+          -d "Git Fundamentals Windows Signing Certificate" `
+          -u "https://github.com/git-ecosystem/git-credential-manager" `
+          -acst $env:ACST `
+          -acsi $env:ACSI `
+          -acss $env:ACSS
 
     - name: Lay out signed payload, images, and symbols
       shell: bash
       run: |
         mkdir dotnet-tool-payload-sign
-        rm -rf payload
-        mv images payload.sym -t dotnet-tool-payload-sign
-        unzip signed/payload.zip -d dotnet-tool-payload-sign
+        mv images payload.sym payload -t dotnet-tool-payload-sign
 
     - name: Upload signed payload
       uses: actions/upload-artifact@v4
@@ -427,7 +421,6 @@ jobs:
 
   dotnet-tool-sign:
     name: Sign .NET tool package
-    # ESRP service requires signing to run on Windows
     runs-on: windows-latest
     environment: release
     needs: dotnet-tool-pack
@@ -440,13 +433,6 @@ jobs:
         name: tmp.dotnet-tool-package-unsigned
         path: nupkg
 
-    - name: Zip unsigned package
-      shell: pwsh
-      run: |
-        Compress-Archive -Path nupkg/*.nupkg nupkg/gcm-nupkg.zip
-        cd nupkg
-        Get-ChildItem -Exclude gcm-nupkg.zip | Remove-Item -Recurse -Force
-
     - name: Log into Azure
       uses: azure/login@v1
       with:
@@ -454,38 +440,37 @@ jobs:
         tenant-id: ${{ secrets.AZURE_TENANT_ID }}
         subscription-id: ${{ secrets.AZURE_SUBSCRIPTION_ID }}
 
-    - name: Set up ESRP client
-      shell: pwsh
+    - name: Download/extract Sign CLI tool
       env:
-        AZURE_VAULT: ${{ secrets.AZURE_VAULT }}
-        AZURE_STORAGE_ACCOUNT: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
-        AZURE_STORAGE_CONTAINER: ${{ secrets.AZURE_STORAGE_CONTAINER }}
-        ESRP_TOOL: ${{ secrets.ESRP_TOOL }}
-        AUTH_CERT: ${{ secrets.AZURE_VAULT_AUTH_CERT_NAME }}
-        REQUEST_SIGNING_CERT: ${{ secrets.AZURE_VAULT_REQUEST_SIGNING_CERT_NAME }}
+        AST: ${{ secrets.AZURE_STORAGE_ACCOUNT }}
+        ASC: ${{ secrets.AZURE_STORAGE_CONTAINER }}
+        SCT: ${{ secrets.SIGN_CLI_TOOL }}
       run: |
-        .github\set_up_esrp.ps1
+        az storage blob download --file sign-cli.zip --auth-mode login `
+          --account-name $env:AST --container-name $env:ASC --name $env:SCT
+        Expand-Archive -Path sign-cli.zip -DestinationPath .\sign-cli
 
     - name: Sign package
-      shell: pwsh
       env:
-        AZURE_AAD_ID: ${{ secrets.AZURE_AAD_ID }}
-        NUGET_KEY_CODE: ${{ secrets.NUGET_KEY_CODE }}
-        NUGET_OPERATION_CODE: ${{ secrets.NUGET_OPERATION_CODE }}
-      run: |
-        python .github\run_esrp_signing.py nupkg $env:NUGET_KEY_CODE $env:NUGET_OPERATION_CODE
-
-    - name: Unzip signed package
-      shell: pwsh
+        ACST: ${{ secrets.AZURE_TENANT_ID }}
+        ACSI: ${{ secrets.AZURE_CLIENT_ID }}
+        ACSS: ${{ secrets.AZURE_CLIENT_SECRET }}
       run: |
-        Expand-Archive -LiteralPath signed\gcm-nupkg.zip -DestinationPath .\signed -Force
-        Remove-Item signed\gcm-nupkg.zip -Force
+        ./sign-cli/sign.exe code azcodesign nupkg/* `
+          -acsu https://wus2.codesigning.azure.net/ `
+          -acsa git-fundamentals-signing `
+          -acscp git-fundamentals-windows-signing `
+          -d "Git Fundamentals Windows Signing Certificate" `
+          -u "https://github.com/git-ecosystem/git-credential-manager" `
+          -acst $env:ACST `
+          -acsi $env:ACSI `
+          -acss $env:ACSS
 
     - name: Publish signed package
       uses: actions/upload-artifact@v4
       with:
         name: dotnet-tool-sign
-        path: signed/*.nupkg
+        path: nupkg/*.nupkg
 
 # ================================
 #           Validate

From cc7e35d493d0d2441913459116567a7e813eaee3 Mon Sep 17 00:00:00 2001
From: Lessley <lessleydennington@gmail.com>
Date: Sun, 7 Apr 2024 18:59:38 -0600
Subject: [PATCH 19/27] release: remove scripts associated with esrp

Remove ESRP-related scripts, as we are no longer using this tool for signing.
---
 .github/run_esrp_signing.py | 135 ------------------------------------
 .github/set_up_esrp.ps1     |  12 ----
 2 files changed, 147 deletions(-)
 delete mode 100644 .github/run_esrp_signing.py
 delete mode 100644 .github/set_up_esrp.ps1

diff --git a/.github/run_esrp_signing.py b/.github/run_esrp_signing.py
deleted file mode 100644
index be5a0f222..000000000
--- a/.github/run_esrp_signing.py
+++ /dev/null
@@ -1,135 +0,0 @@
-import argparse
-import json
-import os
-import glob
-import pprint
-import subprocess
-import sys
-import re
-
-parser = argparse.ArgumentParser(description='Sign binaries for Windows, macOS, and Linux')
-parser.add_argument('path', help='Path to file for signing')
-parser.add_argument('keycode', help='Platform-specific key code for signing')
-parser.add_argument('opcode', help='Platform-specific operation code for signing')
-# Setting nargs=argparse.REMAINDER allows us to pass in params that begin with `--`
-parser.add_argument('--params', nargs=argparse.REMAINDER, help='Parameters for signing')
-args = parser.parse_args()
-
-esrp_tool = os.path.join("esrp", "tools", "EsrpClient.exe")
-
-aad_id = os.environ['AZURE_AAD_ID'].strip()
-workspace = os.environ['GITHUB_WORKSPACE'].strip()
-
-source_location = args.path
-files = glob.glob(os.path.join(source_location, "*"))
-
-print("Found files:")
-pprint.pp(files)
-
-auth_json = {
-    "Version": "1.0.0",
-    "AuthenticationType": "AAD_CERT",
-    "TenantId": "72f988bf-86f1-41af-91ab-2d7cd011db47",
-    "ClientId": f"{aad_id}",
-    "AuthCert": {
-            "SubjectName": f"CN={aad_id}.microsoft.com",
-            "StoreLocation": "LocalMachine",
-            "StoreName": "My",
-            "SendX5c" : "true"
-    },
-    "RequestSigningCert": {
-            "SubjectName": f"CN={aad_id}",
-            "StoreLocation": "LocalMachine",
-            "StoreName": "My"
-    }
-}
-
-input_json = {
-	"Version": "1.0.0",
-	"SignBatches": [
-		{
-			"SourceLocationType": "UNC",
-			"SourceRootDirectory": source_location,
-			"DestinationLocationType": "UNC",
-			"DestinationRootDirectory": workspace,
-			"SignRequestFiles": [],
-			"SigningInfo": {
-				"Operations": [
-					{
-						"KeyCode": f"{args.keycode}",
-						"OperationCode": f"{args.opcode}",
-						"Parameters": {},
-						"ToolName": "sign",
-						"ToolVersion": "1.0",
-					}
-				]
-			}
-		}
-	]
-}
-
-# add files to sign
-for f in files:
-	name = os.path.basename(f)
-	input_json["SignBatches"][0]["SignRequestFiles"].append(
-		{
-			"SourceLocation": name,
-			"DestinationLocation": os.path.join("signed", name),
-		}
-	)
-
-# add parameters to input.json (e.g. enabling the hardened runtime for macOS)
-if args.params is not None:
-	i = 0
-	while i < len(args.params):
-		input_json["SignBatches"][0]["SigningInfo"]["Operations"][0]["Parameters"][args.params[i]] = args.params[i + 1]
-		i += 2
-
-policy_json = {
-	"Version": "1.0.0",
-	"Intent": "production release",
-	"ContentType": "binary",
-}
-
-configs = [
-	("auth.json", auth_json),
-	("input.json", input_json),
-	("policy.json", policy_json),
-]
-
-for filename, data in configs:
-	with open(filename, 'w') as fp:
-		json.dump(data, fp)
-
-# Run ESRP Client
-esrp_out = "esrp_out.json"
-result = subprocess.run(
-	[esrp_tool, "sign",
-	"-a", "auth.json",
-	"-i", "input.json",
-	"-p", "policy.json",
-	"-o", esrp_out,
-	"-l", "Verbose"],
-	capture_output=True,
-	text=True,
-	cwd=workspace)
-
-# Scrub log before printing
-log = re.sub(r'^.+Uploading.*to\s*destinationUrl\s*(.+?),.+$',
-    '***', 
-    result.stdout,
-    flags=re.IGNORECASE|re.MULTILINE)
-print(log)
-
-if result.returncode != 0:
-	print("Failed to run ESRPClient.exe")
-	sys.exit(1)
-
-if os.path.isfile(esrp_out):
-	print("ESRP output json:")
-	with open(esrp_out, 'r') as fp:
-		pprint.pp(json.load(fp))
-
-for file in files:
-	if os.path.isfile(os.path.join("signed", file)):
-		print(f"Success!\nSigned {file}")
\ No newline at end of file
diff --git a/.github/set_up_esrp.ps1 b/.github/set_up_esrp.ps1
deleted file mode 100644
index abe9183e0..000000000
--- a/.github/set_up_esrp.ps1
+++ /dev/null
@@ -1,12 +0,0 @@
-# Install ESRP client
-az storage blob download --file esrp.zip --auth-mode login --account-name $env:AZURE_STORAGE_ACCOUNT --container $env:AZURE_STORAGE_CONTAINER --name $env:ESRP_TOOL
-Expand-Archive -Path esrp.zip -DestinationPath .\esrp
-
-# Install certificates
-az keyvault secret download --vault-name "$env:AZURE_VAULT" --name "$env:AUTH_CERT" --file out.pfx
-certutil -f -importpfx out.pfx
-Remove-Item out.pfx
-
-az keyvault secret download --vault-name "$env:AZURE_VAULT" --name "$env:REQUEST_SIGNING_CERT" --file out.pfx
-certutil -f -importpfx out.pfx
-Remove-Item out.pfx
\ No newline at end of file

From cd9b3d57b6a948f5c30f54f3818c69628a5b801e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Apr 2024 21:00:55 +0000
Subject: [PATCH 20/27] build(deps): bump DavidAnson/markdownlint-cli2-action

Bumps [DavidAnson/markdownlint-cli2-action](https://github.com/davidanson/markdownlint-cli2-action) from 15.0.0 to 16.0.0.
- [Release notes](https://github.com/davidanson/markdownlint-cli2-action/releases)
- [Commits](https://github.com/davidanson/markdownlint-cli2-action/compare/510b996878fc0d1a46c8a04ec86b06dbfba09de7...b4c9feab76d8025d1e83c653fa3990936df0e6c8)

---
updated-dependencies:
- dependency-name: DavidAnson/markdownlint-cli2-action
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/lint-docs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/lint-docs.yml b/.github/workflows/lint-docs.yml
index 213d9edec..4cf4c4b70 100644
--- a/.github/workflows/lint-docs.yml
+++ b/.github/workflows/lint-docs.yml
@@ -20,7 +20,7 @@ jobs:
     steps:
       - uses: actions/checkout@v4
 
-      - uses: DavidAnson/markdownlint-cli2-action@510b996878fc0d1a46c8a04ec86b06dbfba09de7
+      - uses: DavidAnson/markdownlint-cli2-action@b4c9feab76d8025d1e83c653fa3990936df0e6c8
         with:
           globs: |
             "**/*.md"

From 2d9b27e91579aa7bf2f795c148469e4da652e77f Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 11 Sep 2023 13:16:44 -0700
Subject: [PATCH 21/27] dotnet: update from .NET 7 to .NET 8

---
 .vscode/launch.json                                           | 4 ++--
 .vscode/tasks.json                                            | 4 ++--
 build/GCM.MSBuild.csproj                                      | 2 +-
 docs/development.md                                           | 4 ++--
 src/linux/Packaging.Linux/Packaging.Linux.csproj              | 2 +-
 src/linux/Packaging.Linux/install-from-source.sh              | 2 +-
 src/linux/Packaging.Linux/layout.sh                           | 2 +-
 src/osx/Installer.Mac/Installer.Mac.csproj                    | 2 +-
 src/osx/Installer.Mac/layout.sh                               | 2 +-
 .../Atlassian.Bitbucket.Tests.csproj                          | 2 +-
 src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj     | 4 ++--
 src/shared/Core.Tests/Core.Tests.csproj                       | 2 +-
 src/shared/Core/Core.csproj                                   | 4 ++--
 src/shared/DotnetTool/DotnetTool.csproj                       | 2 +-
 src/shared/DotnetTool/dotnet-tool.nuspec                      | 2 +-
 src/shared/DotnetTool/layout.sh                               | 2 +-
 .../Git-Credential-Manager/Git-Credential-Manager.csproj      | 4 ++--
 src/shared/GitHub.Tests/GitHub.Tests.csproj                   | 2 +-
 src/shared/GitHub/GitHub.csproj                               | 4 ++--
 src/shared/GitLab.Tests/GitLab.Tests.csproj                   | 2 +-
 src/shared/GitLab/GitLab.csproj                               | 4 ++--
 .../Microsoft.AzureRepos.Tests.csproj                         | 2 +-
 src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj   | 4 ++--
 src/shared/TestInfrastructure/TestInfrastructure.csproj       | 2 +-
 24 files changed, 33 insertions(+), 33 deletions(-)

diff --git a/.vscode/launch.json b/.vscode/launch.json
index af72a8e27..d9b004b86 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -10,7 +10,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net7.0/git-credential-manager.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net8.0/git-credential-manager.dll",
             "args": ["get"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
@@ -22,7 +22,7 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net7.0/git-credential-manager.dll",
+            "program": "${workspaceFolder}/out/shared/Git-Credential-Manager/bin/Debug/net8.0/git-credential-manager.dll",
             "args": ["store"],
             "cwd": "${workspaceFolder}/out/shared/Git-Credential-Manager",
             "console": "integratedTerminal",
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index e47892848..c559b17b8 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -56,7 +56,7 @@
             "type": "shell",
             "group": "test",
             "args": [
-                "~/.nuget/packages/reportgenerator/*/*/net7.0/ReportGenerator.dll",
+                "~/.nuget/packages/reportgenerator/*/*/net8.0/ReportGenerator.dll",
                 "-reports:${workspaceFolder}/**/TestResults/**/coverage.cobertura.xml",
                 "-targetdir:${workspaceFolder}/out/code-coverage"
             ],
@@ -71,7 +71,7 @@
             "type": "shell",
             "group": "test",
             "args": [
-                "${env:USERROFILE}/.nuget/packages/reportgenerator/*/*/net7.0/ReportGenerator.dll",
+                "${env:USERROFILE}/.nuget/packages/reportgenerator/*/*/net8.0/ReportGenerator.dll",
                 "-reports:${workspaceFolder}/**/TestResults/**/coverage.cobertura.xml",
                 "-targetdir:${workspaceFolder}/out/code-coverage"
             ],
diff --git a/build/GCM.MSBuild.csproj b/build/GCM.MSBuild.csproj
index 02f5a8444..3df4909e6 100644
--- a/build/GCM.MSBuild.csproj
+++ b/build/GCM.MSBuild.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IncludeBuildOutput>false</IncludeBuildOutput>
   </PropertyGroup>
 
diff --git a/docs/development.md b/docs/development.md
index 31350192a..7729556f9 100644
--- a/docs/development.md
+++ b/docs/development.md
@@ -209,13 +209,13 @@ HTML reports can be generated using ReportGenerator, this should be installed
 during the build process, from the command line:
 
 ```shell
-dotnet ~/.nuget/packages/reportgenerator/*/*/net7.0/ReportGenerator.dll -reports:./**/TestResults/**/coverage.cobertura.xml -targetdir:./out/code-coverage
+dotnet ~/.nuget/packages/reportgenerator/*/*/net8.0/ReportGenerator.dll -reports:./**/TestResults/**/coverage.cobertura.xml -targetdir:./out/code-coverage
 ```
 
 or
 
 ```shell
-dotnet {$env:USERPROFILE}/.nuget/packages/reportgenerator/*/*/net7.0/ReportGenerator.dll -reports:./**/TestResults/**/coverage.cobertura.xml -targetdir:./out/code-coverage
+dotnet {$env:USERPROFILE}/.nuget/packages/reportgenerator/*/*/net8.0/ReportGenerator.dll -reports:./**/TestResults/**/coverage.cobertura.xml -targetdir:./out/code-coverage
 ```
 
 Or via VSCode Terminal/Run Task:
diff --git a/src/linux/Packaging.Linux/Packaging.Linux.csproj b/src/linux/Packaging.Linux/Packaging.Linux.csproj
index 362ffc230..8b9755c78 100644
--- a/src/linux/Packaging.Linux/Packaging.Linux.csproj
+++ b/src/linux/Packaging.Linux/Packaging.Linux.csproj
@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
diff --git a/src/linux/Packaging.Linux/install-from-source.sh b/src/linux/Packaging.Linux/install-from-source.sh
index df586ce1c..643afb812 100755
--- a/src/linux/Packaging.Linux/install-from-source.sh
+++ b/src/linux/Packaging.Linux/install-from-source.sh
@@ -157,7 +157,7 @@ case "$distribution" in
         # Install dotnet packages and dependencies if needed.
         if [ -z "$(verify_existing_dotnet_installation)" ]; then
             # First try to use native feeds (Ubuntu 22.04 and later).
-            if ! apt_install dotnet7; then
+            if ! apt_install dotnet8; then
                 # If the native feeds fail, we fall back to
                 # packages.microsoft.com. We begin by adding the dotnet package
                 # repository/signing key.
diff --git a/src/linux/Packaging.Linux/layout.sh b/src/linux/Packaging.Linux/layout.sh
index 5f3ba8ca8..6679c39ca 100755
--- a/src/linux/Packaging.Linux/layout.sh
+++ b/src/linux/Packaging.Linux/layout.sh
@@ -38,7 +38,7 @@ GCM_SRC="$SRC/shared/Git-Credential-Manager"
 PROJ_OUT="$OUT/linux/Packaging.Linux"
 
 # Build parameters
-FRAMEWORK=net7.0
+FRAMEWORK=net8.0
 RUNTIME=linux-x64
 
 # Perform pre-execution checks
diff --git a/src/osx/Installer.Mac/Installer.Mac.csproj b/src/osx/Installer.Mac/Installer.Mac.csproj
index e46022374..daabd20d4 100644
--- a/src/osx/Installer.Mac/Installer.Mac.csproj
+++ b/src/osx/Installer.Mac/Installer.Mac.csproj
@@ -3,7 +3,7 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
 
diff --git a/src/osx/Installer.Mac/layout.sh b/src/osx/Installer.Mac/layout.sh
index 544b7e106..ad8e2cfc2 100755
--- a/src/osx/Installer.Mac/layout.sh
+++ b/src/osx/Installer.Mac/layout.sh
@@ -24,7 +24,7 @@ GCM_SRC="$SRC/shared/Git-Credential-Manager"
 GCM_UI_SRC="$SRC/shared/Git-Credential-Manager.UI.Avalonia"
 
 # Build parameters
-FRAMEWORK=net7.0
+FRAMEWORK=net8.0
 
 # Parse script arguments
 for i in "$@"
diff --git a/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj b/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
index 0e3c94c22..d5d08797c 100644
--- a/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
+++ b/src/shared/Atlassian.Bitbucket.Tests/Atlassian.Bitbucket.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj b/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj
index af8285c72..6aab348f8 100644
--- a/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj
+++ b/src/shared/Atlassian.Bitbucket/Atlassian.Bitbucket.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
     <AssemblyName>Atlassian.Bitbucket</AssemblyName>
     <RootNamespace>Atlassian.Bitbucket</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Core.Tests/Core.Tests.csproj b/src/shared/Core.Tests/Core.Tests.csproj
index 4ee2d350e..db045a83b 100644
--- a/src/shared/Core.Tests/Core.Tests.csproj
+++ b/src/shared/Core.Tests/Core.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/shared/Core/Core.csproj b/src/shared/Core/Core.csproj
index 644d07e4e..fde8cb3a0 100644
--- a/src/shared/Core/Core.csproj
+++ b/src/shared/Core/Core.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
     <AssemblyName>gcmcore</AssemblyName>
     <RootNamespace>GitCredentialManager</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/DotnetTool/DotnetTool.csproj b/src/shared/DotnetTool/DotnetTool.csproj
index a951303bb..a1107a4b6 100644
--- a/src/shared/DotnetTool/DotnetTool.csproj
+++ b/src/shared/DotnetTool/DotnetTool.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.Build.NoTargets/3.5.6">
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <PackAsTool>true</PackAsTool>
     <NuSpecFile>dotnet-tool.nuspec</NuSpecFile>
     <!-- Inject correct properties into NuSpec -->
diff --git a/src/shared/DotnetTool/dotnet-tool.nuspec b/src/shared/DotnetTool/dotnet-tool.nuspec
index e707ba27e..cf9ba7444 100644
--- a/src/shared/DotnetTool/dotnet-tool.nuspec
+++ b/src/shared/DotnetTool/dotnet-tool.nuspec
@@ -12,7 +12,7 @@
         </packageTypes>
   </metadata>
   <files>
-    <file src="$publishdir$payload/" target="tools/net7.0/any" />
+    <file src="$publishdir$payload/" target="tools/net8.0/any" />
     <file src="$publishdir$images/icon.png" target="images" />
   </files>
 </package>
diff --git a/src/shared/DotnetTool/layout.sh b/src/shared/DotnetTool/layout.sh
index 44c712650..f5244dbbd 100755
--- a/src/shared/DotnetTool/layout.sh
+++ b/src/shared/DotnetTool/layout.sh
@@ -39,7 +39,7 @@ PROJ_OUT="$OUT/$DOTNET_TOOL"
 CONFIGURATION="${CONFIGURATION:=Debug}"
 
 # Build parameters
-FRAMEWORK=net7.0
+FRAMEWORK=net8.0
 
 # Outputs
 OUTDIR="$PROJ_OUT/nupkg/$CONFIGURATION"
diff --git a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
index bc6dcb061..2b594e3eb 100644
--- a/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
+++ b/src/shared/Git-Credential-Manager/Git-Credential-Manager.csproj
@@ -2,8 +2,8 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;net7.0</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net472;net8.0</TargetFrameworks>
     <RuntimeIdentifiers>win-x86;osx-x64;linux-x64;osx-arm64</RuntimeIdentifiers>
     <PlatformTarget Condition="'$(OSPlatform)'=='windows'">x86</PlatformTarget>
     <AssemblyName>git-credential-manager</AssemblyName>
diff --git a/src/shared/GitHub.Tests/GitHub.Tests.csproj b/src/shared/GitHub.Tests/GitHub.Tests.csproj
index a5cda349e..1b892075e 100644
--- a/src/shared/GitHub.Tests/GitHub.Tests.csproj
+++ b/src/shared/GitHub.Tests/GitHub.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/shared/GitHub/GitHub.csproj b/src/shared/GitHub/GitHub.csproj
index 1de18e7a5..66a4afd79 100644
--- a/src/shared/GitHub/GitHub.csproj
+++ b/src/shared/GitHub/GitHub.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
     <AssemblyName>GitHub</AssemblyName>
     <RootNamespace>GitHub</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/GitLab.Tests/GitLab.Tests.csproj b/src/shared/GitLab.Tests/GitLab.Tests.csproj
index bcd5fe7e8..253c36db4 100644
--- a/src/shared/GitLab.Tests/GitLab.Tests.csproj
+++ b/src/shared/GitLab.Tests/GitLab.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/shared/GitLab/GitLab.csproj b/src/shared/GitLab/GitLab.csproj
index 66017d55e..25c37f2fe 100644
--- a/src/shared/GitLab/GitLab.csproj
+++ b/src/shared/GitLab/GitLab.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
     <AssemblyName>GitLab</AssemblyName>
     <RootNamespace>GitLab</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/Microsoft.AzureRepos.Tests/Microsoft.AzureRepos.Tests.csproj b/src/shared/Microsoft.AzureRepos.Tests/Microsoft.AzureRepos.Tests.csproj
index 8a475c370..01ec9d411 100644
--- a/src/shared/Microsoft.AzureRepos.Tests/Microsoft.AzureRepos.Tests.csproj
+++ b/src/shared/Microsoft.AzureRepos.Tests/Microsoft.AzureRepos.Tests.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <IsPackable>false</IsPackable>
     <IsTestProject>true</IsTestProject>
     <LangVersion>latest</LangVersion>
diff --git a/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj b/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj
index c99f102b3..eaf866bfa 100644
--- a/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj
+++ b/src/shared/Microsoft.AzureRepos/Microsoft.AzureRepos.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net7.0</TargetFrameworks>
-    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net7.0;net472</TargetFrameworks>
+    <TargetFrameworks>net8.0</TargetFrameworks>
+    <TargetFrameworks Condition="'$(OSPlatform)'=='windows'">net8.0;net472</TargetFrameworks>
     <AssemblyName>Microsoft.AzureRepos</AssemblyName>
     <RootNamespace>Microsoft.AzureRepos</RootNamespace>
     <IsTestProject>false</IsTestProject>
diff --git a/src/shared/TestInfrastructure/TestInfrastructure.csproj b/src/shared/TestInfrastructure/TestInfrastructure.csproj
index 467df5c3c..569b64cd5 100644
--- a/src/shared/TestInfrastructure/TestInfrastructure.csproj
+++ b/src/shared/TestInfrastructure/TestInfrastructure.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <RootNamespace>GitCredentialManager.Tests</RootNamespace>
     <IsPackable>false</IsPackable>
     <IsTestProject>false</IsTestProject>

From 6144b5fa2198d01cc2e6cac96b0819d434e084f0 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Wed, 20 Sep 2023 13:43:29 -0700
Subject: [PATCH 22/27] ci: install .NET 8 SDK in CI and builds

---
 .github/workflows/codeql-analysis.yml        |  5 +++++
 .github/workflows/continuous-integration.yml |  6 +++---
 .github/workflows/release.yml                | 16 ++++++++--------
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index 27274d812..dba63ecf0 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -24,6 +24,11 @@ jobs:
     steps:
     - uses: actions/checkout@v4
 
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v3.2.0
+      with:
+        dotnet-version: 8.0.x
+
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
       uses: github/codeql-action/init@v3
diff --git a/.github/workflows/continuous-integration.yml b/.github/workflows/continuous-integration.yml
index 4482f0b18..1b83a990d 100644
--- a/.github/workflows/continuous-integration.yml
+++ b/.github/workflows/continuous-integration.yml
@@ -21,7 +21,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 6.0.201
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore
@@ -61,7 +61,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 6.0.201
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore
@@ -102,7 +102,7 @@ jobs:
     - name: Setup .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 6.0.201
+        dotnet-version: 8.0.x
 
     - name: Install dependencies
       run: dotnet restore
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
index 81af37da3..1d044b48e 100644
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -37,7 +37,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: |
@@ -152,7 +152,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: |
@@ -192,7 +192,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build with signed payload
       run: |
@@ -238,7 +238,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build
       run: dotnet build --configuration=LinuxRelease
@@ -316,7 +316,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build .NET tool
       run: |
@@ -404,7 +404,7 @@ jobs:
     - name: Set up .NET
       uses: actions/setup-dotnet@v4.0.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Package tool
       run: |
@@ -508,7 +508,7 @@ jobs:
       - name: Set up .NET
         uses: actions/setup-dotnet@v4.0.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Download artifacts
         uses: actions/download-artifact@v4
@@ -578,7 +578,7 @@ jobs:
       - name: Set up .NET
         uses: actions/setup-dotnet@v4.0.0
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - name: Download artifacts
         uses: actions/download-artifact@v4

From beaf40dbbbeafa08da1242f6218173c1fa0d1bd6 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 15 Apr 2024 16:17:02 -0700
Subject: [PATCH 23/27] install-from-source.sh: update to .NET 8 SDK

Update the install from source script on Linux to install the .NET 8
SDK.
---
 src/linux/Packaging.Linux/install-from-source.sh | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/linux/Packaging.Linux/install-from-source.sh b/src/linux/Packaging.Linux/install-from-source.sh
index 643afb812..751e57f53 100755
--- a/src/linux/Packaging.Linux/install-from-source.sh
+++ b/src/linux/Packaging.Linux/install-from-source.sh
@@ -83,7 +83,7 @@ ensure_dotnet_installed() {
     if [ -z "$(verify_existing_dotnet_installation)" ]; then
         curl -LO https://dot.net/v1/dotnet-install.sh
         chmod +x ./dotnet-install.sh
-        bash -c "./dotnet-install.sh --channel 7.0"
+        bash -c "./dotnet-install.sh --channel 8.0"
 
         # Since we have to run the dotnet install script with bash, dotnet isn't
         # added to the process PATH, so we manually add it here.
@@ -98,7 +98,7 @@ verify_existing_dotnet_installation() {
     sdks=$(dotnet --list-sdks | cut -c 1-3)
 
     # If we have a supported version installed, return.
-    supported_dotnet_versions="7.0"
+    supported_dotnet_versions="8.0"
     for v in $supported_dotnet_versions; do
         if [ $(echo $sdks | grep "$v") ]; then
             echo $sdks
@@ -173,7 +173,7 @@ case "$distribution" in
                 $sudo_cmd apt update
                 $sudo_cmd apt install apt-transport-https -y
                 $sudo_cmd apt update
-                $sudo_cmd apt install dotnet-sdk-7.0 dpkg-dev -y
+                $sudo_cmd apt install dotnet-sdk-8.0 dpkg-dev -y
             fi
         fi
     ;;

From d992bbf2c67ce5785ec80fa1fd52f84557d0d818 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 15 Apr 2024 16:28:34 -0700
Subject: [PATCH 24/27] VERSION: bump to version 2.5 for next release

---
 VERSION | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/VERSION b/VERSION
index 42dece39c..e975051fc 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-2.4.1.0
+2.5.0.0

From 7cda9db4ff0b39bbe97252219962553acaad4785 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 15 Apr 2024 17:57:50 -0700
Subject: [PATCH 25/27] install-from-source.sh: fix libssl Alpine pkgs

The version of libssl available in the Alpine package feeds changed with
version 3.15. The latest libssl package is 1.1 in 3.14.x and earlier,
but newer versions only have libssl3.

Add a check for the Alpine version in the install from source script and
switch between installing libssl3 and libssl1.1 depending on the distro
version.

Also add another entry to the test matrix of distributions to include a
3.14.x Alpine version.
---
 .github/workflows/validate-install-from-source.yml |  1 +
 src/linux/Packaging.Linux/install-from-source.sh   | 13 ++++++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/validate-install-from-source.yml b/.github/workflows/validate-install-from-source.yml
index ff28dc85c..ca57d2daf 100644
--- a/.github/workflows/validate-install-from-source.yml
+++ b/.github/workflows/validate-install-from-source.yml
@@ -24,6 +24,7 @@ jobs:
         - image: tgagor/centos-stream
         - image: redhat/ubi8
         - image: alpine
+        - image: alpine:3.14.10
         - image: opensuse/leap
         - image: opensuse/tumbleweed
         - image: registry.suse.com/suse/sle15:15.4.27.11.31
diff --git a/src/linux/Packaging.Linux/install-from-source.sh b/src/linux/Packaging.Linux/install-from-source.sh
index 751e57f53..be6ea1579 100755
--- a/src/linux/Packaging.Linux/install-from-source.sh
+++ b/src/linux/Packaging.Linux/install-from-source.sh
@@ -137,6 +137,10 @@ print_unsupported_distro() {
     echo "See https://gh.io/gcm/linux for details."
 }
 
+version_at_least() {
+	[ "$(printf '%s\n' "$1" "$2" | sort -V | head -n1)" = "$1" ]
+}
+
 sudo_cmd=
 
 # If the user isn't root, we need to use `sudo` for certain commands
@@ -189,7 +193,14 @@ case "$distribution" in
         $sudo_cmd apk update
 
         # Install dotnet/GCM dependencies.
-        install_packages apk add "curl git icu-libs krb5-libs libgcc libintl libssl1.1 libstdc++ zlib which bash coreutils gcompat"
+        # Alpine 3.14 and earlier need libssl1.1, while later versions need libssl3.
+        if ( version_at_least "3.15" $version ) then
+            libssl_pkg="libssl3"
+        else
+            libssl_pkg="libssl1.1"
+        fi
+
+        install_packages apk add "curl git icu-libs krb5-libs libgcc libintl $libssl_pkg libstdc++ zlib which bash coreutils gcompat"
 
         ensure_dotnet_installed
     ;;

From 6931c9275780477eae6b682a542c739924d44a36 Mon Sep 17 00:00:00 2001
From: Matthew John Cheetham <mjcheetham@outlook.com>
Date: Mon, 15 Apr 2024 18:24:45 -0700
Subject: [PATCH 26/27] azrepos: fix error message to stderr when not in repo

Suppress the standard error stream from Git when checking if we're
inside a repository or not, because the failure message is otherwise
printed to the user's console when we are not (which is what we're
trying to decide!).

Note that we normally don't suppress or redirect the standard error
stream for Git commands as the user may have enabled Git tracing (v1 or
v2) to the stderr file and we don't want to mute these for all calls.
---
 src/shared/Core/Git.cs                        | 31 +++++++++++++------
 .../TestInfrastructure/Objects/TestGit.cs     |  2 ++
 2 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/src/shared/Core/Git.cs b/src/shared/Core/Git.cs
index b63e0fe3d..0c58e0159 100644
--- a/src/shared/Core/Git.cs
+++ b/src/shared/Core/Git.cs
@@ -20,6 +20,12 @@ public interface IGit
         /// <returns>Process object ready to be started.</returns>
         ChildProcess CreateProcess(string args);
 
+        /// <summary>
+        /// Returns true if the current Git instance is scoped to a local repository.
+        /// </summary>
+        /// <returns>True if inside a local Git repository, false otherwise.</returns>
+        bool IsInsideRepository();
+
         /// <summary>
         /// Return the path to the current repository, or null if this instance is not
         /// scoped to a Git repository.
@@ -119,10 +125,26 @@ public IGitConfiguration GetConfiguration()
             return new GitProcessConfiguration(_trace, this);
         }
 
+        public bool IsInsideRepository()
+        {
+            return !string.IsNullOrWhiteSpace(GetCurrentRepositoryInternal(suppressStreams: true));
+        }
+
         public string GetCurrentRepository()
+        {
+            return GetCurrentRepositoryInternal(suppressStreams: false);
+        }
+
+        private string GetCurrentRepositoryInternal(bool suppressStreams)
         {
             using (var git = CreateProcess("rev-parse --absolute-git-dir"))
             {
+                // Redirect standard error to ensure any error messages are captured and not exposed to the user's console
+                if (suppressStreams)
+                {
+                    git.StartInfo.RedirectStandardError = true;
+                }
+
                 git.Start(Trace2ProcessClass.Git);
                 string data = git.StandardOutput.ReadToEnd();
                 git.WaitForExit();
@@ -270,14 +292,5 @@ public GitException(string message, string gitErrorMessage, int exitCode)
 
     public static class GitExtensions
     {
-        /// <summary>
-        /// Returns true if the current Git instance is scoped to a local repository.
-        /// </summary>
-        /// <param name="git">Git object.</param>
-        /// <returns>True if inside a local Git repository, false otherwise.</returns>
-        public static bool IsInsideRepository(this IGit git)
-        {
-            return !string.IsNullOrWhiteSpace(git.GetCurrentRepository());
-        }
     }
 }
diff --git a/src/shared/TestInfrastructure/Objects/TestGit.cs b/src/shared/TestInfrastructure/Objects/TestGit.cs
index 27ddba9b3..f7a93a372 100644
--- a/src/shared/TestInfrastructure/Objects/TestGit.cs
+++ b/src/shared/TestInfrastructure/Objects/TestGit.cs
@@ -33,6 +33,8 @@ public ChildProcess CreateProcess(string args)
             throw new NotImplementedException();
         }
 
+        bool IGit.IsInsideRepository() => !string.IsNullOrWhiteSpace(CurrentRepository);
+
         string IGit.GetCurrentRepository() => CurrentRepository;
 
         IEnumerable<GitRemote> IGit.GetRemotes() => Remotes;

From 9ec175b9690112868575dc8a3719193786ae7533 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 16 Apr 2024 20:07:09 +0000
Subject: [PATCH 27/27] build(deps): bump actions/setup-dotnet from 3.2.0 to
 4.0.0

Bumps [actions/setup-dotnet](https://github.com/actions/setup-dotnet) from 3.2.0 to 4.0.0.
- [Release notes](https://github.com/actions/setup-dotnet/releases)
- [Commits](https://github.com/actions/setup-dotnet/compare/v3.2.0...v4.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-dotnet
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/codeql-analysis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index dba63ecf0..dc252805a 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -25,7 +25,7 @@ jobs:
     - uses: actions/checkout@v4
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@v3.2.0
+      uses: actions/setup-dotnet@v4.0.0
       with:
         dotnet-version: 8.0.x