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.

Sign up for GitHub

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

Jump to bottom

DNN-8639 #1482

Merged
merged 2 commits into from
Jun 14, 2016
Merged

DNN-8639 #1482

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
3ea330e
local deployment
r1mar Apr 28, 2016
543e727
cleaned up missed files
r1mar Apr 29, 2016
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
3 changes: 3 additions & 0 deletions DNN Platform/Tests/DotNetNuke.Tests.Web.Mvc/DotNetNuke.Tests.Web.Mvc.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,9 @@
<Name>DotNetNuke.Tests.Utilities</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this line looks not needed.

<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Import Project="$(SolutionDir)\.nuget\NuGet.targets" Condition="Exists('$(SolutionDir)\.nuget\NuGet.targets')" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
Expand Down
101 changes: 2 additions & 99 deletions Website/DotNetNuke.Website.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -863,7 +863,7 @@
<Compile Include="DesktopModules\Admin\MobilePreview\Preview.ascx.designer.cs">
<DependentUpon>Preview.ascx</DependentUpon>
</Compile>
<Content Include="admin\Menus\ModuleActions\dnnQuickSettings.js" />
<Content Include="admin\Menus\ModuleActions\dnnQuickSettings.js" />
<Content Include="admin\Menus\ModuleActions\ModuleActions.less" />
<None Include="compilerconfig.json" />
<Compile Include="DesktopModules\Admin\Portals\Portals.ascx.cs">
Expand Down Expand Up @@ -1434,7 +1434,6 @@
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\css-hint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\html-hint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\javascript-hint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\pig-hint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\python-hint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\show-hint.css" />
<Content Include="Resources\Shared\components\CodeEditor\addon\hint\show-hint.js" />
Expand All @@ -1448,7 +1447,6 @@
<Content Include="Resources\Shared\components\CodeEditor\addon\lint\lint.css" />
<Content Include="Resources\Shared\components\CodeEditor\addon\lint\lint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\lint\yaml-lint.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\merge\dep\diff_match_patch.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\merge\merge.css" />
<Content Include="Resources\Shared\components\CodeEditor\addon\merge\merge.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\mode\loadmode.js" />
Expand Down Expand Up @@ -1477,7 +1475,6 @@
<Content Include="Resources\Shared\components\CodeEditor\addon\tern\worker.js" />
<Content Include="Resources\Shared\components\CodeEditor\addon\wrap\hardwrap.js" />
<Content Include="Resources\Shared\components\CodeEditor\keymap\emacs.js" />
<Content Include="Resources\Shared\components\CodeEditor\keymap\extra.js" />
<Content Include="Resources\Shared\components\CodeEditor\keymap\sublime.js" />
<Content Include="Resources\Shared\components\CodeEditor\keymap\vim.js" />
<Content Include="Resources\Shared\components\CodeEditor\lib\codemirror.css" />
Expand Down Expand Up @@ -1587,8 +1584,6 @@
<Content Include="Resources\Shared\components\CodeEditor\mode\julia\julia.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\kotlin\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\kotlin\kotlin.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\less\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\less\less.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\livescript\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\livescript\livescript.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\lua\index.html" />
Expand All @@ -1611,8 +1606,6 @@
<Content Include="Resources\Shared\components\CodeEditor\mode\nginx\nginx.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\ntriples\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\ntriples\ntriples.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\ocaml\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\ocaml\ocaml.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\octave\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\octave\octave.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\pascal\index.html" />
Expand All @@ -1634,13 +1627,9 @@
<Content Include="Resources\Shared\components\CodeEditor\mode\python\python.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\q\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\q\q.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\changes\changes.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\changes\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\rpm.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\spec\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\spec\spec.css" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rpm\spec\spec.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rst\index.html" />
<Content Include="Resources\Shared\components\CodeEditor\mode\rst\rst.js" />
<Content Include="Resources\Shared\components\CodeEditor\mode\ruby\index.html" />
Expand Down Expand Up @@ -1807,7 +1796,6 @@
<Content Include="Providers\DataProviders\SqlDataProvider\07.04.01.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\07.04.02.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.05.SqlDataProvider" />
<Content Include="Portals\_default\Content Templates\GettingStarted.cshtml" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.06.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.07.SqlDataProvider" />
<Content Include="Resources\Shared\stylesheets\dnnicons\fonts\dnnicon.eot" />
Expand All @@ -1822,15 +1810,10 @@
<Content Include="Resources\Shared\components\CKEditor\plugins\wsc\LICENSE.md" />
<Content Include="Resources\Shared\components\CKEditor\plugins\wsc\README.md" />
<Content Include="Resources\Shared\components\CKEditor\README.md" />
<Content Include="Resources\Shared\components\CKEditor\samples\assets\posteddata.php" />
<Content Include="Resources\Shared\components\CKEditor\samples\plugins\htmlwriter\assets\outputforflash\outputforflash.fla" />
<Content Include="Resources\Shared\components\CKEditor\samples\sample_posteddata.php" />
<Content Include="Resources\Shared\components\CKEditor\skins\moono\readme.md" />
<Content Include="Resources\Shared\components\CodeEditor\AUTHORS" />
<Content Include="Resources\Shared\components\CodeEditor\LICENSE" />
<Content Include="Resources\Shared\components\CodeEditor\mode\livescript\livescript.ls" />
<Content Include="Portals\_default\Content Templates\ViewMarkdown.cshtml" />
<Content Include="Portals\_default\Content Templates\ViewHtml.cshtml" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.10.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.11.SqlDataProvider" />
<Content Include="Providers\DataProviders\SqlDataProvider\08.00.00.12.SqlDataProvider" />
Expand Down Expand Up @@ -3765,13 +3748,6 @@
<Content Include="Portals\_default\admin.css" />
<Content Include="Portals\_default\Cache\PlaceHolder.txt" />
<Content Include="Portals\_default\Cache\ReadMe.txt" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\container.css" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\images\DKLogo.png" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\images\minus-icn.png" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\images\plus-icn.png" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\NoTitle.ascx" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\Simple.ascx" />
<Content Include="Portals\_default\Containers\DarkKnightMobile\ToggledContentContainer.ascx" />
<Content Include="Portals\_default\Containers\Facebook\container.css" />
<Content Include="Portals\_default\Containers\Facebook\images\FacebookLogo.png" />
<Content Include="Portals\_default\Containers\Gravity\Banner.ascx" />
Expand All @@ -3789,28 +3765,6 @@
<Content Include="Portals\_default\EventQueue\readme.txt" />
<Content Include="Portals\_default\ie.css" />
<Content Include="Portals\_default\portal.css" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\DNNMobileNav\DNNMobileNav-menudef.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\DNNMobileNav\DNNMobileNav.xslt" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\DNNMobileSubNav\DNNMobileSubNav-menudef.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\DNNMobileSubNav\DNNMobileSubNav.xslt" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\home.ascx" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\home.doctype.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\1-icn.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\2-icn.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\3-icn.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\d-arrow.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\DKLogo.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\Logo.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\mbg.jpg" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\r-arrow.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\images\social-icns.png" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\interior.ascx" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\interior.doctype.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\microsite_home.ascx" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\microsite_home.doctype.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\microsite_interior.ascx" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\microsite_interior.doctype.xml" />
<Content Include="Portals\_default\Skins\DarkKnightMobile\skin.css" />
<Content Include="Portals\_default\Skins\Facebook\Facebook-Mega-Menu.ascx" />
<Content Include="Portals\_default\Skins\Facebook\Facebook-Mega-Menu.doctype.xml" />
<Content Include="Portals\_default\Skins\Facebook\images\FacebookLogo.png" />
Expand Down Expand Up @@ -3968,19 +3922,12 @@
<Content Include="Providers\DataProviders\SqlDataProvider\InstallProfile.sql" />
<Content Include="Providers\DataProviders\SqlDataProvider\InstallRoles.sql" />
<Content Include="Providers\LoggingProviders\XMLLoggingProvider\Log.xslt" />
<Content Include="Providers\NavigationProviders\DNNMenuNavigationProvider\license.txt" />
<Content Include="Providers\NavigationProviders\DNNMenuNavigationProvider\releaseNotes.txt" />
<Content Include="Resources\ContentRotator\scripts\contentrotator.js" />
<Content Include="Resources\ContentRotator\themes\simple\loading.gif" />
<Content Include="Resources\ContentRotator\themes\simple\simple.css" />
<Content Include="Resources\ControlPanel\ControlPanel.debug.js" />
<Content Include="Resources\ControlPanel\ControlPanel.js" />
<Content Include="Resources\Dashboard\jquery.dashboard.js" />
<Content Include="Resources\Libraries\jQuery-Migrate\01_02_01\jquery-migrate.js" />
<Content Include="Resources\Libraries\jQuery-UI\01_10_03\jquery-ui.js" />
<Content Include="Resources\Libraries\jQuery\01_09_01\jquery.js" />
<Content Include="Resources\Libraries\Knockout.Mapping\02_04_01\knockout.mapping.js" />
<Content Include="Resources\Libraries\Knockout\03_01_00\knockout.js" />
<Content Include="Resources\Search\Search.js" />
<Content Include="Resources\Search\SearchSkinObjectPreview.css" />
<Content Include="Resources\Search\SearchSkinObjectPreview.js" />
Expand Down Expand Up @@ -4055,49 +4002,6 @@
<Content Include="Resources\Shared\stylesheets\dnn.searchBox.css" />
<Content Include="Resources\Shared\stylesheets\yui\base-min.css" />
<Content Include="Resources\Shared\stylesheets\yui\reset-fonts-grids.css" />
<Content Include="Resources\TabStrip\scripts\tabstrip.js" />
<Content Include="Resources\TabStrip\themes\graphite\filler.gif" />
<Content Include="Resources\TabStrip\themes\graphite\graphite.css" />
<Content Include="Resources\TabStrip\themes\graphite\leftNormal.gif" />
<Content Include="Resources\TabStrip\themes\graphite\leftSelected.gif" />
<Content Include="Resources\TabStrip\themes\graphite\middleNormal.gif" />
<Content Include="Resources\TabStrip\themes\graphite\middleSelected.gif" />
<Content Include="Resources\TabStrip\themes\graphite\rightNormal.gif" />
<Content Include="Resources\TabStrip\themes\graphite\rightNormalNormal.gif" />
<Content Include="Resources\TabStrip\themes\graphite\rightNormalSelected.gif" />
<Content Include="Resources\TabStrip\themes\graphite\rightSelected.gif" />
<Content Include="Resources\TabStrip\themes\graphite\rightSelectedNormal.gif" />
<Content Include="Resources\TabStrip\themes\platinum\filler.gif" />
<Content Include="Resources\TabStrip\themes\platinum\leftNormal.gif" />
<Content Include="Resources\TabStrip\themes\platinum\leftSelected.gif" />
<Content Include="Resources\TabStrip\themes\platinum\middleNormal.gif" />
<Content Include="Resources\TabStrip\themes\platinum\middleSelected.gif" />
<Content Include="Resources\TabStrip\themes\platinum\platinum.css" />
<Content Include="Resources\TabStrip\themes\platinum\rightNormal.gif" />
<Content Include="Resources\TabStrip\themes\platinum\rightNormalNormal.gif" />
<Content Include="Resources\TabStrip\themes\platinum\rightNormalSelected.gif" />
<Content Include="Resources\TabStrip\themes\platinum\rightSelected.gif" />
<Content Include="Resources\TabStrip\themes\platinum\rightSelectedNormal.gif" />
<Content Include="Resources\Widgets\DNN\EmbedWidget.js" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\Disqus\disqus.snippet.htm" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\Flash\flash.snippet.htm" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\Flash\swfobject.js" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\Flickr\flickr.snippet.htm" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\GoogleAnalytics\googleanalytics.snippet.htm" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\WidgetBox\widgetbox.flash.snippet.htm" />
<Content Include="Resources\Widgets\DNN\EmbedWidgetResources\YouTube\youtube.snippet.htm" />
<Content Include="Resources\Widgets\DNN\PaneCollapseWidget.js" />
<Content Include="Resources\Widgets\DNN\PngTransparencyWidget.js" />
<Content Include="Resources\Widgets\DNN\RelocationWidget.js" />
<Content Include="Resources\Widgets\DNN\RotatorWidget.js" />
<Content Include="Resources\Widgets\DNN\StyleScrubberWidget.js" />
<Content Include="Resources\Widgets\DNN\StyleSheetWidget.js" />
<Content Include="Resources\Widgets\DNN\VisibilityWidget.js" />
<Content Include="Resources\Widgets\User\YourCompany\EmbedWidgetResources\Sample\sample.snippet.htm" />
<Content Include="Resources\Widgets\User\YourCompany\EmbedWidgetResources\Sample\sample.styled.snippet.htm" />
<Content Include="Resources\Widgets\User\YourCompany\license.txt" />
<Content Include="Resources\Widgets\User\YourCompany\releaseNotes.txt" />
<Content Include="Resources\Widgets\User\YourCompany\YourCompany.Widgets.SampleWidget.js" />
<Content Include="Robots.txt" />
</ItemGroup>
<ItemGroup>
Expand Down Expand Up @@ -4289,6 +4193,7 @@
</None>
<None Include="Portals\_default\Templates\Default.page.template" />
<None Include="Portals\_default\Templates\UserProfile.page.template" />
<None Include="Properties\PublishProfiles\local.pubxml" />
<None Include="Providers\DataProviders\SqlDataProvider\01.00.00.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\01.00.01.SqlDataProvider" />
<None Include="Providers\DataProviders\SqlDataProvider\01.00.02.SqlDataProvider" />
Expand Down Expand Up @@ -4442,8 +4347,6 @@
</None>
<None Include="Resources\Libraries\jQuery\01_09_01\jquery.min.map" />
<None Include="Resources\Shared\scripts\jquery\jquery.min.map" />
<None Include="Resources\Widgets\User\YourCompany\SampleWidget.dnn" />
<None Include="Resources\Widgets\User\YourCompany\SampleWidget.zip" />
</ItemGroup>
<ItemGroup>
<Folder Include="Install\Provider\" />
Expand Down
17 changes: 17 additions & 0 deletions Website/Properties/PublishProfiles/local.pubxml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this files looks not needed for this issue.

<!--
Diese Datei wird vom Veröffentlichungs-/Packvorgang Ihres Webprojekts verwendet. Sie können das Verhalten dieses Vorgangs anpassen,
indem Sie diese MSBuild-Datei bearbeiten. Besuchen Sie "http://go.microsoft.com/fwlink/?LinkID=208121", um weitere Informationen zu erhalten.
-->
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<WebPublishMethod>FileSystem</WebPublishMethod>
<LastUsedBuildConfiguration>Release</LastUsedBuildConfiguration>
<LastUsedPlatform>Any CPU</LastUsedPlatform>
<SiteUrlToLaunchAfterPublish />
<LaunchSiteAfterPublish>True</LaunchSiteAfterPublish>
<ExcludeApp_Data>False</ExcludeApp_Data>
<publishUrl>C:\inetpub\wwwroot\DotNetNuke</publishUrl>
<DeleteExistingFiles>True</DeleteExistingFiles>
</PropertyGroup>
</Project>