mirror of
https://github.com/stuff-by-3-random-dudes/UWUVCI-AIO-WPF
synced 2024-11-22 02:53:04 +00:00
Resolved merge conflicts in favor of my branch
This commit is contained in:
commit
403cf5cb08
12 changed files with 13519 additions and 27 deletions
71
AnalysisReport.sarif
Normal file
71
AnalysisReport.sarif
Normal file
|
@ -0,0 +1,71 @@
|
|||
{
|
||||
"$schema": "https://schemastore.azurewebsites.net/schemas/json/sarif-2.1.0-rtm.5.json",
|
||||
"version": "2.1.0",
|
||||
"runs": [
|
||||
{
|
||||
"tool": {
|
||||
"driver": {
|
||||
"name": "Dependency Analysis",
|
||||
"semanticVersion": "0.4.336902",
|
||||
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview",
|
||||
"rules": [
|
||||
{
|
||||
"id": "UA106",
|
||||
"name": "PackageToBeAdded",
|
||||
"fullDescription": {
|
||||
"text": "Packages that need to be added in order to upgrade the project to chosen TFM"
|
||||
},
|
||||
"helpUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
|
||||
}
|
||||
]
|
||||
}
|
||||
},
|
||||
"results": [
|
||||
{
|
||||
"ruleId": "UA106",
|
||||
"message": {
|
||||
"text": "Package Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers, Version=0.4.336902 needs to be added."
|
||||
},
|
||||
"locations": [
|
||||
{
|
||||
"physicalLocation": {
|
||||
"artifactLocation": {
|
||||
"uri": "file:///C:/Users/zesty.fernandez/Documents/GitHub/UWUVCI-AIO-WPF/UWUVCI%20AIO%20WPF/UWUVCI%20AIO%20WPF.csproj"
|
||||
},
|
||||
"region": {}
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
{
|
||||
"ruleId": "UA106",
|
||||
"message": {
|
||||
"text": "Package Microsoft.Windows.Compatibility, Version=6.0.0 needs to be added."
|
||||
},
|
||||
"locations": [
|
||||
{
|
||||
"physicalLocation": {
|
||||
"artifactLocation": {
|
||||
"uri": "file:///C:/Users/zesty.fernandez/Documents/GitHub/UWUVCI-AIO-WPF/UWUVCI%20AIO%20WPF/UWUVCI%20AIO%20WPF.csproj"
|
||||
},
|
||||
"region": {}
|
||||
}
|
||||
}
|
||||
]
|
||||
}
|
||||
],
|
||||
"columnKind": "utf16CodeUnits"
|
||||
},
|
||||
{
|
||||
"tool": {
|
||||
"driver": {
|
||||
"name": "API Upgradability",
|
||||
"semanticVersion": "0.4.336902",
|
||||
"informationUri": "https://docs.microsoft.com/en-us/dotnet/core/porting/upgrade-assistant-overview"
|
||||
}
|
||||
},
|
||||
"results": [],
|
||||
"columnKind": "utf16CodeUnits"
|
||||
}
|
||||
]
|
||||
}
|
|
@ -1,20 +1,32 @@
|
|||
|
||||
Microsoft Visual Studio Solution File, Format Version 12.00
|
||||
# Visual Studio Version 16
|
||||
VisualStudioVersion = 16.0.29806.167
|
||||
# Visual Studio Version 17
|
||||
VisualStudioVersion = 17.2.32630.192
|
||||
MinimumVisualStudioVersion = 10.0.40219.1
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
|
||||
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "UWUVCI AIO WPF", "UWUVCI AIO WPF\UWUVCI AIO WPF.csproj", "{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}"
|
||||
EndProject
|
||||
Global
|
||||
GlobalSection(SolutionConfigurationPlatforms) = preSolution
|
||||
Debug|Any CPU = Debug|Any CPU
|
||||
Debug|x64 = Debug|x64
|
||||
Debug|x86 = Debug|x86
|
||||
Release|Any CPU = Release|Any CPU
|
||||
Release|x64 = Release|x64
|
||||
Release|x86 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(ProjectConfigurationPlatforms) = postSolution
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|Any CPU.Build.0 = Debug|Any CPU
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.ActiveCfg = Debug|x64
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x64.Build.0 = Debug|x64
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.ActiveCfg = Debug|x86
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Debug|x86.Build.0 = Debug|x86
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.ActiveCfg = Release|Any CPU
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|Any CPU.Build.0 = Release|Any CPU
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.ActiveCfg = Release|x64
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x64.Build.0 = Release|x64
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.ActiveCfg = Release|x86
|
||||
{6A60AB0E-4597-4ECA-AEFB-D63A26CA7B54}.Release|x86.Build.0 = Release|x86
|
||||
EndGlobalSection
|
||||
GlobalSection(SolutionProperties) = preSolution
|
||||
HideSolutionNode = FALSE
|
||||
|
|
|
@ -33,7 +33,7 @@ namespace UWUVCI_AIO_WPF.Classes
|
|||
public static void ExportFile(List<TKeys> precomp, GameConsoles console)
|
||||
{
|
||||
CheckAndFixFolder("bin\\keys");
|
||||
Stream createConfigStream = new FileStream($@"bin\keys\{console.ToString().ToLower()}.vck", FileMode.Create, FileAccess.Write);
|
||||
Stream createConfigStream = new FileStream(Path.Combine(Directory.GetCurrentDirectory(), $@"bin\keys\{console.ToString().ToLower()}.vck"), FileMode.Create, FileAccess.Write);
|
||||
GZipStream compressedStream = new GZipStream(createConfigStream, CompressionMode.Compress);
|
||||
IFormatter formatter = new BinaryFormatter();
|
||||
formatter.Serialize(compressedStream, precomp);
|
||||
|
|
|
@ -17,6 +17,16 @@
|
|||
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element minOccurs="0" maxOccurs="1" name="ExcludeRuntimeAssemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with line breaks</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element minOccurs="0" maxOccurs="1" name="IncludeRuntimeAssemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with line breaks.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:element>
|
||||
<xs:element minOccurs="0" maxOccurs="1" name="Unmanaged32Assemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with line breaks.</xs:documentation>
|
||||
|
@ -43,6 +53,16 @@
|
|||
<xs:documentation>Controls if .pdbs for reference assemblies are also embedded.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="IncludeRuntimeReferences" type="xs:boolean">
|
||||
<xs:annotation>
|
||||
<xs:documentation>Controls if runtime assemblies are also embedded.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="UseRuntimeReferencePaths" type="xs:boolean">
|
||||
<xs:annotation>
|
||||
<xs:documentation>Controls whether the runtime assemblies are embedded with their full path or only with their assembly name.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="DisableCompression" type="xs:boolean">
|
||||
<xs:annotation>
|
||||
<xs:documentation>Embedded assemblies are compressed by default, and uncompressed when they are loaded. You can turn compression off with this option.</xs:documentation>
|
||||
|
@ -73,6 +93,16 @@
|
|||
<xs:documentation>A list of assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="ExcludeRuntimeAssemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of runtime assembly names to exclude from the default action of "embed all Copy Local references", delimited with |</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="IncludeRuntimeAssemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of runtime assembly names to include from the default action of "embed all Copy Local references", delimited with |.</xs:documentation>
|
||||
</xs:annotation>
|
||||
</xs:attribute>
|
||||
<xs:attribute name="Unmanaged32Assemblies" type="xs:string">
|
||||
<xs:annotation>
|
||||
<xs:documentation>A list of unmanaged 32 bit assembly names to include, delimited with |.</xs:documentation>
|
||||
|
|
BIN
UWUVCI AIO WPF/GameBaseClassLibrary.dll
Normal file
BIN
UWUVCI AIO WPF/GameBaseClassLibrary.dll
Normal file
Binary file not shown.
|
@ -41,5 +41,8 @@
|
|||
<Setting Name="gczw" Type="System.Boolean" Scope="User">
|
||||
<Value Profile="(Default)">False</Value>
|
||||
</Setting>
|
||||
<Setting Name="Ancast" Type="System.String" Scope="User">
|
||||
<Value Profile="(Default)" />
|
||||
</Setting>
|
||||
</Settings>
|
||||
</SettingsFile>
|
|
@ -91,26 +91,17 @@ namespace UWUVCI_AIO_WPF.UI.Frames.InjectFrames.Bases
|
|||
if (info[0])
|
||||
{
|
||||
mvm.BaseDownloaded = true;
|
||||
if (mvm.RomSet) mvm.CanInject = true;
|
||||
if (mvm.RomSet)
|
||||
mvm.CanInject = true;
|
||||
}
|
||||
else
|
||||
{
|
||||
mvm.BaseDownloaded = false;
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
private void btnDwnlnd_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
||||
mvm.Download();
|
||||
Thread.Sleep(500);
|
||||
checkStuff(mvm.getInfoOfBase(Base));
|
||||
|
||||
|
||||
|
||||
mvm.Download();
|
||||
checkStuff(mvm.getInfoOfBase(Base));
|
||||
}
|
||||
|
||||
private void btnDwnlnd_Copy_Click(object sender, RoutedEventArgs e)
|
||||
|
|
|
@ -17,7 +17,20 @@ namespace UWUVCI_AIO_WPF.UI.Frames
|
|||
|
||||
private void Button_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
Process.Start("https://ko-fi.com/uwuvci");
|
||||
OpenKofiLink("uwuvci");
|
||||
}
|
||||
private void Button_Click2(object sender, RoutedEventArgs e)
|
||||
{
|
||||
OpenKofiLink("zestyts");
|
||||
}
|
||||
private void OpenKofiLink(string urlSuffix)
|
||||
{
|
||||
Process.Start(new ProcessStartInfo()
|
||||
{
|
||||
FileName = "https://ko-fi.com/" + urlSuffix,
|
||||
UseShellExecute = true,
|
||||
Verb = "open"
|
||||
});
|
||||
}
|
||||
private void Button_Click2(object sender, RoutedEventArgs e)
|
||||
{
|
||||
|
|
|
@ -110,15 +110,24 @@ namespace UWUVCI_AIO_WPF.UI.Windows
|
|||
|
||||
private void Folder_Click(object sender, RoutedEventArgs e)
|
||||
{
|
||||
var filePath = "";
|
||||
try
|
||||
{
|
||||
if (File.Exists(path)) path = new FileInfo(path).DirectoryName;
|
||||
Process.Start(path);
|
||||
filePath = path;
|
||||
if (File.Exists(filePath))
|
||||
filePath = new FileInfo(filePath).DirectoryName;
|
||||
|
||||
Process.Start(new ProcessStartInfo()
|
||||
{
|
||||
FileName = filePath,
|
||||
UseShellExecute = true,
|
||||
Verb = "open"
|
||||
});
|
||||
Close();
|
||||
}
|
||||
catch (Exception)
|
||||
{
|
||||
Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.");
|
||||
Custom_Message cm = new Custom_Message("An Error occured", "An error occured opening the folder. Please make sure the Output Path exists.\n\nFile path: " + filePath);
|
||||
try
|
||||
{
|
||||
cm.Owner = (FindResource("mvm") as MainViewModel).mw;
|
||||
|
@ -157,7 +166,7 @@ namespace UWUVCI_AIO_WPF.UI.Windows
|
|||
Close();
|
||||
var containNintendont = Message.Content.ToString().ToLower().Contains("nintendont");
|
||||
|
||||
SDSetup sd = new SDSetup(containNintendont ? true : false, path);
|
||||
SDSetup sd = new SDSetup(containNintendont, path);
|
||||
try
|
||||
{
|
||||
sd.Owner = (FindResource("mvm") as MainViewModel).mw;
|
||||
|
|
|
@ -479,9 +479,8 @@ namespace UWUVCI_AIO_WPF.UI.Windows
|
|||
{
|
||||
HttpWebRequest request = WebRequest.Create(url) as HttpWebRequest;
|
||||
request.Method = "HEAD";
|
||||
HttpWebResponse response = request.GetResponse() as HttpWebResponse;
|
||||
response.Close();
|
||||
return (response.StatusCode == HttpStatusCode.OK);
|
||||
using (HttpWebResponse response = request.GetResponse() as HttpWebResponse)
|
||||
return (response.StatusCode == HttpStatusCode.OK);
|
||||
}
|
||||
catch
|
||||
{
|
||||
|
|
|
@ -511,7 +511,18 @@ namespace UWUVCI_AIO_WPF
|
|||
{
|
||||
try
|
||||
{
|
||||
Process.Start("UWUVCI VWII.exe");
|
||||
var p = new Process();
|
||||
var fileName = Application.ResourceAssembly.Location;
|
||||
foreach (var file in Directory.GetFiles(Directory.GetCurrentDirectory(), "*.exe"))
|
||||
if (Path.GetFileName(file).Contains("vWii"))
|
||||
{
|
||||
fileName = file;
|
||||
break;
|
||||
}
|
||||
|
||||
p.StartInfo.FileName = fileName;
|
||||
p.Start();
|
||||
|
||||
Environment.Exit(0);
|
||||
}
|
||||
catch
|
||||
|
|
13353
upgrade-assistant.clef
Normal file
13353
upgrade-assistant.clef
Normal file
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue