project file clean up

tiny preformatted types
ninianne98 · Jun 16, 2024 · 424bf2c · 424bf2c
1 parent 84e4205
commit 424bf2c
Show file tree

Hide file tree

Showing 9 changed files with 80 additions and 50 deletions.
diff --git 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
@@ -28,6 +28,12 @@
 		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
 	</PropertyGroup>
 
+
+	<PropertyGroup>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<Content Remove="compilerconfig.json" />
 	</ItemGroup>
@@ -36,7 +42,6 @@
 		<None Remove="adminHelp.js" />
 	</ItemGroup>
 
-
 	<ItemGroup>
 		<EmbeddedResource Include="adminHelp.js" />
 		<EmbeddedResource Include="feed.png" />

diff --git a/CMSCore/CMSCore.csproj b/CMSCore/CMSCore.csproj
@@ -29,14 +29,9 @@
 	</PropertyGroup>
 
 
-	<ItemGroup>
-		<Reference Update="System.Core">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-		<Reference Update="System.Xml.Linq">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-	</ItemGroup>
+	<PropertyGroup>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+	</PropertyGroup>
 
 	<ItemGroup>
 		<ProjectReference Include="..\CarrotCMSData\CMSData.csproj" />

diff --git a/CMSDataScripts/CMSDataScripts.sqlproj b/CMSDataScripts/CMSDataScripts.sqlproj
@@ -8,7 +8,7 @@
     <SchemaVersion>2.0</SchemaVersion>
     <ProjectVersion>4.1</ProjectVersion>
     <ProjectGuid>{be957d52-307d-4eba-8b37-7016f8cd77e0}</ProjectGuid>
-    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql100DatabaseSchemaProvider</DSP>
+    <DSP>Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider</DSP>
     <OutputType>Database</OutputType>
     <RootPath>
     </RootPath>

diff --git a/CMSSecurity/CMSSecurity.csproj b/CMSSecurity/CMSSecurity.csproj
@@ -31,6 +31,7 @@
 
 	<PropertyGroup>
 		<ResolveStaticWebAssetsInputsDependsOn>RemoveIdentityAssets</ResolveStaticWebAssetsInputsDependsOn>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
 	</PropertyGroup>
 
 	<Target Name="RemoveIdentityAssets">

diff --git a/CarrotCMSData/CMSData.csproj b/CarrotCMSData/CMSData.csproj
@@ -29,6 +29,10 @@
 	</PropertyGroup>
 
 
+	<PropertyGroup>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<None Remove="Scripts\00_Initial.sql" />
 		<None Remove="Scripts\20230610_Migrate.sql" />

diff --git a/LoremIpsum/LoremIpsum.csproj b/LoremIpsum/LoremIpsum.csproj
@@ -23,6 +23,12 @@
 		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
 	</PropertyGroup>
 
+
+	<PropertyGroup>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="8.0.6" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />

diff --git a/PluginEventCalendarModule/PluginEventCalendarModule.csproj b/PluginEventCalendarModule/PluginEventCalendarModule.csproj
@@ -23,6 +23,12 @@
 		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
 	</PropertyGroup>
 
+
+	<PropertyGroup>
+		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
+		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<Compile Include="Code\CalendarDisplaySettings.cs" />
 		<Compile Include="Code\CalendarEvent.cs" />
@@ -64,7 +70,7 @@
 			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
 		<Content Include="global.json">
-		  <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+			<CopyToOutputDirectory>Always</CopyToOutputDirectory>
 		</Content>
 		<Content Include="Properties\launchSettings.json" />
 	</ItemGroup>
@@ -94,31 +100,31 @@
 	</ItemGroup>
 
 	<ItemGroup>
