Merge branch 'master' of https://github.com/izanhzh/Amos.Abp

# Conflicts: # framework/Directory.Build.props # framework/src/Amos.Abp.Domain/Amos.Abp.Domain.csproj # framework/src/Amos.Abp.EntityFrameworkCore/Amos.Abp.EntityFrameworkCore.csproj # framework/src/Amos.Abp.SqlScript/Amos.Abp.SqlScript.csproj # framework/src/Amos.Abp.TempTable/Amos.Abp.TempTable.csproj # framework/test/Amos.Abp.TestBase/Amos.Abp.TestBase.csproj
izanhzh · Dec 8, 2023 · 8ac2a66 · 8ac2a66
2 parents 2dc5af8 + bb27a3d
commit 8ac2a66
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/framework/src/Amos.Abp.EntityFrameworkCore/Amos.Abp.EntityFrameworkCore.csproj b/framework/src/Amos.Abp.EntityFrameworkCore/Amos.Abp.EntityFrameworkCore.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
 		<PackageReference Include="Volo.Abp.EntityFrameworkCore"/>

diff --git a/framework/src/Amos.Abp.SqlScript/Amos.Abp.SqlScript.csproj b/framework/src/Amos.Abp.SqlScript/Amos.Abp.SqlScript.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
 		<PackageReference Include="Scriban"/>

diff --git a/framework/src/Amos.Abp.TempTable/Amos.Abp.TempTable.csproj b/framework/src/Amos.Abp.TempTable/Amos.Abp.TempTable.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
 	<ItemGroup>
 		<PackageReference Include="Microsoft.Data.SqlClient"/>