Merge branch 'main' into description-fixes

Author: digimangos

LATEST-VERSION.txt

@@ -1 +1 @@
-v1.17.0
+v1.18.0

docs/ContributingCode.md

@@ -66,20 +66,20 @@ There are 3 types of static analysis that are enforced on every PR:
 3. dotnet format - This is a style/formatting check. To ensure we follow consistent code formatting you should run `dotnet format` locally before creating a PR. If the PR build fails on dotnet format it's almost certainly because you didn't run dotnet format before committing.
 
 ## Publishing a Release
-Only repo maintainers can publish a release. The process is kicked off by pushing a tag in the format `v0.7`. We follow [Semantic Versioning](https://semver.org/) when deciding on the next version number.
+Only repo maintainers can publish a release. The process is kicked off by pushing a tag in the format `v1.18.0`. We follow [Semantic Versioning](https://semver.org/) when deciding on the next version number.
 
 ### How to publish a release
 
-1. Check [`RELEASENOTES.md`](http://releasenotes.md/) to see if there is anything to release.
+1. Check [`RELEASENOTES.md`](/RELEASENOTES.md) to see if there is anything to release.
 2. Switch to the `main` branch and `pull` the latest.
 3. *optional* List the tags e.g. `git tag`
-4. Tag the version e.g. `git tag v5.0`
+4. Tag the version e.g. `git tag v1.18.0`
 5. Push the tags up e.g. `git push --tags`
 6. This will trigger an Actions workflow that results in a new release being published, once the build is done it will wait for approval(from maintainers) in order to `pushlish` the binaries. The workflow does the following steps:
     - Validates that the SHA referenced by the tag is in the history of the `main` branch
     - Runs `publish.ps1` to build self-contained binaries for each platform. This script also embeds the version number (extracted from the tag) into each binary.
-    - Creates a release in this repo with the self-contained binaries, uses the contents of `RELEASENOTES.md` as the release description.
-    - Moves the contents of `[RELEASENOTES.md](http://RELEASENOTES.md)` to a version specific file under the name of the created `tag` in the releasenotes folder, then empties out `RELEASENOTES.md` and commits the 2 files.
+    - Creates a release in this repo with the self-contained binaries, uses the contents of [`RELEASENOTES.md`](/RELEASENOTES.md) as the release description.
+    - Moves the contents of [`RELEASENOTES.md`](/RELEASENOTES.md) to a version specific file under the name of the created `tag` in the releasenotes folder, then empties out [`RELEASENOTES.md`](/RELEASENOTES.md) and commits the 2 files.
 
 ## Development Basics
 

releasenotes/v1.18.0.md

@@ -0,0 +1 @@
+- Add --target-uploads-url option to support GitHub-owned storage uploads to locations other than uploads.github.com.

src/Octoshift/Commands/CreateTeam/CreateTeamCommandBase.cs

@@ -43,7 +43,7 @@ public override CreateTeamCommandHandler BuildHandler(CreateTeamCommandArgs args
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
 
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
 
         return new CreateTeamCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/DownloadLogs/DownloadLogsCommandBase.cs

@@ -67,7 +67,7 @@ public override DownloadLogsCommandHandler BuildHandler(DownloadLogsCommandArgs
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.GithubApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.GithubApiUrl, null, args.GithubPat);
         var httpDownloadServiceFactory = sp.GetRequiredService<HttpDownloadServiceFactory>();
         var httpDownloadService = httpDownloadServiceFactory.CreateDefaultWithRedirects();
         var retryPolicy = sp.GetRequiredService<RetryPolicy>();

src/Octoshift/Commands/GenerateMannequinCsv/GenerateMannequinCsvCommandBase.cs

@@ -56,7 +56,7 @@ public override GenerateMannequinCsvCommandHandler BuildHandler(GenerateMannequi
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
 
         return new GenerateMannequinCsvCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/GrantMigratorRole/GrantMigratorRoleCommandBase.cs

@@ -53,7 +53,7 @@ public override GrantMigratorRoleCommandHandler BuildHandler(GrantMigratorRoleCo
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
         var apiUrl = args.TargetApiUrl ?? args.GhesApiUrl;
-        var githubApi = githubApiFactory.Create(apiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(apiUrl, null, args.GithubPat);
 
         return new GrantMigratorRoleCommandHandler(log, githubApi);
     }

src/Octoshift/Commands/ReclaimMannequin/ReclaimMannequinCommandBase.cs

@@ -88,7 +88,7 @@ public override ReclaimMannequinCommandHandler BuildHandler(ReclaimMannequinComm
 
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
-        var githubApi = githubApiFactory.Create(args.TargetApiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(args.TargetApiUrl, null, args.GithubPat);
         var reclaimService = new ReclaimService(githubApi, log);
         var confirmationService = sp.GetRequiredService<ConfirmationService>();
 

src/Octoshift/Commands/RevokeMigratorRole/RevokeMigratorRoleCommandBase.cs

@@ -42,7 +42,7 @@ public override RevokeMigratorRoleCommandHandler BuildHandler(RevokeMigratorRole
         var log = sp.GetRequiredService<OctoLogger>();
         var githubApiFactory = sp.GetRequiredService<ITargetGithubApiFactory>();
         var apiUrl = args.TargetApiUrl ?? args.GhesApiUrl;
-        var githubApi = githubApiFactory.Create(apiUrl, args.GithubPat);
+        var githubApi = githubApiFactory.Create(apiUrl, null, args.GithubPat);
 
         return new RevokeMigratorRoleCommandHandler(log, githubApi);
     }

src/Octoshift/Contracts/ISourceGithubApiFactory.cs

@@ -4,6 +4,6 @@ namespace OctoshiftCLI.Contracts;
 
 public interface ISourceGithubApiFactory
 {
-    GithubApi Create(string apiUrl = null, string sourcePersonalAccessToken = null);
-    GithubApi CreateClientNoSsl(string apiUrl = null, string sourcePersonalAccessToken = null);
+    GithubApi Create(string apiUrl = null, string uploadsUrl = null, string sourcePersonalAccessToken = null);
+    GithubApi CreateClientNoSsl(string apiUrl = null, string uploadsUrl = null, string sourcePersonalAccessToken = null);
 }