Merge branch rel-10.0 with rel-9.3

docs/en/cli/index.md

@@ -358,7 +358,7 @@ Note that this command can upgrade your solution from a previous version, and al
 * `--solution-name` or `-sn`: Specify the solution name. Search `*.sln` files in the directory by default.
 * `--check-all`: Check the new version of each package separately. Default is `false`.
 * `--version` or `-v`: Specifies the version to use for update. If not specified, latest version is used.
-* * `--leptonx-version` or `-lv`: Specifies the LeptonX version to use for update. If not specified, latest version or the version that is compatible with `--version` argument  is used.
+* `--leptonx-version` or `-lv`: Specifies the LeptonX version to use for update. If not specified, latest version or the version that is compatible with `--version` argument  is used.
 
 ### clean
 

docs/en/framework/data/entity-framework-core/mysql.md

@@ -32,11 +32,22 @@ Find `UseSqlServer()` calls in your solution. Check the following files:
 
 Alternatively, you can use the [Pomelo.EntityFrameworkCore.MySql](https://www.nuget.org/packages/Pomelo.EntityFrameworkCore.MySql) provider. Replace the [Volo.Abp.EntityFrameworkCore.MySQL](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.MySQL) package with the [Volo.Abp.EntityFrameworkCore.MySQL.Pomelo](https://www.nuget.org/packages/Volo.Abp.EntityFrameworkCore.MySQL.Pomelo) package in your `.EntityFrameworkCore` project.
 
-Find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, replace `typeof(AbpEntityFrameworkCoreMySQLModule)` with `typeof(AbpEntityFrameworkCoreMySQLPomeloModule)` in the `DependsOn` attribute.
+To complete the switch to the Pomelo Provider, you'll need to update your module dependencies. To do that, find ***YourProjectName*EntityFrameworkCoreModule** class inside the `.EntityFrameworkCore` project, replace `typeof(AbpEntityFrameworkCoreMySQLModule)` with `typeof(AbpEntityFrameworkCoreMySQLPomeloModule)` in the `DependsOn` attribute.
 
-> Depending on your solution structure, you may find more code files need to be changed.
+Also, if you are switching from a provider other than ABP's MySQL provider, you need to call the `UseMySQL` method in the relevant places, as described in the next section.
+
+### UseMySQL()
+
+Find `UseSqlServer()` calls in your solution. Check the following files:
 
-The `UseMySQL()` method calls remain the same, no changes needed.
+* *YourProjectName*EntityFrameworkCoreModule.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySql()`.
+* *YourProjectName*DbContextFactory.cs inside the `.EntityFrameworkCore` project. Replace `UseSqlServer()` with `UseMySql()`.
+
+You also need to specify the `ServerVersion`. See https://github.com/PomeloFoundation/Pomelo.EntityFrameworkCore.MySql/wiki/Configuration-Options#server-version for more details.
+
+`UseMySql(configuration.GetConnectionString("Default"), ServerVersion.AutoDetect(configuration.GetConnectionString("Default")));` or `UseMySql(configuration.GetConnectionString("Default"), new MySqlServerVersion(new Version(8, 4, 6)));`
+
+> Depending on your solution structure, you may find more code files need to be changed.
 
 ## Change the Connection Strings
 

docs/en/ui-themes/lepton/customizing-lepton-theme.md

@@ -45,9 +45,16 @@ export const appConfig: ApplicationConfig = {
 
 Import your style file to `src/style.scss`
 
-```css
+```scss
+/* style.scss */
+@import 'your-custom-style';
+```
+
+or
+
+```scss
 /* style.scss */
-import 'your-custom-style';
+@use 'your-custom-style';
 ```
 
 Or add your style file to the `styles` arrays which in `angular.json` file 

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.Demo/package.json

@@ -3,8 +3,8 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.shared": "~9.3.5",
-    "@abp/prismjs": "~9.3.5",
-    "@abp/highlight.js": "~9.3.5"
+    "@abp/aspnetcore.mvc.ui.theme.shared": "~9.3.6",
+    "@abp/prismjs": "~9.3.6",
+    "@abp/highlight.js": "~9.3.6"
   }
 }

modules/basic-theme/test/Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Demo/package.json

@@ -3,8 +3,8 @@
   "name": "asp.net",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.5",
-    "@abp/prismjs": "~9.3.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
+    "@abp/prismjs": "~9.3.6"
   },
   "devDependencies": {}
 }

modules/blogging/app/Volo.BloggingTestApp/package.json

@@ -3,7 +3,7 @@
   "name": "volo.blogtestapp",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.5",
-    "@abp/blogging": "~9.3.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6",
+    "@abp/blogging": "~9.3.6"
   }
 }

modules/client-simulation/demo/Volo.ClientSimulation.Demo/package.json

@@ -3,6 +3,6 @@
   "name": "client-simulation-web",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.5"
+    "@abp/aspnetcore.mvc.ui.theme.basic": "~9.3.6"
   }
 }