diff --git a/src/Umbraco.Core/Composing/LightInjectExtensions.cs b/src/Umbraco.Core/Composing/LightInjectExtensions.cs
index c7b51404fe..68ba48c803 100644
--- a/src/Umbraco.Core/Composing/LightInjectExtensions.cs
+++ b/src/Umbraco.Core/Composing/LightInjectExtensions.cs
@@ -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;
+ //}
}
///
diff --git a/src/Umbraco.Core/IO/FileSystems.cs b/src/Umbraco.Core/IO/FileSystems.cs
index 33989122b8..5d7088b0e1 100644
--- a/src/Umbraco.Core/IO/FileSystems.cs
+++ b/src/Umbraco.Core/IO/FileSystems.cs
@@ -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();
diff --git a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
index 8b85d6992e..b7d869ee62 100644
--- a/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
+++ b/src/Umbraco.Core/Migrations/Upgrade/V_8_0_0/RefactorXmlColumns.cs
@@ -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 (
diff --git a/src/Umbraco.Core/Models/MediaType.cs b/src/Umbraco.Core/Models/MediaType.cs
index bc8b7c4c89..9612fce728 100644
--- a/src/Umbraco.Core/Models/MediaType.cs
+++ b/src/Umbraco.Core/Models/MediaType.cs
@@ -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
///
///
- public IMediaType DeepCloneWithResetIdentities(string alias)
+ public new IMediaType DeepCloneWithResetIdentities(string alias)
{
var clone = (MediaType)DeepClone();
clone.Alias = alias;
diff --git a/src/Umbraco.Core/Packaging/DefaultPackageContext.cs b/src/Umbraco.Core/Packaging/DefaultPackageContext.cs
deleted file mode 100644
index c08418ec86..0000000000
--- a/src/Umbraco.Core/Packaging/DefaultPackageContext.cs
+++ /dev/null
@@ -1,45 +0,0 @@
-using System;
-using NuGet;
-using Umbraco.Core.Configuration;
-
-namespace Umbraco.Core.Packaging
-{
- internal class DefaultPackageContext : IPackageContext
- {
- public DefaultPackageContext(Func mapPath)
- {}
-
- private readonly string _localPackageRepoFolderPath;
- private readonly string _pluginInstallFolderPath;
- private readonly Lazy _localPackageManager;
- private readonly Lazy _localPackageRepository;
- private readonly Lazy _publicPackageManager;
- private readonly Lazy _privatePackageManager;
- private readonly Lazy _publicPackageRepository;
- private readonly Lazy _sprivatePackageRepository;
-
- ///
- /// Gets the local path resolver.
- ///
- public IPackagePathResolver LocalPathResolver
- {
- get { return ((PackageManager)LocalPackageManager).PathResolver; }
- }
-
- ///
- /// Gets the local package manager.
- ///
- public IPackageManager LocalPackageManager
- {
- get { return _localPackageManager.Value; }
- }
-
- ///
- /// Gets the public package manager.
- ///
- public IPackageManager PublicPackageManager
- {
- get { return _publicPackageManager.Value; }
- }
- }
-}
diff --git a/src/Umbraco.Core/Packaging/IPackageContext.cs b/src/Umbraco.Core/Packaging/IPackageContext.cs
deleted file mode 100644
index 41cf372ce6..0000000000
--- a/src/Umbraco.Core/Packaging/IPackageContext.cs
+++ /dev/null
@@ -1,11 +0,0 @@
-using NuGet;
-
-namespace Umbraco.Core.Packaging
-{
- internal interface IPackageContext
- {
- IPackageManager LocalPackageManager { get; }
- IPackageManager PublicPackageManager { get; }
- IPackagePathResolver LocalPathResolver { get; }
- }
-}
diff --git a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
index 8a0333a965..73dcb44fef 100644
--- a/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
+++ b/src/Umbraco.Core/Persistence/Repositories/Implement/StylesheetRepository.cs
@@ -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;
diff --git a/src/Umbraco.Core/Security/MachineKeyGenerator.cs b/src/Umbraco.Core/Security/MachineKeyGenerator.cs
index 283ca1ac3a..a20f04c919 100644
--- a/src/Umbraco.Core/Security/MachineKeyGenerator.cs
+++ b/src/Umbraco.Core/Security/MachineKeyGenerator.cs
@@ -26,8 +26,6 @@ namespace Umbraco.Core.Security
validation=""HMACSHA256"" decryption=""AES""
/>";
- var Xxx = 3;
-
return string.Format(c, GenerateAESDecryptionKey(), GenerateHMACSHA256ValidationKey());
}
diff --git a/src/Umbraco.Core/Services/Implement/MemberService.cs b/src/Umbraco.Core/Services/Implement/MemberService.cs
index f8245f18c2..ca2b39dee2 100644
--- a/src/Umbraco.Core/Services/Implement/MemberService.cs
+++ b/src/Umbraco.Core/Services/Implement/MemberService.cs
@@ -186,8 +186,9 @@ namespace Umbraco.Core.Services.Implement
/// Email of the to create
/// This value should be the encoded/encrypted/hashed value for the password that will be stored in the database
/// Alias of the Type
+ ///
///
- IMember IMembershipMemberService.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved = true)
+ IMember IMembershipMemberService.CreateWithIdentity(string username, string email, string passwordValue, string memberTypeAlias, bool isApproved)
{
return CreateMemberWithIdentity(username, email, username, passwordValue, memberTypeAlias, isApproved);
}
diff --git a/src/Umbraco.Core/Services/Implement/UserService.cs b/src/Umbraco.Core/Services/Implement/UserService.cs
index 4b27fb5c51..96cac1d814 100644
--- a/src/Umbraco.Core/Services/Implement/UserService.cs
+++ b/src/Umbraco.Core/Services/Implement/UserService.cs
@@ -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
diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs
index a399c82f0c..4369e8faac 100644
--- a/src/Umbraco.Core/StringExtensions.cs
+++ b/src/Umbraco.Core/StringExtensions.cs
@@ -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;
}
diff --git a/src/Umbraco.Core/Umbraco.Core.csproj b/src/Umbraco.Core/Umbraco.Core.csproj
index e8a5a3654b..42e532869b 100644
--- a/src/Umbraco.Core/Umbraco.Core.csproj
+++ b/src/Umbraco.Core/Umbraco.Core.csproj
@@ -836,9 +836,7 @@
-
-