Release v.11.1.6800.0

Sitefinity · Nov 12, 2018 · 342dc14 · 342dc14
1 parent a84e2e9
commit 342dc14
Show file tree

Hide file tree

Showing 84 changed files with 3,698 additions and 1,905 deletions.
diff --git a/AssemblyInfoShare/SharedAssemblyInfo.cs b/AssemblyInfoShare/SharedAssemblyInfo.cs
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -7,6 +7,9 @@ module.exports = function (grunt) {
 		pkg: grunt.file.readJSON('package.json'),
 
 		jshint: {
+			options: {
+				reporterOutput: ""
+			},
 			//define the files to lint
 			files: ['gruntfile.js',
 					'Telerik.Sitefinity.Frontend/Designers/Scripts/*.js',
@@ -60,7 +63,7 @@ module.exports = function (grunt) {
 							{type: 'cobertura', options: {dir: 'Tests/Telerik.Sitefinity.Frontend.ClientTest/coverage/cobertura'}},
 							{type: 'text-summary'}
 						]
-					}
+    }
 				}
 			}
 		},

diff --git a/README.md b/README.md
@@ -4,6 +4,11 @@ The Feather Project
 This repository contains the core infrastructure related to [Project Feather](http://projectfeather.sitefinity.com).
 
 
+| Test | Status |
+|----|----|
+| Unit | [![Build Status](https://feather-ci.sitefinity.com/buildStatus/icon?job=Master_FeatherUnitTests)](https://feather-ci.sitefinity.com/job/Master_FeatherUnitTests/) |
+| Integration | [![Build Status](https://feather-ci.sitefinity.com/buildStatus/icon?job=Master_FeatherIntegrationTests)](https://feather-ci.sitefinity.com/job/Master_FeatherIntegrationTests/) |
+
 # Related Repositories
 
 [feather-widgets](https://github.com/Sitefinity/feather-widgets) - This repository contains custom MVC widgets which are part of the Feather project.
@@ -43,7 +48,7 @@ This repository contains the core infrastructure related to [Project Feather](ht
 
 This project has been released under the Apache License, version 2.0, the text of which is included below. This license applies ONLY to the project-specific source of each repository and does not extend to Telerik Sitefinity CMS itself, or any other 3rd party libraries used in a repository. For licensing information about Telerik Sitefinity CMS, see the [License Agreements page](http://www.sitefinity.com/purchase/license-agreement) at [Sitefinity.com](http://www.sitefinity.com/).
 
-Copyright © 2005-2018 Telerik AD
+Copyright © 2005-2017 Telerik AD
 
 Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
 

diff --git a/Telerik.Sitefinity.Frontend.Data/FileMonitorFluentMapping.cs b/Telerik.Sitefinity.Frontend.Data/FileMonitorFluentMapping.cs
@@ -1,8 +1,8 @@
 using System.Collections.Generic;
 using Telerik.OpenAccess;
 using Telerik.OpenAccess.Metadata.Fluent;
-using Telerik.Sitefinity.Model;
 using Telerik.OpenAccess.Metadata.Fluent.Advanced;
+using Telerik.Sitefinity.Model;
 
 namespace Telerik.Sitefinity.Frontend.FilesMonitoring.Data
 {

diff --git a/Telerik.Sitefinity.Frontend.Data/OpenAccessNuGet.targets b/Telerik.Sitefinity.Frontend.Data/OpenAccessNuGet.targets
@@ -25,7 +25,7 @@ Copyright (C) 2007-2015 Telerik AD. All rights reserved.
     <EnhancerVerboseMode Condition="'$(EnhancerVerboseMode)'==''">3</EnhancerVerboseMode>
     <Use64BitEnhancer Condition="'$(Use64BitEnhancer)'=='' And '$(PlatformTarget)'=='x64'">true</Use64BitEnhancer>
     <ValidateMapping Condition="'$(ValidateMapping)'==''">false</ValidateMapping>
-    <EnhancerDoNotCheckVersionOfReferencedAssemblies Condition="'$(EnhancerDoNotCheckVersionOfReferencedAssemblies)'==''">true</EnhancerDoNotCheckVersionOfReferencedAssemblies>
+    <EnhancerDoNotCheckVersionOfReferencedAssemblies Condition="'$(EnhancerDoNotCheckVersionOfReferencedAssemblies)'==''">false</EnhancerDoNotCheckVersionOfReferencedAssemblies>
   </PropertyGroup>
 
   <!-- Register the enhancement tasks from the enhancer assembly -->

diff --git a/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj b/Telerik.Sitefinity.Frontend.Data/Telerik.Sitefinity.Frontend.Data.csproj
@@ -13,12 +13,12 @@
     <FileAlignment>512</FileAlignment>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
     <RestorePackages>true</RestorePackages>
-    <EnhancerAssembly>$(SolutionDir)\packages\Telerik.DataAccess.Fluent.2016.2.822.1\tools\enhancer\enhancer.exe</EnhancerAssembly>
     <SccProjectName>SAK</SccProjectName>
     <SccLocalPath>SAK</SccLocalPath>
     <SccAuxPath>SAK</SccAuxPath>
     <SccProvider>SAK</SccProvider>
     <TargetFrameworkProfile />
+    <EnhancerAssembly>$(SolutionDir)\packages\Telerik.DataAccess.Fluent.2018.0.911.1\tools\enhancer\enhancer.exe</EnhancerAssembly>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -52,25 +52,17 @@
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
-    <Reference Include="Telerik.OpenAccess, Version=2016.2.822.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2016.2.822.1\lib\net40\Telerik.OpenAccess.dll</HintPath>
-      <Private>True</Private>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Telerik.OpenAccess, Version=2018.0.911.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.911.1\lib\net40\Telerik.OpenAccess.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.35.Extensions, Version=2016.2.822.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2016.2.822.1\lib\net40\Telerik.OpenAccess.35.Extensions.dll</HintPath>
-      <Private>True</Private>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Telerik.OpenAccess.35.Extensions, Version=2018.0.911.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.911.1\lib\net40\Telerik.OpenAccess.35.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.40.Extensions, Version=2016.2.822.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2016.2.822.1\lib\net40\Telerik.OpenAccess.40.Extensions.dll</HintPath>
-      <Private>True</Private>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Telerik.OpenAccess.40.Extensions, Version=2018.0.911.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.911.1\lib\net40\Telerik.OpenAccess.40.Extensions.dll</HintPath>
     </Reference>
-    <Reference Include="Telerik.OpenAccess.Runtime, Version=2016.2.822.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
-      <HintPath>..\packages\Telerik.DataAccess.Core.2016.2.822.1\lib\net40\Telerik.OpenAccess.Runtime.dll</HintPath>
-      <Private>True</Private>
-      <SpecificVersion>False</SpecificVersion>
+    <Reference Include="Telerik.OpenAccess.Runtime, Version=2018.0.911.1, Culture=neutral, PublicKeyToken=7ce17eeaf1d59342, processorArchitecture=MSIL">
+      <HintPath>..\packages\Telerik.DataAccess.Core.2018.0.911.1\lib\net40\Telerik.OpenAccess.Runtime.dll</HintPath>
     </Reference>
   </ItemGroup>
   <ItemGroup>
@@ -89,24 +81,20 @@
     <None Include="..\..\snk\PublicKey.snk">
       <Link>PublicKey.snk</Link>
     </None>
-    <None Include="OpenAccessNuGet.targets">
-      <SubType>Designer</SubType>
-    </None>
-    <None Include="packages.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="OpenAccessNuGet.targets" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Telerik.Sitefinity.Model">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.11.0.6700\lib\net471\Telerik.Sitefinity.Model.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.11.1.6800\lib\net471\Telerik.Sitefinity.Model.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.11.0.6700\lib\net471\Telerik.Sitefinity.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.11.1.6800\lib\net471\Telerik.Sitefinity.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Telerik.Sitefinity.Utilities">
-      <HintPath>..\packages\Telerik.Sitefinity.Core.11.0.6700\lib\net471\Telerik.Sitefinity.Utilities.dll</HintPath>
+      <HintPath>..\packages\Telerik.Sitefinity.Core.11.1.6800\lib\net471\Telerik.Sitefinity.Utilities.dll</HintPath>
       <Private>True</Private>
     </Reference>
   </ItemGroup>

diff --git a/Telerik.Sitefinity.Frontend.Data/packages.config b/Telerik.Sitefinity.Frontend.Data/packages.config
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Telerik.DataAccess.Core" version="2016.2.822.1" targetFramework="net45" />
-  <package id="Telerik.DataAccess.Fluent" version="2016.2.822.1" targetFramework="net45" developmentDependency="true" />
-  <package id="Telerik.Sitefinity.Core" version="11.0.6700" targetFramework="net45" />
+  <package id="Telerik.DataAccess.Core" version="2018.0.911.1" targetFramework="net471" />
+  <package id="Telerik.DataAccess.Fluent" version="2018.0.911.1" targetFramework="net471" developmentDependency="true" />
+  <package id="Telerik.Sitefinity.Core" version="11.1.6800" targetFramework="net45" />
 </packages>
diff --git a/Telerik.Sitefinity.Frontend/Designers/DesignerInitializer.cs b/Telerik.Sitefinity.Frontend/Designers/DesignerInitializer.cs
@@ -7,6 +7,7 @@
 using System.Web.UI;
 using Telerik.Microsoft.Practices.Unity;
 using Telerik.Sitefinity.Abstractions;
+using Telerik.Sitefinity.Frontend.Mvc.Helpers;
 using Telerik.Sitefinity.Frontend.Resources;
 using Telerik.Sitefinity.Services;
 using Telerik.Sitefinity.Web.UI;
@@ -58,21 +59,21 @@ private void RegisteringScriptsHandler(IScriptsRegisteringEvent @event)
             {
                 var scriptRootPath = "~/" + FrontendManager.VirtualPathBuilder.GetVirtualPath(this.GetType().Assembly);
 
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Mvc/Scripts/Angular/angular.min.js"));
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Mvc/Scripts/Angular/angular-route.min.js"));
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Mvc/Scripts/Angular/angular-sanitize.min.js"));
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Mvc/Scripts/Bootstrap/js/ui-bootstrap-tpls.min.js"));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Mvc/Scripts/Angular/angular.min.js")));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Mvc/Scripts/Angular/angular-route.min.js")));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Mvc/Scripts/Angular/angular-sanitize.min.js")));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Mvc/Scripts/Bootstrap/js/ui-bootstrap-tpls.min.js")));
 
                 ////var references = PageManager.GetScriptReferences(ScriptRef.KendoAll);
                 ////foreach (var scriptRef in references)
                 ////{
                 ////    @event.Scripts.Add(scriptRef);
                 ////}
 
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Designers/Scripts/page-editor-services.js"));
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Designers/Scripts/page-editor.js"));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Designers/Scripts/page-editor-services.js")));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Designers/Scripts/page-editor.js")));
 
-                @event.Scripts.Add(new ScriptReference(scriptRootPath + "Mvc/Scripts/LABjs/LAB.min.js"));
+                @event.Scripts.Add(new ScriptReference(scriptRootPath + UrlHelpers.AppendVersion("Mvc/Scripts/LABjs/LAB.min.js")));
 
                 var currentPackage = new PackageManager().GetCurrentPackage();
                 if (!currentPackage.IsNullOrEmpty())

diff --git a/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor.js b/Telerik.Sitefinity.Frontend/Designers/Scripts/page-editor.js
@@ -7,7 +7,10 @@ var sitefinity = sitefinity || {};
         var loader,
         loaderMarkup = '<div class="sf-loading-wrapper"><div class="sf-loading"><span></span></div></div>',
         loaderTemplate = kendo.template(loaderMarkup),
-        dialog;
+        dialog,
+        pageScripts = $('script').map(function () {
+            return $(this).attr('src');
+        }).toArray();
 
         function isScriptTag(tag) {
             return tag.tagName == 'SCRIPT' && (!tag.type || tag.type.toLowerCase() == 'text/javascript');
@@ -46,20 +49,37 @@ var sitefinity = sitefinity || {};
         function loadScripts(container, scriptTags, loadHandler) {
             var lab = $LAB.setOptions({
                 AlwaysPreserveOrder: true,
-                AllowDuplicates: true
+                AllowDuplicates: true,
+            });
+
+            var labNoDuplicates = $LAB.setOptions({
+                AlwaysPreserveOrder: true,
+                AllowDuplicates: false
             });
 
             for (var i = 0; i < scriptTags.length; i++) {
                 if (scriptTags[i].src) {
-                    lab = lab.script(scriptTags[i].src);
+                    // Hack to not load bootstrap multiple times, should be removed with the next version of bootstrap or with feather designer script refactoring
+                    if (scriptTags[i].src.indexOf('Mvc/Scripts/Bootstrap/js/bootstrap.min.js') >= 0) {
+                        var src = $(scriptTags[i]).attr('src');
+
+                        if (pageScripts.indexOf(src) < 0) {
+                            labNoDuplicates.script(src);
+                        }
+                    }
+                    else {
+                        lab = lab.script(scriptTags[i].src);
+                    }
                 }
                 else if (scriptTags[i].text) {
                     var text = scriptTags[i].text;
                     lab = lab.wait(function () { eval(text); }); // jshint ignore:line
                 }
             }
 
-            lab.wait(loadHandler);
+            labNoDuplicates.wait(function () {
+                lab.wait(loadHandler);
+            });
         }
 
         /**

diff --git a/Telerik.Sitefinity.Frontend/FrontendModule.cs b/Telerik.Sitefinity.Frontend/FrontendModule.cs
@@ -48,7 +48,7 @@ public override Guid LandingPageId
         /// <value>An array of <see cref="Type"/> objects.</value>
         public override Type[] Managers
         {
-            get { return managerTypes; }
+            get { return ManagerTypes; }
         }
 
         /// <summary>
@@ -133,7 +133,7 @@ public override void Uninstall(SiteInitializer initializer)
         public override void Upgrade(SiteInitializer initializer, Version upgradeFrom)
         {
             base.Upgrade(initializer, upgradeFrom);
-            FrontendModuleUpgrader.Upgrade(upgradeFrom);
+            FrontendModuleUpgrader.Upgrade(upgradeFrom, initializer);
         }
 
         /// <summary>
@@ -178,16 +178,13 @@ protected virtual void Bootstrapper_Initialized(object sender, ExecutedEventArgs
         {
             if (e.CommandName == "Bootstrapped")
             {
-                //System.Threading.Tasks.Task.Run(() =>
-                //{
-                    using (new HealthMonitoring.MethodPerformanceRegion("Feather"))
-                    {
-                        FrontendModuleInstaller.Bootstrapper_Initialized(this.initializers.Value);
-                    }
-                //});
+                using (new HealthMonitoring.MethodPerformanceRegion("Feather"))
+                {
+                    FrontendModuleInstaller.Bootstrapper_Initialized(this.initializers.Value);
+                }
             }
         }
-        
+
         // Called both by Unload and Uninstall
         private void Uninitialize()
         {
@@ -208,23 +205,23 @@ private void InitializeDependencyResolver()
             foreach (var assembly in assemblies)
             {
                 var assemblyModules = this.GetNinjectModules(assembly);
-                    
+
                 // check assembly for already registered ninject modules
                 var registeredAssemblyModules = assemblyModules.Where(module => loadedModules.Where(loadedModule => loadedModule.Name.Equals(module.Name, StringComparison.OrdinalIgnoreCase)).Any());
                 if (registeredAssemblyModules.Any())
                 {
                     foreach (var module in assemblyModules)
-	                {
+                    {
                         if (!registeredAssemblyModules.Any(registeredModule => registeredModule.Name.Equals(module.Name, StringComparison.OrdinalIgnoreCase)))
                         {
                             ninjectDependencyResolver.Load(module);
                         }
-	                } 
+                    }
                 }
                 else
                 {
                     ninjectDependencyResolver.Load(assembly);
-                }    
+                }
             }
         }
 
@@ -269,8 +266,13 @@ private bool IsLoadableModule(Type type)
             return type.GetConstructor(Type.EmptyTypes) != null;
         }
 
+        /// <summary>
+        /// The <see cref="FrontendModule"/> name.
+        /// </summary>
         public const string ModuleName = "Feather";
+
         private static IKernel ninjectDependencyResolver;
+        private static readonly Type[] ManagerTypes = new Type[] { typeof(FilesMonitoring.Data.FileMonitorDataManager) };
 
         private class SitefinityKernel : StandardKernel
         {
@@ -279,6 +281,5 @@ public SitefinityKernel()
             {
             }
         }
-        private static readonly Type[] managerTypes = new Type[] { typeof(FilesMonitoring.Data.FileMonitorDataManager) };
     }
 }
diff --git a/Telerik.Sitefinity.Frontend/FrontendModuleInstaller.cs b/Telerik.Sitefinity.Frontend/FrontendModuleInstaller.cs
@@ -98,8 +98,6 @@ private static void RenameControllers(SiteInitializer initializer)
                     property.Value = "Telerik.Sitefinity.Frontend.ContentBlock.Mvc.Controllers.ContentBlockController";
                 else if (property.Value == "Navigation.Mvc.Controllers.NavigationController")
                     property.Value = "Telerik.Sitefinity.Frontend.Navigation.Mvc.Controllers.NavigationController";
-                else if (property.Value == "SocialShare.Mvc.Controllers.SocialShareController")
-                    property.Value = "Telerik.Sitefinity.Frontend.SocialShare.Mvc.Controllers.SocialShareController";
                 else if (property.Value == "DynamicContent.Mvc.Controllers.DynamicContentController")
                     property.Value = "Telerik.Sitefinity.Frontend.DynamicContent.Mvc.Controllers.DynamicContentController";
             }