Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Adjusts build scripts to build CKEditor #4105

Merged
merged 12 commits into from
Sep 21, 2020
Next Next commit
Adjusted nuget references to project references
  • Loading branch information
valadas committed Sep 20, 2020
commit 9950d0b8314e72341dfda2f2f12921e58d4cbfa4
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="12.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -19,7 +19,7 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<IsWebBootstrapper>true</IsWebBootstrapper>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<Install>true</Install>
<InstallFrom>Web</InstallFrom>
<UpdateEnabled>true</UpdateEnabled>
@@ -51,6 +51,7 @@
<DocumentationFile>bin\WatchersNET.CKEditor.xml</DocumentationFile>
<NOWARN>1591</NOWARN>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>none</DebugType>
@@ -62,30 +63,23 @@
<NOWARN>1591</NOWARN>
<AllowUnsafeBlocks>false</AllowUnsafeBlocks>
<CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
<Prefer32Bit>false</Prefer32Bit>
</PropertyGroup>
<ItemGroup>
<Reference Include="DotNetNuke">
<HintPath>packages\Dnn.Platform.7.4.0\lib\net40\DotNetNuke.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web">
<HintPath>packages\Dnn.Platform.7.4.0\lib\net40\DotNetNuke.Web.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.Web.Client">
<HintPath>packages\Dnn.Platform.7.4.0\lib\net40\DotNetNuke.Web.Client.dll</HintPath>
</Reference>
<Reference Include="DotNetNuke.WebUtility">
<HintPath>packages\Dnn.Platform.7.4.0\lib\net40\DotNetNuke.WebUtility.dll</HintPath>
</Reference>
<Reference Include="Microsoft.ApplicationBlocks.Data">
<HintPath>packages\Dnn.Platform.7.4.0\lib\net40\Microsoft.ApplicationBlocks.Data.dll</HintPath>
<HintPath>..\..\..\Components\DataAccessBlock\bin\Microsoft.ApplicationBlocks.Data.dll</HintPath>
</Reference>
<Reference Include="Microsoft.JScript" />
<Reference Include="mscorlib" />
<Reference Include="System" />
<Reference Include="System.configuration" />
<Reference Include="System.Data" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Drawing" />
<Reference Include="System.Web" />
<Reference Include="System.Web.ApplicationServices" />
<Reference Include="System.Web.DynamicData" />
<Reference Include="System.Web.Entity" />
<Reference Include="System.Web.Extensions" />
<Reference Include="System.Web.Services" />
<Reference Include="System.Xml" />
@@ -290,10 +284,37 @@
<SubType>Designer</SubType>
</None>
<Content Include="Tabs.ashx" />
<Content Include="packages.config" />
<Content Include="readme.md" />
<Content Include="web.config" />
<None Include="web.Debug.config">
<DependentUpon>web.config</DependentUpon>
</None>
<None Include="web.Release.config">
<DependentUpon>web.config</DependentUpon>
</None>
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\DotNetNuke.Abstractions\DotNetNuke.Abstractions.csproj">
<Project>{6928A9B1-F88A-4581-A132-D3EB38669BB0}</Project>
<Name>DotNetNuke.Abstractions</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\DotNetNuke.Web.Client\DotNetNuke.Web.Client.csproj">
<Project>{03e3afa5-ddc9-48fb-a839-ad4282ce237e}</Project>
<Name>DotNetNuke.Web.Client</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\DotNetNuke.WebUtility\DotNetNuke.WebUtility.vbproj">
<Project>{4912f062-f8a8-4f9d-8f8e-244ebee1acbd}</Project>
<Name>DotNetNuke.WebUtility</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\DotNetNuke.Web\DotNetNuke.Web.csproj">
<Project>{ee1329fe-fd88-4e1a-968c-345e394ef080}</Project>
<Name>DotNetNuke.Web</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Library\DotNetNuke.Library.csproj">
<Project>{6b29aded-7b56-4484-bea5-c0e09079535b}</Project>
<Name>DotNetNuke.Library</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup />
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
Original file line number Diff line number Diff line change
@@ -1,23 +1,8 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information
using System.Reflection;
using System.Runtime.InteropServices;

/*
* CKEditor Provider for DNN
* ========
* https://github.com/DNN-Connect/CKEditorProvider
* Copyright (C) DNN Connect
*
* The software, this file and its contents are subject to the CKEditorProvider
* License. Please read the license.txt file before using, installing, copying,
* modifying or distribute this file or part of its contents. The contents of
* this file is part of the Source Code of the CKEditor Provider.
*/

[assembly: AssemblyDescription("CKEditor HTML Editor Provider for DNN")]
[assembly: AssemblyTitle("CKEditor HTML Editor Provider for DNN")]
[assembly: AssemblyVersion("1.1.0.*")]
[assembly: AssemblyFileVersion("1.1.0")]
[assembly: ComVisible(false)]
[assembly: AssemblyCompany("DNN-Connect")]
[assembly: AssemblyCopyright("2019 DNN-Connect")]

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".

