manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-14 22:40:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix typo in ReleaseInformation

Browse source
This commit is contained in:
TSR Berry 2022-12-28 18:00:19 +01:00
parent 31ce4da61c
commit ded69a56af
No known key found for this signature in database
GPG key ID: 52353C0A4CCA15E2
12 changed files with 27 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
.github/workflows/release.yml vendored
View file

@ -38,11 +38,11 @@ jobs:
shell: bash shell: bash
- name: Configure for release - name: Configure for release
run: | run: |
sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' Ryujinx.Common/ReleaseInformations.cs sed -r --in-place 's/\%\%RYUJINX_BUILD_VERSION\%\%/${{ steps.version_info.outputs.build_version }}/g;' Ryujinx.Common/ReleaseInformation.cs
sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' Ryujinx.Common/ReleaseInformations.cs sed -r --in-place 's/\%\%RYUJINX_BUILD_GIT_HASH\%\%/${{ steps.version_info.outputs.git_short_hash }}/g;' Ryujinx.Common/ReleaseInformation.cs
sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' Ryujinx.Common/ReleaseInformations.cs sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_NAME\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_NAME }}/g;' Ryujinx.Common/ReleaseInformation.cs
sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' Ryujinx.Common/ReleaseInformations.cs sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_OWNER\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_OWNER }}/g;' Ryujinx.Common/ReleaseInformation.cs
sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' Ryujinx.Common/ReleaseInformations.cs sed -r --in-place 's/\%\%RYUJINX_TARGET_RELEASE_CHANNEL_REPO\%\%/${{ env.RYUJINX_TARGET_RELEASE_CHANNEL_REPO }}/g;' Ryujinx.Common/ReleaseInformation.cs
shell: bash shell: bash
- name: Create output dir - name: Create output dir
run: "mkdir release_output" run: "mkdir release_output"

6
Ryujinx.Ava/Modules/Updater/Updater.cs
View file

