🎨 sync proj structure

BeyondDimension · Jun 6, 2023 · e266c2a · e266c2a
1 parent 371a7b1
commit e266c2a
Show file tree

Hide file tree

Showing 60 changed files with 375 additions and 102 deletions.
diff --git a/BD.Common.sln b/BD.Common.sln
@@ -19,10 +19,12 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "_Root", "_Root", "{F221D7EA
 	ProjectSection(SolutionItems) = preProject
 		src\.editorconfig = src\.editorconfig
 		.gitignore = .gitignore
+		.gitmodules = .gitmodules
 		.github\workflows\CI.yml = .github\workflows\CI.yml
 		src\Directory.Build.props = src\Directory.Build.props
 		ref\DirectoryPackages\Directory.Packages.props = ref\DirectoryPackages\Directory.Packages.props
 		src\GeneratePackage.props = src\GeneratePackage.props
+		nuget.config = nuget.config
 		README.md = README.md
 	EndProjectSection
 EndProject
@@ -110,15 +112,15 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.DynamicHttpWindow
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TFM", "TFM", "{149E7C8E-7B18-4363-A327-B80B65DB74A9}"
 	ProjectSection(SolutionItems) = preProject
-		src\TFM_NET7.props = src\TFM_NET7.props
-		src\TFM_NET7_ANDROID.props = src\TFM_NET7_ANDROID.props
-		src\TFM_NET7_IOS.props = src\TFM_NET7_IOS.props
-		src\TFM_NET7_IOS_MACOS_MACCATALYST.props = src\TFM_NET7_IOS_MACOS_MACCATALYST.props
-		src\TFM_NET7_MAUI.props = src\TFM_NET7_MAUI.props
-		src\TFM_NET7_WINDOWS.props = src\TFM_NET7_WINDOWS.props
-		src\TFM_NET7_WITH_ALL.props = src\TFM_NET7_WITH_ALL.props
-		src\TFM_NET7_WITH_ANDROID.props = src\TFM_NET7_WITH_ANDROID.props
-		src\TFM_NET7_WITH_WINDOWS.props = src\TFM_NET7_WITH_WINDOWS.props
+		src\TFM_NETX.props = src\TFM_NETX.props
+		src\TFM_NETX_ANDROID.props = src\TFM_NETX_ANDROID.props
+		src\TFM_NETX_IOS.props = src\TFM_NETX_IOS.props
+		src\TFM_NETX_IOS_MACOS_MACCATALYST.props = src\TFM_NETX_IOS_MACOS_MACCATALYST.props
+		src\TFM_NETX_MAUI.props = src\TFM_NETX_MAUI.props
+		src\TFM_NETX_WINDOWS.props = src\TFM_NETX_WINDOWS.props
+		src\TFM_NETX_WITH_ALL.props = src\TFM_NETX_WITH_ALL.props
+		src\TFM_NETX_WITH_ANDROID.props = src\TFM_NETX_WITH_ANDROID.props
+		src\TFM_NETX_WITH_WINDOWS.props = src\TFM_NETX_WITH_WINDOWS.props
 	EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ImplicitUsings", "ImplicitUsings", "{78E65096-FE22-4E82-AB15-EB4CB986194B}"
