diff --git a/src/Umbraco.Core/Configuration/GlobalSettings.cs b/src/Umbraco.Core/Configuration/GlobalSettings.cs index 2ac8e7d2ac..7b209a15cd 100644 --- a/src/Umbraco.Core/Configuration/GlobalSettings.cs +++ b/src/Umbraco.Core/Configuration/GlobalSettings.cs @@ -32,7 +32,6 @@ namespace Umbraco.Core.Configuration #region Private static fields - private static Version _version; private static readonly object Locker = new object(); //make this volatile so that we can ensure thread safety with a double check lock private static volatile string _reservedUrlsCache; diff --git a/src/Umbraco.Core/Persistence/PetaPoco.cs b/src/Umbraco.Core/Persistence/PetaPoco.cs index 735691f6d6..ae0044035d 100644 --- a/src/Umbraco.Core/Persistence/PetaPoco.cs +++ b/src/Umbraco.Core/Persistence/PetaPoco.cs @@ -337,7 +337,7 @@ namespace Umbraco.Core.Persistence _transaction = _sharedConnection.BeginTransaction(isolationLevel); } - catch (Exception e) + catch (Exception) { throw; } diff --git a/src/Umbraco.Core/PluginManager.cs b/src/Umbraco.Core/PluginManager.cs index 44d505d1d2..ceb9b2d7d1 100644 --- a/src/Umbraco.Core/PluginManager.cs +++ b/src/Umbraco.Core/PluginManager.cs @@ -343,7 +343,7 @@ namespace Umbraco.Core { return ReadCache(); } - catch (Exception ex) + catch (Exception) { try { @@ -519,7 +519,7 @@ namespace Umbraco.Core { return new FileStream(path, fileMode, fileAccess, fileShare); } - catch (Exception ex) + catch (Exception) { if (--attempts == 0) throw; diff --git a/src/Umbraco.Core/Security/MachineKeyGenerator.cs b/src/Umbraco.Core/Security/MachineKeyGenerator.cs index 9dd06f44bd..546429b72c 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()); } @@ -83,4 +81,4 @@ namespace Umbraco.Core.Security return sb.ToString(); } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Core/Services/UserService.cs b/src/Umbraco.Core/Services/UserService.cs index 9b52af6827..0e15eb6cc1 100644 --- a/src/Umbraco.Core/Services/UserService.cs +++ b/src/Umbraco.Core/Services/UserService.cs @@ -207,7 +207,7 @@ namespace Umbraco.Core.Services { return repository.GetByUsername(username, includeSecurityData: true); } - catch (DbException ex) + catch (DbException) { //we need to handle this one specific case which is when we are upgrading to 7.7 since the user group //tables don't exist yet. This is the 'easiest' way to deal with this without having to create special @@ -786,7 +786,7 @@ namespace Umbraco.Core.Services var result = repository.Get(id); return result; } - catch (DbException ex) + catch (DbException) { //we need to handle this one specific case which is when we are upgrading to 7.7 since the user group //tables don't exist yet. This is the 'easiest' way to deal with this without having to create special diff --git a/src/Umbraco.Core/StringExtensions.cs b/src/Umbraco.Core/StringExtensions.cs index ce9ac77712..d2a1d97709 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/Strings/DefaultShortStringHelper.cs b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs index f74a8c0a59..a9d24d00c5 100644 --- a/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs +++ b/src/Umbraco.Core/Strings/DefaultShortStringHelper.cs @@ -26,7 +26,6 @@ namespace Umbraco.Core.Strings [Obsolete("Use the other ctor that specifies all dependencies")] public DefaultShortStringHelper() { - _umbracoSettings = _umbracoSettings; InitializeLegacyUrlReplaceCharacters(); } diff --git a/src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs b/src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs index 149eb19080..8caf215678 100644 --- a/src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs +++ b/src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs @@ -1,6 +1,5 @@ using System; using System.Linq; -using Umbraco.Core; using Umbraco.Core.Models; namespace Umbraco.Tests.CodeFirst @@ -32,7 +31,7 @@ namespace Umbraco.Tests.CodeFirst value = DateTime.Parse(property.Value.ToString()); else if (propertyInfo.PropertyType == typeof(Boolean)) { - if (String.IsNullOrEmpty(property.Value.ToString()) || property.Value == "0") + if (String.IsNullOrEmpty(property.Value.ToString()) || (string)property.Value == "0") { value = false; } @@ -48,4 +47,4 @@ namespace Umbraco.Tests.CodeFirst return mapped; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs index bf5100815f..3f85ecab0f 100644 --- a/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs +++ b/src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs @@ -419,7 +419,6 @@ namespace Umbraco.Tests.CoreXml { var source = new TestSource5(); var nav = new NavigableNavigator(source); - TestContent content; Assert.AreEqual(NavigableNavigator.StatePosition.Root, nav.InternalState.Position); Assert.IsTrue(nav.MoveToFirstChild()); @@ -1162,4 +1161,4 @@ namespace Umbraco.Tests.CoreXml } #endregion -} \ No newline at end of file +} diff --git a/src/Umbraco.Tests/DelegateExtensionsTests.cs b/src/Umbraco.Tests/DelegateExtensionsTests.cs index 511440c2c7..e745e029d0 100644 --- a/src/Umbraco.Tests/DelegateExtensionsTests.cs +++ b/src/Umbraco.Tests/DelegateExtensionsTests.cs @@ -26,7 +26,6 @@ namespace Umbraco.Tests [Test] public void Quits_On_Success_Count() { - var maxTries = 5; var totalTries = 0; DelegateExtensions.RetryUntilSuccessOrMaxAttempts((currentTry) => { @@ -43,4 +42,4 @@ namespace Umbraco.Tests } -} \ No newline at end of file +} diff --git a/src/Umbraco.Tests/Models/Collections/Item.cs b/src/Umbraco.Tests/Models/Collections/Item.cs index ff1789a850..f20648fd41 100644 --- a/src/Umbraco.Tests/Models/Collections/Item.cs +++ b/src/Umbraco.Tests/Models/Collections/Item.cs @@ -12,7 +12,6 @@ namespace Umbraco.Tests.Models.Collections public abstract class Item : IEntity, ICanBeDirty { private bool _hasIdentity; - private int? _hash; private int _id; private Guid _key; @@ -173,15 +172,7 @@ namespace Umbraco.Tests.Models.Collections public static bool operator ==(Item left, Item right) { - /*if (ReferenceEquals(null, left)) - return false; - - if(ReferenceEquals(null, right)) - return false;*/ - return ReferenceEquals(left, right); - - return left.Equals(right); } public static bool operator !=(Item left, Item right) @@ -250,4 +241,4 @@ namespace Umbraco.Tests.Models.Collections return this.MemberwiseClone(); } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs index db7fcb815a..5ec34ea781 100644 --- a/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs +++ b/src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs @@ -935,7 +935,6 @@ namespace Umbraco.Tests.PublishedContent { // the converter args PublishedPropertyType argPropertyType = null; - object argSource = null; bool argPreview = false; var pt1 = new PublishedPropertyType("legend", 0, Constants.PropertyEditors.TextboxAlias); diff --git a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs index dee8a26743..0712056a30 100644 --- a/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs +++ b/src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs @@ -943,8 +943,6 @@ namespace Umbraco.Tests.Scheduling throw new NotImplementedException(); } - private int i; - public async Task RunAsync(CancellationToken token) { Console.WriteLine("boom"); diff --git a/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs b/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs index c2995b6793..cd71ece0db 100644 --- a/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs +++ b/src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs @@ -95,7 +95,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages { _sb.Append("" + oDir.Name + " (Include entire folder)"); } - catch (Exception ex) + catch (Exception) { _sb.Append("" + oDir.Name + " (Access Denied)"); } @@ -139,4 +139,4 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs b/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs index 18931cf1dd..861363422a 100644 --- a/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs +++ b/src/Umbraco.Web/HealthCheck/HealthCheckAction.cs @@ -8,8 +8,6 @@ namespace Umbraco.Web.HealthCheck [DataContract(Name = "healtCheckAction", Namespace = "")] public class HealthCheckAction { - private readonly ILocalizedTextService _textService; - /// /// Empty ctor used for serialization /// @@ -78,4 +76,4 @@ namespace Umbraco.Web.HealthCheck [DataMember(Name = "providedValue")] public string ProvidedValue { get; set; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/Install/FilePermissionHelper.cs b/src/Umbraco.Web/Install/FilePermissionHelper.cs index a91bd6d306..73a74654ad 100644 --- a/src/Umbraco.Web/Install/FilePermissionHelper.cs +++ b/src/Umbraco.Web/Install/FilePermissionHelper.cs @@ -163,7 +163,7 @@ namespace Umbraco.Web.Install if (accessRules == null) return false; } - catch (Exception e) + catch (Exception) { //This is not 100% accurate btw because it could turn out that the current user doesn't //have access to read the current permissions but does have write access. @@ -198,4 +198,4 @@ namespace Umbraco.Web.Install return true; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs index 2d0daf1aa9..dfcb441cce 100644 --- a/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs +++ b/src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs @@ -64,7 +64,7 @@ namespace Umbraco.Web.Install.InstallSteps throw new FormatException("Password must be at least " + CurrentProvider.MinRequiredPasswordLength + " characters long and contain at least " + CurrentProvider.MinRequiredNonAlphanumericCharacters + " symbols"); } } - catch (Exception ex) + catch (Exception) { throw new FormatException("Password must be at least " + CurrentProvider.MinRequiredPasswordLength + " characters long and contain at least " + CurrentProvider.MinRequiredNonAlphanumericCharacters + " symbols"); } diff --git a/src/Umbraco.Web/Trees/PackagesTreeController.cs b/src/Umbraco.Web/Trees/PackagesTreeController.cs index 68acfe3d1f..eb4b0e51f9 100644 --- a/src/Umbraco.Web/Trees/PackagesTreeController.cs +++ b/src/Umbraco.Web/Trees/PackagesTreeController.cs @@ -36,8 +36,6 @@ namespace Umbraco.Web.Trees protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) { - var baseUrl = Constants.Applications.Developer + "/packages/"; - var nodes = new TreeNodeCollection(); var createdPackages = CreatedPackage.GetAllCreatedPackages(); diff --git a/src/Umbraco.Web/Trees/UserTreeController.cs b/src/Umbraco.Web/Trees/UserTreeController.cs index 89963a17e4..2c201d93d2 100644 --- a/src/Umbraco.Web/Trees/UserTreeController.cs +++ b/src/Umbraco.Web/Trees/UserTreeController.cs @@ -47,8 +47,6 @@ namespace Umbraco.Web.Trees protected override TreeNodeCollection GetTreeNodes(string id, FormDataCollection queryStrings) { - var baseUrl = Constants.Applications.Users + "/users/"; - var nodes = new TreeNodeCollection(); return nodes; } @@ -84,4 +82,4 @@ namespace Umbraco.Web.Trees return menu; } } -} \ No newline at end of file +} diff --git a/src/Umbraco.Web/UmbracoModule.cs b/src/Umbraco.Web/UmbracoModule.cs index 8e472f7cea..99043143a7 100644 --- a/src/Umbraco.Web/UmbracoModule.cs +++ b/src/Umbraco.Web/UmbracoModule.cs @@ -503,7 +503,7 @@ namespace Umbraco.Web httpContext.Response.Headers.Remove("X-AspNet-Version"); httpContext.Response.Headers.Remove("X-AspNetMvc-Version"); } - catch (PlatformNotSupportedException ex) + catch (PlatformNotSupportedException) { // can't remove headers this way on IIS6 or cassini. } diff --git a/src/Umbraco.Web/umbraco.presentation/content.cs b/src/Umbraco.Web/umbraco.presentation/content.cs index c8daf43715..ccd2e009a7 100644 --- a/src/Umbraco.Web/umbraco.presentation/content.cs +++ b/src/Umbraco.Web/umbraco.presentation/content.cs @@ -428,8 +428,6 @@ namespace umbraco if (!e.Cancel) { - XmlNode x; - //Hack: this is here purely for backwards compat if someone for some reason is using the // ClearDocumentCache(int documentId) method and expecting it to remove the xml if (removeDbXmlEntry) diff --git a/src/Umbraco.Web/umbraco.presentation/requestModule.cs b/src/Umbraco.Web/umbraco.presentation/requestModule.cs index 9e2eeff4e6..7c49802d2e 100644 --- a/src/Umbraco.Web/umbraco.presentation/requestModule.cs +++ b/src/Umbraco.Web/umbraco.presentation/requestModule.cs @@ -253,7 +253,6 @@ namespace umbraco.presentation + ex; // Hide error if getting the user throws an error (e.g. corrupt / blank db) - User staticUser = null; try { User.GetCurrent(); @@ -473,4 +472,4 @@ namespace umbraco.presentation } -} \ No newline at end of file +} diff --git a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs index d5867fbc68..aefd999c9d 100644 --- a/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs +++ b/src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs @@ -165,7 +165,7 @@ namespace umbraco.BasePages throw new UserAuthorizationException(String.Format("The current user doesn't have access to the section/app '{0}'", CurrentApp)); } } - catch (UserAuthorizationException ex) + catch (UserAuthorizationException) { LogHelper.Warn(string.Format("{0} tried to access '{1}'", CurrentUser.Id, CurrentApp)); throw; diff --git a/src/umbraco.cms/businesslogic/Content.cs b/src/umbraco.cms/businesslogic/Content.cs index b0ad710f2c..519fc2e006 100644 --- a/src/umbraco.cms/businesslogic/Content.cs +++ b/src/umbraco.cms/businesslogic/Content.cs @@ -149,7 +149,7 @@ namespace umbraco.cms.businesslogic { _contentType = new ContentType(contentTypeId); } - catch (Exception e) + catch (Exception) { return null; } @@ -809,4 +809,4 @@ namespace umbraco.cms.businesslogic } #endregion } -} \ No newline at end of file +} diff --git a/src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs b/src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs index 7bc48d3e05..760a3a4cf1 100644 --- a/src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs +++ b/src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs @@ -25,8 +25,6 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions string documentName = xmlData.Attributes["documentName"].Value; - int parentDocid = 0; - web.Document[] rootDocs = web.Document.GetRootDocuments(); foreach (web.Document rootDoc in rootDocs) @@ -71,4 +69,4 @@ namespace umbraco.cms.businesslogic.packager.standardPackageActions } } -} \ No newline at end of file +} diff --git a/src/umbraco.controls/UmbracoClientDependencyLoader.cs b/src/umbraco.controls/UmbracoClientDependencyLoader.cs index 06c369a5a1..e2320cedce 100644 --- a/src/umbraco.controls/UmbracoClientDependencyLoader.cs +++ b/src/umbraco.controls/UmbracoClientDependencyLoader.cs @@ -1,15 +1,10 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Web.UI; +using System.Web.UI; using ClientDependency.Core.Controls; using ClientDependency.Core.FileRegistration.Providers; using Umbraco.Core.IO; namespace umbraco.uicontrols { - /// /// Used to load in all client dependencies for Umbraco. /// Ensures that both UmbracoClient and UmbracoRoot paths are added to the loader. @@ -28,7 +23,7 @@ namespace umbraco.uicontrols } - public static new ClientDependencyLoader TryCreate(Control parent, out bool isNew) + public static ClientDependencyLoader TryCreate(Control parent, out bool isNew) { if (ClientDependencyLoader.Instance == null) {