-	  <EmbeddedResource Include="Data\Scripts\Script01_DownCalendarEvent.sql" />
-	  <EmbeddedResource Include="Data\Scripts\Script01_UpCalendarEvent.sql" />
-	  <Content Include="Views\_ViewImports.cshtml" />
-	  <Content Include="Views\_ViewStart.cshtml" />
-	  <Content Include="Views\Admin.config" />
-	  <Content Include="Views\Admin\CategoryDetail.cshtml" />
-	  <Content Include="Views\Admin\CategoryList.cshtml" />
-	  <Content Include="Views\Admin\Database.cshtml" />
-	  <Content Include="Views\Admin\EventDetail.cshtml" />
-	  <Content Include="Views\Admin\EventDetailSingle.cshtml" />
-	  <Content Include="Views\Admin\EventList.cshtml" />
-	  <Content Include="Views\Admin\Index.cshtml" />
-	  <Content Include="Views\Admin\ProfileList.cshtml" />
-	  <Content Include="Views\Home\CalendarUpcoming.cshtml" />
-	  <Content Include="Views\Home\EventCalendarDisplay.cshtml" />
-	  <Content Include="Views\Home\EventCalendarDisplay2.cshtml" />
-	  <Content Include="Views\Home\Index.cshtml" />
-	  <Content Include="Views\Public.config" />
-	  <Content Include="Views\Shared\_Layout.cshtml" />
-	  <Content Include="Views\Shared\_LayoutPop.cshtml" />
-	  <Content Include="Views\Test\TestView.cshtml" />
+		<EmbeddedResource Include="Data\Scripts\Script01_DownCalendarEvent.sql" />
+		<EmbeddedResource Include="Data\Scripts\Script01_UpCalendarEvent.sql" />
+		<Content Include="Views\_ViewImports.cshtml" />
+		<Content Include="Views\_ViewStart.cshtml" />
+		<Content Include="Views\Admin.config" />
+		<Content Include="Views\Admin\CategoryDetail.cshtml" />
+		<Content Include="Views\Admin\CategoryList.cshtml" />
+		<Content Include="Views\Admin\Database.cshtml" />
+		<Content Include="Views\Admin\EventDetail.cshtml" />
+		<Content Include="Views\Admin\EventDetailSingle.cshtml" />
+		<Content Include="Views\Admin\EventList.cshtml" />
+		<Content Include="Views\Admin\Index.cshtml" />
+		<Content Include="Views\Admin\ProfileList.cshtml" />
+		<Content Include="Views\Home\CalendarUpcoming.cshtml" />
+		<Content Include="Views\Home\EventCalendarDisplay.cshtml" />
+		<Content Include="Views\Home\EventCalendarDisplay2.cshtml" />
+		<Content Include="Views\Home\Index.cshtml" />
+		<Content Include="Views\Public.config" />
+		<Content Include="Views\Shared\_Layout.cshtml" />
+		<Content Include="Views\Shared\_LayoutPop.cshtml" />
+		<Content Include="Views\Test\TestView.cshtml" />
 	</ItemGroup>
 
 	<ItemGroup>
-	  <None Include="Views\Shared\_LayoutModule.cshtml" />
+		<None Include="Views\Shared\_LayoutModule.cshtml" />
 	</ItemGroup>
 
 	<ItemGroup>
@@ -130,13 +136,13 @@
 	<ItemGroup>
 		<PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.6" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.6">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 		<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.6" />
 		<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="8.0.6">
-		  <PrivateAssets>all</PrivateAssets>
-		  <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 		</PackageReference>
 	</ItemGroup>
 

diff --git a/WebComponents/WebComponents.csproj b/WebComponents/WebComponents.csproj
@@ -28,6 +28,7 @@
 		<FileVersion>$(VersionPrefix).$(VersionSuffix)</FileVersion>
 	</PropertyGroup>
 
+
 	<PropertyGroup>
 		<ErrorOnDuplicatePublishOutputFiles>false</ErrorOnDuplicatePublishOutputFiles>
 		<GenerateRuntimeConfigDevFile>true</GenerateRuntimeConfigDevFile>
@@ -37,6 +38,10 @@
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>-->
 	</PropertyGroup>
 
+	<ItemGroup>
+		<Content Remove="compilerconfig.json" />
+	</ItemGroup>
+
 	<ItemGroup>
 		<None Remove="bootstrap5\amethystorchid.min.css" />
 		<None Remove="bootstrap5\blue.min.css" />
@@ -273,14 +278,6 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<ItemGroup>
-		<Reference Update="System.Core">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-		<Reference Update="System.Xml.Linq">
-			<RequiredTargetFramework>3.5</RequiredTargetFramework>
-		</Reference>
-	</ItemGroup>
 	<ItemGroup>
 		<EmbeddedResource Include="calendar.txt" />
 		<EmbeddedResource Include="carrotHelp.js" />
@@ -535,4 +532,12 @@
 	<ItemGroup>
 		<Folder Include="Properties\" />
 	</ItemGroup>
+	<ItemGroup>
+		<None Include="compilerconfig.json" />
+	</ItemGroup>
+	<ItemGroup>
+		<Content Update="appsettings.json">
+			<CopyToOutputDirectory>Never</CopyToOutputDirectory>
+		</Content>
+	</ItemGroup>
 </Project>