diff --git a/BootstrapBlazor.slnx b/BootstrapBlazor.slnx
index 661d0952e28..6ae2706fd52 100644
--- a/BootstrapBlazor.slnx
+++ b/BootstrapBlazor.slnx
@@ -9,10 +9,7 @@
   <Folder Name="/configuration/">
     <File Path=".editorconfig" />
     <File Path=".gitignore" />
-    <File Path="Directory.Build.props" />
     <File Path="exclusion.dic" />
-    <File Path="Framework.props" />
-    <File Path="Version.props" />
   </Folder>
   <Folder Name="/docs/">
     <File Path="README.md" />
@@ -28,6 +25,11 @@
     <File Path="localization/uk-UA.json" />
     <File Path="localization/zh-TW.json" />
   </Folder>
+  <Folder Name="/props/">
+    <File Path="Directory.Build.props" />
+    <File Path="Framework.props" />
+    <File Path="Version.props" />
+  </Folder>
   <Folder Name="/scripts/" />
   <Folder Name="/scripts/linux/">
     <File Path="scripts/linux/ba.blazor.service" />
@@ -55,12 +57,20 @@
     <Project Path="src/BootstrapBlazor.Server/BootstrapBlazor.Server.csproj" />
     <Project Path="src/BootstrapBlazor/BootstrapBlazor.csproj" />
   </Folder>
+  <Folder Name="/src/props/">
+    <File Path="src/Directory.Build.props" />
+    <File Path="src/Logo.props" />
+    <File Path="src/SourceLink.targets" />
+  </Folder>
   <Folder Name="/test/">
     <Project Path="test/UniTest.Sass/UniTest.Sass.csproj" />
     <Project Path="test/UnitTest.Localization/UnitTest.Localization.csproj" />
     <Project Path="test/UnitTest/UnitTest.csproj" />
     <Project Path="test/UnitTestDocs/UnitTestDocs.csproj" />
   </Folder>
+  <Folder Name="/test/props/">
+    <File Path="test/Directory.Build.props" />
+  </Folder>
   <Folder Name="/tools/">
     <Project Path="tools/Benchmarks/UnitTest.Benchmarks.csproj" />
   </Folder>
diff --git a/Version.props b/Version.props
index d5e192cdc3a..a39d9af4200 100644
--- a/Version.props
+++ b/Version.props
@@ -1,11 +1,6 @@
 <Project>
 
-  <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>
     <RunTargetFramework>net10.0</RunTargetFramework>
     <RunTargetFrameworks>net6.0;net7.0;net8.0;net9.0;net10.0</RunTargetFrameworks>
   </PropertyGroup>
diff --git a/src/BootstrapBlazor/BootstrapBlazor.csproj b/src/BootstrapBlazor/BootstrapBlazor.csproj
index c64dd357097..59d168bf912 100644
--- a/src/BootstrapBlazor/BootstrapBlazor.csproj
+++ b/src/BootstrapBlazor/BootstrapBlazor.csproj
@@ -1,11 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.Razor">
 
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '17.0'">
-    <Version>9.12.2-beta03</Version>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(VisualStudioVersion)' == '18.0'">
-    <Version>10.0.0-rc.2.2.5</Version>
+  <PropertyGroup>
+    <Version>10.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/test/Directory.Build.props b/test/Directory.Build.props
index d7452664327..6806e997142 100644
--- a/test/Directory.Build.props
+++ b/test/Directory.Build.props
@@ -9,11 +9,20 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Using Include="BootstrapBlazor.Components"/>
-    <Using Include="Bunit"/>
-    <Using Include="Microsoft.AspNetCore.Components"/>
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
+    <PackageReference Include="xunit" Version="2.*" />
+    <PackageReference Include="xunit.runner.visualstudio" Version="2.*">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+    <PackageReference Include="coverlet.collector" Version="6.*">
+      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+      <PrivateAssets>all</PrivateAssets>
+    </PackageReference>
+  </ItemGroup>
+
+  <ItemGroup>
     <Using Include="System.Diagnostics.CodeAnalysis"/>
-    <Using Include="UnitTest.Core"/>
     <Using Include="Xunit"/>
     <Using Include="Xunit.Abstractions"/>
   </ItemGroup>
diff --git a/test/UniTest.Sass/UniTest.Sass.csproj b/test/UniTest.Sass/UniTest.Sass.csproj
index 2d959a0f4f7..61718a1f874 100644
--- a/test/UniTest.Sass/UniTest.Sass.csproj
+++ b/test/UniTest.Sass/UniTest.Sass.csproj
@@ -1,23 +1,3 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="xunit" Version="2.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
-  <ItemGroup>
-    <Using Remove="BootstrapBlazor.Components" />
-    <Using Remove="Bunit" />
-    <Using Remove="Microsoft.AspNetCore.Components" />
-    <Using Remove="UnitTest.Core" />
-  </ItemGroup>
-
 </Project>
diff --git a/test/UnitTest.Localization/UnitTest.Localization.csproj b/test/UnitTest.Localization/UnitTest.Localization.csproj
index 353724a6184..e575f67ab61 100644
--- a/test/UnitTest.Localization/UnitTest.Localization.csproj
+++ b/test/UnitTest.Localization/UnitTest.Localization.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <Compile Include="..\..\src\BootstrapBlazor.Server\Data\Foo.cs" Link="Mics\Foo.cs" />
@@ -9,16 +9,6 @@
 
   <ItemGroup>
     <PackageReference Include="bunit" Version="1.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="xunit" Version="2.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -40,4 +30,11 @@
     <ProjectReference Include="..\..\src\BootstrapBlazor\BootstrapBlazor.csproj" />
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="BootstrapBlazor.Components"/>
+    <Using Include="Bunit"/>
+    <Using Include="Microsoft.AspNetCore.Components"/>
+    <Using Include="UnitTest.Core"/>
+  </ItemGroup>
+
 </Project>
diff --git a/test/UnitTest/UnitTest.csproj b/test/UnitTest/UnitTest.csproj
index 89333e84506..a9648e62187 100644
--- a/test/UnitTest/UnitTest.csproj
+++ b/test/UnitTest/UnitTest.csproj
@@ -1,18 +1,8 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <ItemGroup>
     <PackageReference Include="bunit" Version="1.*" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.*" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="xunit" Version="2.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="3.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>
@@ -58,4 +48,11 @@
     </None>
   </ItemGroup>
 
+  <ItemGroup>
+    <Using Include="BootstrapBlazor.Components"/>
+    <Using Include="Bunit"/>
+    <Using Include="Microsoft.AspNetCore.Components"/>
+    <Using Include="UnitTest.Core"/>
+  </ItemGroup>
+  
 </Project>
diff --git a/test/UnitTestDocs/UnitTestDocs.csproj b/test/UnitTestDocs/UnitTestDocs.csproj
index 39f45675c3a..4ccdb4a5ec3 100644
--- a/test/UnitTestDocs/UnitTestDocs.csproj
+++ b/test/UnitTestDocs/UnitTestDocs.csproj
@@ -1,28 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
-  <PropertyGroup>
-    <IsPackable>false</IsPackable>
-    <IsTestProject>true</IsTestProject>
-  </PropertyGroup>
-
   <ItemGroup>
     <Compile Include="..\..\src\BootstrapBlazor.Server\Extensions\MenusLocalizerExtensions.cs" Link="Extensions\MenusLocalizerExtensions.cs" />
     <Compile Include="..\..\src\BootstrapBlazor.Server\Services\MenuService.cs" Link="Services\MenuService.cs" />
   </ItemGroup>
 
-  <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.*" />
-    <PackageReference Include="xunit" Version="2.*" />
-    <PackageReference Include="xunit.runner.visualstudio" Version="2.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.*">
-      <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
-      <PrivateAssets>all</PrivateAssets>
-    </PackageReference>
-  </ItemGroup>
-
   <ItemGroup>
     <Using Include="BootstrapBlazor.Components" />
     <Using Include="BootstrapBlazor.Server.Components" />
@@ -32,8 +14,6 @@
     <Using Include="Microsoft.AspNetCore.Components" />
     <Using Include="Microsoft.Extensions.Localization" />
     <Using Include="System.ComponentModel.DataAnnotations" />
-    <Using Remove="Bunit" />
-    <Using Remove="UnitTest.Core" />
   </ItemGroup>
 
   <ItemGroup>