mirrors/Ryujinx
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' of https://github.com/DrHacknik/Ryujinx

Browse source
This commit is contained in:
MelonSpeedruns 2020-02-06 15:24:37 -05:00
commit a335fbbe0b
3 changed files with 35 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
Ryujinx.sln
View file

@ -34,9 +34,9 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Texture",
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Shader", "Ryujinx.Graphics.Shader\Ryujinx.Graphics.Shader.csproj", "{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Updater", "Ryujinx.Updater\Ryujinx.Updater.csproj", "{529E361C-FEF5-4C07-A2F4-3351C45CADDD}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Updater", "Ryujinx.Updater\Ryujinx.Updater.csproj", "{529E361C-FEF5-4C07-A2F4-3351C45CADDD}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ryujinx.Graphics.Nvdec", "Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Graphics.Nvdec", "Ryujinx.Graphics.Nvdec\Ryujinx.Graphics.Nvdec.csproj", "{85A0FA56-DC01-4A42-8808-70DAC76BD66D}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Ryujinx.Debugger", "Ryujinx.Debugger\Ryujinx.Debugger.csproj", "{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}"
EndProject
@ -160,14 +160,6 @@ Global
{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Profile Release|Any CPU.Build.0 = Debug|Any CPU
{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.ActiveCfg = Release|Any CPU
{03B955CD-AD84-4B93-AAA7-BF17923BBAA5}.Release|Any CPU.Build.0 = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Debug|Any CPU.Build.0 = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Release|Any CPU.ActiveCfg = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Release|Any CPU.Build.0 = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Profile Debug|Any CPU.ActiveCfg = Debug|Any CPU
@ -176,6 +168,22 @@ Global
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Profile Release|Any CPU.Build.0 = Release|Any CPU
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{529E361C-FEF5-4C07-A2F4-3351C45CADDD}.Release|Any CPU.Build.0 = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Debug|Any CPU.ActiveCfg = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Debug|Any CPU.Build.0 = Debug|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Release|Any CPU.ActiveCfg = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Profile Release|Any CPU.Build.0 = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{85A0FA56-DC01-4A42-8808-70DAC76BD66D}.Release|Any CPU.Build.0 = Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Debug|Any CPU.Build.0 = Debug|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Profile Debug|Any CPU.ActiveCfg = Profile Debug|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Profile Debug|Any CPU.Build.0 = Profile Debug|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Profile Release|Any CPU.ActiveCfg = Profile Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Profile Release|Any CPU.Build.0 = Profile Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Release|Any CPU.ActiveCfg = Release|Any CPU
{2E02B7F3-245E-43B1-AE5B-44167A0FDA20}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE

12
Ryujinx/Ui/AboutWindow.cs
View file

@ -1,4 +1,5 @@
using Gtk;
using Newtonsoft.Json.Linq;
using System;
using System.Diagnostics;
using System.IO;
@ -45,7 +46,16 @@ namespace Ryujinx.Ui
try
{
_versionText.Text = "Version " + File.ReadAllText(versionJsonFile);
string currentVersionJson;
string currentVersionBranch;
string currentVersionPr;
var VersionJSON = JObject.Parse(System.IO.Path.Combine(Environment.CurrentDirectory, "Version.json"));
var _JRoot = VersionJSON[0];
currentVersionJson = (string)_JRoot["BuildVer"];
currentVersionPr = (string)_JRoot["BuildPR"];
currentVersionBranch = (string)_JRoot["BuildBranch"];
_versionText.Text = "Version " + File.ReadAllText(currentVersionJson + " - Branch " + currentVersionBranch + " - PR ID " + currentVersionPr);
}
catch
{

9
Ryujinx/Updater/UpdateParser.cs
View file

@ -70,11 +70,14 @@ namespace Ryujinx
{
try
{
string currentVersionJson;
string currentVersionBranch;
string currentVersionPr;
var VersionJSON = JObject.Parse(Path.Combine(Environment.CurrentDirectory, "Version.json"));
var _JRoot = VersionJSON[0];
(string)currentVersionJson = (string)_JRoot["BuildVer"];
(string)currentVersionPr = (string)_JRoot["BuildPR"];
(string)currentVersionBranch = (string)_JRoot["BuildBranch"];
currentVersionJson = (string)_JRoot["BuildVer"];
currentVersionPr = (string)_JRoot["BuildPR"];
currentVersionBranch = (string)_JRoot["BuildBranch"];
Version newVersion = Version.Parse(_buildVer);
Version currentVersion = Version.Parse(currentVersionJson);