Skip to content

Commit a883600

Browse files
author
feiling
committed
Create class DependencyResolutionRepository which is used to resolve dependencies.
Other changes: - Remove dialog* projects - Remove FallbackRepository
1 parent 2dea84e commit a883600

File tree

107 files changed

+517
-13639
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

107 files changed

+517
-13639
lines changed

‎Build/Build.proj

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,6 @@
110110
<TestProjects Include="$(NuGetTestRoot)\CommandLine.Test\CommandLine.Test.csproj" Condition="'$(MonoBuild)' == ''" />
111111
<TestProjects Include="$(NuGetTestRoot)\Core.Test\Core.Test.csproj" Condition="'$(MonoBuild)' == ''" />
112112
<TestProjects Include="$(NuGetTestRoot)\Server.Test\Server.Test.csproj" Condition="'$(MonoBuild)' == ''" />
113-
<TestProjects Include="$(NuGetTestRoot)\Dialog.Test\Dialog.Test.csproj" Condition="'$(MonoBuild)' == ''" />
114113
<TestProjects Include="$(NuGetTestRoot)\VisualStudio.Test\VisualStudio.Test.csproj" Condition="'$(MonoBuild)' == ''" />
115114
<TestProjects Include="$(NuGetTestRoot)\VisualStudio11.Test\VisualStudio11.Test.csproj"
116115
Condition="'$(MonoBuild)' == '' and $(VisualStudioVersion) != '10.0'" />

‎NuGet.sln

