Skip to content

Commit

Permalink
Switch to a new versioning strategy
Browse files Browse the repository at this point in the history
  • Loading branch information
Tyrrrz committed Nov 23, 2023
1 parent f47b782 commit 2221504
Show file tree
Hide file tree
Showing 8 changed files with 8 additions and 165 deletions.
7 changes: 5 additions & 2 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -79,12 +79,15 @@ jobs:
- name: Publish app
run: >
dotnet publish LightBulb
-p:Version=${{ github.ref_type == 'tag' && github.ref_name || '0.0.0' }}
-p:CSharpier_Bypass=true
--output LightBulb/bin/publish/
--configuration Release
- name: Create installer
shell: pwsh
env:
INSTALLER_APP_VERSION: ${{ github.ref_type == 'tag' && github.ref_name || '0.0.0' }}
run: |
choco install innosetup --no-progress
Copy-Item -Path LightBulb/bin/publish/ -Recurse -Destination Installer/Source/
Expand Down Expand Up @@ -143,7 +146,7 @@ jobs:
LightBulb-Installer.exe
--repo ${{ github.event.repository.full_name }}
--title ${{ github.ref_name }}
--notes "[Changelog](${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md)"
--notes-from-tag
--verify-tag
notify:
Expand All @@ -163,6 +166,6 @@ jobs:
body: |
{
"avatar_url": "https://raw.githubusercontent.com/${{ github.event.repository.full_name }}/${{ github.ref_name }}/favicon.png",
"content": "**${{ github.event.repository.name }}** v${{ github.ref_name }} has been released!\n🔗 [Download](<${{ github.event.repository.html_url }}/releases/tag/${{ github.ref_name }}>) • [Changelog](<${{ github.event.repository.html_url }}/blob/${{ github.ref_name }}/Changelog.md>)"
"content": "**${{ github.event.repository.name }}** v${{ github.ref_name }} has been released!\n[Download](<${{ github.event.repository.html_url }}/releases/tag/${{ github.ref_name }}>)"
}
retry-count: 5
145 changes: 0 additions & 145 deletions Changelog.md

This file was deleted.

1 change: 0 additions & 1 deletion Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@

<PropertyGroup>
<TargetFramework>net8.0-windows</TargetFramework>
<Version>2.4.7</Version>
<Company>Tyrrrz</Company>
<Copyright>Copyright (C) Oleksii Holub</Copyright>
<LangVersion>preview</LangVersion>
Expand Down
2 changes: 1 addition & 1 deletion Installer/Installer.iss
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#define AppName "LightBulb"
#define AppVersion "2.4.7"
#define AppVersion GetEnv("INSTALLER_APP_VERSION")

[Setup]
AppId={{892F745F-A497-42ED-B503-8D74936D0BEB}
Expand Down
2 changes: 0 additions & 2 deletions LightBulb.sln
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightBulb.WindowsApi", "Lig
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{BE19AEAD-02BC-4F40-AC14-D30082A5E78B}"
ProjectSection(SolutionItems) = preProject
Changelog.md = Changelog.md
License.txt = License.txt
ReadMe.md = ReadMe.md
Directory.Build.props = Directory.Build.props
UpdateVersion.ps1 = UpdateVersion.ps1
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LightBulb.Core.Tests", "LightBulb.Core.Tests\LightBulb.Core.Tests.csproj", "{6DE898D9-0BAF-4C96-B19A-FCFCF8CE046F}"
Expand Down
2 changes: 1 addition & 1 deletion LightBulb/App.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ public partial class App
public static string ExecutableFilePath { get; } =
Path.ChangeExtension(Assembly.Location, "exe");

public static string GitHubProjectUrl { get; } = "https://github.com/Tyrrrz/LightBulb";
public static string ProjectUrl { get; } = "https://github.com/Tyrrrz/LightBulb";
}

public partial class App
Expand Down
2 changes: 1 addition & 1 deletion LightBulb/ViewModels/RootViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -140,7 +140,7 @@ public async void OnViewFullyLoaded()
public async void ShowSettings() =>
await _dialogManager.ShowDialogAsync(_viewModelFactory.CreateSettingsViewModel());

public void ShowAbout() => ProcessEx.StartShellExecute(App.GitHubProjectUrl);
public void ShowAbout() => ProcessEx.StartShellExecute(App.ProjectUrl);

public void Exit() => Application.Current.Shutdown();

Expand Down
12 changes: 0 additions & 12 deletions UpdateVersion.ps1

This file was deleted.

0 comments on commit 2221504

Please sign in to comment.