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

Merge pull request #10136 from umbraco/netcore/feature/make-internal-classes-public

Browse Source 
Removed project configuration to expose internals to Forms and made the two used internal dependencies public.
This commit is contained in:
Andy Butland
2021-04-15 14:36:10 +02:00
committed by GitHub
parent 12d5bdc552 19a9caf47b
commit a8cdbc8697
7 changed files with 9 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/Umbraco.Core/Umbraco.Core.csproj
View File

@@ -46,20 +46,6 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
</AssemblyAttribute>
<!-- Making internals visible to Umbraco Forms -->
<!--
Temporarily removing to see what we need
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Core</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Core.Providers</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Web</_Parameter1>
</AssemblyAttribute>
-->
</ItemGroup>
<ItemGroup>

9
src/Umbraco.Infrastructure/Persistence/Mappers/MapperForAttribute.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
namespace Umbraco.Cms.Infrastructure.Persistence.Mappers
{
@@ -6,14 +6,11 @@ namespace Umbraco.Cms.Infrastructure.Persistence.Mappers
/// An attribute used to decorate mappers to be associated with entities
/// </summary>
[AttributeUsage(AttributeTargets.Class, AllowMultiple = true)]
internal sealed class MapperForAttribute : Attribute
public sealed class MapperForAttribute : Attribute
{
public Type EntityType { get; private set; }
public MapperForAttribute(Type entityType)
{
EntityType = entityType;
}
public MapperForAttribute(Type entityType) => EntityType = entityType;
}
}

14
src/Umbraco.Infrastructure/Umbraco.Infrastructure.csproj
View File

@@ -101,20 +101,6 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>DynamicProxyGenAssembly2</_Parameter1>
</AssemblyAttribute>
<!-- Making internals visible to Umbraco Forms -->
<!--
Temporarily removing to see what we need
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Core</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Core.Providers</_Parameter1>
</AssemblyAttribute>
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Web</_Parameter1>
</AssemblyAttribute>
-->
</ItemGroup>
<ItemGroup>

15
src/Umbraco.Web.BackOffice/Filters/FileUploadCleanupFilterAttribute.cs
View File

@@ -1,4 +1,4 @@
using System;
using System;
using System.Collections.Generic;
using System.IO;
using System.Linq;
@@ -7,6 +7,7 @@ using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.Extensions.Logging;
using Umbraco.Cms.Core.Models.ContentEditing;
using Umbraco.Cms.Core.Models.Editors;
using Umbraco.Extensions;
namespace Umbraco.Cms.Web.BackOffice.Filters
@@ -15,20 +16,17 @@ namespace Umbraco.Cms.Web.BackOffice.Filters
/// Checks if the parameter is IHaveUploadedFiles and then deletes any temporary saved files from file uploads
/// associated with the request
/// </summary>
internal sealed class FileUploadCleanupFilterAttribute : TypeFilterAttribute
public sealed class FileUploadCleanupFilterAttribute : TypeFilterAttribute
{
/// <summary>
/// Constructor specifies if the filter should analyze the incoming or outgoing model
/// </summary>
/// <param name="incomingModel"></param>
public FileUploadCleanupFilterAttribute( bool incomingModel = true) : base(typeof(FileUploadCleanupFilter))
{
public FileUploadCleanupFilterAttribute(bool incomingModel = true) : base(typeof(FileUploadCleanupFilter)) =>
Arguments = new object[]
{
incomingModel
};
}
// We need to use IAsyncActionFilter even that we dont have any async because we need access to
// context.ActionArguments, and this is only available on ActionExecutingContext and not on
@@ -45,7 +43,6 @@ namespace Umbraco.Cms.Web.BackOffice.Filters
_incomingModel = incomingModel;
}
public Task OnActionExecutionAsync(ActionExecutingContext context, ActionExecutionDelegate next)
{
next(); // We only to do stuff after the action is executed
@@ -60,7 +57,7 @@ namespace Umbraco.Cms.Web.BackOffice.Filters
if (context.ActionArguments.First().Value is IHaveUploadedFiles contentItem)
{
//cleanup any files associated
foreach (var f in contentItem.UploadedFiles)
foreach (ContentPropertyFile f in contentItem.UploadedFiles)
{
//track all temp folders so we can remove old files afterwards
var dir = Path.GetDirectoryName(f.TempFilePath);
@@ -109,7 +106,7 @@ namespace Umbraco.Cms.Web.BackOffice.Filters
if (uploadedFiles.UploadedFiles != null)
{
//cleanup any files associated
foreach (var f in uploadedFiles.UploadedFiles)
foreach (ContentPropertyFile f in uploadedFiles.UploadedFiles)
{
if (f.TempFilePath.IsNullOrWhiteSpace() == false)
{

8
src/Umbraco.Web.BackOffice/Umbraco.Web.BackOffice.csproj
View File

@@ -31,14 +31,6 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Tests.Integration</_Parameter1>
</AssemblyAttribute>
<!-- Making internals visible to Umbraco Forms -->
<!--
Temporarily removing to see what we need
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Web</_Parameter1>
</AssemblyAttribute>
-->
</ItemGroup>
<ItemGroup>

8
src/Umbraco.Web.Common/Umbraco.Web.Common.csproj
View File

@@ -40,14 +40,6 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Tests.UnitTests</_Parameter1>
</AssemblyAttribute>
<!-- Making internals visible to Umbraco Forms -->
<!--
Temporarily removing to see what we need
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Web</_Parameter1>
</AssemblyAttribute>
-->
</ItemGroup>
</Project>

8
src/Umbraco.Web.Website/Umbraco.Web.Website.csproj
View File

@@ -34,13 +34,5 @@
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Tests.Integration</_Parameter1>
</AssemblyAttribute>
<!-- Making internals visible to Umbraco Forms -->
<!--
Temporarily removing to see what we need
<AssemblyAttribute Include="System.Runtime.CompilerServices.InternalsVisibleTo">
<_Parameter1>Umbraco.Forms.Web</_Parameter1>
</AssemblyAttribute>
-->
</ItemGroup>
</Project>