Merge pull request #8526 from abpframework/auto-merge/rel-4-3/277

Merge branch dev with rel-4.3

Directory.Build.props

@@ -23,7 +23,7 @@
     <xUnitRunnerVisualstudioPackageVersion>2.4.3</xUnitRunnerVisualstudioPackageVersion>
 
     <!-- Mongo2Go https://www.nuget.org/packages/Mongo2Go -->
-    <Mongo2GoPackageVersion>3.0.0</Mongo2GoPackageVersion>
+    <Mongo2GoPackageVersion>3.1.1</Mongo2GoPackageVersion>
 
   </PropertyGroup>
 </Project>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Create.cshtml

@@ -33,6 +33,7 @@
 @section styles {
     <abp-style-bundle>
         <abp-style type="typeof(TuiEditorStyleContributor)"/>
+        <abp-style src="/Pages/CmsKit/BlogPosts/create.css"/>
     </abp-style-bundle>
 }
 
@@ -61,7 +62,7 @@
             
             <abp-form-content />
 
-            <div class="content-editor" 
+            <div class="content-editor cms-kit-editor" 
                  id="ContentEditor" 
                  data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
                  data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/Update.cshtml

@@ -33,6 +33,7 @@
 @section styles {
     <abp-style-bundle>
         <abp-style type="typeof(TuiEditorStyleContributor)"/>
+        <abp-style src="/Pages/CmsKit/BlogPosts/update.css"/>
     </abp-style-bundle>
 }
 
@@ -59,7 +60,7 @@
 
             <abp-form-content />
         
-            <div class="content-editor" 
+            <div class="content-editor cms-kit-editor" 
                  id="ContentEditor" 
                  data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
                  data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.css

@@ -0,0 +1,3 @@
+.cms-kit-editor {
+    height: 65vh !important;
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/create.js

@@ -231,7 +231,7 @@
             useCommandShortcut: true,
             initialValue: initialValue,
             previewStyle: 'tab',
-            height: "95vh",
+            height: "100%",
             minHeight: "25em",
             initialEditType: 'markdown',
             language: $editorContainer.data("language"),

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.css

@@ -0,0 +1,3 @@
+.cms-kit-editor {
+    height: 65vh !important;
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/BlogPosts/update.js

@@ -178,7 +178,7 @@
             useCommandShortcut: true,
             initialValue: initialValue,
             previewStyle: 'tab',
-            height: "95vh",
+            height: "100%",
             minHeight: "25em",
             initialEditType: 'markdown',
             language: $editorContainer.data("language"),

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Create.cshtml

@@ -29,6 +29,7 @@
 @section styles {
 <abp-style-bundle>
     <abp-style type="typeof(TuiEditorStyleContributor)" />
+    <abp-style src="/Pages/CmsKit/Pages/create.css"/>
 </abp-style-bundle>
 }
 
@@ -45,7 +46,7 @@
             <abp-tabs tab-style="Tab">
 
                 <abp-tab title="@L["Content"]">
-                    <div class="content-editor"
+                    <div class="content-editor cms-kit-editor"
                          id="ContentEditor"
                          data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
                          data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
@@ -53,11 +54,11 @@
                 </abp-tab>
 
                 <abp-tab title="@L["Script"]">
-                    <abp-input asp-for="ViewModel.Script" suppress-label="true" />
+                    <abp-input asp-for="ViewModel.Script" suppress-label="true" class="cms-kit-editor" />
                 </abp-tab>
 
                 <abp-tab title="@L["Style"]">
-                    <abp-input asp-for="ViewModel.Style"  suppress-label="true"/>
+                    <abp-input asp-for="ViewModel.Style"  suppress-label="true" class="cms-kit-editor"/>
                 </abp-tab>
 
             </abp-tabs>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/Update.cshtml

@@ -30,6 +30,7 @@
 @section styles {
 <abp-style-bundle>
     <abp-style type="typeof(TuiEditorStyleContributor)" />
+    <abp-style src="/Pages/CmsKit/Pages/update.css" />
 </abp-style-bundle>
 }
 
@@ -49,7 +50,7 @@
             <abp-tabs tab-style="Tab">
 
                 <abp-tab title="@L["Content"]">
-                    <div class="content-editor"
+                    <div class="content-editor cms-kit-editor"
                          id="ContentEditor"
                          data-input-id="@Html.IdFor(x => x.ViewModel.Content)"
                          data-language="@(CultureInfo.CurrentUICulture.TwoLetterISOLanguageName)">
@@ -57,11 +58,11 @@
                 </abp-tab>
 
                 <abp-tab title="@L["Script"]">
-                    <abp-input asp-for="ViewModel.Script" suppress-label="true" />
+                    <abp-input asp-for="ViewModel.Script" suppress-label="true" class="cms-kit-editor" />
                 </abp-tab>
 
                 <abp-tab title="@L["Style"]">
-                    <abp-input asp-for="ViewModel.Style" suppress-label="true"/>
+                    <abp-input asp-for="ViewModel.Style" suppress-label="true" class="cms-kit-editor"/>
                 </abp-tab>
 
             </abp-tabs>

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.css

@@ -0,0 +1,3 @@
+.cms-kit-editor {
+    height: 65vh !important;
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/create.js

@@ -90,7 +90,7 @@
             useCommandShortcut: true,
             initialValue: initialValue,
             previewStyle: 'tab',
-            height: "95vh",
+            height: "100%",
             minHeight: "25em",
             initialEditType: 'markdown',
             language: $editorContainer.data("language"),

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.css

@@ -0,0 +1,3 @@
+.cms-kit-editor {
+    height: 65vh !important;
+}

modules/cms-kit/src/Volo.CmsKit.Admin.Web/Pages/CmsKit/Pages/update.js

@@ -61,7 +61,7 @@
             useCommandShortcut: true,
             initialValue: initialValue,
             previewStyle: 'tab',
-            height: "95vh",
+            height: "100%",
             minHeight: "25em",
             initialEditType: 'markdown',
             language: $editorContainer.data("language"),

templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj

@@ -14,7 +14,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="Mongo2Go" Version="3.0.0" />
+    <PackageReference Include="Mongo2Go" Version="3.1.1" />
   </ItemGroup>
 
 </Project>

templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MyCompanyName.MyProjectName.MongoDB.Tests.csproj

@@ -9,7 +9,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.9.1" />
-    <PackageReference Include="Mongo2Go" Version="3.0.0" />
+    <PackageReference Include="Mongo2Go" Version="3.1.1" />
     <ProjectReference Include="..\..\src\MyCompanyName.MyProjectName.MongoDB\MyCompanyName.MyProjectName.MongoDB.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.TestBase\MyCompanyName.MyProjectName.TestBase.csproj" />
   </ItemGroup>