Fix project paths on disk to match solution structure

tareqimbasher · Jun 8, 2024 · e2204dd · e2204dd
1 parent 8cfa61a
commit e2204dd
Show file tree

Hide file tree

Showing 17 changed files with 7 additions and 11 deletions.
diff --git a/src/Apps/NetPad.Apps.App/NetPad.Apps.App.csproj b/src/Apps/NetPad.Apps.App/NetPad.Apps.App.csproj
@@ -72,8 +72,8 @@
     <ItemGroup>
         <ProjectReference Include="..\..\Core\NetPad.Runtime\NetPad.Runtime.csproj" />
         <ProjectReference Include="..\..\External\O2Html\O2Html.csproj" />
-        <ProjectReference Include="..\..\Infrastructure\NetPad.Apps.Shells.Electron\NetPad.Apps.Shells.Electron.csproj" />
-        <ProjectReference Include="..\..\Infrastructure\NetPad.Apps.Shells.Web\NetPad.Apps.Shells.Web.csproj" />
+        <ProjectReference Include="..\NetPad.Apps.Shells.Electron\NetPad.Apps.Shells.Electron.csproj" />
+        <ProjectReference Include="..\NetPad.Apps.Shells.Web\NetPad.Apps.Shells.Web.csproj" />
         <ProjectReference Include="..\..\Plugins\NetPad.Plugins.OmniSharp\NetPad.Plugins.OmniSharp.csproj" />
         <ProjectReference Include="..\NetPad.Apps.Common\NetPad.Apps.Common.csproj" />
     </ItemGroup>

diff --git a/src/Apps/NetPad.Apps.Common/Shells/IShell.cs b/src/Apps/NetPad.Apps.Common/Shells/IShell.cs
@@ -5,6 +5,9 @@
 
 namespace NetPad.Apps.Shells;
 
