Skip to content

Commit

Permalink
Move XNA installer
Browse files Browse the repository at this point in the history
  • Loading branch information
sgkoishi committed Feb 21, 2020
1 parent dbcd6de commit 3bf2441
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
8 changes: 4 additions & 4 deletions externals/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ private static void Publish(string path, string savePath, Version version)

var props = new Dictionary<string, string>
{
["displayname"] = buildProps["displayName"],
["displayname"] = buildProps.Get("displayName"),
["displaynameclean"] = Regex.Replace(buildProps["displayName"], @"\[c/[0-9A-F]+:([^\]]*)\]", "$1"),
["name"] = Path.GetFileName(path.Trim('\\')),
["version"] = "v" + buildProps.Get("version", "1.0"),
Expand All @@ -116,8 +116,8 @@ private static void Publish(string path, string savePath, Version version)
["steamid64"] = steamid64,
["modloaderversion"] = "tModLoader v" + version,
["passphrase"] = passphrase,
["modreferences"] = buildProps["modreferences"],
["modside"] = buildProps["side"]
["modreferences"] = buildProps.Get("modreferences"),
["modside"] = buildProps.Get("side")
};

ServicePointManager.Expect100Continue = false;
Expand Down Expand Up @@ -167,7 +167,7 @@ private static void Setup(string savePath, WebClient wc, Version version)
Console.WriteLine("Download tModLoader Windows to " + fileName);
ZipFile.ExtractToDirectory(Path.Combine(directory, "tModLoader.zip"), GAME_PATH);

fileName = Path.Combine(directory, "xnafx40_redist.msi");
fileName = Path.Combine(refPath, "xnafx40_redist.msi");
wc.DownloadFile("https://download.microsoft.com/download/5/3/A/53A804C8-EC78-43CD-A0F0-2FB4D45603D3/xnafx40_redist.msi", fileName);
Console.WriteLine("Download XNA to " + fileName);
Process.Start("msiexec", $"/i \"{fileName}\" /quiet").WaitForExit();
Expand Down
7 changes: 7 additions & 0 deletions externals/Properties/launchSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
{
"profiles": {
"ModLoaderTools": {
"commandName": "Project"
}
}
}

0 comments on commit 3bf2441

Please sign in to comment.