Merge remote-tracking branch 'official/main' into issue/OCORE-136

# Conflicts:
#	CONTRIBUTING.md

.all-contributorsrc

@@ -1877,7 +1877,7 @@
       ]
     },
     {
-      "login": "NogginBox",
+      "login": "nogginbox",
       "name": "Richard Garside",
       "avatar_url": "https://avatars3.githubusercontent.com/u/729381?v=4",
       "profile": "http://www.nogginbox.co.uk",
@@ -2861,6 +2861,267 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "jorisdebock",
+      "name": "Joris de Bock",
+      "avatar_url": "https://avatars.githubusercontent.com/u/10253291?v=4",
+      "profile": "https://github.com/jorisdebock",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "MarGraz",
+      "name": "MarGraz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/19241483?v=4",
+      "profile": "https://codingops.dev/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "arnaudroy97",
+      "name": "Arnaud",
+      "avatar_url": "https://avatars.githubusercontent.com/u/66786602?v=4",
+      "profile": "https://github.com/arnaudroy97",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mroskamp",
+      "name": "Brian Roskamp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/4029047?v=4",
+      "profile": "https://github.com/mroskamp",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "M-Lipin",
+      "name": "Mikhail Lipin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/23213980?v=4",
+      "profile": "https://github.com/M-Lipin",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "AndreySurkov",
+      "name": "AndreySurkov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/17640441?v=4",
+      "profile": "https://github.com/AndreySurkov",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "spyraklas",
+      "name": "Spyros",
+      "avatar_url": "https://avatars.githubusercontent.com/u/93044877?v=4",
+      "profile": "https://github.com/spyraklas",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ThiemeNL",
+      "name": "ThiemeNL",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5397828?v=4",
+      "profile": "https://github.com/ThiemeNL",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "miroslavpopovic",
+      "name": "Miroslav Popovic",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1155797?v=4",
+      "profile": "https://miroslavpopovic.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ovekaaven",
+      "name": "Ove Kåven",
+      "avatar_url": "https://avatars.githubusercontent.com/u/20878244?v=4",
+      "profile": "https://github.com/ovekaaven",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "Psichorex",
+      "name": "Roland Márkus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/92299130?v=4",
+      "profile": "https://github.com/Psichorex",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "santoshyadavdev",
+      "name": "Santosh Yadav",
+      "avatar_url": "https://avatars.githubusercontent.com/u/11923975?v=4",
+      "profile": "https://mastodon.online/@SantoshYadavDev",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "michaelschiller",
+      "name": "michaelschiller",
+      "avatar_url": "https://avatars.githubusercontent.com/u/6459215?v=4",
+      "profile": "https://github.com/michaelschiller",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "minhtaile2712",
+      "name": "minhtaile2712",
+      "avatar_url": "https://avatars.githubusercontent.com/u/53080238?v=4",
+      "profile": "https://github.com/minhtaile2712",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "rwawr",
+      "name": "rwawr",
+      "avatar_url": "https://avatars.githubusercontent.com/u/153218770?v=4",
+      "profile": "https://github.com/rwawr",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "thatplatypus",
+      "name": "thatplatypus",
+      "avatar_url": "https://avatars.githubusercontent.com/u/29233866?v=4",
+      "profile": "https://github.com/thatplatypus",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "vesko-k",
+      "name": "Veselin Kutsarov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/12114162?v=4",
+      "profile": "https://github.com/vesko-k",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "lakuri",
+      "name": "lakuri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/8038760?v=4",
+      "profile": "https://github.com/lakuri",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "plompd",
+      "name": "Daniel Plomp",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1482375?v=4",
+      "profile": "https://www.zimplerapps.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "drewnoakes",
+      "name": "Drew Noakes",
+      "avatar_url": "https://avatars.githubusercontent.com/u/350947?v=4",
+      "profile": "https://github.com/drewnoakes",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "DrewScoggins",
+      "name": "Drew Scoggins",
+      "avatar_url": "https://avatars.githubusercontent.com/u/9439069?v=4",
+      "profile": "https://github.com/DrewScoggins",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "xperiandri",
+      "name": "Andrii Chebukin",
+      "avatar_url": "https://avatars.githubusercontent.com/u/2365592?v=4",
+      "profile": "https://github.com/xperiandri",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "elaurentin",
+      "name": "Banzai316",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5598813?v=4",
+      "profile": "http://www.ernzo.com/",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ahmedbera",
+      "name": "Bera",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5622227?v=4",
+      "profile": "https://github.com/ahmedbera",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "markus-codechefs",
+      "name": "Markus Trachsel",
+      "avatar_url": "https://avatars.githubusercontent.com/u/62404942?v=4",
+      "profile": "https://github.com/markus-codechefs",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "mwpowellhtx",
+      "name": "Michael W Powell",
+      "avatar_url": "https://avatars.githubusercontent.com/u/1824187?v=4",
+      "profile": "https://github.com/mwpowellhtx",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "ggkoning",
+      "name": "Gido Koning",
+      "avatar_url": "https://avatars.githubusercontent.com/u/60574784?v=4",
+      "profile": "https://github.com/ggkoning",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "idan-h",
+      "name": "Idan",
+      "avatar_url": "https://avatars.githubusercontent.com/u/61008695?v=4",
+      "profile": "https://github.com/idan-h",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "kartheekp-ms",
+      "name": "Kartheek Penagamuri",
+      "avatar_url": "https://avatars.githubusercontent.com/u/52756182?v=4",
+      "profile": "https://github.com/kartheekp-ms",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true,

.dockerignore

@@ -3,6 +3,8 @@
 
 # Except src for building
 !./src/*
+!Directory.Build.props
+
 # TODO : Remove this line when Docker Buildkit works in Windows
 !/.build/release/*
 

.gitattributes

@@ -1,3 +1,7 @@
 * text=auto
 
-**/wwwroot/Scripts/* linguist-vendored
+**/wwwroot/Scripts/* linguist-vendored
+
+# Keep LF line endings in webroot assets files. Otherwise, building them under Windows would change the line endings to CLRF and cause changes without actually editing the source files.
+**/wwwroot/**/*.js text eol=lf
+**/wwwroot/**/*.css text eol=lf

.github/pull_request_template.md

@@ -0,0 +1 @@
+<!--- Please make sure that you're familiar with our contribution guidelines before submitting a pull request: https://docs.orchardcore.net/en/latest/docs/guides/contributing/. -->