diff --git a/CMSAdmin/wwwroot/Assets/Admin/Includes/tinymce-config.js b/CMSAdmin/wwwroot/Assets/Admin/Includes/tinymce-config.js
index 377482f..a511bdc 100644
--- a/CMSAdmin/wwwroot/Assets/Admin/Includes/tinymce-config.js
+++ b/CMSAdmin/wwwroot/Assets/Admin/Includes/tinymce-config.js
@@ -12,8 +12,8 @@ function cmsTinyMceInit(winWidth, winHeight, allowResize) {
if (tinyBrowseWidth < 500) {
tinyBrowseWidth = 500;
}
- if (tinyBrowseWidth > 800) {
- tinyBrowseWidth = 800;
+ if (tinyBrowseWidth > 850) {
+ tinyBrowseWidth = 850;
}
if (tinyBrowseHeight < 100) {
tinyBrowseHeight = 100;
@@ -49,20 +49,28 @@ function cmsTinyMceInit(winWidth, winHeight, allowResize) {
{ text: 'Bash', value: 'bash' },
{ text: 'Shell', value: 'shell' },
{ text: 'Access log', value: 'accesslog' },
+ { text: 'Log', value: 'log' },
{ text: 'JavaScript', value: 'javascript' },
{ text: 'TypeScript', value: 'typescript' },
{ text: 'CSS', value: 'css' },
+ { text: 'LESS (css)', value: 'less' },
+ { text: 'SASS (css)', value: 'scss' },
{ text: 'SQL', value: 'sql' },
{ text: 'PHP', value: 'php' },
{ text: 'Ruby', value: 'ruby' },
{ text: 'Python', value: 'python' },
{ text: 'PowerShell', value: 'powershell' },
+ { text: 'Batch File', value: 'batch' },
{ text: 'Java', value: 'java' },
{ text: 'C', value: 'c' },
- { text: 'C#', value: 'csharp' },
- { text: 'VB', value: 'vbnet' },
- { text: 'ASP', value: 'vbscript-html' },
+ { text: 'VB', value: 'visual-basic' },
{ text: 'VBS', value: 'vbscript' },
+ { text: 'ASP', value: 'vbscript-html' },
+ { text: 'VB.Net', value: 'vbnet' },
+ { text: 'C#', value: 'csharp' },
+ { text: 'C# ASP.Net', value: 'aspnet' },
+ { text: 'C# Razor', value: 'cshtml' },
+ { text: 'C-Like', value: 'clike' },
{ text: 'C++', value: 'cpp' }
],
resize: tinyBrowseResize,
diff --git a/CMSComponents/CMSComponents.csproj b/CMSComponents/CMSComponents.csproj
index 94d65e5..b32f85a 100644
--- a/CMSComponents/CMSComponents.csproj
+++ b/CMSComponents/CMSComponents.csproj
@@ -28,6 +28,12 @@
$(VersionPrefix).$(VersionSuffix)
+
+
+ false
+ true
+
+
@@ -36,7 +42,6 @@
-
diff --git a/CMSCore/CMSCore.csproj b/CMSCore/CMSCore.csproj
index f41862d..28c558e 100644
--- a/CMSCore/CMSCore.csproj
+++ b/CMSCore/CMSCore.csproj
@@ -29,14 +29,9 @@
-
-
- 3.5
-
-
- 3.5
-
-
+
+ false
+
diff --git a/CMSDataScripts/CMSDataScripts.sqlproj b/CMSDataScripts/CMSDataScripts.sqlproj
index ac67127..d1b1767 100644
--- a/CMSDataScripts/CMSDataScripts.sqlproj
+++ b/CMSDataScripts/CMSDataScripts.sqlproj
@@ -8,7 +8,7 @@
2.0
4.1
{be957d52-307d-4eba-8b37-7016f8cd77e0}
- Microsoft.Data.Tools.Schema.Sql.Sql100DatabaseSchemaProvider
+ Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider
Database
diff --git a/CMSSecurity/CMSSecurity.csproj b/CMSSecurity/CMSSecurity.csproj
index 33ca2a2..c362ecc 100644
--- a/CMSSecurity/CMSSecurity.csproj
+++ b/CMSSecurity/CMSSecurity.csproj
@@ -31,6 +31,7 @@
RemoveIdentityAssets
+ false
diff --git a/CarrotCMSData/CMSData.csproj b/CarrotCMSData/CMSData.csproj
index aa518a0..beab3ef 100644
--- a/CarrotCMSData/CMSData.csproj
+++ b/CarrotCMSData/CMSData.csproj
@@ -29,6 +29,10 @@
+
+ false
+
+
diff --git a/LoremIpsum/LoremIpsum.csproj b/LoremIpsum/LoremIpsum.csproj
index 3f80803..cafc312 100644
--- a/LoremIpsum/LoremIpsum.csproj
+++ b/LoremIpsum/LoremIpsum.csproj
@@ -23,6 +23,12 @@
$(VersionPrefix).$(VersionSuffix)
+
+
+ false
+ true
+
+
diff --git a/PluginEventCalendarModule/PluginEventCalendarModule.csproj b/PluginEventCalendarModule/PluginEventCalendarModule.csproj
index 852719d..5cd7100 100644
--- a/PluginEventCalendarModule/PluginEventCalendarModule.csproj
+++ b/PluginEventCalendarModule/PluginEventCalendarModule.csproj
@@ -23,6 +23,12 @@
$(VersionPrefix).$(VersionSuffix)
+
+
+ false
+ true
+
+
@@ -64,7 +70,7 @@
Always
- Always
+ Always
@@ -94,31 +100,31 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -130,13 +136,13 @@
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
- all
- runtime; build; native; contentfiles; analyzers; buildtransitive
+ all
+ runtime; build; native; contentfiles; analyzers; buildtransitive
diff --git a/WebComponents/WebComponents.csproj b/WebComponents/WebComponents.csproj
index 0f05b47..a10b17c 100644
--- a/WebComponents/WebComponents.csproj
+++ b/WebComponents/WebComponents.csproj
@@ -28,6 +28,7 @@
$(VersionPrefix).$(VersionSuffix)
+
false
true
@@ -37,6 +38,10 @@
true-->
+
+
+
+
@@ -273,14 +278,6 @@
-
-
- 3.5
-
-
- 3.5
-
-
@@ -535,4 +532,12 @@
+
+
+
+
+
+ Never
+
+
\ No newline at end of file