From f04a5e01681d61a83f611651f9fc48497b3c6542 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Wed, 27 Jul 2022 16:36:18 -0400 Subject: [PATCH 1/5] tweaks to getLatestRelease --- .releaseindex.json | 6 +++--- Source/AppScaffolding/LibationScaffolding.cs | 11 +++++++---- 2 files changed, 10 insertions(+), 7 deletions(-) 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))); From b12bef81bd08ae66fcd0e4f7735ac6126af7185e Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Thu, 28 Jul 2022 09:36:12 -0400 Subject: [PATCH 2/5] These stupid unused language packs are 40% of our disk usage. And the SatelliteResourceLanguages bug *still* isn't fixed --- Source/LibationAvalonia/LibationAvalonia.csproj | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index 06e66b4d..3c3e301e 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -16,6 +16,16 @@ + + + en;es + + ..\bin-Avalonia\Debug embedded From 8effdcb92dfc895bf4288cd6dd941ba3b9f72c24 Mon Sep 17 00:00:00 2001 From: Robert McRackan Date: Thu, 28 Jul 2022 10:43:00 -0400 Subject: [PATCH 3/5] add macos publish options. standardize publish profiles --- .releaseindex.json | 3 ++- Source/AppScaffolding/LibationScaffolding.cs | 3 ++- ...olderProfile.pubxml => WindowsProfile.pubxml} | 0 Source/LibationAvalonia/LibationAvalonia.csproj | 4 ++-- .../PublishProfiles/MacOSProfile.pubxml | 16 ++++++++++++++++ ...olderProfile.pubxml => WindowsProfile.pubxml} | 3 ++- .../PublishProfiles/LinuxProfile.pubxml | 2 +- .../PublishProfiles/MacOSProfile.pubxml | 16 ++++++++++++++++ ...olderProfile.pubxml => WindowsProfile.pubxml} | 0 ...olderProfile.pubxml => WindowsProfile.pubxml} | 0 10 files changed, 41 insertions(+), 6 deletions(-) rename Source/Hangover/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%) create mode 100644 Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml rename Source/LibationAvalonia/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (69%) create mode 100644 Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml rename Source/LibationCli/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%) rename Source/LibationWinForms/Properties/PublishProfiles/{FolderProfile.pubxml => WindowsProfile.pubxml} (100%) diff --git a/.releaseindex.json b/.releaseindex.json index b6dc4ed1..d3a35438 100644 --- a/.releaseindex.json +++ b/.releaseindex.json @@ -1,5 +1,6 @@ { "WindowsClassic": "Libation\\.\\d+\\.\\d+\\.\\d+-win-classic\\.zip", "WindowsAvalonia":"Libation\\.\\d+\\.\\d+\\.\\d+-win-chardonnay\\.zip", - "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay" + "LinuxAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-linux-chardonnay", + "MacOSAvalonia": "Libation\\.\\d+\\.\\d+\\.\\d+-macos-chardonnay" } diff --git a/Source/AppScaffolding/LibationScaffolding.cs b/Source/AppScaffolding/LibationScaffolding.cs index 92d69327..68362cf7 100644 --- a/Source/AppScaffolding/LibationScaffolding.cs +++ b/Source/AppScaffolding/LibationScaffolding.cs @@ -313,7 +313,8 @@ namespace AppScaffolding { WindowsClassic, WindowsAvalonia, - LinuxAvalonia + LinuxAvalonia, + MacOSAvalonia } public static UpgradeProperties GetLatestRelease(ReleaseIdentifier releaseID = ReleaseIdentifier.WindowsClassic) diff --git a/Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml b/Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 100% rename from Source/Hangover/Properties/PublishProfiles/FolderProfile.pubxml rename to Source/Hangover/Properties/PublishProfiles/WindowsProfile.pubxml diff --git a/Source/LibationAvalonia/LibationAvalonia.csproj b/Source/LibationAvalonia/LibationAvalonia.csproj index 3c3e301e..8b3f9e96 100644 --- a/Source/LibationAvalonia/LibationAvalonia.csproj +++ b/Source/LibationAvalonia/LibationAvalonia.csproj @@ -27,12 +27,12 @@ - ..\bin-Avalonia\Debug + ..\bin\Avalonia\Debug embedded - ..\bin-Avalonia\Release + ..\bin\Avalonia\Release embedded diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml new file mode 100644 index 00000000..2fc8471a --- /dev/null +++ b/Source/LibationAvalonia/Properties/PublishProfiles/MacOSProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\bin-Avalonia\publish\osx-x64\ + FileSystem + net6.0 + osx-x64 + false + false + + \ No newline at end of file diff --git a/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 69% rename from Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml rename to Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml index 7a5531a3..34da8075 100644 --- a/Source/LibationAvalonia/Properties/PublishProfiles/FolderProfile.pubxml +++ b/Source/LibationAvalonia/Properties/PublishProfiles/WindowsProfile.pubxml @@ -6,7 +6,8 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin\publish\linux-x64\ + + ..\bin\publish\win-avalonia-x64\ FileSystem net6.0 win-x64 diff --git a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml index fe716d12..4f12172b 100644 --- a/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml +++ b/Source/LibationCli/Properties/PublishProfiles/LinuxProfile.pubxml @@ -6,7 +6,7 @@ https://go.microsoft.com/fwlink/?LinkID=208121. Release Any CPU - ..\bin-Avalonia\publish\linux-x64 + ..\bin-Avalonia\publish\linux-x64\ FileSystem net6.0 linux-x64 diff --git a/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml new file mode 100644 index 00000000..2fc8471a --- /dev/null +++ b/Source/LibationCli/Properties/PublishProfiles/MacOSProfile.pubxml @@ -0,0 +1,16 @@ + + + + + Release + Any CPU + ..\bin-Avalonia\publish\osx-x64\ + FileSystem + net6.0 + osx-x64 + false + false + + \ No newline at end of file diff --git a/Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 100% rename from Source/LibationCli/Properties/PublishProfiles/FolderProfile.pubxml rename to Source/LibationCli/Properties/PublishProfiles/WindowsProfile.pubxml diff --git a/Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml b/Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml similarity index 100% rename from Source/LibationWinForms/Properties/PublishProfiles/FolderProfile.pubxml rename to Source/LibationWinForms/Properties/PublishProfiles/WindowsProfile.pubxml From 7b3a25e45a4c20fe4ffda4a6c340a6e69a63a102 Mon Sep 17 00:00:00 2001 From: Mbucari <37587114+Mbucari@users.noreply.github.com> Date: Thu, 28 Jul 2022 09:42:33 -0600 Subject: [PATCH 4/5] Create bug report template --- .github/ISSUE_TEMPLATE/bug_report.md | 31 ++++++++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..6eec1d52 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve Libation +title: '' +labels: bug +assignees: '' +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: + +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Platform** + +[e.g. Windows 10, Windows 11, Mac, Linux (State distribution)] + +**Log Files** +Attach your Libation log file here. From 16b0feeb823b21b174d3d32dbb211fc97f2299dd Mon Sep 17 00:00:00 2001 From: Mbucari <37587114+Mbucari@users.noreply.github.com> Date: Thu, 28 Jul 2022 09:43:11 -0600 Subject: [PATCH 5/5] Create feature request template --- .github/ISSUE_TEMPLATE/feature_request.md | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..5f0a04ce --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,19 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: enhancement +assignees: '' +--- + +**Is your feature request related to a problem? Please describe.** +A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** +A clear and concise description of what you want to happen. + +**Describe alternatives you've considered** +A clear and concise description of any alternative solutions or features you've considered. + +**Additional context** +Add any other context or screenshots about the feature request here.