Merge remote-tracking branch 'origin/develop' into develop

# Conflicts:
#	src/Simplify.Web/Simplify.Web.csproj

Author: i4004

.github/workflows/build.yml

@@ -13,13 +13,18 @@ jobs:
       fail-fast: false
       matrix:
         os: [ubuntu-latest, windows-latest]
+        include:
+          - os: ubuntu-latest
+            test-framework-command: --framework net9.0
 
     steps:
       - name: Code Checkout
         uses: actions/[email protected]
 
       - name: Install DotNet
         uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: "9.0.x"
 
       - name: Restore Dependencies
         run: dotnet restore
@@ -28,7 +33,7 @@ jobs:
         run: dotnet build --no-restore -c Release
 
       - name: Perform Unit Testing
-        run: dotnet test --no-build -c Release --verbosity normal --filter "TestCategory!=Benchmark"
+        run: dotnet test --no-build -c Release ${{ matrix.test-framework-command }} --verbosity normal --filter "TestCategory!=Benchmark"
 
       - name: Create Package
         run: dotnet pack Simplify.Web/Simplify.Web.csproj --no-build -c Release -o ./publish

.github/workflows/codeql-analysis.yml

@@ -54,7 +54,7 @@ jobs:
       - name: Setup .NET
         uses: actions/setup-dotnet@v4
         with:
-          dotnet-version: 8.0.x
+          dotnet-version: 9.0.x
 
       # Build
       - run: dotnet build src/Simplify.Web.sln -v minimal

.vscode/launch.json

@@ -6,7 +6,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Angular Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net8.0/SampleApp.Angular.dll",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net9.0/SampleApp.Angular.dll",
 			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
@@ -23,7 +23,7 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Angular Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net8.0/SampleApp.Angular.dll",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/bin/Debug/net9.0/SampleApp.Angular.dll",
 			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Angular/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
@@ -41,8 +41,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Api Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net8.0/SampleApp.Api.dll",
-			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net8.0/",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net9.0/SampleApp.Api.dll",
+			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Api/bin/Debug/net9.0/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
 				"action": "openExternally",
@@ -58,8 +58,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build Classic Example",
-			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net8.0/SampleApp.Classic.dll",
-			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net8.0/",
+			"program": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net9.0/SampleApp.Classic.dll",
+			"cwd": "${workspaceFolder}/src/SampleApps/SampleApp.Classic/bin/Debug/net9.0/",
 			"internalConsoleOptions": "openOnSessionStart",
 			"serverReadyAction": {
 				"action": "openExternally",
@@ -75,8 +75,8 @@
 			"type": "coreclr",
 			"request": "launch",
 			"preLaunchTask": "Build",
-			"program": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net8.0/Simplify.Web.Benchmark.dll",
-			"cwd": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net8.0/",
+			"program": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net9.0/Simplify.Web.Benchmark.dll",
+			"cwd": "${workspaceFolder}/src/Simplify.Web.Benchmark/bin/Debug/net9.0/",
 			"internalConsoleOptions": "openOnSessionStart"
 		},
 	]

.vscode/tasks.json

