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

U4-11546 [v7] Clean up to remove compiler warnings (#2823)

Browse Source
This commit is contained in:
Mundairson
2018-07-31 09:41:15 +01:00
committed by Sebastiaan Janssen
parent 3a0c872587
commit 9cd2db5018
26 changed files with 28 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/Umbraco.Core/Configuration/GlobalSettings.cs
View File

@@ -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;

2
src/Umbraco.Core/Persistence/PetaPoco.cs
View File

@@ -337,7 +337,7 @@ namespace Umbraco.Core.Persistence
_transaction = _sharedConnection.BeginTransaction(isolationLevel);
}
catch (Exception e)
catch (Exception)
{
throw;
}

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

@@ -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;

4
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());
}
@@ -83,4 +81,4 @@ namespace Umbraco.Core.Security
return sb.ToString();
}
}
}
}

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

@@ -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

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;
}

1
src/Umbraco.Core/Strings/DefaultShortStringHelper.cs
View File

@@ -26,7 +26,6 @@ namespace Umbraco.Core.Strings
[Obsolete("Use the other ctor that specifies all dependencies")]
public DefaultShortStringHelper()
{
_umbracoSettings = _umbracoSettings;
InitializeLegacyUrlReplaceCharacters();
}

5
src/Umbraco.Tests/CodeFirst/ContentTypeMapper.cs
View File

@@ -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;
}
}
}
}

3
src/Umbraco.Tests/CoreXml/NavigableNavigatorTests.cs
View File

@@ -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
}
}

3
src/Umbraco.Tests/DelegateExtensionsTests.cs
View File

@@ -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
}
}
}

11
src/Umbraco.Tests/Models/Collections/Item.cs
View File

@@ -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();
}
}
}
}

1
src/Umbraco.Tests/PublishedContent/PublishedContentTests.cs
View File

@@ -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);

2
src/Umbraco.Tests/Scheduling/BackgroundTaskRunnerTests.cs
View File

@@ -943,8 +943,6 @@ namespace Umbraco.Tests.Scheduling
throw new NotImplementedException();
}
private int i;
public async Task RunAsync(CancellationToken token)
{
Console.WriteLine("boom");

4
src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs
View File

@@ -95,7 +95,7 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
{
_sb.Append("<tr><td class=\"tdDir\"><a href=\"" + _lsScriptName + "?path=" + _lsWebPath + oDir.Name + "&target=" + Target + "\">" + oDir.Name + "</a> <small><a href=\"javascript:postPath('/" + _lsWebPath + oDir.Name + "')\"> (Include entire folder)</small></td></tr>");
}
catch (Exception ex)
catch (Exception)
{
_sb.Append("<tr><td class=\"tdDir\">" + oDir.Name + " (Access Denied)</td></tr>");
}
@@ -139,4 +139,4 @@ namespace Umbraco.Web.UI.Umbraco.Developer.Packages
}
}
}
}

4
src/Umbraco.Web/HealthCheck/HealthCheckAction.cs
View File

@@ -8,8 +8,6 @@ namespace Umbraco.Web.HealthCheck
[DataContract(Name = "healtCheckAction", Namespace = "")]
public class HealthCheckAction
{
private readonly ILocalizedTextService _textService;
/// <summary>
/// Empty ctor used for serialization
/// </summary>
@@ -78,4 +76,4 @@ namespace Umbraco.Web.HealthCheck
[DataMember(Name = "providedValue")]
public string ProvidedValue { get; set; }
}
}
}

4
src/Umbraco.Web/Install/FilePermissionHelper.cs
View File

@@ -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;
}
}
}
}

2
src/Umbraco.Web/Install/InstallSteps/NewInstallStep.cs
View File

@@ -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");
}

2
src/Umbraco.Web/Trees/PackagesTreeController.cs
View File

@@ -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();

4
src/Umbraco.Web/Trees/UserTreeController.cs
View File

@@ -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;
}
}
}
}

2
src/Umbraco.Web/UmbracoModule.cs
View File

@@ -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.
}

2
src/Umbraco.Web/umbraco.presentation/content.cs
View File

@@ -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)

3
src/Umbraco.Web/umbraco.presentation/requestModule.cs
View File

@@ -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
}
}
}

2
src/umbraco.businesslogic/BasePages/UmbracoEnsuredPage.cs
View File

@@ -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<UmbracoEnsuredPage>(string.Format("{0} tried to access '{1}'", CurrentUser.Id, CurrentApp));
throw;

4
src/umbraco.cms/businesslogic/Content.cs
View File

@@ -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
}
}
}

4
src/umbraco.cms/businesslogic/Packager/PackageActions/publishRootDocument.cs
View File

@@ -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
}
}
}
}

9
src/umbraco.controls/UmbracoClientDependencyLoader.cs
View File

@@ -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
{
/// <summary>
/// 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)
{