Skip to content

Commit

Permalink
Move WPF version to AssemblyInfo (#1183)
Browse files Browse the repository at this point in the history
* Specify WPF version in AssemblyInfo
This fixes an issue with upgrading settings since the default settings provider uses the assembly version for upgrading.

* Strip revision from assembly version
  • Loading branch information
ScrubN authored Aug 6, 2024
1 parent 9c1d83e commit 04963e1
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 3 deletions.
9 changes: 9 additions & 0 deletions TwitchDownloaderWPF/Extensions/VersionExtensions.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
using System;

namespace TwitchDownloaderWPF.Extensions
{
public static class VersionExtensions
{
public static Version StripRevisionIfDefault(this Version version) => version.Revision < 1 ? new Version(version.Major, version.Minor, version.Build) : version;
}
}
5 changes: 4 additions & 1 deletion TwitchDownloaderWPF/MainWindow.xaml.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,13 @@
using System.Diagnostics;
using System.IO;
using System.Net;
using System.Reflection;
using System.Runtime.InteropServices;
using System.Text.RegularExpressions;
using System.Threading.Tasks;
using System.Windows;
using System.Windows.Interop;
using TwitchDownloaderWPF.Extensions;
using TwitchDownloaderWPF.Properties;
using TwitchDownloaderWPF.Services;
using Xabe.FFmpeg;
Expand Down Expand Up @@ -88,7 +90,8 @@ private async void Window_Loaded(object sender, RoutedEventArgs e)
// it will sometimes start behind other windows, usually (but not always) due to the user's actions.
FlashTaskbarIconIfNotForeground(TimeSpan.FromSeconds(3));

var currentVersion = Version.Parse("1.55.0");
// Despite not specifying a revision in the AssemblyVersion, the compiler still adds one. We don't want that.
var currentVersion = Assembly.GetExecutingAssembly().GetName().Version!.StripRevisionIfDefault();
#if DEBUG
Title = $"Twitch Downloader v{currentVersion} - DEBUG";
#else
Expand Down
3 changes: 1 addition & 2 deletions TwitchDownloaderWPF/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,4 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]
[assembly: AssemblyVersion("1.55.0")]

0 comments on commit 04963e1

Please sign in to comment.