Skip to content
This repository has been archived by the owner on Feb 10, 2021. It is now read-only.

Removes duplicate dll packaging #126

Merged
merged 2 commits into from
Sep 25, 2019
Merged

Removes duplicate dll packaging #126

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4afa27e
Removed duplicate dll packaging
valadas Sep 25, 2019
86b9d9f
Removed debugging message log
valadas Sep 25, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion BuildScripts/Package.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
<Import Project="$(BuildScriptsPath)\MSBuild.Community.Tasks.Targets" />
<UsingTask AssemblyFile="$(DotNetNukeMSBuildTasksLib)" TaskName="DotNetNuke.MSBuild.Tasks.ExtensionPackager" />

<Target Name="AfterBuild" DependsOnTargets="CopyBin;GetFiles;Package">
<Target Name="AfterBuild" DependsOnTargets="GetFiles;Package">
</Target>

<Target Name="CopyBin">
Expand Down
7 changes: 6 additions & 1 deletion DNNConnect.CKEditorProvider.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup>
Expand Down Expand Up @@ -220,6 +220,9 @@
<Content Include="Browser\js\jquery.ImageResizer.js" />
<Content Include="Browser\js\jquery.ImageSlider.js" />
<Content Include="Browser\js\jquery.pagemethod.js" />
<Content Include="BuildScripts\DotNetNuke.MSBuild.Tasks.dll" />
<Content Include="BuildScripts\ICSharpCode.SharpZipLib.dll" />
<Content Include="BuildScripts\MSBuild.Community.Tasks.dll" />
<Content Include="CKEditorConfig.png" />
<Content Include="css\CKEditorOverride.css" />
<Content Include="css\CkEditorContents.css" />
Expand Down Expand Up @@ -280,6 +283,8 @@
<Content Include="Browser\FileUploader.ashx" />
<Content Include="Browser\Browser.comb.css.bundle" />
<Content Include="Install\01.00.00.SqlDataProvider" />
<Content Include="BuildScripts\MSBuild.Community.Tasks.Targets" />
<Content Include="BuildScripts\Package.targets" />
<None Include="Install\Uninstall.SqlDataProvider" />
<None Include="DNNConnect.CKEditorProvider.dnn">
<SubType>Designer</SubType>
Expand Down