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

Remove last traces of metaproject code.

release-1.0.0
Icedream 2015-01-12 05:21:10 +01:00
parent 866c9044e2
commit 7b520b78cd
1 changed files with 2 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
src/updater/Program.cs
View File

@ -312,9 +312,6 @@ namespace CitizenMP.Server.Installer
var pc = new ProjectCollection(); var pc = new ProjectCollection();
pc.RegisterLogger(new ConsoleLogger(LoggerVerbosity.Minimal)); pc.RegisterLogger(new ConsoleLogger(LoggerVerbosity.Minimal));
// Generate meta project for solution
var isSolution = projectFilePath.EndsWith(".sln");
if (isSolution && !IsWin32())
{ {
// Import Mozilla certs for NuGet to not fail out // Import Mozilla certs for NuGet to not fail out
try try
@ -331,22 +328,8 @@ namespace CitizenMP.Server.Installer
throw; throw;
} }
// Mono doesn't work with the new API, use the deprecated api // Build doesn't work with the new API on Mono, use the deprecated api
#pragma warning disable 618 #pragma warning disable 618
/*
// Attempt at using new API, doesn't find Build task.
var tmpProject = new Microsoft.Build.BuildEngine.Project();
var slnParser = new SolutionParser();
slnParser.ParseSolution(projectFilePath, tmpProject, (number, message) =>
{
Console.Error.WriteLine("WARNING: While parsing solution file - #{0}: {1}", number, message);
});
projectFilePath = projectFilePath + ".proj";
tmpProject.Save(projectFilePath);*/
Engine.GlobalEngine.RegisterLogger(new FileLogger {Parameters = logPath});
var project = new Project(Engine.GlobalEngine) {BuildEnabled = true}; var project = new Project(Engine.GlobalEngine) {BuildEnabled = true};
project.Load(projectFilePath); project.Load(projectFilePath);
foreach (var property in buildProperties) foreach (var property in buildProperties)
@ -356,6 +339,7 @@ namespace CitizenMP.Server.Installer
return result; return result;
} }
// Windows build can make use of the new API which is more efficient
{ {
var buildReq = new BuildRequestData(projectFilePath, buildProperties, null, new[] {"Build"}, null); var buildReq = new BuildRequestData(projectFilePath, buildProperties, null, new[] {"Build"}, null);
@ -384,9 +368,6 @@ namespace CitizenMP.Server.Installer
} }
finally finally
{ {
if (projectFilePath.EndsWith(".proj"))
File.Delete(projectFilePath);
newTempDir.Delete(true); newTempDir.Delete(true);
} }
} }