themaster1970sf/TShock
1
0
Fork 0
Code Issues Pull requests Projects Releases 1 Packages Wiki Activity Actions

Fix #2895

Browse source
This commit is contained in:
SGKoishi 2025-01-26 13:00:06 +09:00
parent 846ccb46bd
commit 52ed275be2
No known key found for this signature in database
GPG key ID: 8FFC399070653828
1 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

16
TShockPluginManager/Nuget.cs
View file

@ -30,7 +30,6 @@ using NuGet.Versioning;
namespace TShockPluginManager namespace TShockPluginManager
{ {
public class Nugetter public class Nugetter
{ {
// this object can figure out the right framework folders to use from a set of packages // this object can figure out the right framework folders to use from a set of packages
@ -82,15 +81,13 @@ namespace TShockPluginManager
// make sure the source repository can actually tell us about dependencies // make sure the source repository can actually tell us about dependencies
var dependencyInfoResource = await sourceRepository.GetResourceAsync<DependencyInfoResource>(); var dependencyInfoResource = await sourceRepository.GetResourceAsync<DependencyInfoResource>();
// get the try and dependencies // get the try and dependencies
// (the above function returns a nullable value, but doesn't properly indicate it as such) if (dependencyInfoResource is null) continue;
#pragma warning disable CS8602 var dependencyInfo = await dependencyInfoResource.ResolvePackage(
var dependencyInfo = await dependencyInfoResource?.ResolvePackage(
package, framework, cacheContext, logger, CancellationToken.None); package, framework, cacheContext, logger, CancellationToken.None);
#pragma warning restore CS8602
// oop, we don't have the ability to get dependency info from this repository, or // oop, we don't have the ability to get dependency info from this repository, or
// it wasn't found. let's try the next source repository! // it wasn't found. let's try the next source repository!
if (dependencyInfo == null) continue; if (dependencyInfo is null) continue;
availablePackages.Add(dependencyInfo); availablePackages.Add(dependencyInfo);
foreach (var dependency in dependencyInfo.Dependencies) foreach (var dependency in dependencyInfo.Dependencies)
@ -302,8 +299,11 @@ namespace TShockPluginManager
var relativeFolder = Path.GetDirectoryName(packageRelativeFilePath); var relativeFolder = Path.GetDirectoryName(packageRelativeFilePath);
var targetFolder = Path.Join(isPlugin ? "./ServerPlugins" : "./bin", relativeFolder); var targetFolder = Path.Join(isPlugin ? "./ServerPlugins" : "./bin", relativeFolder);
Directory.CreateDirectory(targetFolder); if (File.Exists(filePath))
File.Copy(filePath, Path.Join(targetFolder, Path.GetFileName(filePath)), true); {
Directory.CreateDirectory(targetFolder);
File.Copy(filePath, Path.Join(targetFolder, Path.GetFileName(filePath)), true);
}
} }
} }
} }