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

Fixes up some warnings

Browse Source
This commit is contained in:
Shannon
2018-05-16 10:06:51 +02:00
parent 07e7068c22
commit ea6c466323
10 changed files with 42 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Umbraco.Tests.Benchmarks/CtorInvokeBenchmarks.cs
+1 -1
View File
@@ -40,7 +40,7 @@ namespace Umbraco.Tests.Benchmarks
private Func<IFoo, IFoo> _expressionMethod4;
private Func<IFoo, IFoo> _emittedCtor;
[Setup]
[GlobalSetup]
public void Setup()
{
var ctorArgTypes = new[] { typeof(IFoo) };
src/Umbraco.Tests/Services/ThreadSafetyServiceTest.cs
+16 -16
View File
@@ -74,22 +74,22 @@ namespace Umbraco.Tests.Services
// comment out to trace locks
return done;
new Thread(() =>
{
using (var scope = ScopeProvider.CreateScope())
while (done.IsSet == false)
{
var db = scope.Database;
var info = db.Query<dynamic>("SELECT * FROM sys.lock_information;");
Console.WriteLine("LOCKS:");
foreach (var row in info)
{
Console.WriteLine("> " + row.request_spid + " " + row.resource_type + " " + row.resource_description + " " + row.request_mode + " " + row.resource_table + " " + row.resource_table_id + " " + row.request_status);
}
Thread.Sleep(50);
}
}).Start();
return done;
//new Thread(() =>
//{
// using (var scope = ScopeProvider.CreateScope())
// while (done.IsSet == false)
// {
// var db = scope.Database;
// var info = db.Query<dynamic>("SELECT * FROM sys.lock_information;");
// Console.WriteLine("LOCKS:");
// foreach (var row in info)
// {
// Console.WriteLine("> " + row.request_spid + " " + row.resource_type + " " + row.resource_description + " " + row.request_mode + " " + row.resource_table + " " + row.resource_table_id + " " + row.request_status);
// }
// Thread.Sleep(50);
// }
//}).Start();
//return done;
}
[Test]
src/Umbraco.Tests/Testing/UmbracoTestBase.cs
+1 -1
View File
@@ -94,7 +94,7 @@ namespace Umbraco.Tests.Testing
protected IProfiler Profiler => Container.GetInstance<IProfiler>();
protected ProfilingLogger ProfilingLogger => Container.GetInstance<ProfilingLogger>();
protected virtual ProfilingLogger ProfilingLogger => Container.GetInstance<ProfilingLogger>();
protected CacheHelper CacheHelper => Container.GetInstance<CacheHelper>();
src/Umbraco.Tests/UmbracoExamine/ExamineBaseTest.cs
+10 -3
View File
@@ -20,10 +20,17 @@ namespace Umbraco.Tests.UmbracoExamine
public void InitializeFixture()
{
var logger = new Logger(new FileInfo(TestHelper.MapPathForTest("~/unit-test-log4net.config")));
ProfilingLogger = new ProfilingLogger(logger, new LogProfiler(logger));
_profilingLogger = new ProfilingLogger(logger, new LogProfiler(logger));
}
private ProfilingLogger _profilingLogger;
protected override ProfilingLogger ProfilingLogger
{
get
{
return _profilingLogger;
}
}
protected ProfilingLogger ProfilingLogger { get; private set; }
/// <summary>
/// sets up resolvers before resolution is frozen
src/Umbraco.Web.UI/umbraco/developer/Packages/DirectoryBrowser.aspx.cs
+1 -1
View File
@@ -93,7 +93,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>");
}
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoApplicationActions.js
+1 -6
View File
@@ -1,9 +1,4 @@
/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
/// <reference path="UmbracoUtils.js" />
/// <reference path="/umbraco_client/modal/modal.js" />
/// <reference name="MicrosoftAjax.js"/>
Umbraco.Sys.registerNamespace("Umbraco.Application");
Umbraco.Sys.registerNamespace("Umbraco.Application");
Umbraco.Application.Actions = function() {
/// <summary>
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoClientManager.js
+1 -5
View File
@@ -1,8 +1,4 @@
/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
/// <reference path="/umbraco_client/ui/jquery.js" />
/// <reference name="MicrosoftAjax.js"/>
Umbraco.Sys.registerNamespace("Umbraco.Application");
Umbraco.Sys.registerNamespace("Umbraco.Application");
(function($) {
Umbraco.Application.ClientManager = function() {
src/Umbraco.Web.UI/umbraco_client/Application/UmbracoUtils.js
+2 -2
View File
@@ -1,4 +1,4 @@
/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
/// <reference path="../Application/NamespaceManager.js" />
Umbraco.Sys.registerNamespace("Umbraco.Utils");
@@ -8,4 +8,4 @@ Umbraco.Utils.generateRandom = function() {
var z = day.getTime();
var y = (z - (parseInt(z / 1000, 10) * 1000)) / 10;
return y;
}
}
src/Umbraco.Web.UI/umbraco_client/modal/modal.js
+2 -2
View File
@@ -1,4 +1,4 @@
/// <reference path="/umbraco_client/Application/NamespaceManager.js" />
/// <reference path="../Application/NamespaceManager.js" />
Umbraco.Sys.registerNamespace("Umbraco.Controls");
@@ -399,4 +399,4 @@ hs = function(w, t, c) {
});
});
};
})(jQuery);
})(jQuery);
src/Umbraco.Web/Editors/ContentTypeControllerBase.cs
+7 -12
View File
@@ -157,7 +157,7 @@ namespace Umbraco.Web.Editors
if (ModelState.IsValid == false)
{
throw CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay, TContentType>(ctId, contentTypeSave, ct);
throw CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay>(ctId, contentTypeSave, ct);
}
//filter out empty properties
@@ -178,7 +178,7 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex)
{
var responseEx = CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentType, TContentTypeSave, TPropertyType>(ex, contentTypeSave, ct, ctId);
var responseEx = CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave, TPropertyType>(ex, contentTypeSave, ct, ctId);
if (responseEx != null) throw responseEx;
}
@@ -215,7 +215,7 @@ namespace Umbraco.Web.Editors
}
catch (Exception ex)
{
var responseEx = CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentType, TContentTypeSave, TPropertyType>(ex, contentTypeSave, ct, ctId);
var responseEx = CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave, TPropertyType>(ex, contentTypeSave, ct, ctId);
if (responseEx != null) throw responseEx;
}
@@ -247,11 +247,10 @@ namespace Umbraco.Web.Editors
/// <param name="getContentType"></param>
/// <param name="doMove"></param>
/// <returns></returns>
protected HttpResponseMessage PerformMove<TContentType>(
protected HttpResponseMessage PerformMove(
MoveOrCopy move,
Func<int, TContentType> getContentType,
Func<TContentType, int, Attempt<OperationResult<MoveOperationStatusType>>> doMove)
where TContentType : IContentTypeComposition
{
var toMove = getContentType(move.Id);
if (toMove == null)
@@ -382,7 +381,6 @@ namespace Umbraco.Web.Editors
/// If the exception is an InvalidCompositionException create a response exception to be thrown for validation errors
/// </summary>
/// <typeparam name="TContentTypeDisplay"></typeparam>
/// <typeparam name="TContentType"></typeparam>
/// <typeparam name="TContentTypeSave"></typeparam>
/// <typeparam name="TPropertyType"></typeparam>
/// <param name="ex"></param>
@@ -390,9 +388,8 @@ namespace Umbraco.Web.Editors
/// <param name="ct"></param>
/// <param name="ctId"></param>
/// <returns></returns>
private HttpResponseException CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentType, TContentTypeSave, TPropertyType>(
private HttpResponseException CreateInvalidCompositionResponseException<TContentTypeDisplay, TContentTypeSave, TPropertyType>(
Exception ex, TContentTypeSave contentTypeSave, TContentType ct, int ctId)
where TContentType : class, IContentTypeComposition
where TContentTypeDisplay : ContentTypeCompositionDisplay
where TContentTypeSave : ContentTypeSave<TPropertyType>
where TPropertyType : PropertyTypeBasic
@@ -409,7 +406,7 @@ namespace Umbraco.Web.Editors
if (invalidCompositionException != null)
{
AddCompositionValidationErrors<TContentTypeSave, TPropertyType>(contentTypeSave, invalidCompositionException.PropertyTypeAliases);
return CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay, TContentType>(ctId, contentTypeSave, ct);
return CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay>(ctId, contentTypeSave, ct);
}
return null;
}
@@ -418,13 +415,11 @@ namespace Umbraco.Web.Editors
/// Used to throw the ModelState validation results when the ModelState is invalid
/// </summary>
/// <typeparam name="TContentTypeDisplay"></typeparam>
/// <typeparam name="TContentType"></typeparam>
/// <typeparam name="TContentTypeSave"></typeparam>
/// <param name="ctId"></param>
/// <param name="contentTypeSave"></param>
/// <param name="ct"></param>
private HttpResponseException CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay, TContentType>(int ctId, TContentTypeSave contentTypeSave, TContentType ct)
where TContentType : class, IContentTypeComposition
private HttpResponseException CreateModelStateValidationException<TContentTypeSave, TContentTypeDisplay>(int ctId, TContentTypeSave contentTypeSave, TContentType ct)
where TContentTypeDisplay : ContentTypeCompositionDisplay
where TContentTypeSave : ContentTypeSave
{