Merge pull request #5537 from sbwalker/dev

application template changes

Oqtane.Application/AppHost/Oqtane.Application.AppHost.csproj

@@ -1,12 +0,0 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
-
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Version>1.0.0</Version>
-    <AssemblyName>Oqtane.Application.AppHost</AssemblyName>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\Server\Oqtane.Application.Server.csproj" />
-  </ItemGroup>
-</Project>

Oqtane.Application/AppHost/Properties/launchSettings.json

@@ -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"
-      }
-    }
-  }
-}

Oqtane.Application/AppHost/wwwroot/_content/Placeholder.txt

@@ -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

Oqtane.Application/AppHost/wwwroot/resources.txt

@@ -1 +0,0 @@
-This is the location where static resources such as images or style sheets should be located

Oqtane.Application/Client/Modules/MyModule/Edit.razor

@@ -35,7 +35,7 @@
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        new Resource { ResourceType = ResourceType.Stylesheet, Url = ModulePath() + "Module.css" }
+        new Stylesheet(ModulePath() + "Module.css")
     };
 
     private ElementReference form;

Oqtane.Application/Client/Modules/MyModule/Index.razor

@@ -42,8 +42,8 @@ else
 
     public override List<Resource> Resources => new List<Resource>()
     {
-        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<Models.MyModule> _MyModules;

Oqtane.Application/Client/Oqtane.Application.Client.csproj

@@ -1,23 +1,21 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.BlazorWebAssembly">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <Version>1.0.0</Version>
-    <AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<Version>1.0.0</Version>
+		<AssemblyName>Oqtane.Application.Client.Oqtane</AssemblyName>
+		<NoDefaultLaunchSettingsFile>true</NoDefaultLaunchSettingsFile>
+		<StaticWebAssetProjectMode>Default</StaticWebAssetProjectMode>
+		<BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
+		<BlazorWebAssemblyLoadAllGlobalizationData>true</BlazorWebAssemblyLoadAllGlobalizationData>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Oqtane.Client" Version="6.1.6" />
-  </ItemGroup>
-
-  <PropertyGroup>
-    <!-- there may be other elements here -->
-    <BlazorWebAssemblyEnableLinking>false</BlazorWebAssemblyEnableLinking>
-    <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
-  </PropertyGroup>
+	<ItemGroup>
+		<PackageReference Include="Oqtane.Client" Version="6.1.6" />
+	</ItemGroup>
 
 </Project>

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);
+        }
+    }
+}

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<Resource>()
             {
-                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")
             }
         };

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

Oqtane.Application/Server/Oqtane.Application.Server.csproj

@@ -1,25 +1,18 @@
-<Project Sdk="Microsoft.NET.Sdk.Razor">
+<Project Sdk="Microsoft.NET.Sdk.Web">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>
-    <AddRazorSupportForMvc>true</AddRazorSupportForMvc>
-    <Version>1.0.0</Version>
-    <AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<Version>1.0.0</Version>
+		<AssemblyName>Oqtane.Application.Server.Oqtane</AssemblyName>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
-    <ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
-  </ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\Client\Oqtane.Application.Client.csproj" />
+		<ProjectReference Include="..\Shared\Oqtane.Application.Shared.csproj" />
+	</ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Oqtane.Server" Version="6.1.6" />
-  </ItemGroup>
-
-  <Target Name="CopyStaticAssets" AfterTargets="Build">
-    <ItemGroup>
-      <StaticAssets Include="$(ProjectDir)wwwroot\**\*.*" />
-    </ItemGroup>
-    <Copy SourceFiles="@(StaticAssets)" DestinationFolder="$(ProjectDir)..\AppHost\wwwroot\%(RecursiveDir)" SkipUnchangedFiles="true" />
-  </Target>
+	<ItemGroup>
+		<PackageReference Include="Oqtane.Server" Version="6.1.6" />
+	</ItemGroup>
+	
 </Project>

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<ILogger<Program>>();
                 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<Oqtane.Startup>()
+                .UseStartup<Startup>()
                 .ConfigureLocalizationSettings()
                 .Build();
     }
 }
-

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"
+        }
+      }
+    }
+  }

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);
+        }
+    }
+}

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"
     }
   }
 }

Oqtane.Application/Server/wwwroot/_content/Placeholder.txt

@@ -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

Oqtane.Application/Shared/Oqtane.Application.Shared.csproj

@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <TargetFramework>net9.0</TargetFramework>    
-    <Version>1.0.0</Version>
-    <AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
-  </PropertyGroup>
+	<PropertyGroup>
+		<TargetFramework>net9.0</TargetFramework>
+		<Version>1.0.0</Version>
+		<AssemblyName>Oqtane.Application.Shared.Oqtane</AssemblyName>
+	</PropertyGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Oqtane.Shared" Version="6.1.6" />
-  </ItemGroup>
+	<ItemGroup>
+		<PackageReference Include="Oqtane.Shared" Version="6.1.6" />
+	</ItemGroup>
 
 </Project>