Merge pull request #4 from OrchardCMS/dev

Sync with upstream repository

.github/workflows/assets_validation.yml

@@ -27,4 +27,3 @@ jobs:
         git status
         echo "Please make sure to build them properly before pushing"
         exit -1
-

.github/workflows/functional_all_db.yml

@@ -20,7 +20,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Functional Tests
       run: |
         cd test/Functional
@@ -47,7 +47,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Functional Tests
       run: |
         cd test/Functional
@@ -92,7 +92,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Functional Tests
       run: |
         cd test/Functional
@@ -133,7 +133,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Functional Tests
       run: |
         cd test/Functional
@@ -173,7 +173,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Functional Tests
       run: |
         cd test/Functional

.github/workflows/mac_unit_test_ci.yml

@@ -18,7 +18,7 @@ jobs:
     - name: Setup .NET Core 5.0
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Build and test
       run: |
         dotnet build --configuration Release

.github/workflows/pr_ci.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Setup .NET Core 5.0 on ${{ matrix.os }}
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Build
       run: |
         dotnet build --configuration Release

.github/workflows/release_ci.yml

@@ -27,7 +27,7 @@ jobs:
     - name: Setup .NET Core 5.0 on ${{ matrix.os }}
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100
+        dotnet-version: 5.0.101
     - name: Set build number 
       if: matrix.os == 'ubuntu-latest'
       run: echo "BuildNumber=$(( $GITHUB_RUN_NUMBER + 15471 ))" >> $GITHUB_ENV

OrchardCore.sln

@@ -383,6 +383,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Tests.Functiona
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Placements", "src\OrchardCore.Modules\OrchardCore.Placements\OrchardCore.Placements.csproj", "{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "OrchardCore.Configuration.KeyVault", "src\OrchardCore\OrchardCore.Configuration.KeyVault\OrchardCore.Configuration.KeyVault.csproj", "{17187E9E-90EE-4484-AC5E-8920D9126025}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -1037,6 +1039,10 @@ Global
 		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17187E9E-90EE-4484-AC5E-8920D9126025}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17187E9E-90EE-4484-AC5E-8920D9126025}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17187E9E-90EE-4484-AC5E-8920D9126025}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17187E9E-90EE-4484-AC5E-8920D9126025}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -1218,6 +1224,7 @@ Global
 		{57EA05E8-0275-4163-8FD1-2B244E396F91} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 		{2CA507BD-5517-4CD2-8F30-093AC5D11EBA} = {B8D16C60-99B4-43D5-A3AD-4CD89AF39B25}
 		{5F94223B-CD69-47E1-B4AE-DEA03CBC4D3D} = {90030E85-0C4F-456F-B879-443E8A3F220D}
+		{17187E9E-90EE-4484-AC5E-8920D9126025} = {F23AC6C2-DE44-4699-999D-3C478EF3D691}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {46A1D25A-78D1-4476-9CBF-25B75E296341}

mkdocs.yml

@@ -170,6 +170,7 @@ nav:
             - GraphQL queries: docs/reference/core/Apis.GraphQL.Abstractions/README.md
             - Health Check: docs/reference/modules/HealthChecks/README.md
             - HTTPS: docs/reference/modules/Https/README.md
+            - Key Vault (Azure): docs/reference/core/KeyVault.Azure/README.md
             - Localization: docs/reference/modules/Localize/README.md
             - Logging Serilog: docs/reference/core/Logging.Serilog/readme.md
             - Mini Profiler: docs/reference/modules/MiniProfiler/README.md

src/OrchardCore.Build/Dependencies.props

@@ -9,7 +9,9 @@
 
   <ItemGroup>
     <PackageManagement Include="AngleSharp" Version="0.14.0" />
+    <PackageManagement Include="Azure.Extensions.AspNetCore.Configuration.Secrets" Version="1.0.2" />
     <PackageManagement Include="Azure.Extensions.AspNetCore.DataProtection.Blobs" Version="1.0.1" />
+    <PackageManagement Include="Azure.Identity" Version="1.3.0" />
     <PackageManagement Include="Azure.Storage.Blobs" Version="12.7.0" />
     <PackageManagement Include="Castle.Core" Version="4.4.1" />
     <PackageManagement Include="Irony.Core" Version="1.0.7" />
@@ -38,9 +40,8 @@
     <PackageManagement Include="Shortcodes" Version="1.0.0" />
     <PackageManagement Include="SixLabors.ImageSharp.Web" Version="1.0.1" />
     <PackageManagement Include="xunit.analyzers" Version="0.10.0" />
-    <!-- xunit downgraded due to Theory Skip bug c.f. https://github.com/xunit/xunit/issues/1782 -->
-    <PackageManagement Include="xunit" Version="2.3.1" />
-    <PackageManagement Include="xunit.runner.visualstudio" Version="2.3.1" />
+    <PackageManagement Include="xunit" Version="2.4.1" />
+    <PackageManagement Include="xunit.runner.visualstudio" Version="2.4.1" />
     <PackageManagement Include="YesSql.Abstractions" Version="2.0.0-beta-1637" />
     <PackageManagement Include="YesSql.Core" Version="2.0.0-beta-1637" />
     <PackageManagement Include="YesSql.Provider.MySql" Version="1.0.0-beta-1637" />

src/OrchardCore.Cms.Web/appsettings.json

@@ -11,7 +11,7 @@
     //"OrchardCore_Admin": {
     //   "AdminUrlPrefix": "Admin"
     // },
-    // Uncomment to configure content localization.
+    // See https://docs.orchardcore.net/en/latest/docs/reference/modules/contentlocalization/#configuration to configure content localization.
     //"OrchardCore_ContentLocalization_CulturePicker": {
     //  "CookieLifeTime": 14 // Set the culture picker cookie life time (in days).
     //},
@@ -68,6 +68,11 @@
     //  "TablePrefix": "", // Optionally, configure a table prefix.
     //  "MigrateFromFiles": true // Optionally, enable to migrate existing App_Data files to Database automatically.
     //},
+    // Add 'AddOrchardCoreAzureKeyVault()' to the Generic Host in 'CreateHostBuilder() section'.
+    // "OrchardCore_KeyVault_Azure": {
+    //   "KeyVaultName": "", // Set the name of your Azure Key Vault.
+    //   "ReloadInterval":  // Optional, timespan to wait between attempts at polling the Azure KeyVault for changes. Leave blank to disable reloading.
+    // },
     // See https://docs.orchardcore.net/en/latest/docs/reference/modules/Users/Configuration/#custom-paths
     //"OrchardCore_Users": {
     //  "LoginPath": "Login",