Merge pull request #8620 from ocallesp/refactor-projectsystem-vs-pack…

…ageRestore Refactor ProjectSystem/VS/PackageRestore
dotnet · Oct 18, 2022 · 279a7f1 · 279a7f1
2 parents 050a46f + 1d7c1e4
commit 279a7f1
Show file tree

Hide file tree

Showing 13 changed files with 15 additions and 4 deletions.
diff --git a/...udio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/PackageRestoreDataSource.cs b/...udio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/PackageRestoreDataSource.cs
@@ -10,6 +10,7 @@
 using NuGet.SolutionRestoreManager;
 using Microsoft.Internal.VisualStudio.Shell.Interop;
 using System.Diagnostics;
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
 {

diff --git a/.../VS/PackageRestore/PackageRestoreProgressTracker.PackageRestoreProgressTrackerInstance.cs b/.../VS/PackageRestore/PackageRestoreProgressTracker.PackageRestoreProgressTrackerInstance.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using StageId = Microsoft.VisualStudio.ProjectSystem.OperationProgress.OperationProgressStageId;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore

diff --git a/...ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/PackageRestoreProgressTracker.cs b/...ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/PackageRestoreProgressTracker.cs
@@ -1,5 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
+
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
 {
     /// <summary>

diff --git a/...o.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ProjectProperties.cs b/...o.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ProjectProperties.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using NuGet.SolutionRestoreManager;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore

diff --git a/...udio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ReferenceItems.cs b/...udio.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ReferenceItems.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using NuGet.SolutionRestoreManager;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore

diff --git a/...ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ReferenceProperties.cs b/...ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/ReferenceProperties.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using NuGet.SolutionRestoreManager;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore

diff --git a/...io.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/TargetFrameworks.cs b/...io.ProjectSystem.Managed.VS/ProjectSystem/VS/PackageRestore/Snapshots/TargetFrameworks.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using NuGet.SolutionRestoreManager;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore

diff --git a/...ckageRestore/IPackageRestoreDataSource.cs → ...ckageRestore/IPackageRestoreDataSource.cs b/...ckageRestore/IPackageRestoreDataSource.cs → ...ckageRestore/IPackageRestoreDataSource.cs
@@ -2,7 +2,7 @@
 
 using Microsoft.VisualStudio.Composition;
 
-namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
+namespace Microsoft.VisualStudio.ProjectSystem.PackageRestore
 {
     /// <summary>
     ///     Provides a view of the project's restore state.

diff --git a/...ckageRestore/NuGetRestoreCycleDetector.cs → ...ckageRestore/NuGetRestoreCycleDetector.cs b/...ckageRestore/NuGetRestoreCycleDetector.cs → ...ckageRestore/NuGetRestoreCycleDetector.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
+namespace Microsoft.VisualStudio.ProjectSystem.PackageRestore
 {
     // This algorithm is to detect the pattern A -> B -> A -> B -> A in the most recent N values.
     // To keep track of the most N recent values we are using a queue of fixed size, where:

diff --git a/.../Snapshots/ImmutablePropertyCollection.cs → .../Snapshots/ImmutablePropertyCollection.cs b/.../Snapshots/ImmutablePropertyCollection.cs → .../Snapshots/ImmutablePropertyCollection.cs
@@ -3,7 +3,7 @@
 using System.Collections;
 using System.Diagnostics;
 
-namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
+namespace Microsoft.VisualStudio.ProjectSystem.PackageRestore
 {
     /// <summary>
     ///     Abstract immutable collection that supports lookup by index and name.

diff --git a/...S/PackageRestore/Snapshots/RestoreData.cs → ...m/PackageRestore/Snapshots/RestoreData.cs b/...S/PackageRestore/Snapshots/RestoreData.cs → ...m/PackageRestore/Snapshots/RestoreData.cs
@@ -1,6 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
-namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
+namespace Microsoft.VisualStudio.ProjectSystem.PackageRestore
 {
     /// <summary>
     ///     Represents restore data for a package restore operation.

diff --git a/...ft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Mocks/IPackageRestoreServiceFactory.cs b/...ft.VisualStudio.ProjectSystem.Managed.VS.UnitTests/Mocks/IPackageRestoreServiceFactory.cs
@@ -1,5 +1,7 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
+
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore
 {
     internal static class IPackageRestoreServiceFactory

diff --git a/...S.UnitTests/ProjectSystem/VS/PackageRestore/PackageRestoreProgressTrackerInstanceTests.cs b/...S.UnitTests/ProjectSystem/VS/PackageRestore/PackageRestoreProgressTrackerInstanceTests.cs
@@ -1,5 +1,6 @@
 // Licensed to the .NET Foundation under one or more agreements. The .NET Foundation licenses this file to you under the MIT license. See the LICENSE.md file in the project root for more information.
 
+using Microsoft.VisualStudio.ProjectSystem.PackageRestore;
 using static Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore.PackageRestoreProgressTracker;
 
 namespace Microsoft.VisualStudio.ProjectSystem.VS.PackageRestore