Cleanup

2018-03-07 09:36:04 +01:00
parent c9f868dd3c
commit 3637e1e5af
10 changed files with 26 additions and 61 deletions
--- a/src/Umbraco.Compat7/Umbraco.Compat7.csproj
+++ b/src/Umbraco.Compat7/Umbraco.Compat7.csproj
@@ -48,6 +48,7 @@
      <Name>Umbraco.Core</Name>
    </ProjectReference>
    <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
+      <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
      <Name>Umbraco.Web</Name>
    </ProjectReference>
  </ItemGroup>
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -668,6 +668,7 @@ namespace Umbraco.Core.Services.Implement
        {
            //This is called a TON. Go get the full user from cache which should already be IProfile
            var fullUser = GetUserById(id);
+            if (fullUser == null) return null;
            var asProfile = fullUser as IProfile;
            return asProfile ?? new UserProfile(fullUser.Id, fullUser.Name);
        }
--- a/src/Umbraco.Examine/Umbraco.Examine.csproj
+++ b/src/Umbraco.Examine/Umbraco.Examine.csproj
@@ -52,11 +52,6 @@
    <PackageReference Include="Newtonsoft.Json" Version="10.0.3" />
    <PackageReference Include="NPoco" Version="3.6.1" />
  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
-  </ItemGroup>
  <ItemGroup>
    <Compile Include="**\*.cs" Exclude="obj\**\*.cs" />
    <Compile Include="..\SolutionInfo.cs">
@@ -64,6 +59,10 @@
    </Compile>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
  </ItemGroup>
  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -425,26 +425,26 @@
      <HintPath>..\packages\System.Xml.XmlDocument.4.3.0\lib\net46\System.Xml.XmlDocument.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Xml.XmlDocument, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System.Xml.XPath">
      <HintPath>..\packages\System.Xml.XPath.4.3.0\lib\net46\System.Xml.XPath.dll</HintPath>
      <Private>True</Private>
    </Reference>
-    <Reference Include="System.Xml.XPath, Version=4.0.2.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
    <Reference Include="System.Xml.XPath.XDocument">
-      <HintPath>../packages/System.Xml.XPath.XDocument.4.0.1/lib/net46/System.Xml.XPath.XDocument.dll</HintPath>
+      <HintPath>../packages/System.Xml.XPath.XDocument.4.3.0/lib/net46/System.Xml.XPath.XDocument.dll</HintPath>
      <Private>True</Private>
    </Reference>
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
      <Name>Umbraco.Examine</Name>
      <Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
    <ProjectReference Include="..\Umbraco.Web\Umbraco.Web.csproj">
+      <Project>{651e1350-91b6-44b7-bd60-7207006d7003}</Project>
      <Name>Umbraco.Web</Name>
    </ProjectReference>
  </ItemGroup>
@@ -1080,10 +1080,10 @@ xcopy "$(ProjectDir)"..\packages\SqlServerCE.4.0.0.1\x86\*.* "$(TargetDir)x86\"
      <!-- the target file eg webapp/.../umbracoSettings.config -->
      <OutputFileName>$(OriginalFileName.Replace("$(ProjectDir)", "$(WebProjectOutputDir)"))</OutputFileName>
    </PropertyGroup>
-    <!-- 
+    <!--
      for each whatever.config file,
      if there is a whatever.(Release|Debug).config file,
-      copy it over as whatever.config 
+      copy it over as whatever.config
    -->
    <Message Text="ConfigFile: $(OriginalFileName) -&gt; $(OutputFileName)" Importance="high" Condition="Exists('$(ModifiedFileName)')" />
    <Copy SourceFiles="$(ModifiedFileName)" DestinationFiles="$(OutputFileName)" OverwriteReadOnlyFiles="true" SkipUnchangedFiles="false" Condition="Exists('$(ModifiedFileName)')" />
--- a/src/Umbraco.Web/Editors/UsersController.cs
+++ b/src/Umbraco.Web/Editors/UsersController.cs
@@ -203,11 +203,10 @@ namespace Umbraco.Web.Editors

            var filterQuery = Current.SqlContext.Query<IUser>();

-            //if the current user is not the administrator, then don't include this in the results.
-            if (Security.CurrentUser.IsSuper() == false)
+            if (!Security.CurrentUser.IsSuper())
            {
                // only super can see super
-                filterQuery.Where(x => x.Id != Constants.Security.SuperId);
+                filterQuery.Where(x => !x.IsSuper());
            }

            if (filter.IsNullOrWhiteSpace() == false)
--- a/src/Umbraco.Web/HealthCheck/NotificationMethods/NotificationMethodBase.cs
+++ b/src/Umbraco.Web/HealthCheck/NotificationMethods/NotificationMethodBase.cs
@@ -1,7 +1,7 @@
 using System.Collections.Generic;
+using System.Reflection;
 using System.Threading;
 using System.Threading.Tasks;
