Skip to content

Commit

Permalink
Fix project paths on disk to match solution structure
Browse files Browse the repository at this point in the history
  • Loading branch information
@tareqimbasher
tareqimbasher committed Jun 8, 2024
1 parent ec1ee4e commit 8ca63c1
Show file tree
Hide file tree
Showing 43 changed files with 20 additions and 24 deletions.
4 changes: 2 additions & 2 deletions src/Apps/NetPad.Apps.App/NetPad.Apps.App.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion src/Apps/NetPad.Apps.App/Startup.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -235,6 +235,6 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
#endif
});

Program.Shell.Open(app, env);
Program.Shell.Initialize(app, env);
}
}
5 changes: 4 additions & 1 deletion src/Apps/NetPad.Apps.Common/Shells/IShell.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,13 @@

namespace NetPad.Apps.Shells;

/// <summary>
/// A shell that hosts the web interface.
/// </summary>
public interface IShell
{
void ConfigureWebHost(IWebHostBuilder webHostBuilder, string[] programArgs);
void ConfigureServices(IServiceCollection services);
void Open(IApplicationBuilder app, IHostEnvironment env);
void Initialize(IApplicationBuilder app, IHostEnvironment env);
void ShowErrorDialog(string title, string content);
}
0 ...Services/NotificationBackgroundService.cs → ...Services/NotificationBackgroundService.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Pad.Apps.Shells.Electron/ElectronShell.cs → ...Pad.Apps.Shells.Electron/ElectronShell.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ public void ConfigureServices(IServiceCollection services)
services.AddHostedService<NotificationBackgroundService>();
}

