Merge branch 'master' into develop

# Conflicts: # sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
EasyAbp · Dec 29, 2021 · 03f3b29 · 03f3b29
2 parents 35ff330 + f123568
commit 03f3b29
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/sample/MyAbpApp/src/MyAbpApp.DbMigrator/appsettings.json b/sample/MyAbpApp/src/MyAbpApp.DbMigrator/appsettings.json
@@ -1,6 +1,6 @@
 {
   "ConnectionStrings": {
-    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyAbpApp;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyAbpApp;Trusted_Connection=True"
   },
   "IdentityServer": {
     "Clients": {

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpApp.Web.csproj
@@ -33,10 +33,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" />
     <PackageReference Include="Serilog.AspNetCore" Version="3.2.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="6.0.*" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs b/sample/MyAbpApp/src/MyAbpApp.Web/MyAbpAppWebModule.cs
@@ -226,6 +226,7 @@ public override void OnApplicationInitialization(ApplicationInitializationContex
                 app.UseMultiTenancy();
             }
 
+            app.UseUnitOfWork();
             app.UseIdentityServer();
             app.UseAuthorization();
             app.UseSwagger();

diff --git a/sample/MyAbpApp/src/MyAbpApp.Web/appsettings.json b/sample/MyAbpApp/src/MyAbpApp.Web/appsettings.json
@@ -3,7 +3,7 @@
     "SelfUrl": "https://localhost:44336"
   },
   "ConnectionStrings": {
-    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyAbpApp;Trusted_Connection=True;MultipleActiveResultSets=true"
+    "Default": "Server=(LocalDb)\\MSSQLLocalDB;Database=MyAbpApp;Trusted_Connection=True"
   },
   "AuthServer": {
     "Authority": "https://localhost:44336",