Merge remote-tracking branch 'upstream/main' into main

urbanit · Nov 9, 2021 · e625780 · e625780
2 parents fa98b8d + e29cf11
commit e625780
Show file tree

Hide file tree

Showing 57 changed files with 977 additions and 407 deletions.
diff --git a/.all-contributorsrc b/.all-contributorsrc
@@ -2434,6 +2434,15 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "eltociear",
+      "name": "Ikko Ashimine",
+      "avatar_url": "https://avatars.githubusercontent.com/u/22633385?v=4",
+      "profile": "https://bandism.net/",
+      "contributions": [
+        "code"
+      ]
     }
   ],
   "skipCi": true

diff --git a/.github/workflows/functional_all_db.yml b/.github/workflows/functional_all_db.yml
@@ -24,6 +24,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Fix nuget restore issue
       run: |
           apt update && apt --only-upgrade install ca-certificates -y
@@ -54,6 +58,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Fix nuget restore issue
       run: |
           apt update && apt --only-upgrade install ca-certificates -y
@@ -102,6 +110,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Fix nuget restore issue
       run: |
           apt update && apt --only-upgrade install ca-certificates -y
@@ -146,6 +158,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Fix nuget restore issue
       run: |
           apt update && apt --only-upgrade install ca-certificates -y
@@ -189,6 +205,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Fix nuget restore issue
       run: |
           apt update && apt --only-upgrade install ca-certificates -y

diff --git a/.github/workflows/mac_unit_test_ci.yml b/.github/workflows/mac_unit_test_ci.yml
@@ -19,6 +19,10 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
     - name: Build and test
       run: |
         dotnet build --configuration Release

diff --git a/.github/workflows/pr_ci.yml b/.github/workflows/pr_ci.yml
@@ -5,7 +5,7 @@ on:
       - '**/*.md'	
       - 'mkdocs.yml'	
       - 'src/docs/**/*'
