diff --git a/Ryujinx/Program.cs b/Ryujinx/Program.cs index 4aaa5e9f2c..e24d09fb98 100644 --- a/Ryujinx/Program.cs +++ b/Ryujinx/Program.cs @@ -6,11 +6,14 @@ using Ryujinx.Ui; using OpenTK; using System; using System.IO; +using System.Reflection; namespace Ryujinx { class Program { + public static string Version { get; private set; } + static void Main(string[] args) { Toolkit.Init(new ToolkitOptions @@ -21,6 +24,8 @@ namespace Ryujinx Console.Title = "Ryujinx Console"; + Version = Assembly.GetEntryAssembly().GetCustomAttribute().InformationalVersion; + string systemPath = Environment.GetEnvironmentVariable("Path", EnvironmentVariableTarget.Machine); Environment.SetEnvironmentVariable("Path", $"{Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "bin")};{systemPath}"); diff --git a/Ryujinx/Ryujinx.csproj b/Ryujinx/Ryujinx.csproj index bde01b243e..9bd2de66fc 100644 --- a/Ryujinx/Ryujinx.csproj +++ b/Ryujinx/Ryujinx.csproj @@ -6,6 +6,7 @@ Exe true Debug;Release;Profile Debug;Profile Release + 1.0.0-dirty diff --git a/Ryujinx/Ui/AboutWindow.cs b/Ryujinx/Ui/AboutWindow.cs index 122dcaae1f..cae7777666 100644 --- a/Ryujinx/Ui/AboutWindow.cs +++ b/Ryujinx/Ui/AboutWindow.cs @@ -38,8 +38,7 @@ namespace Ryujinx.Ui _discordLogo.Pixbuf = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.DiscordLogo.png", 30 , 30 ); _twitterLogo.Pixbuf = new Gdk.Pixbuf(Assembly.GetExecutingAssembly(), "Ryujinx.Ui.assets.TwitterLogo.png", 30 , 30 ); - // todo: Get version string - _versionText.Text = "Unknown Version"; + _versionText.Text = Program.Version; } private static void OpenUrl(string url) diff --git a/Ryujinx/Ui/GLRenderer.cs b/Ryujinx/Ui/GLRenderer.cs index dff72b3644..7506821737 100644 --- a/Ryujinx/Ui/GLRenderer.cs +++ b/Ryujinx/Ui/GLRenderer.cs @@ -295,7 +295,7 @@ namespace Ryujinx.Ui string titleIdSection = string.IsNullOrWhiteSpace(_device.System.TitleIdText) ? string.Empty : " | " + _device.System.TitleIdText.ToUpper(); - _newTitle = $"Ryujinx{titleNameSection}{titleIdSection} | Host FPS: {hostFps:0.0} | Game FPS: {gameFps:0.0} | " + + _newTitle = $"Ryujinx {Program.Version}{titleNameSection}{titleIdSection} | Host FPS: {hostFps:0.0} | Game FPS: {gameFps:0.0} | " + $"Game Vsync: {(_device.EnableDeviceVsync ? "On" : "Off")}"; _titleEvent = true; diff --git a/appveyor.yml b/appveyor.yml index 73f4654d66..4fcf50503e 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,11 +14,11 @@ build_script: - ps: >- dotnet --version - dotnet publish -c $env:config -r win-x64 + dotnet publish -c $env:config -r win-x64 /p:Version=$env:APPVEYOR_BUILD_VERSION - dotnet publish -c $env:config -r linux-x64 + dotnet publish -c $env:config -r linux-x64 /p:Version=$env:APPVEYOR_BUILD_VERSION - dotnet publish -c $env:config -r osx-x64 + dotnet publish -c $env:config -r osx-x64 /p:Version=$env:APPVEYOR_BUILD_VERSION 7z a ryujinx$env:config_name$env:APPVEYOR_BUILD_VERSION-win_x64.zip $env:APPVEYOR_BUILD_FOLDER\Ryujinx\bin\$env:config\netcoreapp3.0\win-x64\publish\