Compare commits

..

No commits in common. "trunk" and "v1.0.0-experimental" have entirely different histories.

4 changed files with 21 additions and 13 deletions

View File

@ -245,7 +245,7 @@ public class Bootstrapper : Interfaces.IBootstrapper
StartInfo = new() StartInfo = new()
{ {
FileName = Path.Combine(Paths.Versions, Arguments["Version"], $"{Constants.PROJECT_NAME}.Player.exe"), FileName = Path.Combine(Paths.Versions, Arguments["Version"], $"{Constants.PROJECT_NAME}.Player.exe"),
Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx", null, true)}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ", Arguments = $"-a \"{Web.FormatUrl("/Login/Negotiate.ashx")}\" -t \"{Arguments["Ticket"]}\" -j \"{Arguments["JoinScript"]}\" ",
UseShellExecute = true, UseShellExecute = true,
} }
}; };

View File

@ -20,6 +20,12 @@
<AutoGen>True</AutoGen> <AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon> <DependentUpon>Resources.resx</DependentUpon>
</Compile> </Compile>
<Compile Update="Properties\Settings.Designer.cs">
<DesignTimeSharedInput>True</DesignTimeSharedInput>
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
</Compile>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
@ -29,6 +35,13 @@
</EmbeddedResource> </EmbeddedResource>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Update="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="..\Kiseki.Launcher\**\*.cs" /> <Compile Include="..\Kiseki.Launcher\**\*.cs" />
</ItemGroup> </ItemGroup>

View File

@ -7,12 +7,6 @@ internal static class Program
[STAThread] [STAThread]
static void Main(string[] args) static void Main(string[] args)
{ {
if (args.Length > 0 && args[0] == "-uninstall")
{
Bootstrapper.Uninstall(args[0] == "-quiet");
return;
}
// Initialize directories // Initialize directories
if (Path.GetFileName(Path.GetDirectoryName(Application.ExecutablePath))!.ToLower().Contains(Constants.PROJECT_NAME.ToLower())) if (Path.GetFileName(Path.GetDirectoryName(Application.ExecutablePath))!.ToLower().Contains(Constants.PROJECT_NAME.ToLower()))
{ {
@ -68,6 +62,12 @@ internal static class Program
return; return;
} }
if (args[0] == "-uninstall")
{
Bootstrapper.Uninstall(args[0] == "-quiet");
return;
}
ApplicationConfiguration.Initialize(); ApplicationConfiguration.Initialize();
Application.Run(new MainWindow(args[0])); Application.Run(new MainWindow(args[0]));
} }

View File

@ -59,7 +59,7 @@ public static class Web
return response?.Status ?? HealthCheckStatus.Failure; return response?.Status ?? HealthCheckStatus.Failure;
} }
public static string FormatUrl(string path, string? subdomain = null, bool forceHttp = false) public static string FormatUrl(string path, string? subdomain = null)
{ {
string scheme = "https"; string scheme = "https";
string url = subdomain == null ? CurrentUrl! : $"{subdomain!}.{CurrentUrl!}"; string url = subdomain == null ? CurrentUrl! : $"{subdomain!}.{CurrentUrl!}";
@ -68,11 +68,6 @@ public static class Web
scheme = "http"; scheme = "http";
#endif #endif
if (forceHttp)
{
scheme = "http";
}
return $"{scheme}://{url}{path}"; return $"{scheme}://{url}{path}";
} }
} }