1- using OpenMod . Installer . RocketMod . Jobs ;
2- using OpenMod . NuGet ;
3- using System ;
1+ using System ;
42using System . IO ;
3+ using System . Linq ;
4+ using OpenMod . Installer . RocketMod . Helpers . Wrapper ;
55
66namespace 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}
0 commit comments