From 216899ee0dcfd1d3c236b161bda5c5c7b6fb198e Mon Sep 17 00:00:00 2001 From: movingsam Date: Fri, 27 Feb 2026 15:19:02 +0800 Subject: [PATCH] =?UTF-8?q?refactor:=20=E5=8D=87=E7=BA=A7=E5=88=B0=20.NET?= =?UTF-8?q?=2010=20=E5=B9=B6=E4=BC=98=E5=8C=96=E9=A1=B9=E7=9B=AE=E7=BB=93?= =?UTF-8?q?=E6=9E=84?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 移动项目到 src/ 目录 - 创建 slnx 解决方案文件 - 使用 CPM 集中管理 NuGet 包版本并升级到最新 10.x - 添加 Consul 项目打包 - 更新 CI/CD workflow 路径 --- .gitea/workflows/nuget.yml | 24 +++++++++++-------- Directory.Packages.props | 16 +++++++++++++ Fengling.ServiceDiscovery.slnx | 12 ++++++++++ NuGet.Config | 8 +++++++ .../Fengling.ServiceDiscovery.Consul.csproj | 2 +- .../src/ConsulDiscoveryProvider.cs | 0 .../ConsulServiceDiscoveryExtensions.cs | 0 .../Fengling.ServiceDiscovery.Core.csproj | 2 +- .../Abstractions/IServiceDiscoveryProvider.cs | 0 .../Extensions/ServiceCollectionExtensions.cs | 0 .../src/Models/DiscoveredInstance.cs | 0 .../src/Models/DiscoveredService.cs | 0 .../src/Models/HealthCheckResult.cs | 0 .../src/Models/ServiceDiscoveryChange.cs | 0 ...engling.ServiceDiscovery.Kubernetes.csproj | 2 +- .../KubernetesServiceDiscoveryExtensions.cs | 0 .../src/KubernetesDiscoveryProvider.cs | 0 .../Fengling.ServiceDiscovery.Static.csproj | 2 +- .../StaticServiceDiscoveryExtensions.cs | 0 .../src/StaticDiscoveryProvider.cs | 0 20 files changed, 54 insertions(+), 14 deletions(-) create mode 100644 Directory.Packages.props create mode 100644 Fengling.ServiceDiscovery.slnx create mode 100644 NuGet.Config rename {Fengling.ServiceDiscovery.Consul => src/Fengling.ServiceDiscovery.Consul}/Fengling.ServiceDiscovery.Consul.csproj (90%) rename {Fengling.ServiceDiscovery.Consul => src/Fengling.ServiceDiscovery.Consul}/src/ConsulDiscoveryProvider.cs (100%) rename {Fengling.ServiceDiscovery.Consul => src/Fengling.ServiceDiscovery.Consul}/src/Extensions/ConsulServiceDiscoveryExtensions.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/Fengling.ServiceDiscovery.Core.csproj (93%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Abstractions/IServiceDiscoveryProvider.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Extensions/ServiceCollectionExtensions.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Models/DiscoveredInstance.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Models/DiscoveredService.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Models/HealthCheckResult.cs (100%) rename {Fengling.ServiceDiscovery.Core => src/Fengling.ServiceDiscovery.Core}/src/Models/ServiceDiscoveryChange.cs (100%) rename {Fengling.ServiceDiscovery.Kubernetes => src/Fengling.ServiceDiscovery.Kubernetes}/Fengling.ServiceDiscovery.Kubernetes.csproj (91%) rename {Fengling.ServiceDiscovery.Kubernetes => src/Fengling.ServiceDiscovery.Kubernetes}/src/Extensions/KubernetesServiceDiscoveryExtensions.cs (100%) rename {Fengling.ServiceDiscovery.Kubernetes => src/Fengling.ServiceDiscovery.Kubernetes}/src/KubernetesDiscoveryProvider.cs (100%) rename {Fengling.ServiceDiscovery.Static => src/Fengling.ServiceDiscovery.Static}/Fengling.ServiceDiscovery.Static.csproj (88%) rename {Fengling.ServiceDiscovery.Static => src/Fengling.ServiceDiscovery.Static}/src/Extensions/StaticServiceDiscoveryExtensions.cs (100%) rename {Fengling.ServiceDiscovery.Static => src/Fengling.ServiceDiscovery.Static}/src/StaticDiscoveryProvider.cs (100%) diff --git a/.gitea/workflows/nuget.yml b/.gitea/workflows/nuget.yml index b0d85f3..d482b9e 100644 --- a/.gitea/workflows/nuget.yml +++ b/.gitea/workflows/nuget.yml @@ -3,8 +3,8 @@ name: Publish ServiceDiscovery NuGet Packages on: push: branches: [main] - tags: - - "v*" + tags: + - "v*" env: GITEA_TOKEN: ${{ secrets.GITEATOKEN }} @@ -22,20 +22,24 @@ jobs: dotnet-version: "10.0.x" - name: Pack Core - if: startsWith(github.ref, "refs/tags/v") - run: dotnet pack Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj -c Release -o ./packages + if: startsWith(github.ref, 'refs/tags/v') + run: dotnet pack src/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj -c Release -o ./packages - name: Pack Kubernetes - if: startsWith(github.ref, "refs/tags/v") - run: dotnet pack Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj -c Release -o ./packages + if: startsWith(github.ref, 'refs/tags/v') + run: dotnet pack src/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj -c Release -o ./packages + + - name: Pack Consul + if: startsWith(github.ref, 'refs/tags/v') + run: dotnet pack src/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj -c Release -o ./packages - name: Pack Static - if: startsWith(github.ref, "refs/tags/v") - run: dotnet pack Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj -c Release -o ./packages + if: startsWith(github.ref, 'refs/tags/v') + run: dotnet pack src/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj -c Release -o ./packages - name: Push to Gitea - if: startsWith(github.ref, "refs/tags/v") + if: startsWith(github.ref, 'refs/tags/v') run: | for pkg in ./packages/*.nupkg; do dotnet nuget push "$pkg" --source "$GITEA_URL/gitea_registry/fengling/go/__index" --skip-duplicate - done \ No newline at end of file + done diff --git a/Directory.Packages.props b/Directory.Packages.props new file mode 100644 index 0000000..47c1439 --- /dev/null +++ b/Directory.Packages.props @@ -0,0 +1,16 @@ + + + + true + + + + + + + + + + + + diff --git a/Fengling.ServiceDiscovery.slnx b/Fengling.ServiceDiscovery.slnx new file mode 100644 index 0000000..436455b --- /dev/null +++ b/Fengling.ServiceDiscovery.slnx @@ -0,0 +1,12 @@ + + + + + + + + + + + + diff --git a/NuGet.Config b/NuGet.Config new file mode 100644 index 0000000..62a0353 --- /dev/null +++ b/NuGet.Config @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj b/src/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj similarity index 90% rename from Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj rename to src/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj index 809389c..7ef2335 100644 --- a/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj +++ b/src/Fengling.ServiceDiscovery.Consul/Fengling.ServiceDiscovery.Consul.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Fengling.ServiceDiscovery.Consul diff --git a/Fengling.ServiceDiscovery.Consul/src/ConsulDiscoveryProvider.cs b/src/Fengling.ServiceDiscovery.Consul/src/ConsulDiscoveryProvider.cs similarity index 100% rename from Fengling.ServiceDiscovery.Consul/src/ConsulDiscoveryProvider.cs rename to src/Fengling.ServiceDiscovery.Consul/src/ConsulDiscoveryProvider.cs diff --git a/Fengling.ServiceDiscovery.Consul/src/Extensions/ConsulServiceDiscoveryExtensions.cs b/src/Fengling.ServiceDiscovery.Consul/src/Extensions/ConsulServiceDiscoveryExtensions.cs similarity index 100% rename from Fengling.ServiceDiscovery.Consul/src/Extensions/ConsulServiceDiscoveryExtensions.cs rename to src/Fengling.ServiceDiscovery.Consul/src/Extensions/ConsulServiceDiscoveryExtensions.cs diff --git a/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj b/src/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj similarity index 93% rename from Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj rename to src/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj index 9c36c62..ebfed95 100644 --- a/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj +++ b/src/Fengling.ServiceDiscovery.Core/Fengling.ServiceDiscovery.Core.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Fengling.ServiceDiscovery diff --git a/Fengling.ServiceDiscovery.Core/src/Abstractions/IServiceDiscoveryProvider.cs b/src/Fengling.ServiceDiscovery.Core/src/Abstractions/IServiceDiscoveryProvider.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Abstractions/IServiceDiscoveryProvider.cs rename to src/Fengling.ServiceDiscovery.Core/src/Abstractions/IServiceDiscoveryProvider.cs diff --git a/Fengling.ServiceDiscovery.Core/src/Extensions/ServiceCollectionExtensions.cs b/src/Fengling.ServiceDiscovery.Core/src/Extensions/ServiceCollectionExtensions.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Extensions/ServiceCollectionExtensions.cs rename to src/Fengling.ServiceDiscovery.Core/src/Extensions/ServiceCollectionExtensions.cs diff --git a/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredInstance.cs b/src/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredInstance.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Models/DiscoveredInstance.cs rename to src/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredInstance.cs diff --git a/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredService.cs b/src/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredService.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Models/DiscoveredService.cs rename to src/Fengling.ServiceDiscovery.Core/src/Models/DiscoveredService.cs diff --git a/Fengling.ServiceDiscovery.Core/src/Models/HealthCheckResult.cs b/src/Fengling.ServiceDiscovery.Core/src/Models/HealthCheckResult.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Models/HealthCheckResult.cs rename to src/Fengling.ServiceDiscovery.Core/src/Models/HealthCheckResult.cs diff --git a/Fengling.ServiceDiscovery.Core/src/Models/ServiceDiscoveryChange.cs b/src/Fengling.ServiceDiscovery.Core/src/Models/ServiceDiscoveryChange.cs similarity index 100% rename from Fengling.ServiceDiscovery.Core/src/Models/ServiceDiscoveryChange.cs rename to src/Fengling.ServiceDiscovery.Core/src/Models/ServiceDiscoveryChange.cs diff --git a/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj b/src/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj similarity index 91% rename from Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj rename to src/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj index e50ba17..63b58fc 100644 --- a/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj +++ b/src/Fengling.ServiceDiscovery.Kubernetes/Fengling.ServiceDiscovery.Kubernetes.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Fengling.ServiceDiscovery.Kubernetes diff --git a/Fengling.ServiceDiscovery.Kubernetes/src/Extensions/KubernetesServiceDiscoveryExtensions.cs b/src/Fengling.ServiceDiscovery.Kubernetes/src/Extensions/KubernetesServiceDiscoveryExtensions.cs similarity index 100% rename from Fengling.ServiceDiscovery.Kubernetes/src/Extensions/KubernetesServiceDiscoveryExtensions.cs rename to src/Fengling.ServiceDiscovery.Kubernetes/src/Extensions/KubernetesServiceDiscoveryExtensions.cs diff --git a/Fengling.ServiceDiscovery.Kubernetes/src/KubernetesDiscoveryProvider.cs b/src/Fengling.ServiceDiscovery.Kubernetes/src/KubernetesDiscoveryProvider.cs similarity index 100% rename from Fengling.ServiceDiscovery.Kubernetes/src/KubernetesDiscoveryProvider.cs rename to src/Fengling.ServiceDiscovery.Kubernetes/src/KubernetesDiscoveryProvider.cs diff --git a/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj b/src/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj similarity index 88% rename from Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj rename to src/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj index bbcab0b..5ad3171 100644 --- a/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj +++ b/src/Fengling.ServiceDiscovery.Static/Fengling.ServiceDiscovery.Static.csproj @@ -1,7 +1,7 @@ - net8.0 + net10.0 enable enable Fengling.ServiceDiscovery.Static diff --git a/Fengling.ServiceDiscovery.Static/src/Extensions/StaticServiceDiscoveryExtensions.cs b/src/Fengling.ServiceDiscovery.Static/src/Extensions/StaticServiceDiscoveryExtensions.cs similarity index 100% rename from Fengling.ServiceDiscovery.Static/src/Extensions/StaticServiceDiscoveryExtensions.cs rename to src/Fengling.ServiceDiscovery.Static/src/Extensions/StaticServiceDiscoveryExtensions.cs diff --git a/Fengling.ServiceDiscovery.Static/src/StaticDiscoveryProvider.cs b/src/Fengling.ServiceDiscovery.Static/src/StaticDiscoveryProvider.cs similarity index 100% rename from Fengling.ServiceDiscovery.Static/src/StaticDiscoveryProvider.cs rename to src/Fengling.ServiceDiscovery.Static/src/StaticDiscoveryProvider.cs