From bebddb3558db96e1fc8feae010fa0f84abf7a5a3 Mon Sep 17 00:00:00 2001 From: nsnail Date: Thu, 23 Nov 2023 21:43:53 +0800 Subject: [PATCH] =?UTF-8?q?build:=20=F0=9F=93=A6=20=E7=B2=BE=E7=AE=80?= =?UTF-8?q?=E6=A0=B9=E7=9B=AE=E5=BD=95=E6=9E=84=E5=BB=BA=E6=96=87=E4=BB=B6?= =?UTF-8?q?=20(#67)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Directory.Build.props | 2 +- NetAdmin.sln | 15 +++++++++------ StyleCop.json | 9 --------- code.quality.props => build/code.quality.props | 2 +- .../copy.pkg.xml.comment.files.targets | 0 minver.targets => build/minver.targets | 0 prebuild.targets => build/prebuild.targets | 0 .../stylecop.analyzers.ruleset | 0 scripts/sync.sln.files.csx | 14 ++++++++++++++ .../NetAdmin.Application.csproj | 2 +- .../NetAdmin.BizServer.Application.csproj | 2 +- .../NetAdmin.BizServer.Cache.csproj | 2 +- .../NetAdmin.BizServer.Host.csproj | 2 +- src/backend/NetAdmin.Cache/NetAdmin.Cache.csproj | 2 +- .../NetAdmin.Domain/NetAdmin.Domain.csproj | 2 +- src/backend/NetAdmin.Host/NetAdmin.Host.csproj | 2 +- .../NetAdmin.Infrastructure.csproj | 6 +++--- .../NetAdmin.ScheduledService.csproj | 2 +- .../NetAdmin.SysComponent.Application.csproj | 2 +- .../NetAdmin.SysComponent.Cache.csproj | 2 +- .../NetAdmin.SysComponent.Host.csproj | 2 +- 21 files changed, 39 insertions(+), 31 deletions(-) delete mode 100644 StyleCop.json rename code.quality.props => build/code.quality.props (96%) rename copy.pkg.xml.comment.files.targets => build/copy.pkg.xml.comment.files.targets (100%) rename minver.targets => build/minver.targets (100%) rename prebuild.targets => build/prebuild.targets (100%) rename stylecop.analyzers.ruleset => build/stylecop.analyzers.ruleset (100%) diff --git a/Directory.Build.props b/Directory.Build.props index 7788f11e..566f523e 100644 --- a/Directory.Build.props +++ b/Directory.Build.props @@ -3,7 +3,7 @@ $(MSBuildThisFileDirectory) - + true nsnail diff --git a/NetAdmin.sln b/NetAdmin.sln index 9c3d8914..0da79da4 100644 --- a/NetAdmin.sln +++ b/NetAdmin.sln @@ -15,21 +15,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "meta", "meta", "{5198A03D-0 .gitignore = .gitignore .gitmodules = .gitmodules CHANGELOG.md = CHANGELOG.md - code.quality.props = code.quality.props - copy.pkg.xml.comment.files.targets = copy.pkg.xml.comment.files.targets Directory.Build.props = Directory.Build.props Dockerfile = Dockerfile dotnet-tools.json = dotnet-tools.json global.json = global.json LICENSE = LICENSE - minver.targets = minver.targets NetAdmin.sln.DotSettings = NetAdmin.sln.DotSettings nuget.config = nuget.config package.json = package.json - prebuild.targets = prebuild.targets README.md = README.md - stylecop.analyzers.ruleset = stylecop.analyzers.ruleset - StyleCop.json = StyleCop.json EndProjectSection EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B25C9-0901-4923-913F-00F9A6B352A5}" @@ -60,6 +54,15 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{ ci.yml = .github/workflows/ci.yml EndProjectSection EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}" + ProjectSection(SolutionItems) = preProject + code.quality.props = build/code.quality.props + copy.pkg.xml.comment.files.targets = build/copy.pkg.xml.comment.files.targets + minver.targets = build/minver.targets + prebuild.targets = build/prebuild.targets + stylecop.analyzers.ruleset = build/stylecop.analyzers.ruleset + EndProjectSection +EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.Infrastructure", "src\backend\NetAdmin.Infrastructure\NetAdmin.Infrastructure.csproj", "{1E62C322-EE42-4699-A6F1-791C53EFA62D}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NetAdmin.BizServer.Application", "src\backend\NetAdmin.BizServer.Application\NetAdmin.BizServer.Application.csproj", "{E38B2EB4-D7A5-4777-9236-3B348919DF23}" diff --git a/StyleCop.json b/StyleCop.json deleted file mode 100644 index 9251b508..00000000 --- a/StyleCop.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "$schema": "https://raw.githubusercontent.com/DotNetAnalyzers/StyleCopAnalyzers/master/StyleCop.Analyzers/StyleCop.Analyzers/Settings/stylecop.schema.json", - "settings": { - "indentation": { - "useTabs": false, - "indentationSize": 4 - } - } -} \ No newline at end of file diff --git a/code.quality.props b/build/code.quality.props similarity index 96% rename from code.quality.props rename to build/code.quality.props index 68b2ece0..d37e69c9 100644 --- a/code.quality.props +++ b/build/code.quality.props @@ -1,6 +1,6 @@ - $(SolutionDir)/stylecop.analyzers.ruleset + $(SolutionDir)/build/stylecop.analyzers.ruleset true diff --git a/copy.pkg.xml.comment.files.targets b/build/copy.pkg.xml.comment.files.targets similarity index 100% rename from copy.pkg.xml.comment.files.targets rename to build/copy.pkg.xml.comment.files.targets diff --git a/minver.targets b/build/minver.targets similarity index 100% rename from minver.targets rename to build/minver.targets diff --git a/prebuild.targets b/build/prebuild.targets similarity index 100% rename from prebuild.targets rename to build/prebuild.targets diff --git a/stylecop.analyzers.ruleset b/build/stylecop.analyzers.ruleset similarity index 100% rename from stylecop.analyzers.ruleset rename to build/stylecop.analyzers.ruleset diff --git a/scripts/sync.sln.files.csx b/scripts/sync.sln.files.csx index 4e7c3d6b..201e1d6f 100644 --- a/scripts/sync.sln.files.csx +++ b/scripts/sync.sln.files.csx @@ -45,5 +45,19 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "scripts", "scripts", "{BB0B """ ); +content = Regex.Replace( + content, + "Project\\(\"{2150E333-8FDC-42A3-9474-1A3956D46DE8}\"\\) = \"build\", \"build\", \"{8E4C93BA-9493-4892-80C4-5E174C504829}\"(?:.|\n)*?EndProject", + $$""" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "build", "build", "{8E4C93BA-9493-4892-80C4-5E174C504829}" +{{'\t'}}ProjectSection(SolutionItems) = preProject +{{string.Join('\n', + Directory.GetFiles(@"../build", "*") + .Select(x=>$"\t\t{Path.GetFileName(x)} = build/{Path.GetFileName(x)}") + )}} +{{'\t'}}EndProject +""" +); + Console.WriteLine(content); File.WriteAllText(slnFile, content); \ No newline at end of file diff --git a/src/backend/NetAdmin.Application/NetAdmin.Application.csproj b/src/backend/NetAdmin.Application/NetAdmin.Application.csproj index 980dfa47..c21da26e 100644 --- a/src/backend/NetAdmin.Application/NetAdmin.Application.csproj +++ b/src/backend/NetAdmin.Application/NetAdmin.Application.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj b/src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj index 5035b077..dfce2b16 100644 --- a/src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj +++ b/src/backend/NetAdmin.BizServer.Application/NetAdmin.BizServer.Application.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj b/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj index 3b79e7f8..83473100 100644 --- a/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj +++ b/src/backend/NetAdmin.BizServer.Cache/NetAdmin.BizServer.Cache.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj b/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj index 85a91d7b..e99327b6 100644 --- a/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj +++ b/src/backend/NetAdmin.BizServer.Host/NetAdmin.BizServer.Host.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.Cache/NetAdmin.Cache.csproj b/src/backend/NetAdmin.Cache/NetAdmin.Cache.csproj index 7fd1ee13..6138b0be 100644 --- a/src/backend/NetAdmin.Cache/NetAdmin.Cache.csproj +++ b/src/backend/NetAdmin.Cache/NetAdmin.Cache.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj index da77ae3e..f5ca3bd1 100644 --- a/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj +++ b/src/backend/NetAdmin.Domain/NetAdmin.Domain.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.Host/NetAdmin.Host.csproj b/src/backend/NetAdmin.Host/NetAdmin.Host.csproj index a28ff8bc..f56fb086 100644 --- a/src/backend/NetAdmin.Host/NetAdmin.Host.csproj +++ b/src/backend/NetAdmin.Host/NetAdmin.Host.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj index d84feba3..fbfffc38 100644 --- a/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj +++ b/src/backend/NetAdmin.Infrastructure/NetAdmin.Infrastructure.csproj @@ -2,9 +2,9 @@ INFRAS - - - + + + diff --git a/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj b/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj index 3adc3daa..5df6c288 100644 --- a/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj +++ b/src/backend/NetAdmin.ScheduledService/NetAdmin.ScheduledService.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj b/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj index 7fd1ee13..6138b0be 100644 --- a/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj +++ b/src/backend/NetAdmin.SysComponent.Application/NetAdmin.SysComponent.Application.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj b/src/backend/NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj index 30ce70b0..88e0fbcc 100644 --- a/src/backend/NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj +++ b/src/backend/NetAdmin.SysComponent.Cache/NetAdmin.SysComponent.Cache.csproj @@ -1,5 +1,5 @@ - + diff --git a/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj b/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj index 41208256..ec0aa07b 100644 --- a/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj +++ b/src/backend/NetAdmin.SysComponent.Host/NetAdmin.SysComponent.Host.csproj @@ -1,5 +1,5 @@ - +