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

Fix namespace

Browse Source
This commit is contained in:
Bjarke Berg
2021-02-22 10:09:20 +01:00
parent c453719c2d
commit 890cd45677
17 changed files with 117 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/IO/ViewHelper.cs
View File

@@ -71,7 +71,7 @@ namespace Umbraco.Cms.Core.IO
// @inherits Umbraco.Web.Mvc.UmbracoViewPage
// @inherits Umbraco.Web.Mvc.UmbracoViewPage<ModelClass>
content.AppendLine("@using Umbraco.Cms.Web.Common.PublishedModels;");
content.Append("@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage");
content.Append("@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage");
if (modelClassName.IsNullOrWhiteSpace() == false)
{
content.Append("<");

2
src/Umbraco.Infrastructure/Services/Implement/FileService.cs
View File

@@ -33,7 +33,7 @@ namespace Umbraco.Core.Services.Implement
private readonly GlobalSettings _globalSettings;
private readonly IHostingEnvironment _hostingEnvironment;
private const string PartialViewHeader = "@inherits Umbraco.Web.Common.Views.UmbracoViewPage";
private const string PartialViewHeader = "@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage";
private const string PartialViewMacroHeader = "@inherits Umbraco.Web.Common.Macros.PartialViewMacroPage";
public FileService(IScopeProvider uowProvider, ILoggerFactory loggerFactory, IEventMessagesFactory eventMessagesFactory,

12
src/Umbraco.TestData/LoadTestController.cs
View File

@@ -1,14 +1,12 @@
using System;
using System.Threading;
using System.Configuration;
using System.Diagnostics;
using System.Linq;
using System.Web.Mvc;
using Umbraco.Core.Services;
using Umbraco.Core.Models;
using System.Threading;
using System.Web;
using System.Web.Hosting;
using System.Web.Mvc;
using System.Web.Routing;
using System.Diagnostics;
using System.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Umbraco.Cms.Core.Composing;
using Umbraco.Cms.Core.DependencyInjection;
@@ -63,7 +61,7 @@ namespace Umbraco.TestData
</html>";
private static readonly string _containerTemplateText = @"
@inherits Umbraco.Web.Mvc.UmbracoViewPage
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = null;
var container = Umbraco.ContentAtRoot().OfTypes(""" + _containerAlias + @""").FirstOrDefault();

5
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Content/content.ts
View File

@@ -1,5 +1,6 @@
/// <reference types="Cypress" />
import { DocumentTypeBuilder, ContentBuilder, AliasHelper } from 'umbraco-cypress-testhelpers';
import {AliasHelper, ContentBuilder, DocumentTypeBuilder} from 'umbraco-cypress-testhelpers';
context('Content', () => {
beforeEach(() => {
@@ -558,7 +559,7 @@ context('Content', () => {
cy.saveDocumentType(pickerDocType);
// Edit it the template to allow us to verify the rendered view.
cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Web.Mvc.UmbracoViewPage<ContentModels.ContentPickerDocType>
cy.editTemplate(pickerDocTypeName, `@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.ContentPickerDocType>
@using ContentModels = Umbraco.Web.PublishedModels;
@{
Layout = null;

6
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/partialsViews.ts
View File

@@ -1,5 +1,5 @@
/// <reference types="Cypress" />
import { PartialViewBuilder } from "umbraco-cypress-testhelpers";
import {PartialViewBuilder} from "umbraco-cypress-testhelpers";
context('Partial Views', () => {
@@ -95,7 +95,7 @@ context('Partial Views', () => {
// Build and save partial view
const partialView = new PartialViewBuilder()
.withName(name)
.withContent("@inherits Umbraco.Web.Mvc.UmbracoViewPage")
.withContent("@inherits UUmbraco.Cms.Web.Common.Views.UmbracoViewPage")
.build();
cy.savePartialView(partialView);
@@ -123,7 +123,7 @@ context('Partial Views', () => {
const partialView = new PartialViewBuilder()
.withName(name)
.withContent("@inherits Umbraco.Web.Mvc.UmbracoViewPage\n")
.withContent("@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\n")
.build();
cy.savePartialView(partialView);

6
src/Umbraco.Tests.AcceptanceTest/cypress/integration/Settings/templates.ts
View File

@@ -1,5 +1,5 @@
/// <reference types="Cypress" />
import { TemplateBuilder } from 'umbraco-cypress-testhelpers';
import {TemplateBuilder} from 'umbraco-cypress-testhelpers';
context('Templates', () => {
@@ -54,7 +54,7 @@ context('Templates', () => {
const template = new TemplateBuilder()
.withName(name)
.withContent('@inherits Umbraco.Web.Mvc.UmbracoViewPage\n')
.withContent('@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\n')
.build();
cy.saveTemplate(template);
@@ -87,7 +87,7 @@ context('Templates', () => {
const template = new TemplateBuilder()
.withName(name)
.withContent('@inherits Umbraco.Web.Mvc.UmbracoViewPage\n')
.withContent('@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage\n')
.build();
cy.saveTemplate(template);

6
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Persistence/Repositories/TemplateRepositoryTest.cs
View File

@@ -8,6 +8,7 @@ using System.Linq;
using System.Text;
using Microsoft.Extensions.Logging;
using NUnit.Framework;
using Umbraco.Cms.Core;
using Umbraco.Cms.Core.Cache;
using Umbraco.Cms.Core.Configuration.Models;
using Umbraco.Cms.Core.Hosting;
@@ -24,7 +25,6 @@ using Umbraco.Core.Persistence.Repositories.Implement;
using Umbraco.Core.Scoping;
using Umbraco.Core.Serialization;
using Umbraco.Extensions;
using Constants = Umbraco.Cms.Core.Constants;
namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repositories
{
@@ -95,7 +95,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
Assert.That(repository.Get("test"), Is.Not.Null);
Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test.cshtml"), Is.True);
Assert.AreEqual(
@"@usingUmbraco.Cms.Web.Common.PublishedModels;@inheritsUmbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage@{Layout=null;}".StripWhitespace(),
@"@usingUmbraco.Cms.Web.Common.PublishedModels;@inheritsUmbraco.Cms.Web.Common.Views.UmbracoViewPage@{Layout=null;}".StripWhitespace(),
template.Content.StripWhitespace());
}
}
@@ -123,7 +123,7 @@ namespace Umbraco.Cms.Tests.Integration.Umbraco.Infrastructure.Persistence.Repos
Assert.That(repository.Get("test2"), Is.Not.Null);
Assert.That(FileSystems.MvcViewsFileSystem.FileExists("test2.cshtml"), Is.True);
Assert.AreEqual(
"@usingUmbraco.Cms.Web.Common.PublishedModels;@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
"@usingUmbraco.Cms.Web.Common.PublishedModels;@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage @{ Layout = \"test.cshtml\";}".StripWhitespace(),
template2.Content.StripWhitespace());
}
}

166
src/Umbraco.Tests.Integration/Umbraco.Infrastructure/Services/Importing/StandardMvc-Package.xml
View File

@@ -189,17 +189,17 @@
<website>http://www.creativefounds.co.uk</website>
</author>
<readme>
<![CDATA[The Standard Website MVC package installs a complete website that can be adapted to most standard website designs. It can also be useful as a prototype or starting point for further development. It contains:
<![CDATA[The Standard Website MVC package installs a complete website that can be adapted to most standard website designs. It can also be useful as a prototype or starting point for further development. It contains:
Homepage - Rotating images with 3 feature panels
Standard Page - Left hand navigation and right hand content panels
Homepage - Rotating images with 3 feature panels
Standard Page - Left hand navigation and right hand content panels
Content Panel Library - create content panels or adverts to user throughout your site.
Article List - Create news or event lists
Contact Us - With email form and Google Maps integration
Sitemap - Updates to reflect the current site structure
Client Area - Supports multiple clients and projects. Contains a Login Form.
Search - based on Examine with search highlighting
Google Maps - A map macro that you can use within Rich Text Areas
Article List - Create news or event lists
Contact Us - With email form and Google Maps integration
Sitemap - Updates to reflect the current site structure
Client Area - Supports multiple clients and projects. Contains a Login Form.
Search - based on Examine with search highlighting
Google Maps - A map macro that you can use within Rich Text Areas
]]>
</readme>
</info>
@@ -1099,7 +1099,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<Alias>Articles</Alias>
<Master>SW_Master</Master>
<Design>
<![CDATA[@inherits Umbraco.Web.Mvc.UmbracoViewPage
<![CDATA[@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = "SW_Master.cshtml";
int pageSize = 2; // How many items per page
@@ -1131,18 +1131,18 @@ Google Maps - A map macro that you can use within Rich Text Areas
}
}
@@ -1154,10 +1154,10 @@ Google Maps - A map macro that you can use within Rich Text Areas
</div>
<div id="content">
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
<ul id="newsList">
@foreach (var item in nodes.Skip((page - 1) * pageSize).Take(pageSize))
{
@@ -1172,9 +1172,9 @@ Google Maps - A map macro that you can use within Rich Text Areas
</p>
<p>
@item.GetPropertyValue("articleSummary")
</p>
</li>
</li>
}
</ul>
@@ -1185,7 +1185,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
@for (int p = 1; p < totalPages + 1; p++)
{
//string selected = (p == page) ? "selected" : String.Empty;
//<li class="@selected"><a href="?page=@p" title="Go to page @p of results">@p</a></li>
//<li class="@selected"><a href="?page=@p" title="Go to page @p of results">@p</a></li>
<a href="?page=@p" title="Go to page @p of results">@p</a>
if (p < totalPages)
{
@@ -1197,7 +1197,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
</div>
@Html.Partial("ContentPanels",@Model.Content)
</div>]]>
</Design>
@@ -1207,13 +1207,13 @@ Google Maps - A map macro that you can use within Rich Text Areas
<Alias>ClientAreas</Alias>
<Master>SW_Master</Master>
<Design>
<![CDATA[@inherits Umbraco.Web.Mvc.UmbracoViewPage
<![CDATA[@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = "SW_Master.cshtml";
var pages = Model.Content.Children.Where(x => x.IsVisible() && x.TemplateId > 0 && Umbraco.MemberHasAccess(x.Id, x.Path));
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation",@Model.Content)
&nbsp;
@@ -1226,10 +1226,10 @@ Google Maps - A map macro that you can use within Rich Text Areas
{
<h3><a href="@page.NiceUrl()">@page.Name</a></h3>
}
</div>
</div>]]>
</Design>
</Template>
@@ -1243,7 +1243,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
Layout = "SW_Master.cshtml";
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation",@Model.Content)
&nbsp;
@@ -1251,7 +1251,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<div id="content">
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
@Html.Partial("ContactForm",new Koiak.StandardWebsite.ContactFormModel())
</div>
</div>]]>
@@ -1266,9 +1266,9 @@ Google Maps - A map macro that you can use within Rich Text Areas
@{
Layout = "SW_Master.cshtml";
}
<div id="slideshow">
<ul>
<ul>
@{
var nodeIds = Model.Content.GetPropertyValue("slideshow").ToString().Split(',');
List<IPublishedContent> slides = new List<IPublishedContent>();
@@ -1313,7 +1313,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
</ul>
</div>
<div class="fc">
<div class="feature fl">
@Html.Raw(Model.Content.GetPropertyValue("panelContent1").ToString())
@@ -1345,7 +1345,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
}
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation",@Model.Content)
&nbsp;
@@ -1353,7 +1353,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<div id="content">
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
@Html.Partial("LoginForm",new Koiak.StandardWebsite.LoginModel())
</div>
</div>]]>
@@ -1420,13 +1420,13 @@ Google Maps - A map macro that you can use within Rich Text Areas
page = 1;
}
}
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation", @Model.Content)
&nbsp;
</div>
<div id="content">
@@ -1470,14 +1470,14 @@ Google Maps - A map macro that you can use within Rich Text Areas
<p>@Html.Raw(searchHiglight)</p>
<!--<dl>
@foreach (var field in item.Fields)
{
<dt>@field.Key</dt>
<dd>@field.Value</dd>
}
</dl>-->
</li>
</li>
}
</ul>
}
@@ -1489,7 +1489,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
@for (int p = 1; p < totalPages + 1; p++)
{
//string selected = (p == page) ? "selected" : String.Empty;
//<li class="@selected"><a href="?page=@p" title="Go to page @p of results">@p</a></li>
//<li class="@selected"><a href="?page=@p" title="Go to page @p of results">@p</a></li>
<a href="?search=@searchTerm&amp;page=@p" title="Go to page @p of results">@p</a>
if (p < totalPages)
{
@@ -1514,7 +1514,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
Layout = "SW_Master.cshtml";
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation",@Model.Content)
&nbsp;
@@ -1522,19 +1522,19 @@ Google Maps - A map macro that you can use within Rich Text Areas
<div id="content">
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
<div id="sitemap">
@traverse(Model.Content.AncestorOrSelf(1))
</div>
</div>
@Html.Partial("ContentPanels",@Model.Content)
</div>
@helper traverse(IPublishedContent node)
{
var cc = node.Children.Where(x=>x.IsVisible() && x.TemplateId > 0);
var cc = node.Children.Where(x=>x.IsVisible() && x.TemplateId > 0);
if (cc.Count()>0)
{
<ul>
@@ -1560,7 +1560,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
Layout = "SW_Master.cshtml";
}
<div id="mainContent" class="fc">
<div class="navigation">
@Html.Partial("LeftNavigation",@Model.Content)
&nbsp;
@@ -1569,7 +1569,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<div id="content">
@Html.Raw(Model.Content.GetPropertyValue<string>("bodyText"))
</div>
@Html.Partial("ContentPanels",@Model.Content)
</div>]]>
</Design>
@@ -1590,27 +1590,27 @@ Google Maps - A map macro that you can use within Rich Text Areas
<title>@Model.Content.GetPropertyValue("title")</title>
<meta name="keywords" content="@Model.Content.GetPropertyValue("keywords")" />
<meta name="description" content="@Model.Content.GetPropertyValue("description")" />
<meta http-equiv="Content-Language" content="en" />
<meta name="language" content="en" />
<meta name="robots" content="all, follow" />
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
<meta name="MSSmartTagsPreventParsing" content="TRUE" />
<link rel="stylesheet" href="/css/base-min.css" type="text/css" media="screen, projection" />
<link rel="stylesheet" href="/css/default.css" type="text/css" media="screen, projection" />
<link href="http://fonts.googleapis.com/css?family=Open+Sans:400" rel="stylesheet" type="text/css">
<link rel="shortcut icon" type="image/x-icon" href="/favicon.ico" />
</head>
<body>
<div id="header">
<div class="page-width fc">
<a href="/" id="logo"><img src="/images/logo.png" alt="Koiak Basic Site" /></a>
@if (homepage.HasProperty("headerNavigation"))
{
<ul class="navigation fc">
@@ -1623,16 +1623,16 @@ Google Maps - A map macro that you can use within Rich Text Areas
}
</ul>
}
@if(Umbraco.MemberIsLoggedOn())
{
<p class="fr" id="loggedIn">
Welcome @Context.User.Identity.Name, <a href="/login.aspx?signout=true">logout</a>
</p>
}
<form action="/search" id="searchForm" method="get">
<fieldset>
<label for="search" class="remove">Search Site</label>
@@ -1661,7 +1661,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<div id="body" class="page-width">
@RenderBody()
</div>
<div id="footer" class="fc">
<div class="page-width">
@Html.Partial("Affiliations",homepage)
@@ -1672,7 +1672,7 @@ Google Maps - A map macro that you can use within Rich Text Areas
<script type="text/javascript" src="http://ajax.googleapis.com/ajax/libs/jquery/1.4/jquery.min.js"></script>
<script type="text/javascript" src="/scripts/jquery.timers.js"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="http://maps.google.com/maps/api/js?sensor=false"></script>
<script type="text/javascript" src="/scripts/default.js"></script>
</body>
</html>]]>
@@ -1727,10 +1727,10 @@ body{margin:10px;}h1{font-size:138.5%;}h2{font-size:123.1%;}h3{font-size:108%;}h
.inline{display:inline;}.remove{display:none;}.hideLegend legend{display:none;}.hide, #skipNav {position:absolute;top:0;left:-200em;width:20em;}.fr{float:right;}.fl{float:left;}.tar{text-align:right;}.tac{text-align:center;}.tal{text-align:left;}.cl {clear:left;}.cr {clear:right;}.cb {clear:both;}ul, ul li { margin: 0; list-style-type :none;}address{line-height: 1.3em;}
/* FULL CLEAR - forces a container to surround all children - regardless of floating */
.fc:after, .formRow:after{
content: ".";
display: block;
height: 0;
clear: both;
content: ".";
display: block;
height: 0;
clear: both;
visibility: hidden;
}
.fc, .formRow{ display: inline-block;}
@@ -1796,7 +1796,7 @@ div.page-width {
position:relative;
}
div#body
div#body
{
padding: 0px 64px;
}
@@ -1866,16 +1866,16 @@ div#body
font-weight: normal;
}
#mainContent #content
{
#mainContent #content
{
float:left;
width: 425px;
margin: 0px 20px;
}
#mainContent #rightPanel
{
#mainContent #rightPanel
{
float:left;
width:190px;
}
@@ -1906,7 +1906,7 @@ div#footer ul li
padding: 0 10px;
}
/* HEADER */
div#header
div#header
{
position: relative;
}
@@ -1941,7 +1941,7 @@ div#header div.navigation ul.navigation li a
font-size:14px;
padding:13px 22px;
text-decoration: none;
}
div#header div.navigation ul.navigation li a:hover,
@@ -1973,7 +1973,7 @@ div#header p#telephone span
font-size:16px;
}
div#header div.page-width ul.navigation
div#header div.page-width ul.navigation
{
float:right;
clear:right;
@@ -1984,7 +1984,7 @@ div#header div.page-width ul.navigation
div#header div.page-width ul.navigation li
{
display: inline;
display: inline;
padding-right:6px;
margin-right:6px;
}
@@ -1999,7 +1999,7 @@ div#header #logo{float:left}
/* Homepage */
div#slideshow
div#slideshow
{
padding: 30px 0px;
position:relative;
@@ -2008,7 +2008,7 @@ div#slideshow
div#slideshow div
{
}
div#slideshow li
@@ -2031,7 +2031,7 @@ div#slideshow ul li ul {
padding:8px 24px;
}
div#slideshow ul li ul
div#slideshow ul li ul
{
position: relative;
}
@@ -2047,7 +2047,7 @@ div#slideshow ul li ul li
width:auto;
}
div#slideshow h3
div#slideshow h3
{
font-size: 24px;
}
@@ -2139,7 +2139,7 @@ div.feature p
background: url("/images/li_bg.gif") no-repeat left 5px transparent;
}
#rightPanel li
#rightPanel li
{
padding-bottom: 11px;
}
@@ -2216,11 +2216,11 @@ table th, td {border: 0px solid #fff;}
.buttonRow input {padding:5px 10px; border:1px solid #CDCDCD; background-color:#EFEFEF;}
/* List */
#mainContent #content ul#newsList
#mainContent #content ul#newsList
{
border-top:1px solid #CDCDCD;
}
#mainContent #content ul#newsList li
#mainContent #content ul#newsList li
{
border-bottom:1px solid #CDCDCD;
margin-bottom: 20px;

14
src/Umbraco.Tests.UnitTests/Umbraco.Core/Templates/ViewHelperTests.cs
View File

@@ -15,7 +15,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent();
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = null;
}"), FixView(view));
@@ -27,7 +27,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(layoutPageAlias: "Dharznoik");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = ""Dharznoik.cshtml"";
}"), FixView(view));
@@ -39,7 +39,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<ClassName>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ClassName>
@{
Layout = null;
}"), FixView(view));
@@ -51,7 +51,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(modelNamespace: "Models");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage
@{
Layout = null;
}"), FixView(view));
@@ -63,7 +63,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<ContentModels.ClassName>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<ContentModels.ClassName>
@using ContentModels = My.Models;
@{
Layout = null;
@@ -76,7 +76,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<MyModels.ClassName>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
@using MyModels = My.Models;
@{
Layout = null;
@@ -89,7 +89,7 @@ namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Core.Templates
var view = ViewHelper.GetDefaultFileContent(layoutPageAlias: "Dharznoik", modelClassName: "ClassName", modelNamespace: "My.Models", modelNamespaceAlias: "MyModels");
Assert.AreEqual(
FixView(@"@using Umbraco.Cms.Web.Common.PublishedModels;
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<MyModels.ClassName>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<MyModels.ClassName>
@using MyModels = My.Models;
@{
Layout = ""Dharznoik.cshtml"";

2
src/Umbraco.Tests.UnitTests/Umbraco.Web.Common/Views/UmbracoViewPageTests.cs
View File

@@ -10,8 +10,8 @@ using NUnit.Framework;
using Umbraco.Cms.Core.Events;
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Core.Models.PublishedContent;
using Umbraco.Cms.Web.Common.AspNetCore;
using Umbraco.Cms.Web.Common.ModelBinders;
using Umbraco.Cms.Web.Common.Views;
namespace Umbraco.Cms.Tests.UnitTests.Umbraco.Web.Common.Views
{

2
src/Umbraco.Web.Common/Macros/PartialViewMacroPage.cs
View File

@@ -1,5 +1,5 @@
using Umbraco.Cms.Core.Models;
using Umbraco.Cms.Web.Common.AspNetCore;
using Umbraco.Cms.Web.Common.Views;
namespace Umbraco.Cms.Web.Common.Macros
{

2
src/Umbraco.Web.Common/Views/UmbracoViewPage.cs
View File

@@ -18,7 +18,7 @@ using Umbraco.Cms.Core.Web;
using Umbraco.Cms.Web.Common.ModelBinders;
using Umbraco.Extensions;
namespace Umbraco.Cms.Web.Common.AspNetCore
namespace Umbraco.Cms.Web.Common.Views
{
public abstract class UmbracoViewPage : UmbracoViewPage<IPublishedContent>
{

2
src/Umbraco.Web.UI.NetCore/Views/Partials/blocklist/default.cshtml
View File

@@ -1,4 +1,4 @@
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<Umbraco.Cms.Core.Models.Blocks.BlockListModel>
@{
if (!Model.Any()) { return; }
}

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3-fluid.cshtml
View File

@@ -1,7 +1,7 @@
@using System.Web
@using Microsoft.AspNetCore.Html
@using Newtonsoft.Json.Linq
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@*
Razor helpers located at the bottom of this file

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/bootstrap3.cshtml
View File

@@ -1,7 +1,7 @@
@using System.Web
@using Microsoft.AspNetCore.Html
@using Newtonsoft.Json.Linq
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@if (Model != null && Model.sections != null)
{

3
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/embed.cshtml
View File

@@ -1,5 +1,4 @@
@using Umbraco.Cms.Core
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@{
string embedValue = Convert.ToString(Model.value);

2
src/Umbraco.Web.UI.NetCore/Views/Partials/grid/editors/macro.cshtml
View File

@@ -1,4 +1,4 @@
@inherits Umbraco.Cms.Web.Common.AspNetCore.UmbracoViewPage<dynamic>
@inherits Umbraco.Cms.Web.Common.Views.UmbracoViewPage<dynamic>
@if (Model.value != null)
{