@@ -178,7 +180,19 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.Settings.V4.Sourc
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.Settings.V4.SourceGenerator.Tools", "src\BD.Common.Settings.V4.SourceGenerator.Tools\BD.Common.Settings.V4.SourceGenerator.Tools.csproj", "{45B649C9-70DE-4D5A-B10A-2F1CA5F657BB}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BD.Common.AspNetCore.SourceGenerator", "src\BD.Common.AspNetCore.SourceGenerator\BD.Common.AspNetCore.SourceGenerator.csproj", "{7923D9C3-B2AC-4435-9065-17A6B6CD1B34}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.AspNetCore.SourceGenerator", "src\BD.Common.AspNetCore.SourceGenerator\BD.Common.AspNetCore.SourceGenerator.csproj", "{7923D9C3-B2AC-4435-9065-17A6B6CD1B34}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.Repositories.SourceGenerator.Annotations", "src\BD.Common.Repositories.SourceGenerator.Annotations\BD.Common.Repositories.SourceGenerator.Annotations.csproj", "{28C1F178-7080-48B3-93F5-45C4D38A3748}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BD.Common.Repositories.SourceGenerator", "src\BD.Common.Repositories.SourceGenerator\BD.Common.Repositories.SourceGenerator.csproj", "{1B63CB93-87E7-4158-9849-2FA09A139FC1}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SourceGenerator", "SourceGenerator", "{38AD83FC-B2FD-4458-ACEE-84B2B768FA6D}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Source", "Source", "{67F7A45D-E442-4F64-A2B1-776DFBC772BD}"
+	ProjectSection(SolutionItems) = preProject
+		src\Translate.cs = src\Translate.cs
+		src\Utils.cs = src\Utils.cs
+	EndProjectSection
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -354,6 +368,14 @@ Global
 		{7923D9C3-B2AC-4435-9065-17A6B6CD1B34}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{7923D9C3-B2AC-4435-9065-17A6B6CD1B34}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{7923D9C3-B2AC-4435-9065-17A6B6CD1B34}.Release|Any CPU.Build.0 = Release|Any CPU