-    branches: [ dev, main, release/** ]
+    branches: [ main, release/** ]
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -30,13 +30,19 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+        include-prerelease: true
     - name: Build
       run: |
+        dotnet build --configuration Release --framework net6.0
         dotnet build --configuration Release --framework net5.0
         dotnet build --configuration Release --framework netcoreapp3.1
     - name: Unit Tests
       run: |
-        dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj 
+        dotnet test -c Release --no-restore --no-build ./test/OrchardCore.Tests/OrchardCore.Tests.csproj
     - name: Functional Tests
       if: matrix.os == 'ubuntu-latest'
       run: |
@@ -51,4 +57,4 @@ jobs:
         path: |
           test/Functional/cms-tests/cypress/screenshots
           src/OrchardCore.Cms.Web/App_Data/logs
-  
+  
diff --git a/.github/workflows/preview_ci.yml b/.github/workflows/preview_ci.yml
@@ -5,7 +5,7 @@ on:
       - '**/*.md'
       - 'mkdocs.yml'
       - 'src/docs/**/*'
-    branches: [ dev, main, release/** ]
+    branches: [ main, release/** ]
 env:
   DOTNET_SKIP_FIRST_TIME_EXPERIENCE: true
   DOTNET_CLI_TELEMETRY_OPTOUT: true
@@ -30,11 +30,17 @@ jobs:
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+        include-prerelease: true
     - name: Set build number 
       if: matrix.os == 'ubuntu-latest'
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 16368 ))" >> $GITHUB_ENV
     - name: Build
       run: |
+        dotnet build --configuration Release --framework net6.0
         dotnet build --configuration Release --framework net5.0
         dotnet build --configuration Release --framework netcoreapp3.1
     - name: Unit Tests
@@ -70,15 +76,15 @@ jobs:
       run: |
         rm -rf ./src/OrchardCore.Cms.Web/App_Data
         rm -rf ./src/OrchardCore.Cms.Web/App_Data_Tests
-        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
+        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net6.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:dev .
         docker push orchardproject/orchardcore-cms-linux:dev
     - name: Deploy preview docker image for windows
       if: matrix.os == 'windows-latest'
       run: |
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item
-        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
+        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net6.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:dev .
         echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
         docker push orchardproject/orchardcore-cms-windows:dev
diff --git a/.github/workflows/release_ci.yml b/.github/workflows/release_ci.yml
@@ -33,19 +33,25 @@ jobs:
     - uses: actions/setup-node@v2
       with:
         node-version: "15"
-    - name: Setup .NET Core 3.1 on ${{ matrix.os }}
+    - name: Setup .NET Core 3.1
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 3.1.*
-    - name: Setup .NET Core 5.0 on ${{ matrix.os }}
+    - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
         dotnet-version: 5.0.*
+    - name: Setup .NET 6.0
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 6.0.x
+        include-prerelease: true
     - name: Set build number 
       if: matrix.os == 'ubuntu-latest'
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV
     - name: Build
       run: |
+        dotnet build --configuration Release --framework net6.0
         dotnet build --configuration Release --framework net5.0
         dotnet build --configuration Release --framework netcoreapp3.1
     - name: Unit Tests
@@ -81,7 +87,7 @@ jobs:
       run: |
         rm -rf ./src/OrchardCore.Cms.Web/App_Data
         rm -rf ./src/OrchardCore.Cms.Web/App_Data_Tests
-        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
+        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net6.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-linux:latest -t orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }} .
         docker push orchardproject/orchardcore-cms-linux:latest 
         docker push "orchardproject/orchardcore-cms-linux:${{ steps.get_version.outputs.VERSION }}"
@@ -90,7 +96,7 @@ jobs:
       run: |
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data -Recurse | Remove-Item
         Get-ChildItem ./src/OrchardCore.Cms.Web/App_Data_Tests -Recurse | Remove-Item
-        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net5.0
+        dotnet publish -c Release -o ./.build/release --no-build --no-restore --framework net6.0
         docker build -f Dockerfile-CI -t orchardproject/orchardcore-cms-windows:latest -t orchardproject/orchardcore-cms-windows:${{ steps.get_version.outputs.VERSION }} .
         echo "${{ secrets.DOCKERHUB_PASSWORD }}" | docker login -u="${{ secrets.DOCKERHUB_USERNAME }}" --password-stdin
         docker push orchardproject/orchardcore-cms-windows:latest 

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -2,11 +2,11 @@
   "version": "0.2.0",
   "configurations": [
     {
-      "name": ".NET Core Launch (console) - net5.0",
+      "name": ".NET Core Launch (console) - net6.0",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "Web App: Dotnet Build Debug - net5.0",
-      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/net5.0/OrchardCore.Cms.Web.dll",
+      "preLaunchTask": "Web App: Dotnet Build Debug - net6.0",
+      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/net6.0/OrchardCore.Cms.Web.dll",
       "args": [],
       "cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
       "env": {
@@ -15,12 +15,12 @@
       "stopAtEntry": false
     },
     {
-      "name": ".NET Core Launch (web debug) - net5.0",
+      "name": ".NET Core Launch (web debug) - net6.0",
       "type": "coreclr",
       "request": "launch",
       "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "Web App: Dotnet Build Debug - net5.0",
-      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/net5.0/OrchardCore.Cms.Web.dll",
+      "preLaunchTask": "Web App: Dotnet Build Debug - net6.0",
+      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Debug/net6.0/OrchardCore.Cms.Web.dll",
       "args": [],
       "cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
       "env": {
@@ -33,11 +33,11 @@
       }
     },
     {
-      "name": ".NET Core Launch (web release) - net5.0",
+      "name": ".NET Core Launch (web release) - net6.0",
       "type": "coreclr",
       "request": "launch",
-      "preLaunchTask": "Web App: Dotnet Build Release - net5.0",
-      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/net5.0/OrchardCore.Cms.Web.dll",
+      "preLaunchTask": "Web App: Dotnet Build Release - net6.0",
+      "program": "${workspaceRoot}/src/OrchardCore.Cms.Web/bin/Release/net6.0/OrchardCore.Cms.Web.dll",
       "args": [],
       "cwd": "${workspaceRoot}/src/OrchardCore.Cms.Web",
       "env": {
@@ -56,11 +56,11 @@
       "processId": "${command:pickProcess}"
     },
     {
-      "name": ".NET Core Launch (publish framework dependent) - net5.0",
+      "name": ".NET Core Launch (publish framework dependent) - net6.0",
       "type": "coreclr",
       "request": "launch",
       "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "Web App: Dotnet Publish (framework dependent) - net5.0",
+      "preLaunchTask": "Web App: Dotnet Publish (framework dependent) - net6.0",
       "program": "${workspaceRoot}/.build/release/OrchardCore.Cms.Web.dll",
       "args": [],
       "cwd": "${workspaceRoot}/.build/release",
@@ -74,11 +74,11 @@
       }
     },
     {
-      "name": ".NET Core Launch (publish self-contained) - net5.0",
+      "name": ".NET Core Launch (publish self-contained) - net6.0",
       "type": "coreclr",
       "request": "launch",
       "internalConsoleOptions": "openOnSessionStart",
-      "preLaunchTask": "Web App: Dotnet Publish (self-contained) - net5.0",
+      "preLaunchTask": "Web App: Dotnet Publish (self-contained) - net6.0",
       "program": "${workspaceRoot}/.build/release/OrchardCore.Cms.Web.dll",
       "args": [],
       "cwd": "${workspaceRoot}/.build/release",