mirror of
				https://github.com/nsnail/FreeSql.git
				synced 2025-11-04 09:15:27 +08:00 
			
		
		
		
	Merge branch 'master' of https://github.com/2881099/FreeSql
This commit is contained in:
		@@ -23,7 +23,7 @@
 | 
				
			|||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
		<None Include="../../readme.md" Pack="true" PackagePath="\"/>
 | 
							<None Include="../../readme.md" Pack="true" PackagePath="\" />
 | 
				
			||||||
		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
							<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -31,7 +31,7 @@
 | 
				
			|||||||
		<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.32" />
 | 
							<PackageReference Include="Microsoft.Extensions.Http" Version="3.1.32" />
 | 
				
			||||||
		<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 | 
							<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
 | 
				
			||||||
		<PackageReference Include="CsvHelper" Version="30.0.1" />
 | 
							<PackageReference Include="CsvHelper" Version="30.0.1" />
 | 
				
			||||||
		<PackageReference Include="Npgsql" Version="5.0.11" />
 | 
							<PackageReference Include="Npgsql" Version="5.0.18" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,15 +23,15 @@
 | 
				
			|||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
		<None Include="../../readme.md" Pack="true" PackagePath="\"/>
 | 
							<None Include="../../readme.md" Pack="true" PackagePath="\" />
 | 
				
			||||||
		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
							<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
 | 
						<ItemGroup Condition="'$(TargetFramework)' == 'net451'">
 | 
				
			||||||
		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 | 
							<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
	<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
 | 
						<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net8.0' or '$(TargetFramework)' == 'net7.0' or '$(TargetFramework)' == 'net6.0'">
 | 
				
			||||||
		<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.4" />
 | 
							<PackageReference Include="Microsoft.Data.SqlClient" Version="2.1.7" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,12 +23,12 @@
 | 
				
			|||||||
	</PropertyGroup>
 | 
						</PropertyGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
		<None Include="../../readme.md" Pack="true" PackagePath="\"/>
 | 
							<None Include="../../readme.md" Pack="true" PackagePath="\" />
 | 
				
			||||||
		<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
							<None Include="../../logo.png" Pack="true" PackagePath="\" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup Condition="'$(TargetFramework)' != 'net45' and '$(TargetFramework)' != 'net40'">
 | 
						<ItemGroup Condition="'$(TargetFramework)' != 'net45' and '$(TargetFramework)' != 'net40'">
 | 
				
			||||||
		<PackageReference Include="System.Data.SqlClient" Version="4.8.5" />
 | 
							<PackageReference Include="System.Data.SqlClient" Version="4.8.6" />
 | 
				
			||||||
	</ItemGroup>
 | 
						</ItemGroup>
 | 
				
			||||||
 | 
					
 | 
				
			||||||
	<ItemGroup>
 | 
						<ItemGroup>
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user