From ee29af074aaa009d051424bfb7d048493f93f12b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Sun, 4 Dec 2016 22:11:19 +0300 Subject: [PATCH] Removed Volo.CodeAnnotations. --- Volo.Abp.sln | 7 ------- .../Abp/Modularity/AbpModuleDescriptor.cs | 1 - .../Properties/AssemblyInfo.cs | 19 ------------------- .../Volo.CodeAnnotations.xproj | 19 ------------------- src/Volo.CodeAnnotations/project.json | 14 -------------- .../Check.cs | 4 +--- .../Generic/CollectionExtensions.cs | 1 - .../ExtensionMethods/StringExtensions.cs | 1 - 8 files changed, 1 insertion(+), 65 deletions(-) delete mode 100644 src/Volo.CodeAnnotations/Properties/AssemblyInfo.cs delete mode 100644 src/Volo.CodeAnnotations/Volo.CodeAnnotations.xproj delete mode 100644 src/Volo.CodeAnnotations/project.json rename src/{Volo.CodeAnnotations/CodeAnnotations => Volo.ExtensionMethods}/Check.cs (82%) diff --git a/Volo.Abp.sln b/Volo.Abp.sln index 05bd668f59..271e9e3116 100644 --- a/Volo.Abp.sln +++ b/Volo.Abp.sln @@ -40,8 +40,6 @@ Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "AspNetCoreDemo", "test\Apps EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods", "src\Volo.ExtensionMethods\Volo.ExtensionMethods.xproj", "{FC889503-0BF4-4959-AC80-F51073787025}" EndProject -Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.CodeAnnotations", "src\Volo.CodeAnnotations\Volo.CodeAnnotations.xproj", "{161A6C10-00FF-4348-993F-D19893ABC57C}" -EndProject Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Volo.ExtensionMethods.Tests", "test\Volo.ExtensionMethods.Tests\Volo.ExtensionMethods.Tests.xproj", "{B520B696-86C7-46D2-A359-C2E9013A7BED}" EndProject Global @@ -86,10 +84,6 @@ Global {FC889503-0BF4-4959-AC80-F51073787025}.Debug|Any CPU.Build.0 = Debug|Any CPU {FC889503-0BF4-4959-AC80-F51073787025}.Release|Any CPU.ActiveCfg = Release|Any CPU {FC889503-0BF4-4959-AC80-F51073787025}.Release|Any CPU.Build.0 = Release|Any CPU - {161A6C10-00FF-4348-993F-D19893ABC57C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {161A6C10-00FF-4348-993F-D19893ABC57C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {161A6C10-00FF-4348-993F-D19893ABC57C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {161A6C10-00FF-4348-993F-D19893ABC57C}.Release|Any CPU.Build.0 = Release|Any CPU {B520B696-86C7-46D2-A359-C2E9013A7BED}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {B520B696-86C7-46D2-A359-C2E9013A7BED}.Debug|Any CPU.Build.0 = Debug|Any CPU {B520B696-86C7-46D2-A359-C2E9013A7BED}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -113,7 +107,6 @@ Global {A3A3B258-B3D5-4FDE-9D84-CAA8CBB70586} = {447C8A77-E5F0-4538-8687-7383196D04EA} {12E14D95-4ABA-4290-AB1D-CCF5EB158411} = {A3A3B258-B3D5-4FDE-9D84-CAA8CBB70586} {FC889503-0BF4-4959-AC80-F51073787025} = {9A4A646B-CC96-44FB-A717-E50C5C148B54} - {161A6C10-00FF-4348-993F-D19893ABC57C} = {9A4A646B-CC96-44FB-A717-E50C5C148B54} {B520B696-86C7-46D2-A359-C2E9013A7BED} = {82B41A0A-6068-410F-9C6B-2508CA763E21} EndGlobalSection EndGlobal diff --git a/src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs b/src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs index 9ef71cff84..e1091506d3 100644 --- a/src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs +++ b/src/Volo.Abp/Abp/Modularity/AbpModuleDescriptor.cs @@ -1,7 +1,6 @@ using System; using System.Collections.Generic; using JetBrains.Annotations; -using Volo.CodeAnnotations; namespace Volo.Abp.Modularity { diff --git a/src/Volo.CodeAnnotations/Properties/AssemblyInfo.cs b/src/Volo.CodeAnnotations/Properties/AssemblyInfo.cs deleted file mode 100644 index cfe4ccc1de..0000000000 --- a/src/Volo.CodeAnnotations/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,19 +0,0 @@ -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: AssemblyConfiguration("")] -[assembly: AssemblyCompany("")] -[assembly: AssemblyProduct("Volo.CodeAnnotations")] -[assembly: AssemblyTrademark("")] - -// 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("161a6c10-00ff-4348-993f-d19893abc57c")] diff --git a/src/Volo.CodeAnnotations/Volo.CodeAnnotations.xproj b/src/Volo.CodeAnnotations/Volo.CodeAnnotations.xproj deleted file mode 100644 index 63ed8954e0..0000000000 --- a/src/Volo.CodeAnnotations/Volo.CodeAnnotations.xproj +++ /dev/null @@ -1,19 +0,0 @@ - - - - 14.0 - $(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion) - - - - 161a6c10-00ff-4348-993f-d19893abc57c - Volo - .\obj - .\bin\ - v4.6.1 - - - 2.0 - - - \ No newline at end of file diff --git a/src/Volo.CodeAnnotations/project.json b/src/Volo.CodeAnnotations/project.json deleted file mode 100644 index 65a8e28a9d..0000000000 --- a/src/Volo.CodeAnnotations/project.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "version": "1.0.0-*", - - "dependencies": { - "JetBrains.Annotations": "10.2.1", - "NETStandard.Library": "1.6.1" - }, - - "frameworks": { - "netstandard1.6": { - "imports": "dnxcore50" - } - } -} diff --git a/src/Volo.CodeAnnotations/CodeAnnotations/Check.cs b/src/Volo.ExtensionMethods/Check.cs similarity index 82% rename from src/Volo.CodeAnnotations/CodeAnnotations/Check.cs rename to src/Volo.ExtensionMethods/Check.cs index c27eae9bcc..7920639c33 100644 --- a/src/Volo.CodeAnnotations/CodeAnnotations/Check.cs +++ b/src/Volo.ExtensionMethods/Check.cs @@ -2,10 +2,8 @@ using System.Diagnostics; using JetBrains.Annotations; -namespace Volo.CodeAnnotations +namespace Volo { - //TODO: Remove this library and move Check to somewhere else! - [DebuggerStepThrough] public static class Check { diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs index 7c8c2903e7..4da8884fd8 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/Collections/Generic/CollectionExtensions.cs @@ -1,6 +1,5 @@ using System.Collections.Generic; using JetBrains.Annotations; -using Volo.CodeAnnotations; namespace Volo.ExtensionMethods.Collections.Generic { diff --git a/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs b/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs index ff610b4bc8..7c0faf9da6 100644 --- a/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs +++ b/src/Volo.ExtensionMethods/ExtensionMethods/StringExtensions.cs @@ -2,7 +2,6 @@ using System; using System.Security.Cryptography; using System.Text; using System.Text.RegularExpressions; -using Volo.CodeAnnotations; using Volo.ExtensionMethods.Collections.Generic; namespace Volo.ExtensionMethods