@@ -54,7 +54,7 @@
 			"args": [
 				"test",
 				"-f",
-				"net8.0",
+				"net9.0",
 				"--filter",
 				"TestCategory!=\"Benchmark\"",
 				"/p:CollectCoverage=true",

README.md

@@ -9,40 +9,39 @@
 [![Libraries.io dependency status for latest release](https://img.shields.io/librariesio/release/nuget/Simplify.Web)](https://libraries.io/nuget/Simplify.Web)
 [![CodeFactor Grade](https://img.shields.io/codefactor/grade/github/SimplifyNet/Simplify.Web)](https://www.codefactor.io/repository/github/simplifynet/simplify.web)
 ![Platform](https://img.shields.io/badge/platform-.NET%206.0%20%7C%20.NET%20Standard%202.1%20%7C%20.NET%20Standard%202.0-lightgrey)
-[![PRs Welcome](https://img.shields.io/badge/PRs-welcome-brightgreen)](http://makeapullrequest.com)
 
-Simplify.Web is an open-source, lightweight, fast and highly customizable server-side .NET web-framework based on ASP.NET Core for building HTTP based web-applications, RESTful APIs etc.
+Simplify.Web is an open-source, lightweight, fast, and highly customizable server-side .NET web framework based on ASP.NET Core for building HTTP-based web applications, RESTful APIs, etc.
 
-Framework can be used as:
+The framework can be used as:
 
 - An API backend framework
-- As a mix of API backend + some SPA front end like Angular
-- As an old way backend generated web-site
+- A mix of API backend + SPA front end (e.g., Angular)
+- A traditional backend-generated website
 
 Can be hosted:
 
-- The same way as an ApsNetCore MVC application (On IIS, or as a console application)
-- Inside a windows service
+- The same way as an ASP.NET Core MVC application (on IIS or as a console application)
+- Inside a Windows service
 
 ## Main features
 
 - Comes as Microsoft.AspNetCore middleware
 - Can be used as an API backend only with front-end frameworks
 - Based on MVC and MVVM patterns
-- Lightweight & Fast
-- Uses switchable IOC container for itself and controllers, views constructor injection ([Simplify.DI](https://github.com/SimplifyNet/Simplify/wiki/Simplify.DI))
-- Support async controllers
-- Supports controllers which can be run on any request
-- Localization-friendly (supports templates, strings and data files localization by default)
-- Uses fast templates engine ([Simplify.Templates](https://github.com/SimplifyNet/Simplify/wiki/Simplify.Templates))
+- Lightweight & fast
+- Uses a switchable IoC container for itself and controllers, views constructor injection ([Simplify.DI](https://github.com/SimplifyNet/Simplify/wiki/Simplify.DI))
+- Supports async controllers
+- Supports controllers which can run on any request
+- Localization-friendly (supports templates, strings, and data files localization by default)
+- Uses a fast template engine ([Simplify.Templates](https://github.com/SimplifyNet/Simplify/wiki/Simplify.Templates))
 - Mocking-friendly
 - Mono-friendly
 
 ## Quick start
 
 There is a [templates package](https://github.com/SimplifyNet/Simplify.Web.Templates) available at nuget.org for Simplify.Web. It contains a couple of templates which can be a good starting point for your application.
 
-Installing a templates package:
+Install the templates package:
 
 ```console
 dotnet new -i Simplify.Web.Templates
@@ -51,17 +50,17 @@ dotnet new -i Simplify.Web.Templates
 | Template                            | Short Name              |
 | :---------------------------------- | :---------------------- |
 | Angular template                    | sweb.angular            |
-| Api template                        | sweb.api                |
+| API template                        | sweb.api                |
 | Minimal template                    | sweb.minimal            |
-| Windows service hosted api template | sweb.api.windowsservice |
+| Windows service hosted API template | sweb.api.windowsservice |
 
-Use the short name to create a project based on selected template:
+Use the short name to create a project based on the selected template:
 
 ```console
 dotnet new sweb.angular -n HelloWorldApplication
 ```
 
-Then just run project via F5 (it will download all required nuget and npm packages at first build).
+Then just run the project via F5 (it will download all required NuGet and npm packages at the first build).
 
 ## [Detailed documentation](https://github.com/SimplifyNet/Simplify.Web/wiki)
 
@@ -126,7 +125,7 @@ public class SampleModel
 }
 ```
 
-### Some simple HTML generation controllers example
+### Simple HTML generation controllers example
 
 #### Static page controller v1 example
 
@@ -145,7 +144,7 @@ public class AboutController : Controller
 
 #### Any page controller v1 with high run priority example
 
-Runs on any request and adds login panel to a pages
+Runs on any request and adds a login panel to pages.
 
 ```csharp
 // Controller will be executed on any request and will be launched before other controllers (because they have Priority = 0 by default)
@@ -186,11 +185,11 @@ public class LoggedUserPanelView : View
 Below is the list of sample applications showing different variations of Simplify.Web usage:
 
 - [Only as an API backend with Angular + Bootstrap UI SPA](https://github.com/SimplifyNet/Simplify.Web/tree/master/src/SampleApps/SampleApp.Angular)
-- [Kestrel-based Application with backend HTML generation, localization, authentication](https://github.com/SimplifyNet/Simplify.Web/tree/master/src/SampleApps/SampleApp.Classic)
+- [Kestrel-based application with backend HTML generation, localization, authentication](https://github.com/SimplifyNet/Simplify.Web/tree/master/src/SampleApps/SampleApp.Classic)
 
 ![Simplify](https://raw.githubusercontent.com/SimplifyNet/Simplify.Web/master/images/screenshots/sample-app-classic.png)
 
-- [Simple Kestrel-based Application hosted as windows-service](https://github.com/SimplifyNet/Simplify.Web/tree/master/src/SampleApps/SampleApp.WindowsServiceHosted)
+- [Simple Kestrel-based application hosted as a Windows service](https://github.com/SimplifyNet/Simplify.Web/tree/master/src/SampleApps/SampleApp.WindowsServiceHosted)
 
 ## Contributing
 
@@ -213,9 +212,9 @@ Additional extensions to Simplify.Web live in their own repositories on GitHub.
 - [Simplify.Web.Postman](https://github.com/SimplifyNet/Simplify.Web.Postman) - Postman collection and environment generation
 - [Simplify.Web.Swagger](https://github.com/SimplifyNet/Simplify.Web.Swagger) - Swagger generation for controllers
 - [Simplify.Web.Multipart](https://github.com/SimplifyNet/Simplify.Web.Multipart) - multipart form model binder
-- [Simplify.Web.MessageBox](https://github.com/SimplifyNet/Simplify.Web.MessageBox) - non-interactive server side message box
-- [Simplify.Web.Templates](https://github.com/SimplifyNet/Simplify.Web.Templates) - .NET projects templates
+- [Simplify.Web.MessageBox](https://github.com/SimplifyNet/Simplify.Web.MessageBox) - non-interactive server-side message box
+- [Simplify.Web.Templates](https://github.com/SimplifyNet/Simplify.Web.Templates) - .NET project templates
 
 ## License
 
-Licensed under the GNU LESSER GENERAL PUBLIC LICENSE
+Licensed under the GNU LESSER GENERAL PUBLIC LICENSE.

src/SampleApps/SampleApp.Angular/ClientApp/.browserslistrc

@@ -1,16 +1,16 @@
-# Editor configuration, see https://editorconfig.org
-root = true
-
-[*]
-charset = utf-8
-indent_style = space
-indent_size = 2
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.ts]
-quote_type = single
-
-[*.md]
-max_line_length = off
-trim_trailing_whitespace = false
+# Editor configuration, see https://editorconfig.org
+root = true
+
+[*]
+charset = utf-8
+indent_style = space
+indent_size = 2
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[*.ts]
+quote_type = single
+
+[*.md]
+max_line_length = off
+trim_trailing_whitespace = false

src/SampleApps/SampleApp.Angular/ClientApp/.editorconfig

@@ -1,40 +1,42 @@
-# See http://help.github.com/ignore-files/ for more about ignoring files.
-
-# compiled output
-/dist
-/dist-server
-/tmp
-/out-tsc
-
-# dependencies
-/node_modules
-
-# IDEs and editors
-/.idea
-.project
-.classpath
-.c9/
-*.launch
-.settings/
-*.sublime-workspace
-
-# IDE - VSCode
-.vscode/*
-!.vscode/settings.json
-!.vscode/tasks.json
-!.vscode/launch.json
-!.vscode/extensions.json
-
-# misc
-/.sass-cache
-/connect.lock
-/coverage
-/libpeerconnection.log
-npm-debug.log
-yarn-error.log
-testem.log
-/typings
-
-# System Files
-.DS_Store
-Thumbs.db
+# See https://docs.github.com/get-started/getting-started-with-git/ignoring-files for more about ignoring files.
+
+# Compiled output
+/dist
+/tmp
+/out-tsc
+/bazel-out
+
+# Node
+/node_modules
+npm-debug.log
+yarn-error.log
+
+# IDEs and editors
+.idea/
+.project
+.classpath
+.c9/
+*.launch
+.settings/
+*.sublime-workspace
+
+# Visual Studio Code
+.vscode/*
+!.vscode/settings.json
+!.vscode/tasks.json
+!.vscode/launch.json
+!.vscode/extensions.json
+.history/*
+
+# Miscellaneous
+/.angular/cache
+.sass-cache/
+/connect.lock
+/coverage
+/libpeerconnection.log
+testem.log
+/typings
+
+# System files
+.DS_Store
+Thumbs.db

src/SampleApps/SampleApp.Angular/ClientApp/.gitignore

@@ -0,0 +1,22 @@
+This file explains how Visual Studio created the project.
+
+The following tools were used to generate this project:
+- Angular CLI (ng)
+
+The following steps were used to generate this project:
+- Create Angular project with ng: `ng new sampleapp.angular --defaults --skip-install --skip-git --no-standalone `.
+- Add `proxy.conf.js` to proxy calls to the backend ASP.NET server.
+- Add `aspnetcore-https.js` script to install https certs.
+- Update `package.json` to call `aspnetcore-https.js` and serve with https.
+- Update `angular.json` to point to `proxy.conf.js`.
+- Update `app.component.ts` component to fetch and display weather information.
+- Modify `app.component.spec.ts` with updated tests.
+- Update `app.module.ts` to import the HttpClientModule.
+- Update package.json to add `jest-editor-support`.
+- Update package.json to add `run-script-os`.
+- Add `karma.conf.js` for unit tests.
+- Update `angular.json` to point to `karma.conf.js`.
+- Add project to solution.
+- Update proxy endpoint to be the backend server endpoint.
+- Add project to the startup projects list.
+- Write this file.