Skip to content

move to using declarations #3066

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iancooper merged 3 commits into from
Apr 26, 2024
Merged

move to using declarations #3066

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3591fb7
move to using declarations
SimonCropp Apr 23, 2024
7f99eec
Merge branch 'master' into move-to-using-declarations
iancooper Apr 24, 2024
45b0ad9
Update MigrationSqlHelper.cs
SimonCropp Apr 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions samples/HelloAsyncListeners/IpFyApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,19 +29,17 @@ public IpFyApi(Uri endpoint)

public async Task<IpFyApiResult> GetAsync(CancellationToken cancellationToken = default)
{
using (var client = new HttpClient())
{
client.BaseAddress = _endpoint;
client.DefaultRequestHeaders.Clear();
using var client = new HttpClient();
client.BaseAddress = _endpoint;
client.DefaultRequestHeaders.Clear();

var response = await client.GetAsync("", cancellationToken);
string result;
if (response.IsSuccessStatusCode)
result = await response.Content.ReadAsStringAsync(cancellationToken);
else
result = "API returned HTTP status " + response.StatusCode;
return new IpFyApiResult(response.IsSuccessStatusCode, result);
}
var response = await client.GetAsync("", cancellationToken);
string result;
if (response.IsSuccessStatusCode)
result = await response.Content.ReadAsStringAsync(cancellationToken);
else
result = "API returned HTTP status " + response.StatusCode;
return new IpFyApiResult(response.IsSuccessStatusCode, result);
}
}
}
22 changes: 10 additions & 12 deletions samples/HelloWorldAsync/IpFyApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,19 +53,17 @@ public IpFyApi(Uri endpoint)

public async Task<IpFyApiResult> GetAsync(CancellationToken cancellationToken = default)
{
using (var client = new HttpClient())
{
client.BaseAddress = _endpoint;
client.DefaultRequestHeaders.Clear();
using var client = new HttpClient();
client.BaseAddress = _endpoint;
client.DefaultRequestHeaders.Clear();

var response = await client.GetAsync("", cancellationToken);
string result;
if (response.IsSuccessStatusCode)
result = await response.Content.ReadAsStringAsync(cancellationToken);
else
result = "API returned HTTP status " + response.StatusCode;
return new IpFyApiResult(response.IsSuccessStatusCode, result);
}
var response = await client.GetAsync("", cancellationToken);
string result;
if (response.IsSuccessStatusCode)
result = await response.Content.ReadAsStringAsync(cancellationToken);
else
result = "API returned HTTP status " + response.StatusCode;
return new IpFyApiResult(response.IsSuccessStatusCode, result);
}
}
}
28 changes: 13 additions & 15 deletions samples/WebAPI_Dapper/GreetingsWeb/Database/SchemaCreation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,22 +61,20 @@ public static bool HasBinaryMessagePayload(this IHost webHost)