Lines changed: 0 additions & 105 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TestUI", "test\TestUI\TestU
8989
EndProject
9090
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Test.Utility", "test\Test.Utility\Test.Utility.csproj", "{F016882A-C798-4446-BB75-D3C393A38B32}"
9191
EndProject
92-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialog.Test", "test\Dialog.Test\Dialog.Test.csproj", "{FC2D8406-0A17-40FC-A11B-B5133B552C47}"
93-
EndProject
9492
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Console.Types", "src\VsConsole\Console.Types\Console.Types.csproj", "{6FD11460-39A3-4A10-BA63-7541B0A7D053}"
9593
EndProject
9694
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PowerShellCmdlets", "src\VsConsole\PowerShellCmdlets\PowerShellCmdlets.csproj", "{84AC92A6-06B4-41B7-81EC-EFE91356D17C}"
@@ -107,10 +105,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudio.Interop", "src
107105
EndProject
108106
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DialogServices", "src\DialogServices\DialogServices.csproj", "{05497432-8899-4ED4-BB97-7B5EA3E911DB}"
109107
EndProject
110-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialog10", "src\Dialog10\Dialog10.csproj", "{5984731D-613C-440A-833A-F92A3E3CF793}"
111-
EndProject
112-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialog12", "src\Dialog12\Dialog12.csproj", "{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}"
113-
EndProject
114108
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamFoundationServer10", "src\TeamFoundationServer10\TeamFoundationServer10.csproj", "{3F786922-B4F3-4C6E-B22F-3D764BA5B3B8}"
115109
EndProject
116110
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudio10", "src\VisualStudio10\VisualStudio10.csproj", "{7765C89E-790C-4D1E-A877-227E5FE3C90B}"
@@ -123,8 +117,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CommandLine.Test", "test\Co
123117
EndProject
124118
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamFoundationServer.Test", "test\TeamFoundationServer.Test\TeamFoundationServer.Test.csproj", "{F1A63FD0-E1DE-43C6-940A-754D3B6C0A77}"
125119
EndProject
126-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialog11", "src\Dialog11\Dialog11.csproj", "{FD1E159B-A36F-49E4-856D-8555A20D09CF}"
127-
EndProject
128120
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudio11.Test", "test\VisualStudio11.Test\VisualStudio11.Test.csproj", "{25A2D439-B045-4059-9E1F-738362B72554}"
129121
EndProject
130122
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamFoundationServer11", "src\TeamFoundationServer11\TeamFoundationServer11.csproj", "{5220A205-0C3F-4CD5-B1B4-7CD5B8298D7A}"
@@ -135,8 +127,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsEvents", "src\VsEvents\Vs
135127
EndProject
136128
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsEvents.Test", "test\VsEvents.Test\VsEvents.Test.csproj", "{61C7D2E8-79A2-4645-AA84-3C81C89588E9}"
137129
EndProject
138-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Dialog14", "src\Dialog14\Dialog14.csproj", "{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}"
139-
EndProject
140130
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VisualStudio14", "src\VisualStudio14\VisualStudio14.csproj", "{EEA49A74-6EFC-410E-9745-BAD367AC151D}"
141131
EndProject
142132
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "TeamFoundationServer14", "src\TeamFoundationServer14\TeamFoundationServer14.csproj", "{7DD28CAC-D7B8-4053-B820-9DA44565D40C}"
@@ -409,24 +399,6 @@ Global
409399
{F016882A-C798-4446-BB75-D3C393A38B32}.Release|Any CPU.Build.0 = Release|Any CPU
410400
{F016882A-C798-4446-BB75-D3C393A38B32}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
411401
{F016882A-C798-4446-BB75-D3C393A38B32}.Release|Mixed Platforms.Build.0 = Release|Any CPU
412-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
413-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
414-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
415-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
416-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
417-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Debug|Any CPU.Build.0 = Debug|Any CPU
418-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
419-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
420-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
421-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
422-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
423-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU
424-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Release|Any CPU.Build.0 = Release|Any CPU
425-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU
426-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Release|Any CPU.ActiveCfg = Release|Any CPU
427-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Release|Any CPU.Build.0 = Release|Any CPU
428-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
429-
{FC2D8406-0A17-40FC-A11B-B5133B552C47}.Release|Mixed Platforms.Build.0 = Release|Any CPU
430402
{6FD11460-39A3-4A10-BA63-7541B0A7D053}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
431403
{6FD11460-39A3-4A10-BA63-7541B0A7D053}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
432404
{6FD11460-39A3-4A10-BA63-7541B0A7D053}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
@@ -569,42 +541,6 @@ Global
569541
{05497432-8899-4ED4-BB97-7B5EA3E911DB}.Release|Any CPU.Build.0 = Release|Any CPU
570542
{05497432-8899-4ED4-BB97-7B5EA3E911DB}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
571543
{05497432-8899-4ED4-BB97-7B5EA3E911DB}.Release|Mixed Platforms.Build.0 = Release|Any CPU
572-
{5984731D-613C-440A-833A-F92A3E3CF793}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
573-
{5984731D-613C-440A-833A-F92A3E3CF793}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
574-
{5984731D-613C-440A-833A-F92A3E3CF793}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
575-
{5984731D-613C-440A-833A-F92A3E3CF793}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
576-
{5984731D-613C-440A-833A-F92A3E3CF793}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
577-
{5984731D-613C-440A-833A-F92A3E3CF793}.Debug|Any CPU.Build.0 = Debug|Any CPU
578-
{5984731D-613C-440A-833A-F92A3E3CF793}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
579-
{5984731D-613C-440A-833A-F92A3E3CF793}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
580-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
581-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
582-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
583-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU
584-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Release|Any CPU.Build.0 = Release|Any CPU
585-
{5984731D-613C-440A-833A-F92A3E3CF793}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU
586-
{5984731D-613C-440A-833A-F92A3E3CF793}.Release|Any CPU.ActiveCfg = Release|Any CPU
587-
{5984731D-613C-440A-833A-F92A3E3CF793}.Release|Any CPU.Build.0 = Release|Any CPU
588-
{5984731D-613C-440A-833A-F92A3E3CF793}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
589-
{5984731D-613C-440A-833A-F92A3E3CF793}.Release|Mixed Platforms.Build.0 = Release|Any CPU
590-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
591-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
592-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
593-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
594-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
595-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Debug|Any CPU.Build.0 = Debug|Any CPU
596-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
597-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
598-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Debug|Any CPU.ActiveCfg = Debug|Any CPU
599-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Debug|Any CPU.Build.0 = Debug|Any CPU
600-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
601-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Release|Any CPU.ActiveCfg = Release|Any CPU
602-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Release|Any CPU.Build.0 = Release|Any CPU
603-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Mono Release|Mixed Platforms.ActiveCfg = Release|Any CPU
604-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Release|Any CPU.ActiveCfg = Release|Any CPU
605-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Release|Any CPU.Build.0 = Release|Any CPU
606-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
607-
{1C5E9CB6-F6FE-4858-BB63-AA50832F0A4D}.Release|Mixed Platforms.Build.0 = Release|Any CPU
608544
{3F786922-B4F3-4C6E-B22F-3D764BA5B3B8}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
609545
{3F786922-B4F3-4C6E-B22F-3D764BA5B3B8}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
610546
{3F786922-B4F3-4C6E-B22F-3D764BA5B3B8}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
@@ -716,26 +652,6 @@ Global
716652
{F1A63FD0-E1DE-43C6-940A-754D3B6C0A77}.Release|Any CPU.Build.0 = Release|Any CPU
717653
{F1A63FD0-E1DE-43C6-940A-754D3B6C0A77}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
718654
{F1A63FD0-E1DE-43C6-940A-754D3B6C0A77}.Release|Mixed Platforms.Build.0 = Release|Any CPU
719-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
720-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
721-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
722-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
723-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
724-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
725-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
726-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
727-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Debug|Any CPU.ActiveCfg = Mono Debug|Any CPU
728-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Debug|Any CPU.Build.0 = Mono Debug|Any CPU
729-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Debug|Mixed Platforms.ActiveCfg = Mono Debug|Any CPU
730-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Debug|Mixed Platforms.Build.0 = Mono Debug|Any CPU
731-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Release|Any CPU.ActiveCfg = Mono Release|Any CPU
732-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Release|Any CPU.Build.0 = Mono Release|Any CPU
733-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Release|Mixed Platforms.ActiveCfg = Mono Release|Any CPU
734-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Mono Release|Mixed Platforms.Build.0 = Mono Release|Any CPU
735-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
736-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Release|Any CPU.Build.0 = Release|Any CPU
737-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
738-
{FD1E159B-A36F-49E4-856D-8555A20D09CF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
739655
{25A2D439-B045-4059-9E1F-738362B72554}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
740656
{25A2D439-B045-4059-9E1F-738362B72554}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
741657
{25A2D439-B045-4059-9E1F-738362B72554}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
@@ -836,26 +752,6 @@ Global
836752
{61C7D2E8-79A2-4645-AA84-3C81C89588E9}.Release|Any CPU.Build.0 = Release|Any CPU
837753
{61C7D2E8-79A2-4645-AA84-3C81C89588E9}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
838754
{61C7D2E8-79A2-4645-AA84-3C81C89588E9}.Release|Mixed Platforms.Build.0 = Release|Any CPU
839-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
840-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
841-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
842-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Coverage|Mixed Platforms.Build.0 = Coverage|Any CPU
843-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
844-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Debug|Any CPU.Build.0 = Debug|Any CPU
845-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
846-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
847-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Debug|Any CPU.ActiveCfg = Mono Debug|Any CPU
848-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Debug|Any CPU.Build.0 = Mono Debug|Any CPU
849-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Debug|Mixed Platforms.ActiveCfg = Mono Debug|Any CPU
850-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Debug|Mixed Platforms.Build.0 = Mono Debug|Any CPU
851-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Release|Any CPU.ActiveCfg = Mono Release|Any CPU
852-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Release|Any CPU.Build.0 = Mono Release|Any CPU
853-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Release|Mixed Platforms.ActiveCfg = Mono Release|Any CPU
854-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Mono Release|Mixed Platforms.Build.0 = Mono Release|Any CPU
855-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Release|Any CPU.ActiveCfg = Release|Any CPU
856-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Release|Any CPU.Build.0 = Release|Any CPU
857-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
858-
{6F5E90CC-F106-4524-8E98-58C2E9F1D6FF}.Release|Mixed Platforms.Build.0 = Release|Any CPU
859755
{EEA49A74-6EFC-410E-9745-BAD367AC151D}.Coverage|Any CPU.ActiveCfg = Coverage|Any CPU
860756
{EEA49A74-6EFC-410E-9745-BAD367AC151D}.Coverage|Any CPU.Build.0 = Coverage|Any CPU
861757
{EEA49A74-6EFC-410E-9745-BAD367AC151D}.Coverage|Mixed Platforms.ActiveCfg = Coverage|Any CPU
@@ -1068,7 +964,6 @@ Global
1068964
{3840480F-EA53-4CD4-8155-7CA579CB8E37} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1069965
{5B445EB1-3D2F-4D03-A004-09275F649419} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1070966
{F016882A-C798-4446-BB75-D3C393A38B32} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1071-
{FC2D8406-0A17-40FC-A11B-B5133B552C47} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1072967
{6C09BF50-E5B3-4810-8A17-37D399A172ED} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1073968
{82AB7D04-FA51-4707-8A1F-62B29AC23E6D} = {E7B39EAD-EA32-4011-845A-C949A336389A}
1074969
{92D18050-3867-4E39-B305-9F9870F66F5E} = {E7B39EAD-EA32-4011-845A-C949A336389A}

‎src/CommandLine.ServerExtensions/PackageMirrorer.cs

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,9 +75,12 @@ public int MirrorPackage(IPackage package, bool allowPrereleaseVersions, MirrorD
7575

7676
public int MirrorPackage(IPackage package, FrameworkName targetFramework, bool allowPrereleaseVersions, MirrorDependenciesMode mirrorDependenciesMode)
7777
{
78+
var repo = mirrorDependenciesMode == MirrorDependenciesMode.Fail ?
79+
TargetRepository :
80+
SourceRepository;
7881
return Execute(package, new InstallWalker(
7982
TargetRepository,
80-
sourceRepository: mirrorDependenciesMode == MirrorDependenciesMode.Fail ? TargetRepository : SourceRepository,
83+
dependencyResolver: new DependencyResolverFromRepo(repo),
8184
targetFramework: targetFramework,
8285
logger: Logger,
8386
ignoreDependencies: mirrorDependenciesMode == MirrorDependenciesMode.Ignore,

‎src/CommandLine/Commands/ProjectFactory.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1070,7 +1070,7 @@ protected override bool SkipDependencyResolveError
10701070

10711071
protected override IPackage ResolveDependency(PackageDependency dependency)
10721072
{
1073-
return _repository.ResolveDependency(dependency, allowPrereleaseVersions: false, preferListedPackages: false);
1073+
return DependencyResolveUtility.ResolveDependency(_repository, dependency, allowPrereleaseVersions: false, preferListedPackages: false);
10741074
}
10751075

10761076
protected override bool OnAfterResolveDependency(IPackage package, IPackage dependency)

‎src/Core/IPackageManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@ public interface IPackageManager
2525
/// </summary>
2626
IPackageRepository SourceRepository { get; }
2727

28+
IDependencyResolver2 DependencyResolver { get; }
29+
2830
/// <summary>
2931
/// PathResolver used to determine paths for installed packages.
3032
/// </summary>

‎src/Core/OperationResolution/ActionResolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ private IEnumerable<PackageOperation> ResolveOperationsToInstallProjectLevelPack
147147
};
148148
var updateWalker = new UpdateWalker(
149149
projectRepo,
150-
operation.ProjectManager.PackageManager.SourceRepository,
150+
operation.ProjectManager.PackageManager.DependencyResolver,
151151
dependentsWalker,
152152
operation.ProjectManager.ConstraintProvider,
153153
operation.ProjectManager.Project.TargetFramework,
@@ -207,7 +207,7 @@ private IEnumerable<PackageOperation> ResolveOperationsToInstallSolutionLevelPac
207207
var repo = _virtualPackageRepos[operation.ProjectManager.PackageManager];
208208
var installWalker = new InstallWalker(
209209
repo,
210-
operation.ProjectManager.PackageManager.SourceRepository,
210+
operation.ProjectManager.PackageManager.DependencyResolver,
211211
targetFramework: null,
212212
logger: Logger,
213213
ignoreDependencies: IgnoreDependencies,
@@ -230,7 +230,7 @@ private IEnumerable<PackageOperation> ResolveOperationsToUpdateSolutionLevelPack
230230
var repo = _virtualPackageRepos[operation.ProjectManager.PackageManager];
231231
var updateWalker = new UpdateWalker(
232232
repo,
233-
operation.ProjectManager.PackageManager.SourceRepository,
233+
operation.ProjectManager.PackageManager.DependencyResolver,
234234
new DependentsWalker(repo, targetFramework: null)
235235
{
236236
DependencyVersion = DependencyVersion

‎src/Core/PackageManager.cs

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,11 @@ public PackageManager(IPackageRepository sourceRepository, IPackagePathResolver
2525
{
2626
}
2727

28-
public PackageManager(IPackageRepository sourceRepository, IPackagePathResolver pathResolver, IFileSystem fileSystem, ISharedPackageRepository localRepository)
28+
public PackageManager(
29+
IPackageRepository sourceRepository,
30+
IPackagePathResolver pathResolver,
31+
IFileSystem fileSystem,
32+
ISharedPackageRepository localRepository)
2933
{
3034
if (sourceRepository == null)
3135
{
@@ -45,6 +49,7 @@ public PackageManager(IPackageRepository sourceRepository, IPackagePathResolver
4549
}
4650

4751
SourceRepository = sourceRepository;
52+
DependencyResolver = new DependencyResolverFromRepo(sourceRepository);
4853
PathResolver = pathResolver;
4954
FileSystem = fileSystem;
5055
LocalRepository = localRepository;
@@ -64,6 +69,12 @@ public IPackageRepository SourceRepository
6469
private set;
6570
}
6671

72+
public IDependencyResolver2 DependencyResolver
73+
{
74+
get;
75+
private set;
76+
}
77+
6778
public ISharedPackageRepository LocalRepository
6879
{
6980
get;

0 commit comments

Comments
 (0)