+		{28C1F178-7080-48B3-93F5-45C4D38A3748}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{28C1F178-7080-48B3-93F5-45C4D38A3748}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{28C1F178-7080-48B3-93F5-45C4D38A3748}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{28C1F178-7080-48B3-93F5-45C4D38A3748}.Release|Any CPU.Build.0 = Release|Any CPU
+		{1B63CB93-87E7-4158-9849-2FA09A139FC1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{1B63CB93-87E7-4158-9849-2FA09A139FC1}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{1B63CB93-87E7-4158-9849-2FA09A139FC1}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{1B63CB93-87E7-4158-9849-2FA09A139FC1}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -390,7 +412,7 @@ Global
 		{41FCFFCC-CC2D-42E9-8289-D1FCE1864553} = {2396192B-A608-4B23-B05C-ED66885398A9}
 		{34A24725-D4B5-45B2-950B-DA1414715705} = {72184E2D-34EE-4E81-9008-1B2E4FC03972}
 		{149E7C8E-7B18-4363-A327-B80B65DB74A9} = {F221D7EA-7ADF-4F89-B2C9-6373E52D8731}
-		{78E65096-FE22-4E82-AB15-EB4CB986194B} = {F221D7EA-7ADF-4F89-B2C9-6373E52D8731}
+		{78E65096-FE22-4E82-AB15-EB4CB986194B} = {67F7A45D-E442-4F64-A2B1-776DFBC772BD}
 		{B3A960DC-6E46-48D3-A3AE-A77E1989504B} = {72184E2D-34EE-4E81-9008-1B2E4FC03972}
 		{6A660134-CEF5-4066-8A4E-B7543A2695C5} = {F221D7EA-7ADF-4F89-B2C9-6373E52D8731}
 		{1DDE0DE2-D729-4DAA-B61E-E6A200B11C00} = {F221D7EA-7ADF-4F89-B2C9-6373E52D8731}
@@ -399,6 +421,10 @@ Global
 		{668C6475-1857-4CCB-AF7D-C3FD96C3C88B} = {D47E3B6A-2AE8-4AD4-ABA4-9BC9750FAE9A}
 		{45B649C9-70DE-4D5A-B10A-2F1CA5F657BB} = {D47E3B6A-2AE8-4AD4-ABA4-9BC9750FAE9A}
 		{7923D9C3-B2AC-4435-9065-17A6B6CD1B34} = {AEF20BA0-D8EC-49EB-8050-440DE5933957}
+		{28C1F178-7080-48B3-93F5-45C4D38A3748} = {38AD83FC-B2FD-4458-ACEE-84B2B768FA6D}
+		{1B63CB93-87E7-4158-9849-2FA09A139FC1} = {38AD83FC-B2FD-4458-ACEE-84B2B768FA6D}
+		{38AD83FC-B2FD-4458-ACEE-84B2B768FA6D} = {09F764B5-4DB4-40B3-84B0-B9DD15AB69AA}
+		{67F7A45D-E442-4F64-A2B1-776DFBC772BD} = {F221D7EA-7ADF-4F89-B2C9-6373E52D8731}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {3ABA6CBD-C4DB-4300-B2A2-087D9B5C872A}

diff --git a/nuget.config b/nuget.config
@@ -0,0 +1,11 @@
+<configuration>
+	<!-- https://learn.microsoft.com/zh-cn/nuget/reference/nuget-config-file -->
+	<packageSources>
+		<!-- 👇 添加本地包源 LocalNuGetPackages -->
+		<!--<add key="LocalNuGetPackages_xxxx" value="./ref/pkg/xxxx" />-->
+		<!-- 👇 AvaloniaUI 每夜版 -->
+		<add key="avalonia-nightly" value="https://pkgs.dev.azure.com/AvaloniaUI/AvaloniaUI/_packaging/avalonia-all/nuget/v3/index.json" protocolVersion="3" />
+		<!-- 👇 GitHub 包源 https://docs.github.com/en/packages/working-with-a-github-packages-registry/working-with-the-nuget-registry -->
+		<!--<add key="github" value="https://nuget.pkg.github.com/BeyondDimension/index.json" />-->
+	</packageSources>
+</configuration>
diff --git a/src/.editorconfig b/src/.editorconfig
@@ -122,7 +122,7 @@ csharp_prefer_static_local_function = true
 csharp_preferred_modifier_order = public,private,protected,internal,static,extern,new,virtual,abstract,sealed,override,readonly,unsafe,volatile,async
 
 # 代码块首选项
-csharp_style_namespace_declarations=file_scoped:error
+csharp_style_namespace_declarations=file_scoped:suggestion
 csharp_prefer_braces = false
 csharp_prefer_simple_using_statement = true
 
@@ -282,7 +282,7 @@ dotnet_diagnostic.SA1633.severity = silent
 dotnet_diagnostic.SA1128.severity = silent
 
 # SA1413: Use trailing comma in multi-line initializers
-dotnet_diagnostic.SA1413.severity = error
+dotnet_diagnostic.SA1413.severity = suggestion
 
 # SA1005: Single line comments should begin with single space
 dotnet_diagnostic.SA1005.severity = none
@@ -482,39 +482,6 @@ dotnet_diagnostic.CS8604.severity = error
 # CA1829: 在可用时使用 Length/Count 属性而不是 Count()
 dotnet_diagnostic.CA1829.severity = error
 
-# CS8601: 引用类型赋值可能为 null。
-dotnet_diagnostic.CS8601.severity = error
-
-# CS8603: 可能返回 null 引用。
-dotnet_diagnostic.CS8603.severity = error
-
-# IDE0005: Using 指令是不需要的。
-dotnet_diagnostic.IDE0005.severity = error
-
-# CS8602: 解引用可能出现空引用。
-dotnet_diagnostic.CS8602.severity = error
-
-# CS8766: 返回类型中引用类型的为 Null 性与隐式实现的成员不匹配(可能是由于为 Null 性特性)。
-dotnet_diagnostic.CS8766.severity = error
-
-# CS8600: 将 null 字面量或可能为 null 的值转换为非 null 类型。
-dotnet_diagnostic.CS8600.severity = error
-
-# CS8767: 参数类型中引用类型的为 Null 性与隐式实现的成员不匹配(可能是由于为 Null 性特性)。
-dotnet_diagnostic.CS8767.severity = error
-
-# CS8625: 无法将 null 字面量转换为非 null 的引用类型。
-dotnet_diagnostic.CS8625.severity = error
-
-# CS8765: 参数类型的为 Null 性与重写成员不匹配(可能是由于为 Null 性特性)。
-dotnet_diagnostic.CS8765.severity = error
-
-# CS8619: 值中的引用类型的为 Null 性与目标类型不匹配。
-dotnet_diagnostic.CS8619.severity = error
-
-# CS8622: Nullability of reference types in type of parameter doesn't match the target delegate (possibly because of nullability attributes).
-dotnet_diagnostic.CS8622.severity = error
-
 # CA1846: 首选 “AsSpan” 而不是 “Substring”
 dotnet_diagnostic.CA1846.severity = error
 

diff --git a/src/BD.Common.Area.ConsoleTest/BD.Common.Area.ConsoleTest.csproj b/src/BD.Common.Area.ConsoleTest/BD.Common.Area.ConsoleTest.csproj
@@ -28,6 +28,6 @@
 		<ProjectReference Include="..\BD.Common.Settings.V4.SourceGenerator\BD.Common.Settings.V4.SourceGenerator.csproj" OutputItemType="Analyzer" ReferenceOutputAssembly="false" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7_WINDOWS.props" />
+	<Import Project="..\TFM_NETX_WINDOWS.props" />
 
 </Project>
diff --git a/src/BD.Common.Area/BD.Common.Area.csproj b/src/BD.Common.Area/BD.Common.Area.csproj
@@ -45,7 +45,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.AspNetCore.Blazor.BackManage/BD.Common.AspNetCore.Blazor.BackManage.csproj b/src/BD.Common.AspNetCore.Blazor.BackManage/BD.Common.AspNetCore.Blazor.BackManage.csproj
@@ -96,7 +96,7 @@
 		</Compile>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.AspNetCore.Identity.BackManage/BD.Common.AspNetCore.Identity.BackManage.csproj b/src/BD.Common.AspNetCore.Identity.BackManage/BD.Common.AspNetCore.Identity.BackManage.csproj
@@ -64,7 +64,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.AspNetCore.Identity/BD.Common.AspNetCore.Identity.csproj b/src/BD.Common.AspNetCore.Identity/BD.Common.AspNetCore.Identity.csproj
@@ -63,7 +63,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.AspNetCore/BD.Common.AspNetCore.csproj b/src/BD.Common.AspNetCore/BD.Common.AspNetCore.csproj
@@ -53,7 +53,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.BirthDate/BD.Common.BirthDate.csproj b/src/BD.Common.BirthDate/BD.Common.BirthDate.csproj
@@ -38,7 +38,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/....DynamicHttpWindowsProxy.ConsoleTest/BD.Common.DynamicHttpWindowsProxy.ConsoleTest.csproj b/....DynamicHttpWindowsProxy.ConsoleTest/BD.Common.DynamicHttpWindowsProxy.ConsoleTest.csproj
@@ -9,6 +9,6 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7_WINDOWS.props" />
+	<Import Project="..\TFM_NETX_WINDOWS.props" />
 
 </Project>
diff --git a/src/BD.Common.EFCore/BD.Common.EFCore.csproj b/src/BD.Common.EFCore/BD.Common.EFCore.csproj
@@ -43,7 +43,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.EFCore/Extensions/QueryableExtensions.Paging.cs b/src/BD.Common.EFCore/Extensions/QueryableExtensions.Paging.cs
@@ -32,7 +32,7 @@ public static async Task<PagedModel<TEntity>> PagingAsync<TEntity>(
             var futureTotal = source.DeferredCount().FutureValue();
             query = source.Skip(skipCount).Take(pageSize);
 #if DEBUG
-        var sqlString = query.ToQueryString();
+            var sqlString = query.ToQueryString();
 #endif
             var futureDataSource = query.Future();
             total = await futureTotal.ValueAsync(cancellationToken);
@@ -51,7 +51,7 @@ public static async Task<PagedModel<TEntity>> PagingAsync<TEntity>(
         total = await source.CountAsync(cancellationToken);
         query = source.Skip(skipCount).Take(pageSize);
 #if DEBUG
-        var sqlString = query.ToQueryString();
+        var sqlString2 = query.ToQueryString();
 #endif
         dataSource = await query.ToArrayAsync(cancellationToken);
         pagedModel = new PagedModel<TEntity>

diff --git a/src/BD.Common.Essentials.Maui/BD.Common.Essentials.Maui.csproj b/src/BD.Common.Essentials.Maui/BD.Common.Essentials.Maui.csproj
@@ -42,7 +42,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7_MAUI.props" />
+	<Import Project="..\TFM_NETX_MAUI.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Essentials.Preferences.DBreeze/BD.Common.Essentials.Preferences.DBreeze.csproj b/src/BD.Common.Essentials.Preferences.DBreeze/BD.Common.Essentials.Preferences.DBreeze.csproj
@@ -48,7 +48,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>

diff --git a/src/BD.Common.Essentials.Preferences.SQLite/BD.Common.Essentials.Preferences.SQLite.csproj b/src/BD.Common.Essentials.Preferences.SQLite/BD.Common.Essentials.Preferences.SQLite.csproj
@@ -34,7 +34,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>

diff --git a/src/BD.Common.Essentials.Primitives/BD.Common.Essentials.Primitives.csproj b/src/BD.Common.Essentials.Primitives/BD.Common.Essentials.Primitives.csproj
@@ -27,7 +27,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Essentials.Utils/BD.Common.Essentials.Utils.csproj b/src/BD.Common.Essentials.Utils/BD.Common.Essentials.Utils.csproj
@@ -30,7 +30,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>

diff --git a/src/BD.Common.Essentials.Xamarin/BD.Common.Essentials.Xamarin.csproj b/src/BD.Common.Essentials.Xamarin/BD.Common.Essentials.Xamarin.csproj
@@ -40,7 +40,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Essentials/BD.Common.Essentials.csproj b/src/BD.Common.Essentials/BD.Common.Essentials.csproj
@@ -28,7 +28,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.ModelValidator/BD.Common.ModelValidator.csproj b/src/BD.Common.ModelValidator/BD.Common.ModelValidator.csproj
@@ -50,7 +50,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Mvvm.ReactiveUI/BD.Common.Mvvm.ReactiveUI.csproj b/src/BD.Common.Mvvm.ReactiveUI/BD.Common.Mvvm.ReactiveUI.csproj
@@ -24,7 +24,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Mvvm/BD.Common.Mvvm.csproj b/src/BD.Common.Mvvm/BD.Common.Mvvm.csproj
@@ -15,7 +15,7 @@
 		<PackageReference Include="fusillade" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7_WITH_ALL.props" />
+	<Import Project="..\TFM_NETX_WITH_ALL.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Navigation/BD.Common.Navigation.csproj b/src/BD.Common.Navigation/BD.Common.Navigation.csproj
@@ -17,7 +17,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.PhoneNumber/BD.Common.PhoneNumber.csproj b/src/BD.Common.PhoneNumber/BD.Common.PhoneNumber.csproj
@@ -38,7 +38,7 @@
 		</EmbeddedResource>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Pinyin.CFStringTransform/BD.Common.Pinyin.CFStringTransform.csproj b/src/BD.Common.Pinyin.CFStringTransform/BD.Common.Pinyin.CFStringTransform.csproj
@@ -25,7 +25,7 @@
 		<ProjectReference Include="..\BD.Common\BD.Common.csproj" />
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7_IOS_MACOS_MACCATALYST.props" />
+	<Import Project="..\TFM_NETX_IOS_MACOS_MACCATALYST.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>
diff --git a/src/BD.Common.Pinyin.ChnCharInfo/BD.Common.Pinyin.ChnCharInfo.csproj b/src/BD.Common.Pinyin.ChnCharInfo/BD.Common.Pinyin.ChnCharInfo.csproj
@@ -31,7 +31,7 @@
 		</Reference>
 	</ItemGroup>
 
-	<Import Project="..\TFM_NET7.props" />
+	<Import Project="..\TFM_NETX.props" />
 	<Import Project="..\GeneratePackage.props" />
 
 </Project>