Connected/Connected.Host
13
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

Fix dependency loader to properly handle relative local repositories

Browse Source 
Fix .csproj to not include default configuration in nuget package
This commit is contained in:
Matija Koželj 2023-02-06 13:45:06 +01:00
parent a0a9418bd0
commit 4d6d9d5cd7
2 changed files with 30 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/Connected.Host/Connected.Host.csproj
View File

@ -44,6 +44,9 @@
<Pack>True</Pack>
<PackagePath>\</PackagePath>
</None>
<Content Update="sys.json">
<Pack>false</Pack>
</Content>
</ItemGroup>
<Target Name="CopyPackages" AfterTargets="Pack">

28
src/Connected.Host/DependencyLoader.cs
View File

@ -159,7 +159,33 @@ public class DependencyLoader
private IEnumerable<PackageSource> GetPackageSources(IEnumerable<string> sources)
{
foreach (var source in sources)
yield return new PackageSource(source);
{
var packageSource = new PackageSource(source);
if (Uri.TryCreate(source, UriKind.RelativeOrAbsolute, out var sourceUri))
{
if (!sourceUri.IsAbsoluteUri)
packageSource = new PackageSource(Path.GetFullPath(source));
}
//if (packageSource.IsLocal || packageSource.TrySourceAsUri is null)
//{
// /*
// * Suspected local, verify
// */
// var local = Directory.Exists(source);
// if (local)
// {
// /*
// * If it's a cache, add all folders to sources
// */
// foreach (var directorySource in GetPackageSources(Directory.GetDirectories(source)))
// yield return directorySource;
// }
//}
yield return packageSource;
}
}
/// <summary>