Add wabbajack-cli as part of the main Wabbajack distro, re-enable icons and splash screen.

This commit is contained in:
Timothy Baldridge 2020-01-31 15:56:26 -07:00
parent aa85c0dc8c
commit bf7efa1961
4 changed files with 15 additions and 3 deletions

View File

@ -3,6 +3,8 @@
<PropertyGroup> <PropertyGroup>
<OutputType>Exe</OutputType> <OutputType>Exe</OutputType>
<TargetFramework>netcoreapp3.1</TargetFramework> <TargetFramework>netcoreapp3.1</TargetFramework>
<AssemblyName>wabbajack-cli</AssemblyName>
<Company>Wabbajack</Company>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View File

@ -19,7 +19,7 @@ namespace Wabbajack.Common
public static bool Help { get; set; } public static bool Help { get; set; }
} }
public static class CLI public static class CLIOld
{ {
/// <summary> /// <summary>
/// Parses the argument and sets the properties of <see cref="CLIArguments"/> /// Parses the argument and sets the properties of <see cref="CLIArguments"/>

View File

@ -16,9 +16,9 @@ namespace Wabbajack
{ {
public App() public App()
{ {
CLI.ParseOptions(Environment.GetCommandLineArgs()); CLIOld.ParseOptions(Environment.GetCommandLineArgs());
if (CLIArguments.Help) if (CLIArguments.Help)
CLI.DisplayHelpText(); CLIOld.DisplayHelpText();
} }
} }
} }

View File

@ -12,6 +12,10 @@
<StartupObject></StartupObject> <StartupObject></StartupObject>
</PropertyGroup> </PropertyGroup>
<PropertyGroup>
<ApplicationIcon>Resources\Icons\wabbajack.ico</ApplicationIcon>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<PlatformTarget>x64</PlatformTarget> <PlatformTarget>x64</PlatformTarget>
</PropertyGroup> </PropertyGroup>
@ -42,6 +46,7 @@
<None Remove="Resources\Wabba_Ded.png" /> <None Remove="Resources\Wabba_Ded.png" />
<None Remove="Resources\Wabba_Mouth.png" /> <None Remove="Resources\Wabba_Mouth.png" />
<None Remove="Resources\Wabba_Mouth_No_Text.png" /> <None Remove="Resources\Wabba_Mouth_No_Text.png" />
<None Remove="Resources\Wabba_Mouth_Small.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -68,6 +73,7 @@
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" /> <ProjectReference Include="..\Compression.BSA\Compression.BSA.csproj" />
<ProjectReference Include="..\Wabbajack.CLI\Wabbajack.CLI.csproj" />
<ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" /> <ProjectReference Include="..\Wabbajack.Common\Wabbajack.Common.csproj" />
<ProjectReference Include="..\Wabbajack.Lib\Wabbajack.Lib.csproj" /> <ProjectReference Include="..\Wabbajack.Lib\Wabbajack.Lib.csproj" />
</ItemGroup> </ItemGroup>
@ -80,4 +86,8 @@
<Resource Include="Resources\Wabba_Mouth_No_Text.png" /> <Resource Include="Resources\Wabba_Mouth_No_Text.png" />
</ItemGroup> </ItemGroup>
<ItemGroup>
<SplashScreen Include="Resources\Wabba_Mouth_Small.png" />
</ItemGroup>
</Project> </Project>