Skip to content
This repository was archived by the owner on Oct 16, 2020. It is now read-only.

Commit e99013b

Browse files
mrwardmrward
committed
Remove separate project template repositories for NuGet packages.
Install NuGet packages in project templates from the NuGet repositories configured and used by the Manage Packages dialog.
1 parent 2d62da9 commit e99013b

12 files changed

Lines changed: 10 additions & 505 deletions

‎src/AddIns/Misc/PackageManagement/Project/PackageManagement.addin‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -102,10 +102,6 @@
102102
id="PackageSources"
103103
label="Package Sources"
104104
class="ICSharpCode.PackageManagement.RegisteredPackageSourcesView"/>
105-
<OptionPanel
106-
id="ProjectTemplatePackageSources"
107-
label="Template Package Sources"
108-
class="ICSharpCode.PackageManagement.RegisteredProjectTemplatePackageSourcesView"/>
109105
</OptionPanel>
110106
</Path>
111107

‎src/AddIns/Misc/PackageManagement/Project/PackageManagement.csproj‎

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,6 @@
287287
<Compile Include="Src\ProcessPackageOperationsAction.cs" />
288288
<Compile Include="Src\ProjectBrowserRefresher.cs" />
289289
<Compile Include="Src\ProjectBrowserUpdater.cs" />
290-
<Compile Include="Src\ProjectTemplatePackageRepositoryCache.cs" />
291290
<Compile Include="Src\ProjectTemplatePackagesSettingsFileName.cs" />
292291
<Compile Include="Src\RegisteredPackageRepositories.cs" />
293292
<Compile Include="Src\ManagePackagesView.cs">
@@ -380,11 +379,6 @@
380379
<Compile Include="Src\PackageManagementSolution.cs" />
381380
<Compile Include="Src\PackageManagementTask.cs" />
382381
<Compile Include="Src\PackageManagementTaskFactory.cs" />
383-
<Compile Include="Src\RegisteredProjectTemplatePackageSources.cs" />
384-
<Compile Include="Src\RegisteredProjectTemplatePackageSourcesView.xaml.cs">
385-
<DependentUpon>RegisteredProjectTemplatePackageSourcesView.xaml</DependentUpon>
386-
<SubType>Code</SubType>
387-
</Compile>
388382
<Compile Include="Src\Scripting\ConsoleInitializer.cs" />
389383
<Compile Include="Src\Scripting\IPackageManagementConsoleHost.cs" />
390384
<Compile Include="Src\Scripting\IPackageScriptRunner.cs" />
@@ -517,7 +511,6 @@
517511
<Page Include="Src\RegisteredPackageSourcesView.xaml" />
518512
<Page Include="Src\PackagesView.xaml" />
519513
<Page Include="Src\PagedResultsView.xaml" />
520-
<Page Include="Src\RegisteredProjectTemplatePackageSourcesView.xaml" />
521514
<Page Include="Src\Scripting\PackageManagementConsoleView.xaml" />
522515
<Page Include="Src\SelectProjectsView.xaml" />
523516
</ItemGroup>

‎src/AddIns/Misc/PackageManagement/Project/Src/InstallProjectTemplatePackagesCommand.cs‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public class InstallProjectTemplatePackagesCommand : AbstractCommand
3535

3636
public InstallProjectTemplatePackagesCommand()
3737
: this(
38-
PackageManagementServices.ProjectTemplatePackageRepositoryCache,
38+
PackageManagementServices.PackageRepositoryCache,
3939
PackageManagementServices.ProjectService,
4040
SD.MessageService,
4141
SD.Log)
@@ -44,7 +44,7 @@ public InstallProjectTemplatePackagesCommand()
4444

