Merge branch 'master' into main

diff --cc community/DotNet/Umbraco.gitignore
index 0000000000000000000000000000000000000000,d7adb0ef02faa5af97fba9a824755c732b62e581..86b91f300dac22b0cf472d9a776ca4c356dc4cde
mode 000000,100644..100644
--- /dev/null
--- 2/community/DotNet/Umbraco.gitignore
+++ b/community/DotNet/Umbraco.gitignore
@@@ -1,0 -1,45 +1,49 @@@
 -## Get latest from https://github.com/github/gitignore/blob/master/Umbraco.gitignore
+ ## Ignore Umbraco files/folders generated for each instance
+ ##
 -## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3` 
++## Get latest from https://github.com/github/gitignore/blob/main/Umbraco.gitignore
+ 
+ # Note: VisualStudio gitignore rules may also be relevant
+ 
+ # Umbraco
+ # Ignore unimportant folders generated by Umbraco
+ **/App_Data/Logs/
+ **/App_Data/[Pp]review/
+ **/App_Data/TEMP/
+ **/App_Data/NuGetBackup/
+ 
+ # Ignore Umbraco content cache file
+ **/App_Data/umbraco.config
+ 
 -## **/[Uu]mbraco/ 
++## this [Uu]mbraco/ folder should be created by cmd like `Install-Package UmbracoCms -Version 8.5.3`
+ ## you can find your Umbraco version in your Web.config. (i.e. <add key="Umbraco.Core.ConfigurationStatus" value="8.5.3" />)
+ ## Uncomment this line if you think it fits the way you work on your project.
++## **/[Uu]mbraco/
++
++## The [Mm]edia/ folder contains content. Content may vary by environment and should therefore not be added to source control.
++## Uncomment this line if you think it fits the way you work on your project.
++## **/[Mm]edia/ 
+ 
+ # Don't ignore Umbraco packages (VisualStudio.gitignore mistakes this for a NuGet packages folder)
+ # Make sure to include details from VisualStudio.gitignore BEFORE this
+ !**/App_Data/[Pp]ackages/*
+ !**/[Uu]mbraco/[Dd]eveloper/[Pp]ackages/*
+ !**/[Uu]mbraco/[Vv]iews/[Pp]ackages/*
+ 
+ # ImageProcessor DiskCache
+ **/App_Data/cache/
+ 
+ # Ignore the Models Builder models out of date flag
+ **/ood.flag
+ 
+ # NEW for version 9 .Net 5 (Core)
+ #ignore umbraco backoffice assest from wwwroot
+ **/wwwroot/umbraco/
+ 
+ #ignore umbraco data/views/settings
+ **/umbraco/
+ 
+ #include default location for modelsbuilder output
+ !**/umbraco/models
+ 
+ #include default location for packages
+ !**/umbraco/Data/packages