Merge branch 'dev' into maliming/IdentityServer-v4

5 years ago · 19279e8c84
parent e6fafdf08a 05cd4c3091
commit 19279e8c84
2 changed files with 1 additions and 1 deletions
--- a/build/common.ps1
+++ b/build/common.ps1
@ -22,6 +22,5 @@ $solutionPaths = (
    "../modules/virtual-file-explorer",
    "../templates/module/aspnet-core",
    "../templates/app/aspnet-core",
-    "../samples/MicroserviceDemo",
    "../abp_io/AbpIoLocalization"
 )
--- a/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsScriptBundleContributorDocsExtension.cs
+++ b/modules/docs/src/Volo.Docs.Web/Bundling/PrismjsScriptBundleContributorDocsExtension.cs
@ -12,6 +12,7 @@ namespace Volo.Docs.Bundling
            context.Files.AddIfNotContains("/libs/prismjs/plugins/copy-to-clipboard/prism-copy-to-clipboard.js");
            context.Files.AddIfNotContains("/libs/prismjs/plugins/line-highlight/prism-line-highlight.js");
            context.Files.AddIfNotContains("/libs/prismjs/components/prism-csharp.js");
+            context.Files.AddIfNotContains("/libs/prismjs/components/prism-json.js");
        }
    }
 }