<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.

<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
<?xml version="1.0" encoding="utf-8"?>

<!-- For more information on using web.config transformation visit https://go.microsoft.com/fwlink/?LinkId=125889 -->

<configuration xmlns:xdt="http://schemas.microsoft.com/XML-Document-Transform">
<!--
In the example below, the "SetAttributes" transform will change the value of
"connectionString" to use "ReleaseSQLServer" only when the "Match" locator
finds an attribute "name" that has a value of "MyDB".

<connectionStrings>
<add name="MyDB"
connectionString="Data Source=ReleaseSQLServer;Initial Catalog=MyReleaseDB;Integrated Security=True"
xdt:Transform="SetAttributes" xdt:Locator="Match(name)"/>
</connectionStrings>
-->
<system.web>
<compilation xdt:Transform="RemoveAttributes(debug)" />
<!--
In the example below, the "Replace" transform will replace the entire
<customErrors> section of your web.config file.
Note that because there is only one customErrors section under the
<system.web> node, there is no need to use the "xdt:Locator" attribute.

<customErrors defaultRedirect="GenericError.htm"
mode="RemoteOnly" xdt:Transform="Replace">
<error statusCode="500" redirect="InternalError.htm"/>
</customErrors>
-->
</system.web>
</configuration>
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
<?xml version="1.0"?>
<configuration>
<!--
For a description of web.config changes see http://go.microsoft.com/fwlink/?LinkId=235367.

The following attributes can be set on the <httpRuntime> tag.
<system.Web>
<httpRuntime targetFramework="4.7.2" />
</system.Web>
-->
<system.web>
<compilation debug="true" targetFramework="4.7.2"/>
<pages controlRenderingCompatibilityVersion="4.0"/>
</system.web>
</configuration>
33 changes: 33 additions & 0 deletions DNN_Platform.sln
Original file line number Diff line number Diff line change
@@ -502,6 +502,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Caching", "Caching", "{EC1B
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider", "DNN Platform\Providers\CachingProviders\DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider\DotNetNuke.Providers.Caching.SimpleWebFarmCachingProvider.csproj", "{2C25580C-A971-4F0B-9F70-436A35C2473E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "HtmlEditorProviders", "HtmlEditorProviders", "{682824D2-B21A-4460-AC66-67BFFDD5A559}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "DNNConnect.CKE", "DNNConnect.CKE", "{8BA6DD11-0CD5-4556-8853-282B3C1C3A06}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DNNConnect.CKEditorProvider", "DNN Platform\Providers\HtmlEditorProviders\DNNConnect.CKE\DNNConnect.CKEditorProvider.csproj", "{AE7E021E-7C7B-4003-9BD6-5A04C781C277}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Cloud_Debug|Any CPU = Cloud_Debug|Any CPU
@@ -1916,6 +1922,30 @@ Global
{2C25580C-A971-4F0B-9F70-436A35C2473E}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
{2C25580C-A971-4F0B-9F70-436A35C2473E}.Release-Net45|x86.ActiveCfg = Release|Any CPU
{2C25580C-A971-4F0B-9F70-436A35C2473E}.Release-Net45|x86.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Debug|Any CPU.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Debug|x86.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Debug|x86.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Release|Any CPU.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Release|Any CPU.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Release|x86.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Cloud_Release|x86.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|Any CPU.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|x86.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug|x86.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug-Net45|Any CPU.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug-Net45|Any CPU.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug-Net45|x86.ActiveCfg = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Debug-Net45|x86.Build.0 = Debug|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|Any CPU.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|Any CPU.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|x86.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release|x86.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release-Net45|Any CPU.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release-Net45|Any CPU.Build.0 = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release-Net45|x86.ActiveCfg = Release|Any CPU
{AE7E021E-7C7B-4003-9BD6-5A04C781C277}.Release-Net45|x86.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -2021,6 +2051,9 @@ Global
{6928A9B1-F88A-4581-A132-D3EB38669BB0} = {29273BE6-1AA8-4970-98A0-41BFFEEDA67B}
{EC1BEDFA-6DD4-48AD-9326-8274436539E6} = {5D82591D-1525-40A1-ACA3-1F89D817E9AD}
{2C25580C-A971-4F0B-9F70-436A35C2473E} = {EC1BEDFA-6DD4-48AD-9326-8274436539E6}
{682824D2-B21A-4460-AC66-67BFFDD5A559} = {5D82591D-1525-40A1-ACA3-1F89D817E9AD}
{8BA6DD11-0CD5-4556-8853-282B3C1C3A06} = {682824D2-B21A-4460-AC66-67BFFDD5A559}
{AE7E021E-7C7B-4003-9BD6-5A04C781C277} = {8BA6DD11-0CD5-4556-8853-282B3C1C3A06}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {46B6A641-57EB-4B19-B199-23E6FC2AB40B}