diff --git a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj b/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj deleted file mode 100644 index 9a9cb9fa..00000000 --- a/Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj +++ /dev/null @@ -1,12 +0,0 @@ - - - - net9.0 - 1.0.0 - Oqtane.Application.AppHost - - - - - - diff --git a/Oqtane.Application/AppHost/Properties/launchSettings.json b/Oqtane.Application/AppHost/Properties/launchSettings.json deleted file mode 100644 index 11cab4d9..00000000 --- a/Oqtane.Application/AppHost/Properties/launchSettings.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "http://localhost:44358/", - "sslPort": 0 - } - }, - "profiles": { - "Oqtane.Application": { - "commandName": "Project", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - }, - "applicationUrl": "http://localhost:44358/" - }, - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - } - } -} diff --git a/Oqtane.Application/AppHost/wwwroot/_content/Placeholder.txt b/Oqtane.Application/AppHost/wwwroot/_content/Placeholder.txt deleted file mode 100644 index 5a324d79..00000000 --- a/Oqtane.Application/AppHost/wwwroot/_content/Placeholder.txt +++ /dev/null @@ -1,11 +0,0 @@ -The _content folder should only contain static resources from shared razor component libraries (RCLs). Static resources can be extracted from shared RCL Nuget packages by executing a Publish task on the module's Server project to a local folder and copying the files from the _content folder which is created. Each shared RCL would have its own appropriately named subfolder within the module's _content folder. - -ie. - -/_content - /Radzen.Blazor - /css - /fonts - /syncfusion.blazor - /scripts - /styles diff --git a/Oqtane.Application/AppHost/wwwroot/resources.txt b/Oqtane.Application/AppHost/wwwroot/resources.txt deleted file mode 100644 index 2542de03..00000000 --- a/Oqtane.Application/AppHost/wwwroot/resources.txt +++ /dev/null @@ -1 +0,0 @@ -This is the location where static resources such as images or style sheets should be located \ No newline at end of file diff --git a/Oqtane.Application/Client/Modules/MyModule/Edit.razor b/Oqtane.Application/Client/Modules/MyModule/Edit.razor index f84c4daf..3e9caa2a 100644 --- a/Oqtane.Application/Client/Modules/MyModule/Edit.razor +++ b/Oqtane.Application/Client/Modules/MyModule/Edit.razor @@ -35,7 +35,7 @@ public override List Resources => new List() { - new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" } + new Stylesheet(ModulePath() + "Module.css") }; private ElementReference form; diff --git a/Oqtane.Application/Client/Modules/MyModule/Index.razor b/Oqtane.Application/Client/Modules/MyModule/Index.razor index 637ba533..1987a19a 100644 --- a/Oqtane.Application/Client/Modules/MyModule/Index.razor +++ b/Oqtane.Application/Client/Modules/MyModule/Index.razor @@ -42,8 +42,8 @@ else public override List Resources => new List() { - new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }, - new Resource { ResourceType = ResourceType.Script, Url = ModulePath() + "Module.js" } + new Stylesheet(ModulePath() + "Module.css"), + new Script(ModulePath() + "Module.js") }; List _MyModules; diff --git a/Oqtane.Application/Client/Oqtane.Application.Client.csproj b/Oqtane.Application/Client/Oqtane.Application.Client.csproj index 6d83fd5c..638acb68 100644 --- a/Oqtane.Application/Client/Oqtane.Application.Client.csproj +++ b/Oqtane.Application/Client/Oqtane.Application.Client.csproj @@ -1,23 +1,21 @@ - + - - net9.0 - 1.0.0 - Oqtane.Application.Client.Oqtane - + + net9.0 + 1.0.0 + Oqtane.Application.Client.Oqtane + true + Default + false + true + - - - + + + - - - - - - - false - false - + + + diff --git a/Oqtane.Application/Client/Program.cs b/Oqtane.Application/Client/Program.cs new file mode 100644 index 00000000..3d0820e2 --- /dev/null +++ b/Oqtane.Application/Client/Program.cs @@ -0,0 +1,12 @@ +using System.Threading.Tasks; + +namespace Oqtane.Application.Client +{ + internal class Program + { + static async Task Main(string[] args) + { + await Oqtane.Client.Program.Main(args); + } + } +} diff --git a/Oqtane.Application/Client/Themes/MyTheme/ThemeInfo.cs b/Oqtane.Application/Client/Themes/MyTheme/ThemeInfo.cs index 55047946..f46efe9a 100644 --- a/Oqtane.Application/Client/Themes/MyTheme/ThemeInfo.cs +++ b/Oqtane.Application/Client/Themes/MyTheme/ThemeInfo.cs @@ -16,8 +16,8 @@ namespace Oqtane.Application.MyTheme ContainerSettingsType = "Oqtane.Application.MyTheme.ContainerSettings, Oqtane.Application.Client.Oqtane", Resources = new List() { - new Script(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"), - new Resource { ResourceType = ResourceType.Stylesheet, Url = "~/Theme.css" }, + new Stylesheet(Constants.BootstrapStylesheetUrl, Constants.BootstrapStylesheetIntegrity, "anonymous"), + new Stylesheet("~/Theme.css"), new Script(Constants.BootstrapScriptUrl, Constants.BootstrapScriptIntegrity, "anonymous") } }; diff --git a/Oqtane.Application/Oqtane.Application.sln b/Oqtane.Application/Oqtane.Application.sln index a1054772..ea06ef57 100644 --- a/Oqtane.Application/Oqtane.Application.sln +++ b/Oqtane.Application/Oqtane.Application.sln @@ -2,12 +2,10 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.12.35506.116 d17.12 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Oqtane.Application.AppHost", "AppHost\Oqtane.Application.AppHost.csproj", "{5BDDA15B-05CF-41B2-BF12-D532D1A561D1}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Server", "Server\Oqtane.Application.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Client", "Client\Oqtane.Application.Client.csproj", "{AA8E58A1-CD09-4208-BF66-A8BB341FD669}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Server", "Server\Oqtane.Application.Server.csproj", "{04B05448-788F-433D-92C0-FED35122D45A}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Oqtane.Application.Shared", "Shared\Oqtane.Application.Shared.csproj", "{18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}" EndProject Global @@ -16,18 +14,14 @@ Global Release|Any CPU = Release|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5BDDA15B-05CF-41B2-BF12-D532D1A561D1}.Release|Any CPU.Build.0 = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU - {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU {04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {04B05448-788F-433D-92C0-FED35122D45A}.Debug|Any CPU.Build.0 = Debug|Any CPU {04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.ActiveCfg = Release|Any CPU {04B05448-788F-433D-92C0-FED35122D45A}.Release|Any CPU.Build.0 = Release|Any CPU + {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AA8E58A1-CD09-4208-BF66-A8BB341FD669}.Release|Any CPU.Build.0 = Release|Any CPU {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Debug|Any CPU.Build.0 = Debug|Any CPU {18D73F73-D7BE-4388-85BA-FBD9AC96FCA2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -36,7 +30,4 @@ Global GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {1D016F15-46FE-4726-8DFD-2E4FD4DC7668} - EndGlobalSection EndGlobal diff --git a/Oqtane.Application/Server/Oqtane.Application.Server.csproj b/Oqtane.Application/Server/Oqtane.Application.Server.csproj index 7e9ad243..5259f3b5 100644 --- a/Oqtane.Application/Server/Oqtane.Application.Server.csproj +++ b/Oqtane.Application/Server/Oqtane.Application.Server.csproj @@ -1,25 +1,18 @@ - + - - net9.0 - true - 1.0.0 - Oqtane.Application.Server.Oqtane - + + net9.0 + 1.0.0 + Oqtane.Application.Server.Oqtane + - - - - + + + + - - - - - - - - - - + + + + diff --git a/Oqtane.Application/AppHost/Program.cs b/Oqtane.Application/Server/Program.cs similarity index 84% rename from Oqtane.Application/AppHost/Program.cs rename to Oqtane.Application/Server/Program.cs index e2a7714c..9cbd89e5 100644 --- a/Oqtane.Application/AppHost/Program.cs +++ b/Oqtane.Application/Server/Program.cs @@ -1,12 +1,11 @@ using Microsoft.AspNetCore.Hosting; -using Microsoft.Extensions.Hosting; -using Microsoft.Extensions.Configuration; using Microsoft.AspNetCore; -using Microsoft.Extensions.DependencyInjection; -using Oqtane.Infrastructure; +using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Logging; +using Oqtane.Infrastructure; +using Microsoft.Extensions.DependencyInjection; -namespace Oqtane.Application.AppHost +namespace Oqtane.Application.Server { public class Program { @@ -20,7 +19,7 @@ namespace Oqtane.Application.AppHost var filelogger = host.Services.GetRequiredService>(); if (filelogger != null) { - filelogger.LogError($"[Oqtane.Application.AppHost.Program.Main] {install.Message}"); + filelogger.LogError($"[Oqtane.Application.Server.Program.Main] {install.Message}"); } } else @@ -35,9 +34,8 @@ namespace Oqtane.Application.AppHost .AddCommandLine(args) .AddEnvironmentVariables() .Build()) - .UseStartup() + .UseStartup() .ConfigureLocalizationSettings() .Build(); } } - diff --git a/Oqtane.Application/Server/Properties/launchSettings.json b/Oqtane.Application/Server/Properties/launchSettings.json new file mode 100644 index 00000000..80a48970 --- /dev/null +++ b/Oqtane.Application/Server/Properties/launchSettings.json @@ -0,0 +1,25 @@ +{ + "$schema": "https://json.schemastore.org/launchsettings.json", + "profiles": { + "http": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "http://localhost:5084", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + }, + "https": { + "commandName": "Project", + "dotnetRunMessages": true, + "launchBrowser": true, + "inspectUri": "{wsProtocol}://{url.hostname}:{url.port}/_framework/debug/ws-proxy?browser={browserInspectUri}", + "applicationUrl": "https://localhost:7035;http://localhost:5084", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } + } + } + } diff --git a/Oqtane.Application/Server/Startup.cs b/Oqtane.Application/Server/Startup.cs new file mode 100644 index 00000000..da1bc828 --- /dev/null +++ b/Oqtane.Application/Server/Startup.cs @@ -0,0 +1,43 @@ +using System; +using System.IO; +using Microsoft.AspNetCore.Builder; +using Microsoft.AspNetCore.Hosting; +using Microsoft.Extensions.Configuration; +using Microsoft.Extensions.DependencyInjection; +using Oqtane.Extensions; +using Oqtane.Infrastructure; +using Oqtane.Shared; +using Microsoft.AspNetCore.Cors.Infrastructure; + +namespace Oqtane.Application.Server +{ + public class Startup + { + private readonly IConfigurationRoot _configuration; + private readonly IWebHostEnvironment _environment; + + public Startup(IWebHostEnvironment environment) + { + AppDomain.CurrentDomain.SetData(Constants.DataDirectory, Path.Combine(environment.ContentRootPath, "Data")); + + var builder = new ConfigurationBuilder() + .SetBasePath(environment.ContentRootPath) + .AddJsonFile("appsettings.json", false, true) + .AddJsonFile($"appsettings.{environment.EnvironmentName}.json", true, true) + .AddEnvironmentVariables(); + + _configuration = builder.Build(); + _environment = environment; + } + + public void ConfigureServices(IServiceCollection services) + { + services.AddOqtane(_configuration, _environment); + } + + public void Configure(IApplicationBuilder app, IConfigurationRoot configuration, IWebHostEnvironment environment, ICorsService corsService, ICorsPolicyProvider corsPolicyProvider, ISyncManager sync) + { + app.UseOqtane(configuration, environment, corsService, corsPolicyProvider, sync); + } + } +} diff --git a/Oqtane.Application/AppHost/appsettings.json b/Oqtane.Application/Server/appsettings.json similarity index 92% rename from Oqtane.Application/AppHost/appsettings.json rename to Oqtane.Application/Server/appsettings.json index cbf901bd..4da5bbc7 100644 --- a/Oqtane.Application/AppHost/appsettings.json +++ b/Oqtane.Application/Server/appsettings.json @@ -2,7 +2,7 @@ "RenderMode": "Interactive", "Runtime": "Server", "Database": { - "DefaultDBType": "Oqtane.Database.SqlServer.SqlServerDatabase, Oqtane.Server" + "DefaultDBType": "" }, "ConnectionStrings": { "DefaultConnection": "" @@ -57,8 +57,7 @@ } }, "LogLevel": { - "Default": "Information", - "Notify": "Error" + "Default": "Information" } } } \ No newline at end of file diff --git a/Oqtane.Application/AppHost/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css b/Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css rename to Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.Admin.Login/Module.css diff --git a/Oqtane.Application/AppHost/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css b/Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css rename to Oqtane.Application/Server/wwwroot/Modules/Oqtane.Modules.HtmlText/Module.css diff --git a/Oqtane.Application/AppHost/wwwroot/Oqtane.Server.lib.module.js b/Oqtane.Application/Server/wwwroot/Oqtane.Server.lib.module.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/Oqtane.Server.lib.module.js rename to Oqtane.Application/Server/wwwroot/Oqtane.Server.lib.module.js diff --git a/Oqtane.Application/AppHost/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css b/Oqtane.Application/Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css rename to Oqtane.Application/Server/wwwroot/Themes/Oqtane.Themes.BlazorTheme/Theme.css diff --git a/Oqtane.Application/AppHost/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css b/Oqtane.Application/Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css rename to Oqtane.Application/Server/wwwroot/Themes/Oqtane.Themes.OqtaneTheme/Theme.css diff --git a/Oqtane.Application/Server/wwwroot/_content/Placeholder.txt b/Oqtane.Application/Server/wwwroot/_content/Placeholder.txt deleted file mode 100644 index 5a324d79..00000000 --- a/Oqtane.Application/Server/wwwroot/_content/Placeholder.txt +++ /dev/null @@ -1,11 +0,0 @@ -The _content folder should only contain static resources from shared razor component libraries (RCLs). Static resources can be extracted from shared RCL Nuget packages by executing a Publish task on the module's Server project to a local folder and copying the files from the _content folder which is created. Each shared RCL would have its own appropriately named subfolder within the module's _content folder. - -ie. - -/_content - /Radzen.Blazor - /css - /fonts - /syncfusion.blazor - /scripts - /styles diff --git a/Oqtane.Application/AppHost/wwwroot/app_offline.bak b/Oqtane.Application/Server/wwwroot/app_offline.bak similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/app_offline.bak rename to Oqtane.Application/Server/wwwroot/app_offline.bak diff --git a/Oqtane.Application/AppHost/wwwroot/css/app.css b/Oqtane.Application/Server/wwwroot/css/app.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/app.css rename to Oqtane.Application/Server/wwwroot/css/app.css diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/FONT-LICENSE b/Oqtane.Application/Server/wwwroot/css/open-iconic/FONT-LICENSE similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/FONT-LICENSE rename to Oqtane.Application/Server/wwwroot/css/open-iconic/FONT-LICENSE diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/ICON-LICENSE b/Oqtane.Application/Server/wwwroot/css/open-iconic/ICON-LICENSE similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/ICON-LICENSE rename to Oqtane.Application/Server/wwwroot/css/open-iconic/ICON-LICENSE diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/README.md b/Oqtane.Application/Server/wwwroot/css/open-iconic/README.md similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/README.md rename to Oqtane.Application/Server/wwwroot/css/open-iconic/README.md diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/css/open-iconic-bootstrap.min.css diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.eot b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.eot rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.eot diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.otf b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.otf rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.otf diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.svg b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.svg rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.svg diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.ttf diff --git a/Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.woff b/Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/open-iconic/font/fonts/open-iconic.woff rename to Oqtane.Application/Server/wwwroot/css/open-iconic/font/fonts/open-iconic.woff diff --git a/Oqtane.Application/AppHost/wwwroot/css/quill/quill.bubble.css b/Oqtane.Application/Server/wwwroot/css/quill/quill.bubble.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/quill/quill.bubble.css rename to Oqtane.Application/Server/wwwroot/css/quill/quill.bubble.css diff --git a/Oqtane.Application/AppHost/wwwroot/css/quill/quill.snow.css b/Oqtane.Application/Server/wwwroot/css/quill/quill.snow.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/quill/quill.snow.css rename to Oqtane.Application/Server/wwwroot/css/quill/quill.snow.css diff --git a/Oqtane.Application/AppHost/wwwroot/css/quill/quill1.3.7.bubble.css b/Oqtane.Application/Server/wwwroot/css/quill/quill1.3.7.bubble.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/quill/quill1.3.7.bubble.css rename to Oqtane.Application/Server/wwwroot/css/quill/quill1.3.7.bubble.css diff --git a/Oqtane.Application/AppHost/wwwroot/css/quill/quill1.3.7.snow.css b/Oqtane.Application/Server/wwwroot/css/quill/quill1.3.7.snow.css similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/css/quill/quill1.3.7.snow.css rename to Oqtane.Application/Server/wwwroot/css/quill/quill1.3.7.snow.css diff --git a/Oqtane.Application/AppHost/wwwroot/favicon.ico b/Oqtane.Application/Server/wwwroot/favicon.ico similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/favicon.ico rename to Oqtane.Application/Server/wwwroot/favicon.ico diff --git a/Oqtane.Application/AppHost/wwwroot/icon.png b/Oqtane.Application/Server/wwwroot/icon.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/icon.png rename to Oqtane.Application/Server/wwwroot/icon.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/checked.png b/Oqtane.Application/Server/wwwroot/images/checked.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/checked.png rename to Oqtane.Application/Server/wwwroot/images/checked.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/disabled.png b/Oqtane.Application/Server/wwwroot/images/disabled.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/disabled.png rename to Oqtane.Application/Server/wwwroot/images/disabled.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/error.png b/Oqtane.Application/Server/wwwroot/images/error.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/error.png rename to Oqtane.Application/Server/wwwroot/images/error.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/help.png b/Oqtane.Application/Server/wwwroot/images/help.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/help.png rename to Oqtane.Application/Server/wwwroot/images/help.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/logo-black.png b/Oqtane.Application/Server/wwwroot/images/logo-black.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/logo-black.png rename to Oqtane.Application/Server/wwwroot/images/logo-black.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/logo-white.png b/Oqtane.Application/Server/wwwroot/images/logo-white.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/logo-white.png rename to Oqtane.Application/Server/wwwroot/images/logo-white.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/null.png b/Oqtane.Application/Server/wwwroot/images/null.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/null.png rename to Oqtane.Application/Server/wwwroot/images/null.png diff --git a/Oqtane.Application/AppHost/wwwroot/images/unchecked.png b/Oqtane.Application/Server/wwwroot/images/unchecked.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/images/unchecked.png rename to Oqtane.Application/Server/wwwroot/images/unchecked.png diff --git a/Oqtane.Application/AppHost/wwwroot/js/app.js b/Oqtane.Application/Server/wwwroot/js/app.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/app.js rename to Oqtane.Application/Server/wwwroot/js/app.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/interop.js b/Oqtane.Application/Server/wwwroot/js/interop.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/interop.js rename to Oqtane.Application/Server/wwwroot/js/interop.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/loadjs.min.js b/Oqtane.Application/Server/wwwroot/js/loadjs.min.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/loadjs.min.js rename to Oqtane.Application/Server/wwwroot/js/loadjs.min.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/quill-blot-formatter.min.js b/Oqtane.Application/Server/wwwroot/js/quill-blot-formatter.min.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/quill-blot-formatter.min.js rename to Oqtane.Application/Server/wwwroot/js/quill-blot-formatter.min.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/quill-interop.js b/Oqtane.Application/Server/wwwroot/js/quill-interop.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/quill-interop.js rename to Oqtane.Application/Server/wwwroot/js/quill-interop.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/quill.min.js b/Oqtane.Application/Server/wwwroot/js/quill.min.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/quill.min.js rename to Oqtane.Application/Server/wwwroot/js/quill.min.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/quill.min.js.map b/Oqtane.Application/Server/wwwroot/js/quill.min.js.map similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/quill.min.js.map rename to Oqtane.Application/Server/wwwroot/js/quill.min.js.map diff --git a/Oqtane.Application/AppHost/wwwroot/js/quill1.3.7.min.js b/Oqtane.Application/Server/wwwroot/js/quill1.3.7.min.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/quill1.3.7.min.js rename to Oqtane.Application/Server/wwwroot/js/quill1.3.7.min.js diff --git a/Oqtane.Application/AppHost/wwwroot/js/reload.js b/Oqtane.Application/Server/wwwroot/js/reload.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/js/reload.js rename to Oqtane.Application/Server/wwwroot/js/reload.js diff --git a/Oqtane.Application/AppHost/wwwroot/loading.gif b/Oqtane.Application/Server/wwwroot/loading.gif similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/loading.gif rename to Oqtane.Application/Server/wwwroot/loading.gif diff --git a/Oqtane.Application/AppHost/wwwroot/oqtane-black.png b/Oqtane.Application/Server/wwwroot/oqtane-black.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/oqtane-black.png rename to Oqtane.Application/Server/wwwroot/oqtane-black.png diff --git a/Oqtane.Application/AppHost/wwwroot/oqtane-glow.png b/Oqtane.Application/Server/wwwroot/oqtane-glow.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/oqtane-glow.png rename to Oqtane.Application/Server/wwwroot/oqtane-glow.png diff --git a/Oqtane.Application/AppHost/wwwroot/oqtane-white.png b/Oqtane.Application/Server/wwwroot/oqtane-white.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/oqtane-white.png rename to Oqtane.Application/Server/wwwroot/oqtane-white.png diff --git a/Oqtane.Application/AppHost/wwwroot/oqtane.ico b/Oqtane.Application/Server/wwwroot/oqtane.ico similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/oqtane.ico rename to Oqtane.Application/Server/wwwroot/oqtane.ico diff --git a/Oqtane.Application/AppHost/wwwroot/oqtane.png b/Oqtane.Application/Server/wwwroot/oqtane.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/oqtane.png rename to Oqtane.Application/Server/wwwroot/oqtane.png diff --git a/Oqtane.Application/AppHost/wwwroot/package.png b/Oqtane.Application/Server/wwwroot/package.png similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/package.png rename to Oqtane.Application/Server/wwwroot/package.png diff --git a/Oqtane.Application/AppHost/wwwroot/service-worker.js b/Oqtane.Application/Server/wwwroot/service-worker.js similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/service-worker.js rename to Oqtane.Application/Server/wwwroot/service-worker.js diff --git a/Oqtane.Application/AppHost/wwwroot/users.txt b/Oqtane.Application/Server/wwwroot/users.txt similarity index 100% rename from Oqtane.Application/AppHost/wwwroot/users.txt rename to Oqtane.Application/Server/wwwroot/users.txt diff --git a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj index 865461b1..90fcda5d 100644 --- a/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj +++ b/Oqtane.Application/Shared/Oqtane.Application.Shared.csproj @@ -1,13 +1,13 @@ - - net9.0 - 1.0.0 - Oqtane.Application.Shared.Oqtane - + + net9.0 + 1.0.0 + Oqtane.Application.Shared.Oqtane + - - - + + +