Skip to content
This repository was archived by the owner on Jun 27, 2024. It is now read-only.

Commit e4ca848

Browse files
committed
Force plugin to use nuget wrapper
1 parent ff4d8c6 commit e4ca848

2 files changed

Lines changed: 19 additions & 17 deletions

File tree

src/Helpers/NuGetHelper.cs

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,19 @@
1-
using OpenMod.Installer.RocketMod.Jobs;
2-
using OpenMod.NuGet;
3-
using System;
1+
using System;
42
using System.IO;
3+
using System.Linq;
4+
using OpenMod.Installer.RocketMod.Helpers.Wrapper;
55

66
namespace OpenMod.Installer.RocketMod.Helpers
77
{
88
public static class NuGetHelper
99
{
10-
private static NuGetPackageManager s_NuGetPackageManager;
10+
private static NuGetPackageManagerWrapper s_NuGetPackageManagerWrapper;
1111

12-
public static NuGetPackageManager GetNuGetPackageManager()
12+
public static NuGetPackageManagerWrapper GetNuGetPackageManager()
1313
{
14-
if (s_NuGetPackageManager != null)
14+
if (s_NuGetPackageManagerWrapper != null)
1515
{
16-
return s_NuGetPackageManager;
16+
return s_NuGetPackageManagerWrapper;
1717
}
1818

1919
var workingDirectory = OpenModInstallerPlugin.Instance.OpenModManager.WorkingDirectory;
@@ -26,20 +26,22 @@ public static NuGetPackageManager GetNuGetPackageManager()
2626

2727
Environment.SetEnvironmentVariable("NUGET_COMMON_APPLICATION_DATA", packagesPath);
2828

29-
s_NuGetPackageManager = new NuGetPackageManager(packagesPath)
30-
{
31-
Logger = new NuGetConsoleLogger()
32-
};
29+
var nugetAssembly = AppDomain.CurrentDomain.GetAssemblies().First(a => a.GetName().Name.Equals("OpenMod.Nuget", StringComparison.OrdinalIgnoreCase));
30+
31+
s_NuGetPackageManagerWrapper = new NuGetPackageManagerWrapper(nugetAssembly, packagesPath);
32+
33+
var logger = new NuGetConsoleLoggerWrapper(nugetAssembly);
34+
s_NuGetPackageManagerWrapper.SetLogger(logger);
3335

34-
s_NuGetPackageManager.IgnoreDependencies(
36+
s_NuGetPackageManagerWrapper.IgnoreDependencies(
3537
"Microsoft.NETCore.Platforms",
3638
"Microsoft.Packaging.Tools",
3739
"NETStandard.Library",
3840
/*"OpenMod.Unturned.Redist",
3941
"OpenMod.UnityEngine.Redist",*/ // todo
4042
"System.IO.FileSystem.Watcher");
4143

42-
return s_NuGetPackageManager;
44+
return s_NuGetPackageManagerWrapper;
4345
}
4446
}
4547
}

src/Jobs/NuGetInstallJob.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
using OpenMod.Installer.RocketMod.Helpers;
2-
using OpenMod.NuGet;
1+
using System;
2+
using OpenMod.Installer.RocketMod.Helpers;
33
using Rocket.Core.Logging;
44
using System.IO;
55
using System.Linq;
@@ -37,7 +37,7 @@ private async Task DownloadPackage(bool force, bool usePre)
3737
var package = await nuGetPackageManager.QueryPackageExactAsync(m_PackageId, null, usePre);
3838
if (package?.Identity == null)
3939
{
40-
Logger.LogError($"Downloading has failed for {m_PackageId}: {NuGetInstallCode.PackageOrVersionNotFound}");
40+
Logger.LogError($"Downloading has failed for {m_PackageId}: PackageOrVersionNotFound");
4141
return;
4242
}
4343

@@ -50,7 +50,7 @@ private async Task DownloadPackage(bool force, bool usePre)
5050
var identity = package.Identity;
5151

5252
var installResult = await nuGetPackageManager.InstallAsync(identity, usePre);
53-
var isInstalled = installResult.Code == NuGetInstallCode.Success || installResult.Code == NuGetInstallCode.NoUpdatesFound;
53+
var isInstalled = installResult.Code == 0 || installResult.Code == 1;
5454

5555
if (isInstalled)
5656
{

0 commit comments

Comments
 (0)