File tree Expand file tree Collapse file tree
src/NuGet.Core/NuGet.Commands/RestoreCommand
test/NuGet.Core.FuncTests/NuGet.Commands.FuncTest Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -1971,6 +1971,9 @@ private static async Task<IList<CompatibilityCheckResult>> VerifyCompatibilityAs
19711971 return ( success , graphs ) ;
19721972 }
19731973
1974+ private static NuGetVersion Version_11_WithAliasSupport = NuGetVersion . Parse ( "11.0.100-preview.2.26104" ) ;
1975+ private static NuGetVersion Version_10_WithAliasSupport = NuGetVersion . Parse ( "10.0.300-preview.1" ) ;
1976+
19741977 private static bool DoesProjectToolsetSupportsDuplicateFrameworks ( PackageSpec project )
19751978 {
19761979 if ( project . RestoreMetadata . UsingMicrosoftNETSdk &&
@@ -1990,7 +1993,7 @@ private static bool DoesProjectToolsetSupportsDuplicateFrameworks(PackageSpec pr
19901993 && project . RestoreSettings . SdkVersion . Minor == 0
19911994 && project . RestoreSettings . SdkVersion . Patch == 300 )
19921995 {
1993- if ( project . RestoreSettings . SdkVersion < NuGetVersion . Parse ( "10.0.300-preview.1" ) )
1996+ if ( project . RestoreSettings . SdkVersion < Version_10_WithAliasSupport )
19941997 {
19951998 return false ;
19961999 }
@@ -1999,7 +2002,7 @@ private static bool DoesProjectToolsetSupportsDuplicateFrameworks(PackageSpec pr
19992002 && project . RestoreSettings . SdkVersion . Minor == 0
20002003 && project . RestoreSettings . SdkVersion . Patch == 100 )
20012004 {
2002- if ( project . RestoreSettings . SdkVersion < NuGetVersion . Parse ( "11.0.100-preview.1.26104" ) )
2005+ if ( project . RestoreSettings . SdkVersion < Version_11_WithAliasSupport )
20032006 {
20042007 return false ;
20052008 }
Original file line number Diff line number Diff line change @@ -412,7 +412,7 @@ public async Task RestoreCommand_WithAliasesOfSameFramework_MultipleProjectRefer
412412 [ Theory ]
413413 [ InlineData ( "10.0.200" , "10.0.300" ) ]
414414 [ InlineData ( "10.0.300" , "10.0.300-preview.0.12345" ) ]
415- [ InlineData ( "11.0.100" , "11.0.100-preview.1 .26103" ) ]
415+ [ InlineData ( "11.0.100" , "11.0.100-preview.2 .26103" ) ]
416416 public async Task RestoreCommand_WithAliasesOfSameFramework_AndIncompatibleSDKAnalysisLevelAndSDKVersionCombinations_FailsWithNU1018 ( string sdkAnalysisLevel , string sdkVersion )
417417 {
418418 using var pathContext = new SimpleTestPathContext ( ) ;
@@ -429,7 +429,7 @@ public async Task RestoreCommand_WithAliasesOfSameFramework_AndIncompatibleSDKAn
429429 [ InlineData ( "10.0.300" , "10.0.400" ) ]
430430 [ InlineData ( "10.0.300" , null ) ] // Null value means we let it be.
431431 [ InlineData ( "10.0.300" , "10.0.300-preview.1.12345" ) ] // This is a dummy value that'll need to be updated once we have a real one.
432- [ InlineData ( "11.0.100" , "11.0.100-preview.1 .26104" ) ]
432+ [ InlineData ( "11.0.100" , "11.0.100-preview.2 .26104" ) ]
433433 [ InlineData ( "11.0.100" , "11.0.100" ) ]
434434 [ InlineData ( "11.0.100" , "11.0.101" ) ]
435435 public async Task RestoreCommand_WithAliasesOfSameFramework_AndValidSDKAnalysisLevelAndSDKVersionCombinations_Succeeds ( string sdkAnalysisLevel , string sdkVersion )
You can’t perform that action at this time.
0 commit comments