Add more true NuGet support.

This commit is contained in:
Gandifil 2023-12-21 18:26:35 +03:00
parent 4879c17252
commit 783fc8683e
3 changed files with 29 additions and 4 deletions

View file

@ -0,0 +1,15 @@
using NuGet.Configuration;
namespace Contentless;
public class NuGetHelper
{
private readonly ISettings _settings;
public NuGetHelper(string projectFolder)
{
_settings = Settings.LoadDefaultSettings(projectFolder);
}
public string PackageFolder => SettingsUtility.GetGlobalPackagesFolder(_settings);
}

View file

@ -7,7 +7,6 @@ using System.Text.RegularExpressions;
using Microsoft.Build.Construction;
using Microsoft.Xna.Framework.Content.Pipeline;
using Newtonsoft.Json;
using NuGet.Configuration;
namespace Contentless;
@ -48,7 +47,10 @@ public static class Program {
if (config.References.Length > 0)
{
if (args.Length > 1)
{
ExtractVersions(args[1], referencesVersions);
_nuGetHelper = new NuGetHelper(Path.GetDirectoryName(args[1]));
}
else
Console.Error.WriteLine("You supplied references but there is no project file, this isn't compatible. Please specify the full path of project file, if you want to sync references");
}
@ -233,10 +235,11 @@ public static class Program {
Console.Error.WriteLine($"Unable to find library {library.Key} in .csproj");
}
private static NuGetHelper _nuGetHelper;
private static string CalculateFullPathToLibrary(string libraryName, string referencesVersion)
{
var settings = Settings.LoadDefaultSettings(null);
return Path.Combine(SettingsUtility.GetGlobalPackagesFolder(settings), libraryName.ToLower(), referencesVersion, "tools", libraryName + ".dll");
return Path.Combine(_nuGetHelper.PackageFolder, libraryName.ToLower(), referencesVersion, "tools", libraryName + ".dll");
}
private static (List<ImporterInfo>, List<string>) GetContentData() {

7
Test/NuGet.Config Normal file
View file

@ -0,0 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
<add key="lithiumtoast" value="https://www.myget.org/F/lithiumtoast/api/v3/index.json" />
</packageSources>
</configuration>