V10: Build warnings in Web.Website (#12332)
* add new rule to globalconfig * Fix warnings in Web.Website * Fix more warnings in Web.Website * Fix more build warnings in Web.Website * Fix more warnings in Web.Website * Fix tests * Fix proper constructor call * Fix not being able to run project * Fix Obsolete method Co-authored-by: Nikolaj Geisle <niko737@edu.ucl.dk>
This commit is contained in:
@@ -1,49 +1,46 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.Linq;
|
||||
using Microsoft.AspNetCore.Mvc.Razor;
|
||||
using Microsoft.Extensions.Options;
|
||||
|
||||
namespace Umbraco.Cms.Web.Website.ViewEngines
|
||||
{
|
||||
/// <summary>
|
||||
/// Configure view engine locations for front-end rendering
|
||||
/// </summary>
|
||||
public class RenderRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
|
||||
{
|
||||
/// <inheritdoc/>
|
||||
public void Configure(RazorViewEngineOptions options)
|
||||
{
|
||||
if (options == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(options));
|
||||
}
|
||||
namespace Umbraco.Cms.Web.Website.ViewEngines;
|
||||
|
||||
options.ViewLocationExpanders.Add(new ViewLocationExpander());
|
||||
/// <summary>
|
||||
/// Configure view engine locations for front-end rendering
|
||||
/// </summary>
|
||||
public class RenderRazorViewEngineOptionsSetup : IConfigureOptions<RazorViewEngineOptions>
|
||||
{
|
||||
/// <inheritdoc />
|
||||
public void Configure(RazorViewEngineOptions options)
|
||||
{
|
||||
if (options == null)
|
||||
{
|
||||
throw new ArgumentNullException(nameof(options));
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Expands the default view locations
|
||||
/// </summary>
|
||||
private class ViewLocationExpander : IViewLocationExpander
|
||||
options.ViewLocationExpanders.Add(new ViewLocationExpander());
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Expands the default view locations
|
||||
/// </summary>
|
||||
private class ViewLocationExpander : IViewLocationExpander
|
||||
{
|
||||
public IEnumerable<string> ExpandViewLocations(
|
||||
ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
|
||||
{
|
||||
public IEnumerable<string> ExpandViewLocations(ViewLocationExpanderContext context, IEnumerable<string> viewLocations)
|
||||
string[] umbViewLocations =
|
||||
{
|
||||
string[] umbViewLocations = new string[]
|
||||
{
|
||||
"/Views/{0}.cshtml",
|
||||
"/Views/Shared/{0}.cshtml",
|
||||
"/Views/Partials/{0}.cshtml",
|
||||
"/Views/MacroPartials/{0}.cshtml",
|
||||
};
|
||||
"/Views/{0}.cshtml", "/Views/Shared/{0}.cshtml", "/Views/Partials/{0}.cshtml",
|
||||
"/Views/MacroPartials/{0}.cshtml",
|
||||
};
|
||||
|
||||
viewLocations = umbViewLocations.Concat(viewLocations);
|
||||
viewLocations = umbViewLocations.Concat(viewLocations);
|
||||
|
||||
return viewLocations;
|
||||
}
|
||||
return viewLocations;
|
||||
}
|
||||
|
||||
// not a dynamic expander
|
||||
public void PopulateValues(ViewLocationExpanderContext context) { }
|
||||
// not a dynamic expander
|
||||
public void PopulateValues(ViewLocationExpanderContext context)
|
||||
{
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user