Skip to content

Commit 3044955

Browse files
committed
New attempt to fix nuget.config generation.
1 parent f8437c1 commit 3044955

File tree

1 file changed

+12
-6
lines changed
  • src/PostSharp.Engineering.BuildTools/Build/Model

1 file changed

+12
-6
lines changed

src/PostSharp.Engineering.BuildTools/Build/Model/Product.cs

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1443,13 +1443,19 @@ private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOv
14431443
AddDirectory( product.ProductName, artifactDirectory, product.DependencyDefinition.PackagePatterns );
14441444

14451445
// Add dependencies.
1446-
foreach ( var dependency in dependenciesOverrideFile.Dependencies )
1446+
foreach ( var dependencySource in dependenciesOverrideFile.Dependencies )
14471447
{
1448-
var dependencyDefinition = product.GetDependencyDefinition( dependency.Key );
1449-
var parametrizedDependency = product.ParametrizedDependencies.Single( d => d.Name == dependency.Key );
1450-
var dependencyDirectory = Path.GetDirectoryName( dependency.Value.VersionFile )!;
1448+
if ( dependencySource.Value.SourceKind == DependencySourceKind.Feed )
1449+
{
1450+
// Skip any feed dependency, so it will be fall back to the default package source.
1451+
continue;
1452+
}
1453+
1454+
var dependencyDefinition = product.GetDependencyDefinition( dependencySource.Key );
1455+
var parametrizedDependency = product.ParametrizedDependencies.Single( d => d.Name == dependencySource.Key );
1456+
var dependencyDirectory = Path.GetDirectoryName( dependencySource.Value.VersionFile );
14511457

1452-
if ( dependency.Value.SourceKind == DependencySourceKind.Local )
1458+
if ( dependencySource.Value.SourceKind == DependencySourceKind.Local )
14531459
{
14541460
dependencyDirectory = Path.Combine(
14551461
dependencyDirectory,
@@ -1461,7 +1467,7 @@ private static bool TryGenerateNuGetConfig( BuildContext context, DependenciesOv
14611467
null ) ) );
14621468
}
14631469

1464-
if ( !AddDirectory( dependency.Key, dependencyDirectory, dependencyDefinition.PackagePatterns ) )
1470+
if ( !AddDirectory( dependencySource.Key, dependencyDirectory, dependencyDefinition.PackagePatterns ) )
14651471
{
14661472
return false;
14671473
}

0 commit comments

Comments
 (0)