-using NuGet;
 using Umbraco.Core.Configuration;
 using Umbraco.Core.Configuration.HealthChecks;

--- a/src/Umbraco.Web/IUmbracoComponentRendererWithField.cs
+++ b/src/Umbraco.Web/IUmbracoComponentRendererWithField.cs
@@ -1,39 +0,0 @@
-using System.Web;
-using Umbraco.Core.Models.PublishedContent;
-
-namespace Umbraco.Web
-{
-    /// <summary>
-    /// Methods used to render umbraco components as HTML in templates
-    /// </summary>
-    public interface IUmbracoComponentRendererWithField : IUmbracoComponentRenderer
-    {
-        /// <summary>
-        /// Renders an field to the template
-        /// </summary>
-        /// <param name="currentPage"></param>
-        /// <param name="fieldAlias"></param>
-        /// <param name="altFieldAlias"></param>
-        /// <param name="altText"></param>
-        /// <param name="insertBefore"></param>
-        /// <param name="insertAfter"></param>
-        /// <param name="recursive"></param>
-        /// <param name="convertLineBreaks"></param>
-        /// <param name="removeParagraphTags"></param>
-        /// <param name="casing"></param>
-        /// <param name="encoding"></param>
-        /// <param name="formatAsDate"></param>
-        /// <param name="formatAsDateWithTime"></param>
-        /// <param name="formatAsDateWithTimeSeparator"></param>
-        //// <param name="formatString"></param>
-        /// <returns></returns>
-        IHtmlString Field(IPublishedContent currentPage, string fieldAlias,
-            string altFieldAlias = "", string altText = "", string insertBefore = "", string insertAfter = "",
-            bool recursive = false, bool convertLineBreaks = false, bool removeParagraphTags = false,
-            RenderFieldCaseType casing = RenderFieldCaseType.Unchanged,
-            RenderFieldEncodingType encoding = RenderFieldEncodingType.Unchanged,
-            bool formatAsDate =  false,
-            bool formatAsDateWithTime = false,
-            string formatAsDateWithTimeSeparator = "");
-    }
-}
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -103,13 +103,14 @@
    <PackageReference Include="xmlrpcnet" Version="3.0.0.266" />
  </ItemGroup>
  <ItemGroup>
+    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
+      <Project>{31785bc3-256c-4613-b2f5-a1b0bdded8c1}</Project>
+      <Name>Umbraco.Core</Name>
+    </ProjectReference>
    <ProjectReference Include="..\Umbraco.Examine\Umbraco.Examine.csproj">
      <Name>Umbraco.Examine</Name>
      <Project>{07FBC26B-2927-4A22-8D96-D644C667FECC}</Project>
    </ProjectReference>
-    <ProjectReference Include="..\Umbraco.Core\Umbraco.Core.csproj">
-      <Name>Umbraco.Core</Name>
-    </ProjectReference>
  </ItemGroup>
  <ItemGroup>
    <!-- no globbing for now, painful -->
@@ -163,7 +164,6 @@
    <Compile Include="Install\InstallSteps\ConfigureMachineKey.cs" />
    <Compile Include="IPublishedContentQuery.cs" />
    <Compile Include="Editors\MemberGroupController.cs" />
-    <Compile Include="IUmbracoComponentRendererWithField.cs" />
    <Compile Include="LightInjectExtensions.cs" />
    <Compile Include="Editors\EditorValidator.cs" />
    <Compile Include="Macros\MacroContent.cs" />
--- a/src/Umbraco.Web/UmbracoComponentRenderer.cs
+++ b/src/Umbraco.Web/UmbracoComponentRenderer.cs
@@ -24,7 +24,7 @@ namespace Umbraco.Web
    /// <remarks>
    /// Used by UmbracoHelper
    /// </remarks>
-    internal class UmbracoComponentRenderer : IUmbracoComponentRendererWithField
+    internal class UmbracoComponentRenderer : IUmbracoComponentRenderer
    {
        private readonly UmbracoContext _umbracoContext;

--- a/src/umbraco.sln
+++ b/src/umbraco.sln
@@ -86,6 +86,10 @@ EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Tests.Benchmarks", "Umbraco.Tests.Benchmarks\Umbraco.Tests.Benchmarks.csproj", "{86DEB346-089F-4106-89C8-D852B9CF2A33}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Umbraco.Compat7", "Umbraco.Compat7\Umbraco.Compat7.csproj", "{185E098F-5706-4B97-B404-EB974F05F633}"
+	ProjectSection(ProjectDependencies) = postProject
+		{651E1350-91B6-44B7-BD60-7207006D7003} = {651E1350-91B6-44B7-BD60-7207006D7003}
+		{31785BC3-256C-4613-B2F5-A1B0BDDED8C1} = {31785BC3-256C-4613-B2F5-A1B0BDDED8C1}
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution