From d32168012a1fdb0e140660b05f5a6dd40fd40b6e Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 19 Oct 2025 11:10:23 +0800
Subject: [PATCH 1/3] =?UTF-8?q?refactor:=20=E5=A2=9E=E5=8A=A0=E6=9D=A1?=
 =?UTF-8?q?=E4=BB=B6=E7=BC=96=E8=AF=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Version.props                             | 6 +++++-
 src/BootstrapBlazor/Directory.Build.props | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/Version.props b/Version.props
index 880090f8833..32cf0e61ed0 100644
--- a/Version.props
+++ b/Version.props
@@ -1,6 +1,10 @@
 <Project>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="$(VisualStudioVersion) == 17.0">
+    <RunTargetFramework>net9.0</RunTargetFramework>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(VisualStudioVersion) == 18.0">
     <RunTargetFramework>net10.0</RunTargetFramework>
   </PropertyGroup>
 
diff --git a/src/BootstrapBlazor/Directory.Build.props b/src/BootstrapBlazor/Directory.Build.props
index cdd40ac8d64..6da6c73db60 100644
--- a/src/BootstrapBlazor/Directory.Build.props
+++ b/src/BootstrapBlazor/Directory.Build.props
@@ -16,7 +16,11 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup>
+  <PropertyGroup Condition="$(VisualStudioVersion) == 17.0">
+    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+  </PropertyGroup>
+
+  <PropertyGroup Condition="$(VisualStudioVersion) == 18.0">
     <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
   </PropertyGroup>
 

From 03863c69033ec8b03defeb11c226859b1cba48e4 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 19 Oct 2025 11:24:19 +0800
Subject: [PATCH 2/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=96=B0=20Version=20?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E6=96=87=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Version.props                               |  2 ++
 src/BootstrapBlazor/Directory.Build.props   | 11 ++++-------
 src/BootstrapBlazor/Directory.Build.targets |  2 --
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/Version.props b/Version.props
index 32cf0e61ed0..5ebcea42f44 100644
--- a/Version.props
+++ b/Version.props
@@ -2,10 +2,12 @@
 
   <PropertyGroup Condition="$(VisualStudioVersion) == 17.0">
     <RunTargetFramework>net9.0</RunTargetFramework>
+    <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0</RunTargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup Condition="$(VisualStudioVersion) == 18.0">
     <RunTargetFramework>net10.0</RunTargetFramework>
+    <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</RunTargetFrameworks>
   </PropertyGroup>
 
 </Project>
diff --git a/src/BootstrapBlazor/Directory.Build.props b/src/BootstrapBlazor/Directory.Build.props
index 6da6c73db60..989ba5d9719 100644
--- a/src/BootstrapBlazor/Directory.Build.props
+++ b/src/BootstrapBlazor/Directory.Build.props
@@ -3,7 +3,8 @@
   <Import Project="..\Directory.Build.props" />
   <Import Project="..\Logo.props" />
   <Import Project="..\SourceLink.targets" />
-
+  <Import Project="..\..\Version.props" />
+  
   <PropertyGroup>
     <PackageTags>Bootstrap Blazor WebAssembly wasm UI Components</PackageTags>
     <Description>Bootstrap UI components for Blazor and Razor Components</Description>
@@ -16,12 +17,8 @@
     <IsPackable>true</IsPackable>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(VisualStudioVersion) == 17.0">
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="$(VisualStudioVersion) == 18.0">
-    <TargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</TargetFrameworks>
+  <PropertyGroup>
+    <TargetFrameworks>$(RunTargetFrameworks)</TargetFrameworks>
   </PropertyGroup>
 
   <PropertyGroup>
diff --git a/src/BootstrapBlazor/Directory.Build.targets b/src/BootstrapBlazor/Directory.Build.targets
index 19f16e932f0..023c943fe6f 100644
--- a/src/BootstrapBlazor/Directory.Build.targets
+++ b/src/BootstrapBlazor/Directory.Build.targets
@@ -1,7 +1,5 @@
 <Project>
 
-  <Import Project="..\..\Version.props" />
-
   <ItemGroup>
     <PackageReference Include="AspNetCore.SassCompiler" Version="1.93.2" Condition="'$(Configuration)'=='Debug' and '$(TargetFramework)' == '$(RunTargetFramework)'" />
   </ItemGroup>

From 738318f781f23286c49255418a5cbe26d737bce8 Mon Sep 17 00:00:00 2001
From: Argo Zhang <argo@live.ca>
Date: Sun, 19 Oct 2025 11:37:16 +0800
Subject: [PATCH 3/3] =?UTF-8?q?chore:=20=E6=9B=B4=E6=94=B9=E4=B8=BA?=
 =?UTF-8?q?=E5=AD=97=E7=AC=A6=E4=B8=B2=E6=AF=94=E8=BE=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Version.props | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Version.props b/Version.props
index 5ebcea42f44..d5e192cdc3a 100644
--- a/Version.props
+++ b/Version.props
@@ -1,11 +1,11 @@
 <Project>
 
-  <PropertyGroup Condition="$(VisualStudioVersion) == 17.0">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
     <RunTargetFramework>net9.0</RunTargetFramework>
     <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0</RunTargetFrameworks>
   </PropertyGroup>
 
-  <PropertyGroup Condition="$(VisualStudioVersion) == 18.0">
+  <PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
     <RunTargetFramework>net10.0</RunTargetFramework>
     <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</RunTargetFrameworks>
   </PropertyGroup>