yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Cleanup, get rid of warnings

Browse Source
This commit is contained in:
Stephan
2018-05-03 14:58:34 +02:00
parent d04a573888
commit bcf46eceb6
12 changed files with 17 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Core/Composing/LightInjectExtensions.cs
View File

@@ -311,15 +311,15 @@ namespace Umbraco.Core.Composing
// we HAVE to let LightInject throw - and catch at THE OUTERMOST if InvalidOperationException in LightInject.Anything!
return factory.GetInstance(tService, serviceName, args);
try
{
return factory.GetInstance(tService, serviceName, args);
}
catch (Exception e)
{
LightInjectException.TryThrow(e, implementingType);
throw;
}
//try
//{
// return factory.GetInstance(tService, serviceName, args);
//}
//catch (Exception e)
//{
// LightInjectException.TryThrow(e, implementingType);
// throw;
//}
}
/// <summary>

1
src/Umbraco.Core/IO/FileSystems.cs
View File

@@ -28,7 +28,6 @@ namespace Umbraco.Core.IO
private ShadowWrapper _scriptsFileSystem;
private ShadowWrapper _masterPagesFileSystem;
private ShadowWrapper _mvcViewsFileSystem;
private ShadowWrapper _javaScriptLibraryFileSystem;
// well-known file systems lazy initialization
private object _wkfsLock = new object();

7
src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
View File

@@ -67,13 +67,6 @@ namespace Umbraco.Core.Migrations.Upgrade.V_8_0_0
.Do();
}
private bool ColumnExists(string tableName, string columnName)
{
// that's ok even on MySql
var columns = SqlSyntax.GetColumnsInSchema(Context.Database).Distinct().ToArray();
return columns.Any(x => x.TableName.InvariantEquals(tableName) && x.ColumnName.InvariantEquals(columnName));
}
private void RemoveDuplicates()
{
const string sql = @"delete from cmsPreviewXml where versionId in (

2
src/Umbraco.Core/Models/MediaType.cs
View File

@@ -48,7 +48,7 @@ namespace Umbraco.Core.Models
/// Creates a deep clone of the current entity with its identity/alias and it's property identities reset
/// </summary>
/// <returns></returns>
public IMediaType DeepCloneWithResetIdentities(string alias)
public new IMediaType DeepCloneWithResetIdentities(string alias)
{
var clone = (MediaType)DeepClone();
clone.Alias = alias;

45
src/Umbraco.Core/Packaging/DefaultPackageContext.cs
View File

@@ -1,45 +0,0 @@
using System;
using NuGet;
using Umbraco.Core.Configuration;
namespace Umbraco.Core.Packaging
{
internal class DefaultPackageContext : IPackageContext
{
public DefaultPackageContext(Func<string, string> mapPath)
{}
private readonly string _localPackageRepoFolderPath;
private readonly string _pluginInstallFolderPath;
private readonly Lazy<IPackageManager> _localPackageManager;
private readonly Lazy<IPackageRepository> _localPackageRepository;
private readonly Lazy<IPackageManager> _publicPackageManager;
private readonly Lazy<IPackageManager> _privatePackageManager;
private readonly Lazy<IPackageRepository> _publicPackageRepository;
private readonly Lazy<IPackageRepository> _sprivatePackageRepository;
/// <summary>
/// Gets the local path resolver.
/// </summary>
public IPackagePathResolver LocalPathResolver
{
get { return ((PackageManager)LocalPackageManager).PathResolver; }
}
/// <summary>
/// Gets the local package manager.
/// </summary>
public IPackageManager LocalPackageManager
{
get { return _localPackageManager.Value; }
}
/// <summary>
/// Gets the public package manager.
/// </summary>
public IPackageManager PublicPackageManager
{
get { return _publicPackageManager.Value; }
}
}
}

11
src/Umbraco.Core/Packaging/IPackageContext.cs
View File

@@ -1,11 +0,0 @@
using NuGet;
namespace Umbraco.Core.Packaging
{
internal interface IPackageContext
{
IPackageManager LocalPackageManager { get; }
IPackageManager PublicPackageManager { get; }
IPackagePathResolver LocalPathResolver { get; }
}
}

2
src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
View File

@@ -139,7 +139,7 @@ namespace Umbraco.Core.Persistence.Repositories.Implement
FileSystem.AddFile(filepath, content, true);
}
public long GetFileSize(string filepath)
public new long GetFileSize(string filepath)
{
if (FileSystem.FileExists(filepath) == false) return -1;

2
src/Umbraco.Core/Security/MachineKeyGenerator.cs
View File

@@ -26,8 +26,6 @@ namespace Umbraco.Core.Security
validation=""HMACSHA256"" decryption=""AES""
/>";
var Xxx = 3;
return string.Format(c, GenerateAESDecryptionKey(), GenerateHMACSHA256ValidationKey());
}

3
src/Umbraco.Core/Services/Implement/MemberService.cs
View File

@@ -186,8 +186,9 @@ namespace Umbraco.Core.Services.Implement
/// <param name="email">Email of the <see cref="IMembershipUser"/> to create</param>
/// <param name="passwordValue">This value should be the encoded/encrypted/hashed value for the password that will be stored in the database</param>
/// <param name="memberTypeAlias">Alias of the Type</param>
/// <param name="isApproved"></param>
/// <returns><see cref="IMember"/></returns>
IMember IMembershipMemberService<IMember>.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved = true)
IMember IMembershipMemberService<IMember>.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved)
{
return CreateMemberWithIdentity(username, email, username, passwordValue, memberTypeAlias, isApproved);
}

4
src/Umbraco.Core/Services/Implement/UserService.cs
View File

@@ -198,7 +198,7 @@ namespace Umbraco.Core.Services.Implement
{
return _userRepository.GetByUsername(username, includeSecurityData: true);
}
catch (DbException ex)
catch (DbException)
{
// fixme - refactor users/upgrade
// currently kinda accepting anything on upgrade, but that won't deal with all cases
@@ -727,7 +727,7 @@ namespace Umbraco.Core.Services.Implement
{
return _userRepository.Get(id);
}
catch (DbException ex)
catch (DbException)
{
// fixme - refactor users/upgrade
// currently kinda accepting anything on upgrade, but that won't deal with all cases

4
src/Umbraco.Core/StringExtensions.cs
View File

@@ -164,7 +164,7 @@ namespace Umbraco.Core
var obj = JsonConvert.DeserializeObject(input);
return obj;
}
catch (Exception ex)
catch (Exception)
{
return input;
}
@@ -622,7 +622,7 @@ namespace Umbraco.Core
byte[] decodedBytes = UrlTokenDecode(input);
return decodedBytes != null ? Encoding.UTF8.GetString(decodedBytes) : null;
}
catch (FormatException ex)
catch (FormatException)
{
return null;
}

2
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -836,9 +836,7 @@
<Compile Include="ObjectExtensions.cs" />
<Compile Include="Collections\OrderedHashSet.cs" />
<Compile Include="Packaging\ConflictingPackageData.cs" />
<Compile Include="Packaging\DefaultPackageContext.cs" />
<Compile Include="Packaging\IConflictingPackageData.cs" />
<Compile Include="Packaging\IPackageContext.cs" />
<Compile Include="Packaging\IPackageExtraction.cs" />
<Compile Include="Packaging\IPackageInstallation.cs" />
<Compile Include="Packaging\Models\UninstallationSummary.cs" />