4545
public InstallProjectTemplatePackagesCommand(
4646
IPackageRepositoryCache packageRepositoryCache,
47-
IPackageManagementProjectService projectService,
47+
IPackageManagementProjectService projectService,
4848
IMessageService messageService,
4949
ILoggingService loggingService)
5050
{
@@ -81,16 +81,21 @@ void InstallPackages()
8181
IEnumerable<MSBuildBasedProject> GetCreatedProjects()
8282
{
8383
var createInfo = Owner as ProjectTemplateResult;
84-
return createInfo != null ? createInfo.NewProjects.OfType<MSBuildBasedProject>() : Enumerable.Empty<MSBuildBasedProject>();
84+
if (createInfo == null) {
85+
return Enumerable.Empty<MSBuildBasedProject>();
86+
}
87+
88+
return createInfo.NewProjects.OfType<MSBuildBasedProject>();
8589
}
8690

8791
IPackageReferencesForProject CreatePackageReferencesForProject(MSBuildBasedProject project)
8892
{
8993
return CreatePackageReferencesForProject(project, packageRepositoryCache);
9094
}
9195

92-
protected virtual IPackageReferencesForProject
93-
CreatePackageReferencesForProject(MSBuildBasedProject project, IPackageRepositoryCache packageRepositoryCache)
96+
protected virtual IPackageReferencesForProject CreatePackageReferencesForProject(
97+
MSBuildBasedProject project,
98+
IPackageRepositoryCache packageRepositoryCache)
9499
{
95100
return new PackageReferencesForProject(project, packageRepositoryCache);
96101
}

‎src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementServices.cs‎

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,6 @@ public static class PackageManagementServices
3636
static readonly ResetPowerShellWorkingDirectoryOnSolutionClosed resetPowerShellWorkingDirectory;
3737
static readonly PackageActionsToRun packageActionsToRun = new PackageActionsToRun();
3838
static readonly PackageActionRunner packageActionRunner;
39-
static readonly IPackageRepositoryCache projectTemplatePackageRepositoryCache;
40-
static readonly RegisteredProjectTemplatePackageSources projectTemplatePackageSources;
4139
static readonly PackageRepositoryCache packageRepositoryCache;
4240
static readonly UserAgentGeneratorForRepositoryRequests userAgentGenerator;
4341

@@ -47,8 +45,6 @@ static PackageManagementServices()
4745
packageRepositoryCache = new PackageRepositoryCache(options.PackageSources, options.RecentPackages);
4846
userAgentGenerator = new UserAgentGeneratorForRepositoryRequests(packageRepositoryCache);
4947
registeredPackageRepositories = new RegisteredPackageRepositories(packageRepositoryCache, options);
50-
projectTemplatePackageSources = new RegisteredProjectTemplatePackageSources();
51-
projectTemplatePackageRepositoryCache = new ProjectTemplatePackageRepositoryCache(packageRepositoryCache, projectTemplatePackageSources);
5248

5349
outputMessagesView = new PackageManagementOutputMessagesView(packageManagementEvents);
5450
projectBrowserRefresher = new ProjectBrowserRefresher(projectService, packageManagementEvents);
@@ -111,13 +107,5 @@ public static PackageActionsToRun PackageActionsToRun {
111107
public static IPackageActionRunner PackageActionRunner {
112108
get { return packageActionRunner; }
113109
}
114-
115-
public static IPackageRepositoryCache ProjectTemplatePackageRepositoryCache {
116-
get { return projectTemplatePackageRepositoryCache; }
117-
}
118-
119-
public static RegisteredPackageSources ProjectTemplatePackageSources {
120-
get { return projectTemplatePackageSources.PackageSources; }
121-
}
122110
}
123111
}

‎src/AddIns/Misc/PackageManagement/Project/Src/PackageManagementViewModels.cs‎

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,6 @@ RegisteredPackageSourcesViewModel CreateRegisteredPackageSourcesViewModel(Regist
133133
}
134134
}
135135

136-
public RegisteredPackageSourcesViewModel RegisteredProjectTemplatePackageSourcesViewModel {
137-
get {
138-
if (registeredProjectTemplatePackageSourcesViewModel == null) {
139-
RegisteredPackageSources packageSources = GetProjectTemplatePackageSources();
140-
registeredProjectTemplatePackageSourcesViewModel =
141-
CreateRegisteredPackageSourcesViewModel(packageSources);
142-
}
143-
return registeredProjectTemplatePackageSourcesViewModel;
144-
}
145-
}
146-
147-
RegisteredPackageSources GetProjectTemplatePackageSources()
148-
{
149-
if (IsInDesignMode()) {
150-
return CreateDesignTimeRegisteredPackageSources();
151-
} else {
152-
return PackageManagementServices.ProjectTemplatePackageSources;
153-
}
154-
}
155-
156136
public PackageManagementOptionsViewModel PackageManagementOptionsViewModel {
157137
get {
158138
if (packageManagementOptionsViewModel == null) {

‎src/AddIns/Misc/PackageManagement/Project/Src/ProjectTemplatePackageRepositoryCache.cs‎

Lines changed: 0 additions & 89 deletions
This file was deleted.

‎src/AddIns/Misc/PackageManagement/Project/Src/RegisteredProjectTemplatePackageSources.cs‎

Lines changed: 0 additions & 64 deletions
This file was deleted.

‎src/AddIns/Misc/PackageManagement/Project/Src/RegisteredProjectTemplatePackageSourcesView.xaml‎

Lines changed: 0 additions & 26 deletions
This file was deleted.

‎src/AddIns/Misc/PackageManagement/Project/Src/RegisteredProjectTemplatePackageSourcesView.xaml.cs‎

Lines changed: 0 additions & 53 deletions
This file was deleted.

‎src/AddIns/Misc/PackageManagement/Test/PackageManagement.Tests.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,6 @@
212212
<Compile Include="Src\PackageReferencesForProjectTests.cs" />
213213
<Compile Include="Src\ProjectBrowserRefresherTests.cs" />
214214
<Compile Include="Src\ProjectBrowserUpdaterTests.cs" />
215-
<Compile Include="Src\ProjectTemplatePackageRepositoryCacheTests.cs" />
216215
<Compile Include="Src\RegisteredPackageRepositoriesTests.cs" />
217216
<Compile Include="Src\Helpers\ExceptionThrowingPackageManagementService.cs" />
218217
<Compile Include="Src\Helpers\ExceptionThrowingPackageOperationResolver.cs" />
@@ -284,7 +283,6 @@
284283
<Compile Include="Src\PackageManagementOutputMessagesViewTests.cs" />
285284
<Compile Include="Src\PackageManagementSolutionTests.cs" />
286285
<Compile Include="Src\PackageRepositoryCacheTests.cs" />
287-
<Compile Include="Src\RegisteredProjectTemplatePackageSourcesTests.cs" />
288286
<Compile Include="Src\Scripting\ConsoleInitializerTests.cs" />
289287
<Compile Include="Src\Scripting\PackageInitializationScriptsConsoleTests.cs" />
290288
<Compile Include="Src\Scripting\PackageInitializationScriptsTests.cs" />

0 commit comments

Comments
 (0)