From e5d49d92d3ef607ff74f8bc4bcd676193a7d3395 Mon Sep 17 00:00:00 2001 From: qinware Date: Sun, 31 Aug 2025 10:10:56 +0800 Subject: [PATCH] Refactor TargetFrameworks config --- .github/workflows/release-atomui.yml | 6 ++++-- build/Common.props | 3 +++ packages/AtomUI/AtomUI.csproj | 2 +- scripts/PublishToLocalSources.ps1 | 3 +++ src/AtomUI.Base/AtomUI.Base.csproj | 2 +- .../AtomUI.Controls.ColorPicker.csproj | 2 +- .../AtomUI.Controls.DataGrid.csproj | 2 +- src/AtomUI.Controls/AtomUI.Controls.csproj | 2 +- .../AtomUI.IconPkg.AntDesign.csproj | 2 +- src/AtomUI.IconPkg/AtomUI.IconPkg.csproj | 2 +- src/AtomUI.Native/AtomUI.Native.csproj | 2 +- src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj | 2 +- src/AtomUI.Theme/AtomUI.Theme.csproj | 2 +- tests/AtomUI.Base.Tests/AtomUI.Base.Tests.csproj | 2 +- tests/AtomUI.TestBase/AtomUI.TestBase.csproj | 2 +- 15 files changed, 22 insertions(+), 14 deletions(-) diff --git a/.github/workflows/release-atomui.yml b/.github/workflows/release-atomui.yml index 09238d608..8613ab0da 100644 --- a/.github/workflows/release-atomui.yml +++ b/.github/workflows/release-atomui.yml @@ -68,14 +68,16 @@ jobs: Write-Error "push $($pkg.Name) error: $_" } } - - name: Build AtomUI.Controls.DataGrid projects + - name: Build AtomUI Extensions projects shell: pwsh run: | dotnet build --configuration ${{ inputs.BuildConfiguration }} ./src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj - - name: Create AtomUI.Controls.DataGrid NuGet packages + dotnet build --configuration ${{ inputs.BuildConfiguration }} ./src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj + - name: Create AtomUI Extensions NuGet packages shell: pwsh run: | dotnet pack --no-build --output $env:BASE_OUTPUT_DIR --configuration ${{ inputs.BuildConfiguration }} ./src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj + dotnet pack --no-build --output $env:BASE_OUTPUT_DIR --configuration ${{ inputs.BuildConfiguration }} ./src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj - name: Upload NuGet artifacts uses: actions/upload-artifact@v4.6.2 with: diff --git a/build/Common.props b/build/Common.props index 8932faff4..13fba931a 100644 --- a/build/Common.props +++ b/build/Common.props @@ -7,6 +7,9 @@ Debug false + $(AtomUIDevelopTargetFramework) + $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + false diff --git a/packages/AtomUI/AtomUI.csproj b/packages/AtomUI/AtomUI.csproj index b905eb5ce..ecc92aa8b 100644 --- a/packages/AtomUI/AtomUI.csproj +++ b/packages/AtomUI/AtomUI.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) enable enable AtomUI diff --git a/scripts/PublishToLocalSources.ps1 b/scripts/PublishToLocalSources.ps1 index aeff56011..9e3d15655 100644 --- a/scripts/PublishToLocalSources.ps1 +++ b/scripts/PublishToLocalSources.ps1 @@ -58,6 +58,9 @@ if (!$nativeOnly) { dotnet build -v diag --configuration $buildType ../src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj dotnet pack --no-build --configuration $buildType ../src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj + dotnet build -v diag --configuration $buildType ../src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj + dotnet pack --no-build --configuration $buildType ../src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj + Push-NuGetPackages -Source $localSourcesDir } diff --git a/src/AtomUI.Base/AtomUI.Base.csproj b/src/AtomUI.Base/AtomUI.Base.csproj index 1d151bf85..b7f6d4ae0 100644 --- a/src/AtomUI.Base/AtomUI.Base.csproj +++ b/src/AtomUI.Base/AtomUI.Base.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) AtomUI true diff --git a/src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj b/src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj index ae1e8058d..3b8128a9d 100644 --- a/src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj +++ b/src/AtomUI.Controls.ColorPicker/AtomUI.Controls.ColorPicker.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) enable enable true diff --git a/src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj b/src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj index 7c2492d0c..5765905c6 100644 --- a/src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj +++ b/src/AtomUI.Controls.DataGrid/AtomUI.Controls.DataGrid.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) enable enable true diff --git a/src/AtomUI.Controls/AtomUI.Controls.csproj b/src/AtomUI.Controls/AtomUI.Controls.csproj index 732240084..fc440725e 100644 --- a/src/AtomUI.Controls/AtomUI.Controls.csproj +++ b/src/AtomUI.Controls/AtomUI.Controls.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) true GeneratedFiles AtomUI.Controls diff --git a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj index 2cfef2c7b..06e627f09 100644 --- a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj +++ b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) enable enable diff --git a/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj b/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj index a6b288b11..21d9da467 100644 --- a/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj +++ b/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) diff --git a/src/AtomUI.Native/AtomUI.Native.csproj b/src/AtomUI.Native/AtomUI.Native.csproj index a3bbfa29d..b36ae86be 100644 --- a/src/AtomUI.Native/AtomUI.Native.csproj +++ b/src/AtomUI.Native/AtomUI.Native.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) enable enable true diff --git a/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj b/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj index 09b9c4f14..3b4520270 100644 --- a/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj +++ b/src/AtomUI.ReactiveUI/AtomUI.ReactiveUI.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) AtomUI.ReactiveUI diff --git a/src/AtomUI.Theme/AtomUI.Theme.csproj b/src/AtomUI.Theme/AtomUI.Theme.csproj index c699ea6c9..083b60041 100644 --- a/src/AtomUI.Theme/AtomUI.Theme.csproj +++ b/src/AtomUI.Theme/AtomUI.Theme.csproj @@ -1,7 +1,7 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) true GeneratedFiles diff --git a/tests/AtomUI.Base.Tests/AtomUI.Base.Tests.csproj b/tests/AtomUI.Base.Tests/AtomUI.Base.Tests.csproj index d44925abf..30489191c 100644 --- a/tests/AtomUI.Base.Tests/AtomUI.Base.Tests.csproj +++ b/tests/AtomUI.Base.Tests/AtomUI.Base.Tests.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks) diff --git a/tests/AtomUI.TestBase/AtomUI.TestBase.csproj b/tests/AtomUI.TestBase/AtomUI.TestBase.csproj index 4be4ef793..d4ba373b7 100644 --- a/tests/AtomUI.TestBase/AtomUI.TestBase.csproj +++ b/tests/AtomUI.TestBase/AtomUI.TestBase.csproj @@ -1,6 +1,6 @@  - $(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework) + $(AtomUITargetFrameworks)