This commit is contained in:
John Gross
2019-06-06 18:03:58 -07:00
parent 3e5b29c84d
commit 97f380fb7b
3 changed files with 12 additions and 5 deletions

View File

@@ -171,9 +171,10 @@ quit";
File.Delete(STEAMCMD_ZIP);
log.Info("SteamCMD downloaded successfully!");
}
catch
catch (Exception e)
{
log.Error("Failed to download SteamCMD, unable to update the DS.");
log.Error(e);
return;
}
}

View File

@@ -31,9 +31,15 @@ namespace Torch.Server
Directory.SetCurrentDirectory(workingDir);
//HACK for block skins update
foreach (var f in Directory.EnumerateFiles(workingDir, "System.*", SearchOption.TopDirectoryOnly))
var badDlls = new[]
{
File.Delete(f);
"System.Security.Principal.Windows.dll"
};
foreach (var file in badDlls)
{
if (File.Exists(file))
File.Delete(file);
}
if (!TorchLauncher.IsTorchWrapped())

View File

@@ -516,6 +516,6 @@
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\TransformOnBuild.targets" />
<PropertyGroup>
<PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)" &amp; del "$(TargetDir)System.*"</PostBuildEvent>
<PostBuildEvent>copy "$(SolutionDir)NLog.config" "$(TargetDir)" &amp; copy "$(SolutionDir)NLog-user.config" "$(TargetDir)"</PostBuildEvent>
</PropertyGroup>
</Project>