From 92d99e7c41a0f8a251eaf14b04a6c2715c1737d3 Mon Sep 17 00:00:00 2001 From: hjkl950217 <584880422@qq.com> Date: Thu, 10 Dec 2020 14:42:10 +0800 Subject: [PATCH] =?UTF-8?q?=E5=88=A0=E9=99=A4Uitl=E9=A1=B9=E7=9B=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Ray.BiliBiliTool.sln | 19 ++++++------------- .../Ray.BiliBiliTool.Config.csproj | 1 - .../Extensions/DateTimeExtension.cs | 0 .../Extensions/IDictionaryExtensions.cs | 0 .../Extensions/KeyValuePairExtensions.cs | 0 .../Extensions/ObjectExtensions.cs | 0 .../Extensions/StringExtensions.cs | 0 .../Extensions/TypeExtensions.cs | 0 .../Ray.BiliBiliTool.Infrastructure.csproj | 5 +---- .../Ray.BiliBiliTool.Util.csproj | 10 ---------- .../InfrastructureTest.csproj} | 0 .../UnitTest1.cs | 0 12 files changed, 7 insertions(+), 28 deletions(-) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/DateTimeExtension.cs (100%) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/IDictionaryExtensions.cs (100%) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/KeyValuePairExtensions.cs (100%) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/ObjectExtensions.cs (100%) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/StringExtensions.cs (100%) rename src/{Ray.BiliBiliTool.Util => Ray.BiliBiliTool.Infrastructure}/Extensions/TypeExtensions.cs (100%) delete mode 100644 src/Ray.BiliBiliTool.Util/Ray.BiliBiliTool.Util.csproj rename test/{UtilTest/UtilTest.csproj => InfrastructureTest/InfrastructureTest.csproj} (100%) rename test/{UtilTest => InfrastructureTest}/UnitTest1.cs (100%) diff --git a/Ray.BiliBiliTool.sln b/Ray.BiliBiliTool.sln index fdac25d..e9d82b9 100644 --- a/Ray.BiliBiliTool.sln +++ b/Ray.BiliBiliTool.sln @@ -44,9 +44,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution .editorconfig = .editorconfig EndProjectSection EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ray.BiliBiliTool.Util", "src\Ray.BiliBiliTool.Util\Ray.BiliBiliTool.Util.csproj", "{B6FEA041-F3EA-4F16-BFFE-8005EFA05E00}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UtilTest", "test\UtilTest\UtilTest.csproj", "{6A7B2E22-387E-41FB-BE5B-0252129683D9}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "InfrastructureTest", "test\InfrastructureTest\InfrastructureTest.csproj", "{AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -102,14 +100,10 @@ Global {ECEEFE3F-F39F-44EE-8FA2-D5CDBB25397F}.Debug|Any CPU.Build.0 = Debug|Any CPU {ECEEFE3F-F39F-44EE-8FA2-D5CDBB25397F}.Release|Any CPU.ActiveCfg = Release|Any CPU {ECEEFE3F-F39F-44EE-8FA2-D5CDBB25397F}.Release|Any CPU.Build.0 = Release|Any CPU - {B6FEA041-F3EA-4F16-BFFE-8005EFA05E00}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B6FEA041-F3EA-4F16-BFFE-8005EFA05E00}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B6FEA041-F3EA-4F16-BFFE-8005EFA05E00}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B6FEA041-F3EA-4F16-BFFE-8005EFA05E00}.Release|Any CPU.Build.0 = Release|Any CPU - {6A7B2E22-387E-41FB-BE5B-0252129683D9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A7B2E22-387E-41FB-BE5B-0252129683D9}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A7B2E22-387E-41FB-BE5B-0252129683D9}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A7B2E22-387E-41FB-BE5B-0252129683D9}.Release|Any CPU.Build.0 = Release|Any CPU + {AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -131,8 +125,7 @@ Global {191C48BD-5CB5-42CA-B394-7A4A9BFA6275} = {120917DC-474C-448B-9EBB-1B3BA3A20B9D} {7105652A-B1C1-4F9E-BA38-8034BC8B26B4} = {120917DC-474C-448B-9EBB-1B3BA3A20B9D} {ECEEFE3F-F39F-44EE-8FA2-D5CDBB25397F} = {E9BDDCBE-A57D-4E3B-8252-708088386ADF} - {B6FEA041-F3EA-4F16-BFFE-8005EFA05E00} = {110D3D21-8E9B-45AB-9667-6DA1DB3862AC} - {6A7B2E22-387E-41FB-BE5B-0252129683D9} = {E9BDDCBE-A57D-4E3B-8252-708088386ADF} + {AE6A5DBE-E9EA-49C1-AB6C-7F01B2F19A8B} = {E9BDDCBE-A57D-4E3B-8252-708088386ADF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {197319DA-1148-4A99-847C-8B270B6A29AB} diff --git a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj index 9467385..69e4ac8 100644 --- a/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj +++ b/src/Ray.BiliBiliTool.Config/Ray.BiliBiliTool.Config.csproj @@ -15,7 +15,6 @@ - diff --git a/src/Ray.BiliBiliTool.Util/Extensions/DateTimeExtension.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/DateTimeExtension.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/DateTimeExtension.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/DateTimeExtension.cs diff --git a/src/Ray.BiliBiliTool.Util/Extensions/IDictionaryExtensions.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/IDictionaryExtensions.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/IDictionaryExtensions.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/IDictionaryExtensions.cs diff --git a/src/Ray.BiliBiliTool.Util/Extensions/KeyValuePairExtensions.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/KeyValuePairExtensions.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/KeyValuePairExtensions.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/KeyValuePairExtensions.cs diff --git a/src/Ray.BiliBiliTool.Util/Extensions/ObjectExtensions.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/ObjectExtensions.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/ObjectExtensions.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/ObjectExtensions.cs diff --git a/src/Ray.BiliBiliTool.Util/Extensions/StringExtensions.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/StringExtensions.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/StringExtensions.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/StringExtensions.cs diff --git a/src/Ray.BiliBiliTool.Util/Extensions/TypeExtensions.cs b/src/Ray.BiliBiliTool.Infrastructure/Extensions/TypeExtensions.cs similarity index 100% rename from src/Ray.BiliBiliTool.Util/Extensions/TypeExtensions.cs rename to src/Ray.BiliBiliTool.Infrastructure/Extensions/TypeExtensions.cs diff --git a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj index 9116b35..c2dd779 100644 --- a/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj +++ b/src/Ray.BiliBiliTool.Infrastructure/Ray.BiliBiliTool.Infrastructure.csproj @@ -7,9 +7,6 @@ - - - - + \ No newline at end of file diff --git a/src/Ray.BiliBiliTool.Util/Ray.BiliBiliTool.Util.csproj b/src/Ray.BiliBiliTool.Util/Ray.BiliBiliTool.Util.csproj deleted file mode 100644 index e86e4e4..0000000 --- a/src/Ray.BiliBiliTool.Util/Ray.BiliBiliTool.Util.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - net5.0 - - - - - - \ No newline at end of file diff --git a/test/UtilTest/UtilTest.csproj b/test/InfrastructureTest/InfrastructureTest.csproj similarity index 100% rename from test/UtilTest/UtilTest.csproj rename to test/InfrastructureTest/InfrastructureTest.csproj diff --git a/test/UtilTest/UnitTest1.cs b/test/InfrastructureTest/UnitTest1.cs similarity index 100% rename from test/UtilTest/UnitTest1.cs rename to test/InfrastructureTest/UnitTest1.cs