icedream
/
citizenmp-server-updater
mirror of https://github.com/icedream/citizenmp-server-updater.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Update NuGet after certificates are updated, not before.

release-1.0.0
Icedream 2015-01-12 05:51:18 +01:00
parent 5ddfee82af
commit 8d906642d9
1 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/updater/Program.cs
View File

@ -290,17 +290,6 @@ namespace CitizenMP.Server.Installer
// Mono compatibility
Environment.SetEnvironmentVariable("MONO_IOMAP", "all");
{
// The NuGet.exe that is shipped with CitizenMP.Server has a few bugs...
var nugetExePath = Path.Combine(workspace.FullName, ".nuget", "NuGet.exe");
Console.WriteLine("Updating NuGet...");
File.Delete(nugetExePath);
using (var wc = new WebClient())
{
wc.DownloadFile("https://nuget.org/NuGet.exe", nugetExePath);
}
}
// Make sure we restore nuget packages automatically and without permissions interfering with /tmp/nuget/ (edge case)
var newTempDir = workspace.CreateSubdirectory(".tmp");
Environment.SetEnvironmentVariable("EnableNuGetPackageRestore", "true");
@ -323,10 +312,9 @@ namespace CitizenMP.Server.Installer
});
loggers.Add(new ConsoleLogger(LoggerVerbosity.Quiet) {ShowSummary = false});
// Use a different build route if running on the Mono interpreter
// Import/Update Mozilla certs for NuGet to not fail out on non-Windows machines
if (!IsWin32())
{
// Import Mozilla certs for NuGet to not fail out
try
{
// TODO: Make sure this does not fail out by checking if mozroots is installed
@ -341,7 +329,22 @@ namespace CitizenMP.Server.Installer
Console.Error.WriteLine("ERROR: {0}", error.Message);
throw;
}
}
{
// The NuGet.exe that is shipped with CitizenMP.Server has a few bugs...
var nugetExePath = Path.Combine(workspace.FullName, ".nuget", "NuGet.exe");
Console.WriteLine("Updating NuGet...");
File.Delete(nugetExePath);
using (var wc = new WebClient())
{
wc.DownloadFile("https://nuget.org/NuGet.exe", nugetExePath);
}
}
// Use a different build route if running on the Mono interpreter
if (!IsWin32())
{
// Build doesn't work with the new API on Mono, use the deprecated api
Console.WriteLine("Building server binaries...");
#pragma warning disable 618