public static IHost MigrateDatabase(this IHost webHost)
{
using (var scope = webHost.Services.CreateScope())
{
var services = scope.ServiceProvider;
using var scope = webHost.Services.CreateScope();
var services = scope.ServiceProvider;

try
{
var runner = services.GetRequiredService<IMigrationRunner>();
runner.ListMigrations();
runner.MigrateUp();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
throw;
}
try
{
var runner = services.GetRequiredService<IMigrationRunner>();
runner.ListMigrations();
runner.MigrateUp();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
throw;
}

return webHost;
Expand Down
52 changes: 23 additions & 29 deletions samples/WebAPI_Dapper/SalutationAnalytics/Database/SchemaCreation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,50 +47,44 @@ public static IHost CheckDbIsUp(this IHost host)

public static IHost CreateInbox(this IHost host)
{
using (var scope = host.Services.CreateScope())
{
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();
using var scope = host.Services.CreateScope();
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();

CreateInbox(config, env);
}
CreateInbox(config, env);

return host;
}

public static IHost CreateOutbox(this IHost webHost, bool hasBinaryMessagePayload)
{
using (var scope = webHost.Services.CreateScope())
{
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();
using var scope = webHost.Services.CreateScope();
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();

CreateOutbox(config, env, hasBinaryMessagePayload);
}
CreateOutbox(config, env, hasBinaryMessagePayload);

return webHost;
}

public static IHost MigrateDatabase(this IHost host)
{
using (var scope = host.Services.CreateScope())
{
var services = scope.ServiceProvider;
using var scope = host.Services.CreateScope();
var services = scope.ServiceProvider;

try
{
var runner = services.GetRequiredService<IMigrationRunner>();
runner.ListMigrations();
runner.MigrateUp();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
throw;
}
try
{
var runner = services.GetRequiredService<IMigrationRunner>();
runner.ListMigrations();
runner.MigrateUp();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
throw;
}

return host;
Expand Down
38 changes: 17 additions & 21 deletions samples/WebAPI_EFCore/GreetingsWeb/Database/SchemaCreation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,21 +22,19 @@ public static class SchemaCreation

public static IHost MigrateDatabase(this IHost webHost)
{
using (var scope = webHost.Services.CreateScope())
using var scope = webHost.Services.CreateScope();
var services = scope.ServiceProvider;

try
{
var db = services.GetRequiredService<GreetingsEntityGateway>();

db.Database.Migrate();
}
catch (Exception ex)
{
var services = scope.ServiceProvider;

try
{
var db = services.GetRequiredService<GreetingsEntityGateway>();

db.Database.Migrate();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
}
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
}

return webHost;
Expand Down Expand Up @@ -86,14 +84,12 @@ private static void WaitToConnect(string connectionString)

public static IHost CreateOutbox(this IHost webHost)
{
using (var scope = webHost.Services.CreateScope())
{
var services = scope.ServiceProvider;
var env = services.GetService<IWebHostEnvironment>();
var config = services.GetService<IConfiguration>();
using var scope = webHost.Services.CreateScope();
var services = scope.ServiceProvider;
var env = services.GetService<IWebHostEnvironment>();
var config = services.GetService<IConfiguration>();

CreateOutbox(config, env);
}
CreateOutbox(config, env);

return webHost;
}
Expand Down
6 changes: 2 additions & 4 deletions samples/WebAPI_EFCore/GreetingsWeb/Startup.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,10 +94,8 @@ private void CheckDbIsUp()
//don't check this for SQlite in development
if (!_env.IsDevelopment())
{
using (var conn = new MySqlConnection(connectionString))
{
conn.Open();
}
using var conn = new MySqlConnection(connectionString);
conn.Open();
}
});
}
Expand Down
50 changes: 22 additions & 28 deletions samples/WebAPI_EFCore/SalutationAnalytics/Database/SchemaCreation.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,21 +24,19 @@ public static class SchemaCreation

public static IHost MigrateDatabase(this IHost host)
{
using (var scope = host.Services.CreateScope())
using var scope = host.Services.CreateScope();
var services = scope.ServiceProvider;

try
{
var db = services.GetRequiredService<SalutationsEntityGateway>();

db.Database.Migrate();
}
catch (Exception ex)
{
var services = scope.ServiceProvider;

try
{
var db = services.GetRequiredService<SalutationsEntityGateway>();

db.Database.Migrate();
}
catch (Exception ex)
{
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
}
var logger = services.GetRequiredService<ILogger<Program>>();
logger.LogError(ex, "An error occurred while migrating the database.");
}

return host;
Expand Down Expand Up @@ -88,14 +86,12 @@ private static void WaitToConnect(string connectionString)

public static IHost CreateInbox(this IHost host)
{
using (var scope = host.Services.CreateScope())
{
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();
using var scope = host.Services.CreateScope();
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();

CreateInbox(config, env);
}
CreateInbox(config, env);

return host;
}
Expand Down Expand Up @@ -152,14 +148,12 @@ private static void CreateInboxProduction(string connectionString)

public static IHost CreateOutbox(this IHost webHost)
{
using (var scope = webHost.Services.CreateScope())
{
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();
using var scope = webHost.Services.CreateScope();
var services = scope.ServiceProvider;
var env = services.GetService<IHostEnvironment>();
var config = services.GetService<IConfiguration>();

CreateOutbox(config, env);
}
CreateOutbox(config, env);

return webHost;
}
Expand Down
Loading