Handle exception when creating a reference immediately after creating fork

README.md

@@ -39,7 +39,7 @@ Click on the individual commands to learn more.
 
 You can use WingetCreate to update your existing app manifest as part of your CI/CD pipeline. For reference, see the final task in this repo's [release Azure pipeline](https://github.com/microsoft/winget-create/blob/main/pipelines/azure-pipelines.release.yml).
 
-Unfortunately we can't use the msixbundle in a standard Azure Pipeline pool. Instead, use the standalone exe, the latest version of which can be found at https://aka.ms/wingetcreate/latest, and the latest preview version can be found at https://aka.ms/wingetcreate/preview, both of these require .NET to be installed on the build machine.
+Unfortunately, we can't use the msixbundle in a standard Azure Pipeline pool. Instead, use the standalone exe, the latest version of which can be found at https://aka.ms/wingetcreate/latest, and the latest preview version can be found at https://aka.ms/wingetcreate/preview, both of these require .NET to be installed on the build machine.
 
 If .NET isn't already installed, you can use https://aka.ms/wingetcreate/latest/self-contained or https://aka.ms/wingetcreate/preview/self-contained, which has .NET built-in, but is a larger download.
 
@@ -52,6 +52,17 @@ Then simply add a new powershell task to download the exe, and run it to update
 
 The CLI also supports creating or updating manifests with multiple installer URLs. You can either create new manifests with multiple installer nodes using the [New Command](doc/new.md) or update existing manifests with multiple installer URLs using the [Update Command](doc/update.md). 
 
+## Using your GitHub Personal Access Token
+
+When [creating your own GitHub Personal Access Token (PAT)](https://docs.github.com/en/github/authenticating-to-github/keeping-your-account-and-data-secure/creating-a-personal-access-token) to be used with WingetCreate, make sure you verify the following steps are completed:
+
+- [Authorizing your personal access token for use with SAML single sign-on](https://docs.github.com/en/github/authenticating-to-github/authenticating-with-saml-single-sign-on/authorizing-a-personal-access-token-for-use-with-saml-single-sign-on)
+- Selecting the **public_repo** scope to allow access to public repositories
+
+![public_repo scope](./doc/images/tokenscope-publicrepo.png)
+
+- (Optional) Selecting the **delete_repo** scope permission if you want WingetCreate to automatically delete the forked repo that it created if the PR submission fails.
+
 ## Building the client
 
 ### Prerequisites

src/WingetCreateCore/Common/GitHub.cs

@@ -12,6 +12,7 @@ namespace Microsoft.WingetCreateCore.Common
     using Jose;
     using Microsoft.WingetCreateCore.Models;
     using Octokit;
+    using Polly;
 
     /// <summary>
     /// Provides functionality for interacting a user's GitHub account.
@@ -307,8 +308,11 @@ private async Task<PullRequest> SubmitPRAsync(string packageId, string version,
             Reference newBranch = null;
             try
             {
-                // Create new branch synced to upstream master
-                await this.github.Git.Reference.Create(repo.Id, new NewReference($"refs/{newBranchNameHeads}", upstreamMasterSha));
+                var retryPolicy = Policy.Handle<ApiException>().WaitAndRetryAsync(3, i => TimeSpan.FromSeconds(2));
+                await retryPolicy.ExecuteAsync(async () =>
+                {
+                    await this.github.Git.Reference.Create(repo.Id, new NewReference($"refs/{newBranchNameHeads}", upstreamMasterSha));
+                });
 
                 // Update from upstream branch master
                 newBranch = await this.github.Git.Reference.Update(repo.Id, newBranchNameHeads, new ReferenceUpdate(upstreamMasterSha));
@@ -344,7 +348,14 @@ private async Task<PullRequest> SubmitPRAsync(string packageId, string version,
                 // On error, cleanup created branch/repo before re-throwing
                 if (createdRepo)
                 {
-                    await this.github.Repository.Delete(repo.Id);
+                    try
+                    {
+                        await this.github.Repository.Delete(repo.Id);
+                    }
+                    catch (ForbiddenException)
+                    {
+                        // If we fail to delete the fork, the user did not provide a token with the "delete_repo" permission. Do nothing.
+                    }
                 }
                 else if (newBranch != null)
                 {

src/WingetCreateCore/WingetCreateCore.csproj

@@ -26,6 +26,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
+    <PackageReference Include="Polly" Version="7.2.2" />
     <PackageReference Include="RestSharp" Version="106.11.8-alpha.0.13" />
     <PackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.261">
       <PrivateAssets>all</PrivateAssets>