Cleanup directory structure

sboulema · Oct 21, 2024 · f694cdd · f694cdd
1 parent 549e872
commit f694cdd
Show file tree

Hide file tree

Showing 51 changed files with 6 additions and 7 deletions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -13,7 +13,6 @@
     <PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="8.0.1" />
     <PackageVersion Include="Microsoft.VSSDK.BuildTools" Version="17.12.2069" />
     <PackageVersion Include="NuGet.Protocol" Version="[6.5.1]" Justification="VSIX limitation (Newtonsoft.Json 13.0.1)" />
-    <PackageVersion Include="Nullable.Extended.Analyzer" Version="1.15.6169" />
     <PackageVersion Include="PropertyChanged.Fody" Version="4.1.0" />
     <PackageVersion Include="Throttle.Fody" Version="1.7.0" />
     <PackageVersion Include="TomsToolbox.Essentials" Version="2.20.0" />

diff --git a/NuGetMonitor.sln b/NuGetMonitor.sln
@@ -3,8 +3,6 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.33808.371
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetMonitor", "src\NuGetMonitor.csproj", "{C1A48EF4-3E62-4C4C-8A3E-E1BA33FCAF14}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{6574B5FA-865B-4150-A0F9-72420A7D5AA4}"
 	ProjectSection(SolutionItems) = preProject
 		.editorconfig = .editorconfig