@ -95,7 +95,7 @@ namespace Ryujinx.Modules
{ {
using (HttpClient jsonClient = ConstructHttpClient()) using (HttpClient jsonClient = ConstructHttpClient())
{ {
string buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformations.ReleaseChannelOwner}/{ReleaseInformations.ReleaseChannelRepo}/releases/latest"; string buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
string fetchedJson = await jsonClient.GetStringAsync(buildInfoURL); string fetchedJson = await jsonClient.GetStringAsync(buildInfoURL);
JObject jsonRoot = JObject.Parse(fetchedJson); JObject jsonRoot = JObject.Parse(fetchedJson);
@ -625,7 +625,7 @@ namespace Ryujinx.Modules
return false; return false;
} }
if (Program.Version.Contains("dirty") || !ReleaseInformations.IsValid()) if (Program.Version.Contains("dirty") || !ReleaseInformation.IsValid())
{ {
if (showWarnings) if (showWarnings)
{ {
@ -640,7 +640,7 @@ namespace Ryujinx.Modules
#else #else
if (showWarnings) if (showWarnings)
{ {
if (ReleaseInformations.IsFlatHubBuild()) if (ReleaseInformation.IsFlatHubBuild())
{ {
ContentDialogHelper.CreateWarningDialog(LocaleManager.Instance["UpdaterDisabledWarningTitle"], LocaleManager.Instance["DialogUpdaterFlatpakNotSupportedMessage"]); ContentDialogHelper.CreateWarningDialog(LocaleManager.Instance["UpdaterDisabledWarningTitle"], LocaleManager.Instance["DialogUpdaterFlatpakNotSupportedMessage"]);
} }

6
Ryujinx.Ava/Program.cs
View file

@ -38,14 +38,14 @@ namespace Ryujinx.Ava
[SupportedOSPlatform("linux")] [SupportedOSPlatform("linux")]
static void RegisterMimeTypes() static void RegisterMimeTypes()
{ {
if (ReleaseInformations.IsFlatHubBuild()) if (ReleaseInformation.IsFlatHubBuild())
{ {
return; return;
} }
if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "mime", "packages", "Ryujinx.xml"))) if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "mime", "packages", "Ryujinx.xml")))
{ {
string mimeTypesFile = Path.Combine(ReleaseInformations.GetBaseApplicationDirectory(), "mime", "Ryujinx.xml"); string mimeTypesFile = Path.Combine(ReleaseInformation.GetBaseApplicationDirectory(), "mime", "Ryujinx.xml");
using Process mimeProcess = new(); using Process mimeProcess = new();
mimeProcess.StartInfo.FileName = "xdg-mime"; mimeProcess.StartInfo.FileName = "xdg-mime";
@ -58,7 +58,7 @@ namespace Ryujinx.Ava
public static void Main(string[] args) public static void Main(string[] args)
{ {
Version = ReleaseInformations.GetVersion(); Version = ReleaseInformation.GetVersion();
if (OperatingSystem.IsLinux()) if (OperatingSystem.IsLinux())
{ {

2
Ryujinx.Ava/UI/ViewModels/MainWindowViewModel.cs
View file

@ -937,7 +937,7 @@ namespace Ryujinx.Ava.UI.ViewModels
public static void OpenLogsFolder() public static void OpenLogsFolder()
{ {
string logPath = Path.Combine(ReleaseInformations.GetBaseApplicationDirectory(), "Logs"); string logPath = Path.Combine(ReleaseInformation.GetBaseApplicationDirectory(), "Logs");
new DirectoryInfo(logPath).Create(); new DirectoryInfo(logPath).Create();

2
Ryujinx.Common/Logging/Targets/FileLogTarget.cs
View file

@ -29,7 +29,7 @@ namespace Ryujinx.Common.Logging
files[i].Delete(); files[i].Delete();
} }
string version = ReleaseInformations.GetVersion(); string version = ReleaseInformation.GetVersion();
// Get path for the current time // Get path for the current time
path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.log"); path = Path.Combine(logDir.FullName, $"Ryujinx_{version}_{DateTime.Now.ToString("yyyy-MM-dd_HH-mm-ss")}.log");

2
Ryujinx.Common/ReleaseInformations.cs → Ryujinx.Common/ReleaseInformation.cs
View file

@ -5,7 +5,7 @@ using System.Reflection;
namespace Ryujinx.Common namespace Ryujinx.Common
{ {
// DO NOT EDIT, filled by CI // DO NOT EDIT, filled by CI
public static class ReleaseInformations public static class ReleaseInformation
{ {
private const string FlatHubChannelOwner = "flathub"; private const string FlatHubChannelOwner = "flathub";

4
Ryujinx.Headless.SDL2/Program.cs
View file

@ -59,7 +59,7 @@ namespace Ryujinx.Headless.SDL2
static void Main(string[] args) static void Main(string[] args)
{ {
Version = ReleaseInformations.GetVersion(); Version = ReleaseInformation.GetVersion();
Console.Title = $"Ryujinx Console {Version} (Headless SDL2)"; Console.Title = $"Ryujinx Console {Version} (Headless SDL2)";
@ -419,7 +419,7 @@ namespace Ryujinx.Headless.SDL2
if ((bool)option.EnableFileLog) if ((bool)option.EnableFileLog)
{ {
Logger.AddTarget(new AsyncLogTargetWrapper( Logger.AddTarget(new AsyncLogTargetWrapper(
new FileLogTarget(ReleaseInformations.GetBaseApplicationDirectory(), "file"), new FileLogTarget(ReleaseInformation.GetBaseApplicationDirectory(), "file"),
1000, 1000,
AsyncLogTargetOverflowAction.Block AsyncLogTargetOverflowAction.Block
)); ));

2
Ryujinx.SDL2.Common/SDL2Driver.cs
View file

@ -91,7 +91,7 @@ namespace Ryujinx.SDL2.Common
SDL_EventState(SDL_EventType.SDL_CONTROLLERSENSORUPDATE, SDL_DISABLE); SDL_EventState(SDL_EventType.SDL_CONTROLLERSENSORUPDATE, SDL_DISABLE);
string gamepadDbPath = Path.Combine(ReleaseInformations.GetBaseApplicationDirectory(), "SDL_GameControllerDB.txt"); string gamepadDbPath = Path.Combine(ReleaseInformation.GetBaseApplicationDirectory(), "SDL_GameControllerDB.txt");
if (File.Exists(gamepadDbPath)) if (File.Exists(gamepadDbPath))
{ {

2
Ryujinx.Ui.Common/Configuration/LoggerModule.cs
View file

@ -80,7 +80,7 @@ namespace Ryujinx.Ui.Common.Configuration
if (e.NewValue) if (e.NewValue)
{ {
Logger.AddTarget(new AsyncLogTargetWrapper( Logger.AddTarget(new AsyncLogTargetWrapper(
new FileLogTarget(ReleaseInformations.GetBaseApplicationDirectory(), "file"), new FileLogTarget(ReleaseInformation.GetBaseApplicationDirectory(), "file"),
1000, 1000,
AsyncLogTargetOverflowAction.Block AsyncLogTargetOverflowAction.Block
)); ));

6
Ryujinx/Modules/Updater/Updater.cs
View file

@ -103,7 +103,7 @@ namespace Ryujinx.Modules
{ {
using (HttpClient jsonClient = ConstructHttpClient()) using (HttpClient jsonClient = ConstructHttpClient())
{ {
string buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformations.ReleaseChannelOwner}/{ReleaseInformations.ReleaseChannelRepo}/releases/latest"; string buildInfoURL = $"{GitHubApiURL}/repos/{ReleaseInformation.ReleaseChannelOwner}/{ReleaseInformation.ReleaseChannelRepo}/releases/latest";
// Fetch latest build information // Fetch latest build information
string fetchedJson = await jsonClient.GetStringAsync(buildInfoURL); string fetchedJson = await jsonClient.GetStringAsync(buildInfoURL);
@ -556,7 +556,7 @@ namespace Ryujinx.Modules
return false; return false;
} }
if (Program.Version.Contains("dirty") || !ReleaseInformations.IsValid()) if (Program.Version.Contains("dirty") || !ReleaseInformation.IsValid())
{ {
if (showWarnings) if (showWarnings)
{ {
@ -570,7 +570,7 @@ namespace Ryujinx.Modules
#else #else
if (showWarnings) if (showWarnings)
{ {
if (ReleaseInformations.IsFlatHubBuild()) if (ReleaseInformation.IsFlatHubBuild())
{ {
GtkDialog.CreateWarningDialog("Updater Disabled!", "Please update Ryujinx via FlatHub."); GtkDialog.CreateWarningDialog("Updater Disabled!", "Please update Ryujinx via FlatHub.");
} }

6
Ryujinx/Program.cs
View file

@ -77,14 +77,14 @@ namespace Ryujinx
[SupportedOSPlatform("linux")] [SupportedOSPlatform("linux")]
static void RegisterMimeTypes() static void RegisterMimeTypes()
{ {
if (ReleaseInformations.IsFlatHubBuild()) if (ReleaseInformation.IsFlatHubBuild())
{ {
return; return;
} }
if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "mime", "packages", "Ryujinx.xml"))) if (!File.Exists(Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), ".local", "share", "mime", "packages", "Ryujinx.xml")))
{ {
string mimeTypesFile = Path.Combine(ReleaseInformations.GetBaseApplicationDirectory(), "mime", "Ryujinx.xml"); string mimeTypesFile = Path.Combine(ReleaseInformation.GetBaseApplicationDirectory(), "mime", "Ryujinx.xml");
using Process mimeProcess = new(); using Process mimeProcess = new();
mimeProcess.StartInfo.FileName = "xdg-mime"; mimeProcess.StartInfo.FileName = "xdg-mime";
@ -97,7 +97,7 @@ namespace Ryujinx
static void Main(string[] args) static void Main(string[] args)
{ {
Version = ReleaseInformations.GetVersion(); Version = ReleaseInformation.GetVersion();
if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134)) if (OperatingSystem.IsWindows() && !OperatingSystem.IsWindowsVersionAtLeast(10, 0, 17134))
{ {

2
Ryujinx/Ui/MainWindow.cs
View file

@ -1295,7 +1295,7 @@ namespace Ryujinx.Ui
private void OpenLogsFolder_Pressed(object sender, EventArgs args) private void OpenLogsFolder_Pressed(object sender, EventArgs args)
{ {
string logPath = System.IO.Path.Combine(ReleaseInformations.GetBaseApplicationDirectory(), "Logs"); string logPath = System.IO.Path.Combine(ReleaseInformation.GetBaseApplicationDirectory(), "Logs");
new DirectoryInfo(logPath).Create(); new DirectoryInfo(logPath).Create();