From 42a046b80ce91db33c235f89781a96340effbfe2 Mon Sep 17 00:00:00 2001 From: Stephan Date: Thu, 27 Jul 2017 11:18:41 +0200 Subject: [PATCH] Cleanup AssemblyInfo --- .../Properties/AssemblyInfo.cs | 8 ---- src/Umbraco.Core/Properties/AssemblyInfo.cs | 30 +++++---------- src/Umbraco.Web.UI/Properties/AssemblyInfo.cs | 16 +------- src/Umbraco.Web/Properties/AssemblyInfo.cs | 38 ++++++++----------- src/UmbracoExamine/Properties/AssemblyInfo.cs | 7 ++-- 5 files changed, 30 insertions(+), 69 deletions(-) diff --git a/src/Umbraco.Compat7/Properties/AssemblyInfo.cs b/src/Umbraco.Compat7/Properties/AssemblyInfo.cs index 95773b60d9..412c975d0b 100644 --- a/src/Umbraco.Compat7/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Compat7/Properties/AssemblyInfo.cs @@ -1,18 +1,10 @@ using System.Reflection; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Umbraco.Compat7")] [assembly: AssemblyDescription("Umbraco v7 compatibility layer for v8.")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Umbraco CMS")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("185e098f-5706-4b97-b404-eb974f05f633")] diff --git a/src/Umbraco.Core/Properties/AssemblyInfo.cs b/src/Umbraco.Core/Properties/AssemblyInfo.cs index c7629694de..7387a8281f 100644 --- a/src/Umbraco.Core/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Core/Properties/AssemblyInfo.cs @@ -2,36 +2,27 @@ using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. [assembly: AssemblyTitle("Umbraco.Core")] -[assembly: AssemblyDescription("Core assembly containing the new codebase foundation")] +[assembly: AssemblyDescription("Umbraco Core")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Umbraco CMS")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("130a6b5c-50e7-4df3-a0dd-e9e7eb0b7c5c")] // Umbraco Cms [assembly: InternalsVisibleTo("Umbraco.Web")] -[assembly: InternalsVisibleTo("Umbraco.Tests")] -[assembly: InternalsVisibleTo("Umbraco.Extensions")] // fixme ? -[assembly: InternalsVisibleTo("businesslogic")] // fixme ? -[assembly: InternalsVisibleTo("cms")] // fixme ? -[assembly: InternalsVisibleTo("umbraco.webservices")] // fixme ? -[assembly: InternalsVisibleTo("umbraco.datalayer")] -[assembly: InternalsVisibleTo("Umbraco.Tests")] -[assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")] -[assembly: InternalsVisibleTo("Umbraco.Web")] [assembly: InternalsVisibleTo("Umbraco.Web.UI")] [assembly: InternalsVisibleTo("UmbracoExamine")] +[assembly: InternalsVisibleTo("Umbraco.Tests")] +[assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")] + +[assembly: InternalsVisibleTo("Umbraco.Extensions")] // fixme - what is this? + +// Allow this to be mocked in our unit tests +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] + // Umbraco Deploy [assembly: InternalsVisibleTo("Umbraco.Deploy")] [assembly: InternalsVisibleTo("Umbraco.Deploy.UI")] @@ -42,8 +33,5 @@ using System.Runtime.InteropServices; [assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")] [assembly: InternalsVisibleTo("Umbraco.Forms.Web")] -//allow this to be mocked in our unit tests -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] - // v8 [assembly: InternalsVisibleTo("Umbraco.Compat7")] diff --git a/src/Umbraco.Web.UI/Properties/AssemblyInfo.cs b/src/Umbraco.Web.UI/Properties/AssemblyInfo.cs index 8cc09e4fcd..f8a9a5b8e1 100644 --- a/src/Umbraco.Web.UI/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Web.UI/Properties/AssemblyInfo.cs @@ -1,25 +1,13 @@ using System.Reflection; -using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// [assembly: AssemblyTitle("Umbraco.Web.UI")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyDescription("Umbraco Web UI")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Umbraco CMS")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("A87ADD48-9DB5-4068-BCC6-377CC54E7AE4")] -//[assembly: System.Security.SecurityRules(System.Security.SecurityRuleSet.Level1)] - +// log4net [assembly: log4net.Config.XmlConfigurator(Watch = false)] diff --git a/src/Umbraco.Web/Properties/AssemblyInfo.cs b/src/Umbraco.Web/Properties/AssemblyInfo.cs index ca6397f8da..d1d9e10597 100644 --- a/src/Umbraco.Web/Properties/AssemblyInfo.cs +++ b/src/Umbraco.Web/Properties/AssemblyInfo.cs @@ -1,42 +1,34 @@ using System.Reflection; using System.Runtime.CompilerServices; using System.Runtime.InteropServices; -using System.Security; -// -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -// -[assembly: AssemblyTitle("umbraco.presentation")] -[assembly: AssemblyDescription("")] +[assembly: AssemblyTitle("Umbraco.Web")] +[assembly: AssemblyDescription("Umbraco Web")] [assembly: AssemblyConfiguration("")] [assembly: AssemblyProduct("Umbraco CMS")] -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. [assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("ce9d3539-299e-40d3-b605-42ac423e24fa")] +// Umbraco Cms +[assembly: InternalsVisibleTo("Umbraco.Web.UI")] + [assembly: InternalsVisibleTo("Umbraco.Tests")] [assembly: InternalsVisibleTo("Umbraco.Tests.Benchmarks")] -[assembly: InternalsVisibleTo("umbraco.MacroEngines")] -[assembly: InternalsVisibleTo("Umbraco.Web.UI")] -[assembly: InternalsVisibleTo("umbraco.webservices")] -[assembly: InternalsVisibleTo("Concorde.Sync")] -[assembly: InternalsVisibleTo("Umbraco.Courier.Core")] -[assembly: InternalsVisibleTo("Umbraco.Courier.Persistence")] + +[assembly: InternalsVisibleTo("Umbraco.VisualStudio")] // fixme - what is this? +[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")] // fixme - why? +[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.AspNet")] // fixme - why? + +// Allow this to be mocked in our unit tests +[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] + +// Umbraco Deploy [assembly: InternalsVisibleTo("Umbraco.Deploy")] [assembly: InternalsVisibleTo("Umbraco.Deploy.UI")] [assembly: InternalsVisibleTo("Umbraco.Deploy.Cloud")] -[assembly: InternalsVisibleTo("Umbraco.VisualStudio")] -[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder")] -[assembly: InternalsVisibleTo("Umbraco.ModelsBuilder.AspNet")] -[assembly: InternalsVisibleTo("DynamicProxyGenAssembly2")] +// Umbraco Forms [assembly: InternalsVisibleTo("Umbraco.Forms.Core")] [assembly: InternalsVisibleTo("Umbraco.Forms.Core.Providers")] [assembly: InternalsVisibleTo("Umbraco.Forms.Web")] diff --git a/src/UmbracoExamine/Properties/AssemblyInfo.cs b/src/UmbracoExamine/Properties/AssemblyInfo.cs index 6c451e8cb7..5bd98bacd2 100644 --- a/src/UmbracoExamine/Properties/AssemblyInfo.cs +++ b/src/UmbracoExamine/Properties/AssemblyInfo.cs @@ -1,9 +1,10 @@ using System.Reflection; using System.Runtime.CompilerServices; -[assembly: AssemblyTitle("UmbracoExamine")] -[assembly: AssemblyDescription("Umbraco index & search providers based on the Examine model using Lucene.NET 2.9.2")] +[assembly: AssemblyTitle("Umbraco.Examine")] +[assembly: AssemblyDescription("Umbraco Examine")] [assembly: AssemblyConfiguration("")] -[assembly: AssemblyProduct("UmbracoExamine")] +[assembly: AssemblyProduct("Umbraco CMS")] +// Umbraco Cms [assembly: InternalsVisibleTo("Umbraco.Tests")]