@@ -412,7 +412,6 @@ private static bool ProjectHasPackagesConfigFile(string projectDirectory, string
412
412
internal static string GetPackagesPath ( IProject project , ISettings settings )
413
413
{
414
414
var packagesPath = GetValue (
415
- ( ) => UriUtility . GetAbsolutePath ( project . Directory , project . OuterBuild . GetProperty ( ProjectBuildProperties . RestorePackagesPath ) ) ,
416
415
( ) => UriUtility . GetAbsolutePath ( project . Directory , project . OuterBuild . GetProperty ( ProjectBuildProperties . RestorePackagesPath ) ) ,
417
416
( ) => SettingsUtility . GetGlobalPackagesFolder ( settings ) ) ;
418
417
@@ -743,7 +742,6 @@ private static LibraryIncludeFlags GetLibraryIncludeFlags(string value, LibraryI
743
742
private static string GetRepositoryPath ( IProject project , ISettings settings )
744
743
{
745
744
var path = GetValue (
746
- ( ) => UriUtility . GetAbsolutePath ( project . Directory , project . OuterBuild . GetProperty ( ProjectBuildProperties . RestoreRepositoryPath ) ) ,
747
745
( ) => UriUtility . GetAbsolutePath ( project . Directory , project . OuterBuild . GetProperty ( ProjectBuildProperties . RestoreRepositoryPath ) ) ,
748
746
( ) => SettingsUtility . GetRepositoryPath ( settings ) ,
749
747
( ) =>
@@ -795,18 +793,16 @@ internal static List<PackageSource> GetSources(IProject project, ISettings setti
795
793
project . OuterBuild . GetProperty ( "OriginalMSBuildStartupDirectory" ) ,
796
794
project . Directory ,
797
795
project . OuterBuild . SplitPropertyValueOrNull ( ProjectBuildProperties . RestoreSources ) ,
798
- project . OuterBuild . SplitPropertyValueOrNull ( ProjectBuildProperties . RestoreSources ) ,
799
796
project . TargetFrameworks . Values . SelectMany ( i => MSBuildStringUtility . Split ( i . GetProperty ( ProjectBuildProperties . RestoreAdditionalProjectSources ) ) ) ,
800
797
settings )
801
798
. Select ( i => new PackageSource ( i ) )
802
799
. ToList ( ) ;
803
800
}
804
801
805
- private static string [ ] GetSources ( string startupDirectory , string projectDirectory , string [ ] ? sources , string [ ] ? sourcesOverride , IEnumerable < string > additionalProjectSources , ISettings settings )
802
+ private static string [ ] GetSources ( string startupDirectory , string projectDirectory , string [ ] ? sources , IEnumerable < string > additionalProjectSources , ISettings settings )
806
803
{
807
804
// Sources
808
805
var currentSources = GetValue (
809
- ( ) => sourcesOverride ? . Select ( MSBuildRestoreUtility . FixSourcePath ) . Select ( e => UriUtility . GetAbsolutePath ( startupDirectory , e ) ) . ToArray ( ) ,
810
806
( ) => MSBuildRestoreUtility . ContainsClearKeyword ( sources ) ? Array . Empty < string > ( ) : null ,
811
807
( ) => sources ? . Select ( MSBuildRestoreUtility . FixSourcePath ) . Select ( e => UriUtility . GetAbsolutePath ( projectDirectory , e ) ) . ToArray ( ) ,
812
808
( ) => ( PackageSourceProvider . LoadPackageSources ( settings ) ) . Where ( e => e . IsEnabled ) . Select ( e => e . Source ) . ToArray ( ) ) ;
0 commit comments