public void Open(IApplicationBuilder app, IHostEnvironment env)
public void Initialize(IApplicationBuilder app, IHostEnvironment env)
{
Task.Run(async () =>
{
Expand Down
0 ...ectron/NetPad.Apps.Shells.Electron.csproj → ...ectron/NetPad.Apps.Shells.Electron.csproj
View file
File renamed without changes.
0 ...s.Electron/UiInterop/BrowserWindowInfo.cs → ...s.Electron/UiInterop/BrowserWindowInfo.cs
View file
File renamed without changes.
0 ...ectron/UiInterop/ElectronDialogService.cs → ...ectron/UiInterop/ElectronDialogService.cs
View file
File renamed without changes.
0 ....Electron/UiInterop/ElectronIpcService.cs → ....Electron/UiInterop/ElectronIpcService.cs
View file
File renamed without changes.
0 ...Shells.Electron/UiInterop/ElectronUtil.cs → ...Shells.Electron/UiInterop/ElectronUtil.cs
View file
File renamed without changes.
0 ...ectron/UiInterop/ElectronWindowService.cs → ...ectron/UiInterop/ElectronWindowService.cs
View file
File renamed without changes.
0 ...hells.Electron/UiInterop/WindowManager.cs → ...hells.Electron/UiInterop/WindowManager.cs
View file
File renamed without changes.
0 ....Shells.Electron/UiInterop/WindowState.cs → ....Shells.Electron/UiInterop/WindowState.cs
View file
File renamed without changes.
0 ....Shells.Web/NetPad.Apps.Shells.Web.csproj → ....Shells.Web/NetPad.Apps.Shells.Web.csproj
View file
File renamed without changes.
0 ....Shells.Web/UiInterop/WebDialogService.cs → ....Shells.Web/UiInterop/WebDialogService.cs
View file
File renamed without changes.
0 ....Shells.Web/UiInterop/WebWindowService.cs → ....Shells.Web/UiInterop/WebWindowService.cs
View file
File renamed without changes.
2 changes: 1 addition & 1 deletion ...NetPad.Apps.Shells.Web/WebBrowserShell.cs → ...NetPad.Apps.Shells.Web/WebBrowserShell.cs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ public void ConfigureServices(IServiceCollection services)
services.AddTransient<IIpcService, SignalRIpcService>();
}

public void Open(IApplicationBuilder app, IHostEnvironment env)
public void Initialize(IApplicationBuilder app, IHostEnvironment env)
{
// Do nothing.
}
Expand Down
25 changes: 9 additions & 16 deletions src/NetPad.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Apps", "Apps", "{7944C576-A
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Apps.App", "Apps\NetPad.Apps.App\NetPad.Apps.App.csproj", "{ECAAEF05-4BBB-4472-AFEF-7FC6C9A9206F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Runtime.Tests", "Tests\Core\NetPad.Runtime.Tests\NetPad.Runtime.Tests.csproj", "{4782F96F-9369-4476-ABA7-9D962700B215}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Tests", "Tests\NetPad.Tests\NetPad.Tests.csproj", "{891D7115-D776-419F-987D-B0D19303FF06}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "External", "External", "{9EB9B25D-55AA-4166-96E3-90A1048595E2}"
Expand All @@ -22,9 +20,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
Expand All @@ -42,10 +40,10 @@ 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
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetPad.Runtime.Tests", "Tests\NetPad.Runtime.Tests\NetPad.Runtime.Tests.csproj", "{752B6348-2D4A-4345-BA0C-8D91A7826673}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -60,10 +58,6 @@ Global
{ECAAEF05-4BBB-4472-AFEF-7FC6C9A9206F}.Debug|Any CPU.Build.0 = Debug|Any CPU
{ECAAEF05-4BBB-4472-AFEF-7FC6C9A9206F}.Release|Any CPU.ActiveCfg = Release|Any CPU
{ECAAEF05-4BBB-4472-AFEF-7FC6C9A9206F}.Release|Any CPU.Build.0 = Release|Any CPU
{4782F96F-9369-4476-ABA7-9D962700B215}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{4782F96F-9369-4476-ABA7-9D962700B215}.Debug|Any CPU.Build.0 = Debug|Any CPU
{4782F96F-9369-4476-ABA7-9D962700B215}.Release|Any CPU.ActiveCfg = Release|Any CPU
{4782F96F-9369-4476-ABA7-9D962700B215}.Release|Any CPU.Build.0 = Release|Any CPU
{891D7115-D776-419F-987D-B0D19303FF06}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{891D7115-D776-419F-987D-B0D19303FF06}.Debug|Any CPU.Build.0 = Debug|Any CPU
{891D7115-D776-419F-987D-B0D19303FF06}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -96,14 +90,14 @@ 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
{F374F591-F53A-44E9-81A6-38BB30B6CB59}.Release|Any CPU.Build.0 = Release|Any CPU
{752B6348-2D4A-4345-BA0C-8D91A7826673}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{752B6348-2D4A-4345-BA0C-8D91A7826673}.Debug|Any CPU.Build.0 = Debug|Any CPU
{752B6348-2D4A-4345-BA0C-8D91A7826673}.Release|Any CPU.ActiveCfg = Release|Any CPU
{752B6348-2D4A-4345-BA0C-8D91A7826673}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{F297CA80-61A8-4EB2-AAAD-15AE3BA86675} = {69D2D0EE-EE9A-49C5-8739-87AE0CB5D2A7}
Expand All @@ -116,8 +110,7 @@ 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}
{752B6348-2D4A-4345-BA0C-8D91A7826673} = {6DD496D9-D5F3-4985-854C-165CD1B2691E}
EndGlobalSection
EndGlobal
0 ...e.Tests/Application/AppIdentifierTests.cs → ...e.Tests/Application/AppIdentifierTests.cs
View file
File renamed without changes.
0 ...Tests/Application/ApplicationInfoTests.cs → ...Tests/Application/ApplicationInfoTests.cs
View file
File renamed without changes.
0 ...sts/Assemblies/AssemblyInfoReaderTests.cs → ...sts/Assemblies/AssemblyInfoReaderTests.cs
View file
File renamed without changes.
0 .../CodeAnalysis/CodeAnalysisServiceTests.cs → .../CodeAnalysis/CodeAnalysisServiceTests.cs
View file
File renamed without changes.
0 .../Common/JsonConverterWithCtorArgsTests.cs → .../Common/JsonConverterWithCtorArgsTests.cs
View file
File renamed without changes.
0 ...s/Common/JsonInheritanceConverterTests.cs → ...s/Common/JsonInheritanceConverterTests.cs
View file
File renamed without changes.
0 ...ilation/CSharp/CSharpCodeCompilerTests.cs → ...ilation/CSharp/CSharpCodeCompilerTests.cs
View file
File renamed without changes.
0 ...ests/Data/ConnectionStringBuilderTests.cs → ...ests/Data/ConnectionStringBuilderTests.cs
View file
File renamed without changes.
0 ...time.Tests/Data/DatabaseStructureTests.cs → ...time.Tests/Data/DatabaseStructureTests.cs
View file
File renamed without changes.
0 ...ntime.Tests/Exceptions/ExceptionsTests.cs → ...ntime.Tests/Exceptions/ExceptionsTests.cs
View file
File renamed without changes.
0 ...al/ExternalRunnerCSharpCodeParserTests.cs → ...al/ExternalRunnerCSharpCodeParserTests.cs
View file
File renamed without changes.
0 ...ory/InMemoryScriptRunner.Console.Tests.cs → ...ory/InMemoryScriptRunner.Console.Tests.cs
View file
File renamed without changes.
0 ...del/InMemory/InMemoryScriptRunnerTests.cs → ...del/InMemory/InMemoryScriptRunnerTests.cs
View file
File renamed without changes.
0 ....Runtime.Tests/Html/HtmlPresenterTests.cs → ....Runtime.Tests/Html/HtmlPresenterTests.cs
View file
File renamed without changes.
4 changes: 2 additions & 2 deletions ...Runtime.Tests/NetPad.Runtime.Tests.csproj → ...Runtime.Tests/NetPad.Runtime.Tests.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,8 +33,8 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Core\NetPad.Runtime\NetPad.Runtime.csproj" />
<ProjectReference Include="..\..\NetPad.Tests\NetPad.Tests.csproj" />
<ProjectReference Include="..\..\Core\NetPad.Runtime\NetPad.Runtime.csproj" />
<ProjectReference Include="..\NetPad.Tests\NetPad.Tests.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
0 ....Runtime.Tests/Runtimes/RunResultTests.cs → ....Runtime.Tests/Runtimes/RunResultTests.cs
View file
File renamed without changes.
0 ...cripts/DefaultScriptNameGeneratorTests.cs → ...cripts/DefaultScriptNameGeneratorTests.cs
View file
File renamed without changes.
0 ...NetPad.Runtime.Tests/Scripts/EnumTests.cs → ...NetPad.Runtime.Tests/Scripts/EnumTests.cs
View file
File renamed without changes.
0 ...e.Tests/Scripts/ScriptEnvironmentTests.cs → ...e.Tests/Scripts/ScriptEnvironmentTests.cs
View file
File renamed without changes.
0 ...tPad.Runtime.Tests/Scripts/ScriptTests.cs → ...tPad.Runtime.Tests/Scripts/ScriptTests.cs
View file
File renamed without changes.
0 ...Pad.Runtime.Tests/SemanticVersionTests.cs → ...Pad.Runtime.Tests/SemanticVersionTests.cs
View file
File renamed without changes.
0 ...ad.Runtime.Tests/Sessions/SessionTests.cs → ...ad.Runtime.Tests/Sessions/SessionTests.cs
View file
File renamed without changes.
0 ...ore/NetPad.Runtime.Tests/SettingsTests.cs → ...sts/NetPad.Runtime.Tests/SettingsTests.cs
View file
File renamed without changes.
0 ...untime.Tests/Utilities/StringUtilTests.cs → ...untime.Tests/Utilities/StringUtilTests.cs
View file
File renamed without changes.
0 ...ore/NetPad.Runtime.Tests/appsettings.json → ...sts/NetPad.Runtime.Tests/appsettings.json
View file
File renamed without changes.

0 comments on commit 8ca63c1

Please sign in to comment.