diff --git a/.vscode/launch.json b/.vscode/launch.json new file mode 100644 index 0000000..f6541c6 --- /dev/null +++ b/.vscode/launch.json @@ -0,0 +1,26 @@ +{ + "version": "0.2.0", + "configurations": [ + { + // Use IntelliSense to find out which attributes exist for C# debugging + // Use hover for the description of the existing attributes + // For further information visit https://github.com/dotnet/vscode-csharp/blob/main/debugger-launchjson.md + "name": ".NET Core Launch (console)", + "type": "coreclr", + "request": "launch", + "preLaunchTask": "build", + // If you have changed target frameworks, make sure to update the program path. + "program": "${workspaceFolder}/bin/Debug/net7.0/win-x64/Sharpii.dll", + "args": [], + "cwd": "${workspaceFolder}", + // For more information about the 'console' field, see https://aka.ms/VSCode-CS-LaunchJson-Console + "console": "internalConsole", + "stopAtEntry": false + }, + { + "name": ".NET Core Attach", + "type": "coreclr", + "request": "attach" + } + ] +} \ No newline at end of file diff --git a/.vscode/tasks.json b/.vscode/tasks.json index db3b029..29261fe 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -96,6 +96,42 @@ "${workspaceFolder}/Releases/Sharpii-OSX-ARM64" ], "problemMatcher": "$msCompile" + }, + { + "label": "build", + "command": "dotnet", + "type": "process", + "args": [ + "build", + "${workspaceFolder}/Sharpii.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "publish", + "command": "dotnet", + "type": "process", + "args": [ + "publish", + "${workspaceFolder}/Sharpii.sln", + "/property:GenerateFullPaths=true", + "/consoleloggerparameters:NoSummary" + ], + "problemMatcher": "$msCompile" + }, + { + "label": "watch", + "command": "dotnet", + "type": "process", + "args": [ + "watch", + "run", + "--project", + "${workspaceFolder}/Sharpii.sln" + ], + "problemMatcher": "$msCompile" } ] } \ No newline at end of file diff --git a/Sharpii/HBC.cs b/Sharpii/HBC.cs index 5c55877..4bab83b 100644 --- a/Sharpii/HBC.cs +++ b/Sharpii/HBC.cs @@ -219,22 +219,6 @@ namespace Sharpii return false; } - if (!File.Exists(Path.Combine(Path.GetDirectoryName(AppDomain.CurrentDomain.BaseDirectory), "WadInstaller.dll"))) - { - Console.WriteLine("ERROR: WadInstaller.dll not found"); - Console.WriteLine("This should not appear on the .Net Core port."); - Console.WriteLine("If you see this, report how you got here on https://github.com/TheShadowEevee/Sharpii-NetCore/issues."); - Console.WriteLine("Error: SHARPII_NET_CORE_HBC_MISSING_DLL_WADINSTALLER"); - if (OperatingSystem.Windows()) - { - Environment.Exit(0x00003E85); - } - else - { - Environment.Exit(0x00000007); - } - } - return true; } @@ -439,14 +423,15 @@ namespace Sharpii Console.WriteLine(""); Console.WriteLine(" Usage:"); Console.WriteLine(""); - Console.WriteLine(" Sharpii.exe SendDol -ip ip_adress [-old] [-nocomp] [-saveip]"); - Console.WriteLine(" -dol file [args]"); + Console.WriteLine(" Sharpii.exe SendDol -ip ip_address [-old] [-nocomp] [-saveip]"); + Console.WriteLine(" [-dol/-wad] file [args]"); Console.WriteLine(""); Console.WriteLine(""); Console.WriteLine(" Arguments:"); Console.WriteLine(""); Console.WriteLine(" -dol file The dol file to send"); - Console.WriteLine(" -ip ip_adress The IP address of your wii"); + Console.WriteLine(" -wad file The wad file to send"); + Console.WriteLine(" -ip ip_address The IP address of your wii"); Console.WriteLine(" -saveip Save entered IP address for future use"); Console.WriteLine(" -old Use for the old (1.0.4 and below) HBC"); Console.WriteLine(" -nocomp Disable compression");