Skip to content

Commit

Permalink
[NuGet] Removed unused code and pass runtime identifier as parameter
Browse files Browse the repository at this point in the history
xen2 committed Jan 22, 2020
1 parent b66e489 commit b6eb330
Showing 3 changed files with 5 additions and 15 deletions.
Original file line number Diff line number Diff line change
@@ -84,7 +84,7 @@ internal static void __Initialize__()

// Only allow this specific version
var versionRange = new VersionRange(new NuGetVersion(XenkoVersion.NuGetVersion), true, new NuGetVersion(XenkoVersion.NuGetVersion), true);
var (request, result) = RestoreHelper.Restore(logger, nugetFramework, Assembly.GetExecutingAssembly().GetName().Name, versionRange).Result;
var (request, result) = RestoreHelper.Restore(logger, nugetFramework, "win", Assembly.GetExecutingAssembly().GetName().Name, versionRange).Result;
if (!result.Success)
{
throw new InvalidOperationException($"Could not restore NuGet packages");
16 changes: 3 additions & 13 deletions sources/shared/Xenko.NuGetResolver/RestoreHelper.cs
Original file line number Diff line number Diff line change
@@ -52,20 +52,10 @@ public static List<string> ListAssemblies(RestoreRequest request, RestoreResult
return assemblies;
}

public static async Task<(RestoreRequest, RestoreResult)> Restore(ILogger logger, NuGetFramework nugetFramework, string packageName, VersionRange versionRange)
public static async Task<(RestoreRequest, RestoreResult)> Restore(ILogger logger, NuGetFramework nugetFramework, string runtimeIdentifier, string packageName, VersionRange versionRange)
{
var settings = NuGet.Configuration.Settings.LoadDefaultSettings(null);

var packageSourceProvider = new PackageSourceProvider(settings);

// not sure what these do, but it was in the NuGet command line.
var resourceProviders = new List<Lazy<INuGetResourceProvider>>();
resourceProviders.AddRange(Repository.Provider.GetCoreV3());

// Setup source provider as a V3 only.
var sourceRepositoryProvider = new SourceRepositoryProvider(settings, resourceProviders);

var installPath = SettingsUtility.GetGlobalPackagesFolder(settings);
var assemblies = new List<string>();

var projectPath = Path.Combine("XenkoNugetResolver.json");
@@ -93,14 +83,14 @@ public static List<string> ListAssemblies(RestoreRequest request, RestoreResult
ProjectName = Path.GetFileNameWithoutExtension(projectPath),
ProjectStyle = ProjectStyle.PackageReference,
ProjectUniqueName = projectPath,
OutputPath = Path.Combine(Path.GetTempPath(), $"XenkoNugetResolver-{packageName}-{versionRange.MinVersion.ToString()}"),
OutputPath = Path.Combine(Path.GetTempPath(), $"XenkoNugetResolver-{packageName}-{versionRange.MinVersion.ToString()}-{nugetFramework.GetShortFolderName()}-{runtimeIdentifier}"),
OriginalTargetFrameworks = new[] { nugetFramework.GetShortFolderName() },
ConfigFilePaths = settings.GetConfigFilePaths(),
PackagesPath = SettingsUtility.GetGlobalPackagesFolder(settings),
Sources = SettingsUtility.GetEnabledSources(settings).ToList(),
FallbackFolders = SettingsUtility.GetFallbackPackageFolders(settings).ToList()
},
RuntimeGraph = new RuntimeGraph(new[] { new RuntimeDescription("win") }),
RuntimeGraph = new RuntimeGraph(new[] { new RuntimeDescription(runtimeIdentifier) }),
};

using (var context = new SourceCacheContext())
Original file line number Diff line number Diff line change
@@ -331,7 +331,7 @@ internal static async Task<PackageInfo> FindXenkoSdkDir(string solution, string
else
{
var logger = new Logger();
var (request, result) = await RestoreHelper.Restore(logger, NuGetFramework.ParseFrameworkName(".NETFramework,Version=v4.7.2", DefaultFrameworkNameProvider.Instance), packageName, new VersionRange(packageInfo.ExpectedVersion.ToNuGetVersion()));
var (request, result) = await RestoreHelper.Restore(logger, NuGetFramework.ParseFrameworkName(".NETFramework,Version=v4.7.2", "win", DefaultFrameworkNameProvider.Instance), packageName, new VersionRange(packageInfo.ExpectedVersion.ToNuGetVersion()));
if (result.Success)
{
packageInfo.SdkPaths.AddRange(RestoreHelper.ListAssemblies(request, result));

0 comments on commit b6eb330

Please sign in to comment.