Skip to content

Commit f2a0bc7

Browse files
1. app.UseDatabaseErrorPage -> services.AddDatabaseDeveloperPageExceptionFilter
2. Add Microsoft.Extensions.Configuration for AddInMemoryCollection extension 3. Add #pragma warning disable EF1001 // Internal EF Core API usage to ServicesTests 4. Update MigratorMock GenerateScript 5. Change throw ex to throw for Re-throwing caught exception changes stack information Successful build
1 parent 18c9766 commit f2a0bc7

File tree

10 files changed

+26
-21
lines changed

10 files changed

+26
-21
lines changed

samples/ApplicationParts/ApplicationParts.Web/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,14 @@ public void ConfigureServices(IServiceCollection services)
4848

4949
services.AddTransient<IEmailSender, AuthMessageSender>();
5050
services.AddTransient<ISmsSender, AuthMessageSender>();
51+
services.AddDatabaseDeveloperPageExceptionFilter();
5152
}
5253

5354
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
5455
{
5556
if (env.IsDevelopment())
5657
{
5758
app.UseDeveloperExceptionPage();
58-
app.UseDatabaseErrorPage();
5959
}
6060
else
6161
{

samples/Blog/Blog.Web/Startup.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,14 +66,14 @@ public void ConfigureServices(IServiceCollection services)
6666
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
6767

6868
services.AddRazorPages();
69+
services.AddDatabaseDeveloperPageExceptionFilter();
6970
}
7071

7172
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
7273
{
7374
if (env.IsDevelopment())
7475
{
7576
app.UseDeveloperExceptionPage();
76-
app.UseDatabaseErrorPage();
7777
}
7878
else
7979
{

samples/MusicStore/MusicStore.Web/Startup.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,8 @@ public void ConfigureServices(IServiceCollection services)
116116
options.ClientId = "000000004012C08A";
117117
options.ClientSecret = "GaMQ2hCnqAC6EcDLnXsAeBVIJOLmeutL";
118118
});
119+
120+
services.AddDatabaseDeveloperPageExceptionFilter();
119121
}
120122

121123
//This method is invoked when ASPNETCORE_ENVIRONMENT is 'Development' or is not defined
@@ -129,8 +131,6 @@ public void ConfigureDevelopment(IApplicationBuilder app, ILoggerFactory loggerF
129131
// During development use the ErrorPage middleware to display error information in the browser
130132
app.UseDeveloperExceptionPage();
131133

132-
app.UseDatabaseErrorPage();
133-
134134
Configure(app);
135135
}
136136

src/MyTested.AspNetCore.Mvc.Abstractions/Utilities/ExposedObject.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
100100
throw ex.InnerException;
101101
}
102102

103-
throw ex;
103+
throw;
104104
}
105105

106106
return true;

src/MyTested.AspNetCore.Mvc.Configuration/ConfigurationBuilderExtensions.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
namespace MyTested.AspNetCore.Mvc
22
{
3-
using System.Collections.Generic;
4-
using Microsoft.Extensions.Configuration;
5-
3+
using System.Collections.Generic;
4+
5+
using Microsoft.Extensions.Configuration;
6+
67
public static class ConfigurationBuilderExtensions
78
{
89
/// <summary>

src/MyTested.AspNetCore.Mvc.Configuration/MyTested.AspNetCore.Mvc.Configuration.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
</PropertyGroup>
3030

3131
<ItemGroup>
32+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="5.0.0" />
3233
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="5.0.0" />
3334
</ItemGroup>
3435

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/MigratorMock.cs

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
using Microsoft.EntityFrameworkCore.Migrations;
66

77
public class MigratorMock : IMigrator
8-
{
9-
public string GenerateScript(
10-
string fromMigration = null,
11-
string toMigration = null,
12-
bool idempotent = false)
13-
=> string.Empty;
14-
8+
{
9+
public string GenerateScript(
10+
string fromMigration = null,
11+
string toMigration = null,
12+
MigrationsSqlGenerationOptions options =
13+
MigrationsSqlGenerationOptions.Default)
14+
=> string.Empty;
15+
1516
public void Migrate(string targetMigration = null)
1617
{
1718
// intentionally left empty

src/MyTested.AspNetCore.Mvc.EntityFrameworkCore/Internal/EntityFrameworkCore/ScopedInMemoryOptionsExtension.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
using Microsoft.Extensions.DependencyInjection;
77

88
#pragma warning disable EF1001 // Internal EF Core API usage.
9-
public class ScopedInMemoryOptionsExtension : InMemoryOptionsExtension
10-
#pragma warning restore EF1001 // Internal EF Core API usage.
9+
public class ScopedInMemoryOptionsExtension : InMemoryOptionsExtension
10+
//#pragma warning restore EF1001 // Internal EF Core API usage.
1111
{
1212
public override void ApplyServices(IServiceCollection services)
1313
=> services

test/MyTested.AspNetCore.Mvc.EntityFrameworkCore.Test/ServicesTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@
88
using Microsoft.Extensions.DependencyInjection;
99
using Setups;
1010
using Setups.Common;
11-
using Xunit;
12-
11+
using Xunit;
12+
13+
#pragma warning disable EF1001 // Internal EF Core API usage.
1314
public class ServicesTests
1415
{
1516
[Fact]

test/MyTested.AspNetCore.Mvc.Universe.Test/ServicesTests.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,9 @@
2121
using Microsoft.Extensions.Options;
2222
using Setups;
2323
using Setups.Common;
24-
using Xunit;
25-
24+
using Xunit;
25+
26+
#pragma warning disable EF1001 // Internal EF Core API usage.
2627
public class ServicesTests
2728
{
2829
[Fact]

0 commit comments

Comments
 (0)