+/// <summary>
+/// A shell that hosts the web interface.
+/// </summary>
 public interface IShell
 {
     void ConfigureWebHost(IWebHostBuilder webHostBuilder, string[] programArgs);

diff --git a/...Services/NotificationBackgroundService.cs → ...Services/NotificationBackgroundService.cs b/...Services/NotificationBackgroundService.cs → ...Services/NotificationBackgroundService.cs
diff --git a/...Pad.Apps.Shells.Electron/ElectronShell.cs → ...Pad.Apps.Shells.Electron/ElectronShell.cs b/...Pad.Apps.Shells.Electron/ElectronShell.cs → ...Pad.Apps.Shells.Electron/ElectronShell.cs
diff --git a/...ectron/NetPad.Apps.Shells.Electron.csproj → ...ectron/NetPad.Apps.Shells.Electron.csproj b/...ectron/NetPad.Apps.Shells.Electron.csproj → ...ectron/NetPad.Apps.Shells.Electron.csproj
diff --git a/...s.Electron/UiInterop/BrowserWindowInfo.cs → ...s.Electron/UiInterop/BrowserWindowInfo.cs b/...s.Electron/UiInterop/BrowserWindowInfo.cs → ...s.Electron/UiInterop/BrowserWindowInfo.cs
diff --git a/...ectron/UiInterop/ElectronDialogService.cs → ...ectron/UiInterop/ElectronDialogService.cs b/...ectron/UiInterop/ElectronDialogService.cs → ...ectron/UiInterop/ElectronDialogService.cs
diff --git a/....Electron/UiInterop/ElectronIpcService.cs → ....Electron/UiInterop/ElectronIpcService.cs b/....Electron/UiInterop/ElectronIpcService.cs → ....Electron/UiInterop/ElectronIpcService.cs
diff --git a/...Shells.Electron/UiInterop/ElectronUtil.cs → ...Shells.Electron/UiInterop/ElectronUtil.cs b/...Shells.Electron/UiInterop/ElectronUtil.cs → ...Shells.Electron/UiInterop/ElectronUtil.cs
diff --git a/...ectron/UiInterop/ElectronWindowService.cs → ...ectron/UiInterop/ElectronWindowService.cs b/...ectron/UiInterop/ElectronWindowService.cs → ...ectron/UiInterop/ElectronWindowService.cs
diff --git a/...hells.Electron/UiInterop/WindowManager.cs → ...hells.Electron/UiInterop/WindowManager.cs b/...hells.Electron/UiInterop/WindowManager.cs → ...hells.Electron/UiInterop/WindowManager.cs
diff --git a/....Shells.Electron/UiInterop/WindowState.cs → ....Shells.Electron/UiInterop/WindowState.cs b/....Shells.Electron/UiInterop/WindowState.cs → ....Shells.Electron/UiInterop/WindowState.cs
diff --git a/....Shells.Web/NetPad.Apps.Shells.Web.csproj → ....Shells.Web/NetPad.Apps.Shells.Web.csproj b/....Shells.Web/NetPad.Apps.Shells.Web.csproj → ....Shells.Web/NetPad.Apps.Shells.Web.csproj
diff --git a/....Shells.Web/UiInterop/WebDialogService.cs → ....Shells.Web/UiInterop/WebDialogService.cs b/....Shells.Web/UiInterop/WebDialogService.cs → ....Shells.Web/UiInterop/WebDialogService.cs
diff --git a/....Shells.Web/UiInterop/WebWindowService.cs → ....Shells.Web/UiInterop/WebWindowService.cs b/....Shells.Web/UiInterop/WebWindowService.cs → ....Shells.Web/UiInterop/WebWindowService.cs
diff --git a/...NetPad.Apps.Shells.Web/WebBrowserShell.cs → ...NetPad.Apps.Shells.Web/WebBrowserShell.cs b/...NetPad.Apps.Shells.Web/WebBrowserShell.cs → ...NetPad.Apps.Shells.Web/WebBrowserShell.cs
diff --git a/src/NetPad.sln b/src/NetPad.sln
@@ -22,9 +22,9 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OmniSharp.NET", "External\O
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "O2Html.Tests", "External\O2Html.Tests\O2Html.Tests.csproj", "{E561B57D-9B9D-41CB-AD11-6686715D7628}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Shells.Electron", "Infrastructure\NetPad.Apps.Shells.Electron\NetPad.Apps.Shells.Electron.csproj", "{A37E9174-33C0-4F85-AA1A-5C2FE3039875}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Shells.Electron", "Apps\NetPad.Apps.Shells.Electron\NetPad.Apps.Shells.Electron.csproj", "{A37E9174-33C0-4F85-AA1A-5C2FE3039875}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Shells.Web", "Infrastructure\NetPad.Apps.Shells.Web\NetPad.Apps.Shells.Web.csproj", "{DA7DC475-4311-4826-A023-532791E7B058}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Shells.Web", "Apps\NetPad.Apps.Shells.Web\NetPad.Apps.Shells.Web.csproj", "{DA7DC475-4311-4826-A023-532791E7B058}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{CCE585FD-BC07-4E61-ABD9-42028D95C846}"
 	ProjectSection(SolutionItems) = preProject
@@ -42,8 +42,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Plugins.OmniSharp",
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Common", "Apps\NetPad.Apps.Common\NetPad.Apps.Common.csproj", "{5943A808-7E4B-4272-9189-CEC8519568C5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Cli", "Apps\NetPad.Apps.Cli\NetPad.Apps.Cli.csproj", "{2B456C55-6973-40BE-8FDC-16237C36A1AC}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.Common.Tests", "Tests\NetPad.Apps.Common.Tests\NetPad.Apps.Common.Tests.csproj", "{F374F591-F53A-44E9-81A6-38BB30B6CB59}"
 EndProject
 Global
@@ -96,10 +94,6 @@ Global
 		{5943A808-7E4B-4272-9189-CEC8519568C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5943A808-7E4B-4272-9189-CEC8519568C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5943A808-7E4B-4272-9189-CEC8519568C5}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2B456C55-6973-40BE-8FDC-16237C36A1AC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2B456C55-6973-40BE-8FDC-16237C36A1AC}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2B456C55-6973-40BE-8FDC-16237C36A1AC}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2B456C55-6973-40BE-8FDC-16237C36A1AC}.Release|Any CPU.Build.0 = Release|Any CPU
 		{F374F591-F53A-44E9-81A6-38BB30B6CB59}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{F374F591-F53A-44E9-81A6-38BB30B6CB59}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F374F591-F53A-44E9-81A6-38BB30B6CB59}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -116,7 +110,6 @@ Global
 		{5943A808-7E4B-4272-9189-CEC8519568C5} = {7944C576-A700-41AE-8617-91FC05098F74}
 		{DA7DC475-4311-4826-A023-532791E7B058} = {7944C576-A700-41AE-8617-91FC05098F74}
 		{A37E9174-33C0-4F85-AA1A-5C2FE3039875} = {7944C576-A700-41AE-8617-91FC05098F74}
-		{2B456C55-6973-40BE-8FDC-16237C36A1AC} = {7944C576-A700-41AE-8617-91FC05098F74}
 		{F374F591-F53A-44E9-81A6-38BB30B6CB59} = {6DD496D9-D5F3-4985-854C-165CD1B2691E}
 		{4782F96F-9369-4476-ABA7-9D962700B215} = {6DD496D9-D5F3-4985-854C-165CD1B2691E}
 	EndGlobalSection