From 092a8cb8fa2ec01e65fdad31a1bb70e917d8df5d Mon Sep 17 00:00:00 2001
From: chinboy <chinboy@qinware.com>
Date: Fri, 14 Feb 2025 12:12:42 +0800
Subject: [PATCH] Refactor TargetFramework version

---
 build/Common.props                                          | 6 +++++-
 global.json                                                 | 2 +-
 packages/AtomUI/AtomUI.csproj                               | 5 +----
 src/AtomUI.Base/AtomUI.Base.csproj                          | 1 -
 src/AtomUI.Controls/AtomUI.Controls.csproj                  | 1 -
 .../AtomUI.IconPkg.AntDesign.csproj                         | 1 -
 src/AtomUI.IconPkg/AtomUI.IconPkg.csproj                    | 6 ------
 src/AtomUI.Native/AtomUI.Native.csproj                      | 1 -
 src/AtomUI.Theme/AtomUI.Theme.csproj                        | 1 -
 9 files changed, 7 insertions(+), 17 deletions(-)

diff --git a/build/Common.props b/build/Common.props
index 7716e0f99..83ebfc5b4 100644
--- a/build/Common.props
+++ b/build/Common.props
@@ -1,6 +1,10 @@
 <Project>
     <PropertyGroup>
-        <AtomUICurrentTargetFramework>net8.0</AtomUICurrentTargetFramework>
+        <AtomUIDevelopTargetFramework>net9.0</AtomUIDevelopTargetFramework>
+        <AtomUIProductionTargetFramework>net8.0</AtomUIProductionTargetFramework>
+        <TargetFrameworks>$(AtomUIDevelopTargetFramework);$(AtomUIProductionTargetFramework)</TargetFrameworks>
+        <TargetFramework Condition="'$(Configuration)' == 'Debug'">$(AtomUIDevelopTargetFramework)</TargetFramework>
+        <TargetFramework Condition="'$(Configuration)' != 'Debug'">$(AtomUIProductionTargetFramework)</TargetFramework>
         <OutputType>Library</OutputType>
         <TrimMode>copyused</TrimMode>
         <BuiltInComInteropSupport>false</BuiltInComInteropSupport>
diff --git a/global.json b/global.json
index 4e08f9588..6af5c64fc 100644
--- a/global.json
+++ b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
     "version": "8.0.300",
-    "rollForward": "latestFeature"
+    "rollForward": "latestMajor"
   }
 }
\ No newline at end of file
diff --git a/packages/AtomUI/AtomUI.csproj b/packages/AtomUI/AtomUI.csproj
index 99ed5141b..e8dd4d4d3 100644
--- a/packages/AtomUI/AtomUI.csproj
+++ b/packages/AtomUI/AtomUI.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <Import Project="$(MSBuildThisFileDirectory)../../build/Common.props"/>
-    <Import Project="$(MSBuildThisFileDirectory)../../build/PackageMetaInfo.props"/>
+    
     <Import Project="$(MSBuildThisFileDirectory)../../build/AtomUINativePackageInfo.props"/>
 
     <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <RootNamespace>AtomUI</RootNamespace>
diff --git a/src/AtomUI.Base/AtomUI.Base.csproj b/src/AtomUI.Base/AtomUI.Base.csproj
index 2ef59e3a1..322a11689 100644
--- a/src/AtomUI.Base/AtomUI.Base.csproj
+++ b/src/AtomUI.Base/AtomUI.Base.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
         <RootNamespace>AtomUI</RootNamespace>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     </PropertyGroup>
diff --git a/src/AtomUI.Controls/AtomUI.Controls.csproj b/src/AtomUI.Controls/AtomUI.Controls.csproj
index 0209964ac..5d31dad1c 100644
--- a/src/AtomUI.Controls/AtomUI.Controls.csproj
+++ b/src/AtomUI.Controls/AtomUI.Controls.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <CompilerGeneratedFilesOutputPath>GeneratedFiles</CompilerGeneratedFilesOutputPath>
     </PropertyGroup>
diff --git a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj
index 9b2792716..f8fa22672 100644
--- a/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj
+++ b/src/AtomUI.IconPkg.AntDesign/AtomUI.IconPkg.AntDesign.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
     </PropertyGroup>
diff --git a/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj b/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj
index 678b10cc6..5b4ae13dc 100644
--- a/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj
+++ b/src/AtomUI.IconPkg/AtomUI.IconPkg.csproj
@@ -1,10 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-    <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
-        <RootNamespace>AtomUI.IconPkg</RootNamespace>
-    </PropertyGroup>
-
     <ItemGroup>
         <PackageReference Include="Avalonia"/>
     </ItemGroup>
diff --git a/src/AtomUI.Native/AtomUI.Native.csproj b/src/AtomUI.Native/AtomUI.Native.csproj
index 6586fb70e..aec641a46 100644
--- a/src/AtomUI.Native/AtomUI.Native.csproj
+++ b/src/AtomUI.Native/AtomUI.Native.csproj
@@ -2,7 +2,6 @@
     <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk"/>
     <Import Project="$(MSBuildThisFileDirectory)../../build/AtomUINativePackageInfo.props"/>
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
diff --git a/src/AtomUI.Theme/AtomUI.Theme.csproj b/src/AtomUI.Theme/AtomUI.Theme.csproj
index 1274ab7d3..2384fe895 100644
--- a/src/AtomUI.Theme/AtomUI.Theme.csproj
+++ b/src/AtomUI.Theme/AtomUI.Theme.csproj
@@ -1,7 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>$(AtomUICurrentTargetFramework)</TargetFramework>
         <EmitCompilerGeneratedFiles>true</EmitCompilerGeneratedFiles>
         <CompilerGeneratedFilesOutputPath>GeneratedFiles</CompilerGeneratedFilesOutputPath>
     </PropertyGroup>