@@ -15,7 +13,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.github\workflows\workflow.yml = .github\workflows\workflow.yml
 	EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetMonitor.Model", "NuGetMonitor.Model\NuGetMonitor.Model.csproj", "{D1E7ECAB-56A7-4283-A2BC-847AB3B7F72A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetMonitor", "src\NuGetMonitor\NuGetMonitor.csproj", "{C1A48EF4-3E62-4C4C-8A3E-E1BA33FCAF14}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NuGetMonitor.Model", "src\NuGetMonitor.Model\NuGetMonitor.Model.csproj", "{D1E7ECAB-56A7-4283-A2BC-847AB3B7F72A}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/...Monitor.Model/Abstractions/ILoggerSink.cs → ...Monitor.Model/Abstractions/ILoggerSink.cs b/...Monitor.Model/Abstractions/ILoggerSink.cs → ...Monitor.Model/Abstractions/ILoggerSink.cs
diff --git a/NuGetMonitor.Model/ExtensionMethods.cs → src/NuGetMonitor.Model/ExtensionMethods.cs b/NuGetMonitor.Model/ExtensionMethods.cs → src/NuGetMonitor.Model/ExtensionMethods.cs
diff --git a/NuGetMonitor.Model/FodyWeavers.xml → src/NuGetMonitor.Model/FodyWeavers.xml b/NuGetMonitor.Model/FodyWeavers.xml → src/NuGetMonitor.Model/FodyWeavers.xml
diff --git a/NuGetMonitor.Model/GlobalConstants.cs → src/NuGetMonitor.Model/GlobalConstants.cs b/NuGetMonitor.Model/GlobalConstants.cs → src/NuGetMonitor.Model/GlobalConstants.cs
diff --git a/NuGetMonitor.Model/GlobalUsings.cs → src/NuGetMonitor.Model/GlobalUsings.cs b/NuGetMonitor.Model/GlobalUsings.cs → src/NuGetMonitor.Model/GlobalUsings.cs
diff --git a/NuGetMonitor.Model/Models/NugetSession.cs → ...NuGetMonitor.Model/Models/NugetSession.cs b/NuGetMonitor.Model/Models/NugetSession.cs → ...NuGetMonitor.Model/Models/NugetSession.cs
diff --git a/NuGetMonitor.Model/Models/Package.cs → src/NuGetMonitor.Model/Models/Package.cs b/NuGetMonitor.Model/Models/Package.cs → src/NuGetMonitor.Model/Models/Package.cs
diff --git a/NuGetMonitor.Model/Models/PackageInfo.cs → src/NuGetMonitor.Model/Models/PackageInfo.cs b/NuGetMonitor.Model/Models/PackageInfo.cs → src/NuGetMonitor.Model/Models/PackageInfo.cs
diff --git a/...tMonitor.Model/Models/PackageReference.cs → ...tMonitor.Model/Models/PackageReference.cs b/...tMonitor.Model/Models/PackageReference.cs → ...tMonitor.Model/Models/PackageReference.cs
diff --git a/...tor.Model/Models/PackageReferenceEntry.cs → ...tor.Model/Models/PackageReferenceEntry.cs b/...tor.Model/Models/PackageReferenceEntry.cs → ...tor.Model/Models/PackageReferenceEntry.cs
diff --git a/...itor.Model/Models/PackageReferenceInfo.cs → ...itor.Model/Models/PackageReferenceInfo.cs b/...itor.Model/Models/PackageReferenceInfo.cs → ...itor.Model/Models/PackageReferenceInfo.cs
diff --git a/....Model/Models/ProjectInTargetFramework.cs → ....Model/Models/ProjectInTargetFramework.cs b/....Model/Models/ProjectInTargetFramework.cs → ....Model/Models/ProjectInTargetFramework.cs
diff --git a/...el/Models/ProjectItemInTargetFramework.cs → ...el/Models/ProjectItemInTargetFramework.cs b/...el/Models/ProjectItemInTargetFramework.cs → ...el/Models/ProjectItemInTargetFramework.cs
diff --git a/...Monitor.Model/Models/RepositoryContext.cs → ...Monitor.Model/Models/RepositoryContext.cs b/...Monitor.Model/Models/RepositoryContext.cs → ...Monitor.Model/Models/RepositoryContext.cs
diff --git a/...or.Model/Models/TransitiveDependencies.cs → ...or.Model/Models/TransitiveDependencies.cs b/...or.Model/Models/TransitiveDependencies.cs → ...or.Model/Models/TransitiveDependencies.cs
diff --git a/NuGetMonitor.Model/NuGetMonitor.Model.csproj → ...etMonitor.Model/NuGetMonitor.Model.csproj b/NuGetMonitor.Model/NuGetMonitor.Model.csproj → ...etMonitor.Model/NuGetMonitor.Model.csproj
diff --git a/...onitor.Model/Properties/IsExternalInit.cs → ...onitor.Model/Properties/IsExternalInit.cs b/...onitor.Model/Properties/IsExternalInit.cs → ...onitor.Model/Properties/IsExternalInit.cs
diff --git a/NuGetMonitor.Model/Services/LoggerService.cs → ...etMonitor.Model/Services/LoggerService.cs b/NuGetMonitor.Model/Services/LoggerService.cs → ...etMonitor.Model/Services/LoggerService.cs
diff --git a/NuGetMonitor.Model/Services/NuGetService.cs → ...GetMonitor.Model/Services/NuGetService.cs b/NuGetMonitor.Model/Services/NuGetService.cs → ...GetMonitor.Model/Services/NuGetService.cs
diff --git a/...tMonitor.Model/Services/ProjectService.cs → ...tMonitor.Model/Services/ProjectService.cs b/...tMonitor.Model/Services/ProjectService.cs → ...tMonitor.Model/Services/ProjectService.cs
diff --git a/src/Abstractions/ISolutionService.cs → ...tMonitor/Abstractions/ISolutionService.cs b/src/Abstractions/ISolutionService.cs → ...tMonitor/Abstractions/ISolutionService.cs
diff --git a/src/FodyWeavers.xml → src/NuGetMonitor/FodyWeavers.xml b/src/FodyWeavers.xml → src/NuGetMonitor/FodyWeavers.xml
diff --git a/src/GlobalUsings.cs → src/NuGetMonitor/GlobalUsings.cs b/src/GlobalUsings.cs → src/NuGetMonitor/GlobalUsings.cs
diff --git a/src/NuGetMonitor.csproj → src/NuGetMonitor/NuGetMonitor.csproj b/src/NuGetMonitor.csproj → src/NuGetMonitor/NuGetMonitor.csproj
@@ -25,15 +25,15 @@
     <PackageReference Include="VSIX-SdkProjectAdapter" PrivateAssets="all" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\LICENSE">
+    <Content Include="..\..\LICENSE">
       <Link>Resources\LICENSE</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\art\Screenshot.png">
+    <Content Include="..\..\art\Screenshot.png">
       <Link>Resources\Screenshot.png</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>
-    <Content Include="..\art\NugetMonitor_90x90.png">
+    <Content Include="..\..\art\NugetMonitor_90x90.png">
       <Link>Resources\NugetMonitor_90x90.png</Link>
       <IncludeInVSIX>true</IncludeInVSIX>
     </Content>

diff --git a/src/NuGetMonitorCommands.cs → src/NuGetMonitor/NuGetMonitorCommands.cs b/src/NuGetMonitorCommands.cs → src/NuGetMonitor/NuGetMonitorCommands.cs
diff --git a/src/NuGetMonitorPackage.cs → src/NuGetMonitor/NuGetMonitorPackage.cs b/src/NuGetMonitorPackage.cs → src/NuGetMonitor/NuGetMonitorPackage.cs
diff --git a/src/NuGetMonitorPackage.vsct → src/NuGetMonitor/NuGetMonitorPackage.vsct b/src/NuGetMonitorPackage.vsct → src/NuGetMonitor/NuGetMonitorPackage.vsct
diff --git a/src/Options/GeneralOptions.cs → src/NuGetMonitor/Options/GeneralOptions.cs b/src/Options/GeneralOptions.cs → src/NuGetMonitor/Options/GeneralOptions.cs
diff --git a/src/Properties/AssemblyInfo.cs → src/NuGetMonitor/Properties/AssemblyInfo.cs b/src/Properties/AssemblyInfo.cs → src/NuGetMonitor/Properties/AssemblyInfo.cs
diff --git a/src/Properties/IsExternalInit.cs → ...NuGetMonitor/Properties/IsExternalInit.cs b/src/Properties/IsExternalInit.cs → ...NuGetMonitor/Properties/IsExternalInit.cs
diff --git a/src/Resources/NuGetMonitorCommand.png → ...Monitor/Resources/NuGetMonitorCommand.png b/src/Resources/NuGetMonitorCommand.png → ...Monitor/Resources/NuGetMonitorCommand.png
diff --git a/src/Resources/VSColorScheme.xaml → ...NuGetMonitor/Resources/VSColorScheme.xaml b/src/Resources/VSColorScheme.xaml → ...NuGetMonitor/Resources/VSColorScheme.xaml
diff --git a/src/Services/InfoBarService.cs → src/NuGetMonitor/Services/InfoBarService.cs b/src/Services/InfoBarService.cs → src/NuGetMonitor/Services/InfoBarService.cs
diff --git a/src/Services/LoggingService.cs → src/NuGetMonitor/Services/LoggingService.cs b/src/Services/LoggingService.cs → src/NuGetMonitor/Services/LoggingService.cs
diff --git a/src/Services/MonitorService.cs → src/NuGetMonitor/Services/MonitorService.cs b/src/Services/MonitorService.cs → src/NuGetMonitor/Services/MonitorService.cs
diff --git a/src/Services/SolutionService.cs → src/NuGetMonitor/Services/SolutionService.cs b/src/Services/SolutionService.cs → src/NuGetMonitor/Services/SolutionService.cs
diff --git a/...DependencyTree/DependencyTreeControl.xaml → ...DependencyTree/DependencyTreeControl.xaml b/...DependencyTree/DependencyTreeControl.xaml → ...DependencyTree/DependencyTreeControl.xaml
diff --git a/...endencyTree/DependencyTreeControl.xaml.cs → ...endencyTree/DependencyTreeControl.xaml.cs b/...endencyTree/DependencyTreeControl.xaml.cs → ...endencyTree/DependencyTreeControl.xaml.cs
diff --git a/...ependencyTree/DependencyTreeToolWindow.cs → ...ependencyTree/DependencyTreeToolWindow.cs b/...ependencyTree/DependencyTreeToolWindow.cs → ...ependencyTree/DependencyTreeToolWindow.cs
diff --git a/...DependencyTree/DependencyTreeViewModel.cs → ...DependencyTree/DependencyTreeViewModel.cs b/...DependencyTree/DependencyTreeViewModel.cs → ...DependencyTree/DependencyTreeViewModel.cs
diff --git a/src/View/Monitor/NuGetMonitorControl.xaml → ...tor/View/Monitor/NuGetMonitorControl.xaml b/src/View/Monitor/NuGetMonitorControl.xaml → ...tor/View/Monitor/NuGetMonitorControl.xaml
diff --git a/src/View/Monitor/NuGetMonitorToolWindow.cs → ...or/View/Monitor/NuGetMonitorToolWindow.cs b/src/View/Monitor/NuGetMonitorToolWindow.cs → ...or/View/Monitor/NuGetMonitorToolWindow.cs
diff --git a/src/View/Monitor/NugetMonitorControl.xaml.cs → .../View/Monitor/NugetMonitorControl.xaml.cs b/src/View/Monitor/NugetMonitorControl.xaml.cs → .../View/Monitor/NugetMonitorControl.xaml.cs
diff --git a/src/View/Monitor/NugetMonitorViewModel.cs → ...tor/View/Monitor/NugetMonitorViewModel.cs b/src/View/Monitor/NugetMonitorViewModel.cs → ...tor/View/Monitor/NugetMonitorViewModel.cs
diff --git a/src/ViewModels/PackageItemType.cs → ...uGetMonitor/ViewModels/PackageItemType.cs b/src/ViewModels/PackageItemType.cs → ...uGetMonitor/ViewModels/PackageItemType.cs
diff --git a/src/ViewModels/PackageViewModel.cs → ...GetMonitor/ViewModels/PackageViewModel.cs b/src/ViewModels/PackageViewModel.cs → ...GetMonitor/ViewModels/PackageViewModel.cs
diff --git a/src/ViewModels/ProjectViewModel.cs → ...GetMonitor/ViewModels/ProjectViewModel.cs b/src/ViewModels/ProjectViewModel.cs → ...GetMonitor/ViewModels/ProjectViewModel.cs
diff --git a/src/publish-manifest.json → src/NuGetMonitor/publish-manifest.json b/src/publish-manifest.json → src/NuGetMonitor/publish-manifest.json
diff --git a/src/source.extension.vsixmanifest → ...uGetMonitor/source.extension.vsixmanifest b/src/source.extension.vsixmanifest → ...uGetMonitor/source.extension.vsixmanifest