diff --git a/.releaseindex.json b/.releaseindex.json index ea258888..b6dc4ed1 100644 --- a/.releaseindex.json +++ b/.releaseindex.json @@ -1,5 +1,5 @@ { - "Linux":"Libation.\\d+.\\d+.\\d+-linux-chardonnay", - "WindowsClassic":"Libation.\\d+.\\d+.\\d+-win-classic.zip", - "WindowsAvalonia":"Libation.\\d+.\\d+.\\d+-win-chardonnay" + "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip", + "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip", + "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay" } diff --git a/Source/AppScaffolding/LibationScaffolding.cs b/Source/AppScaffolding/LibationScaffolding.cs index c2bdce85..92d69327 100644 --- a/Source/AppScaffolding/LibationScaffolding.cs +++ b/Source/AppScaffolding/LibationScaffolding.cs @@ -313,7 +313,7 @@ namespace AppScaffolding { WindowsClassic, WindowsAvalonia, - Linux + LinuxAvalonia } public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic) @@ -362,15 +362,18 @@ namespace AppScaffolding } private static async System.Threading.Tasks.Task getLatestRelease(ReleaseIdentifier releaseID) { - var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue("Libation")); + var ownerAccount = "rmcrackan"; + var repoName = "Libation"; + + var gitHubClient = new Octokit.GitHubClient(new Octokit.ProductHeaderValue(repoName)); //Download the release index - var bts = await gitHubClient.Repository.Content.GetRawContent("Mbucari", "Libation", ".releaseindex.json"); + var bts = await gitHubClient.Repository.Content.GetRawContent(ownerAccount, repoName, ".releaseindex.json"); var releaseIndex = JObject.Parse(System.Text.Encoding.ASCII.GetString(bts)); var regexPattern = releaseIndex.Value(releaseID.ToString()); // https://octokitnet.readthedocs.io/en/latest/releases/ - var releases = await gitHubClient.Repository.Release.GetAll("rmcrackan", "Libation"); + var releases = await gitHubClient.Repository.Release.GetAll(ownerAccount, repoName); var regex = new System.Text.RegularExpressions.Regex(regexPattern, System.Text.RegularExpressions.RegexOptions.IgnoreCase); var latest = releases.FirstOrDefault(r => !r.Draft && !r.Prerelease && r.Assets.Any(a => regex.IsMatch(a.Name)));