From bc95525543b9d869a3bdd1b29dcd92007dd689ea Mon Sep 17 00:00:00 2001 From: Esteban Solano Granados Date: Mon, 21 Mar 2022 11:43:05 -0600 Subject: [PATCH] =?UTF-8?q?Upgrade=20nginx-aspnet-mysql=20to=20net6.0=20?= =?UTF-8?q?=F0=9F=9A=80=20(#198)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Upgrade to net6.0 [csproj] * Upgrade MySqlConnector NuGet package * Port Program to net6.0 * Upgrade Dockerfile base image --- nginx-aspnet-mysql/backend/.gitignore | 350 ++++++++++++++++++++ nginx-aspnet-mysql/backend/Dockerfile | 4 +- nginx-aspnet-mysql/backend/Program.cs | 140 ++++---- nginx-aspnet-mysql/backend/aspnetapp.csproj | 8 +- 4 files changed, 416 insertions(+), 86 deletions(-) create mode 100644 nginx-aspnet-mysql/backend/.gitignore diff --git a/nginx-aspnet-mysql/backend/.gitignore b/nginx-aspnet-mysql/backend/.gitignore new file mode 100644 index 0000000..dfcfd56 --- /dev/null +++ b/nginx-aspnet-mysql/backend/.gitignore @@ -0,0 +1,350 @@ +## Ignore Visual Studio temporary files, build results, and +## files generated by popular Visual Studio add-ons. +## +## Get latest from https://github.com/github/gitignore/blob/master/VisualStudio.gitignore + +# User-specific files +*.rsuser +*.suo +*.user +*.userosscache +*.sln.docstates + +# User-specific files (MonoDevelop/Xamarin Studio) +*.userprefs + +# Mono auto generated files +mono_crash.* + +# Build results +[Dd]ebug/ +[Dd]ebugPublic/ +[Rr]elease/ +[Rr]eleases/ +x64/ +x86/ +[Aa][Rr][Mm]/ +[Aa][Rr][Mm]64/ +bld/ +[Bb]in/ +[Oo]bj/ +[Ll]og/ +[Ll]ogs/ + +# Visual Studio 2015/2017 cache/options directory +.vs/ +# Uncomment if you have tasks that create the project's static files in wwwroot +#wwwroot/ + +# Visual Studio 2017 auto generated files +Generated\ Files/ + +# MSTest test Results +[Tt]est[Rr]esult*/ +[Bb]uild[Ll]og.* + +# NUnit +*.VisualState.xml +TestResult.xml +nunit-*.xml + +# Build Results of an ATL Project +[Dd]ebugPS/ +[Rr]eleasePS/ +dlldata.c + +# Benchmark Results +BenchmarkDotNet.Artifacts/ + +# .NET Core +project.lock.json +project.fragment.lock.json +artifacts/ + +# StyleCop +StyleCopReport.xml + +# Files built by Visual Studio +*_i.c +*_p.c +*_h.h +*.ilk +*.meta +*.obj +*.iobj +*.pch +*.pdb +*.ipdb +*.pgc +*.pgd +*.rsp +*.sbr +*.tlb +*.tli +*.tlh +*.tmp +*.tmp_proj +*_wpftmp.csproj +*.log +*.vspscc +*.vssscc +.builds +*.pidb +*.svclog +*.scc + +# Chutzpah Test files +_Chutzpah* + +# Visual C++ cache files +ipch/ +*.aps +*.ncb +*.opendb +*.opensdf +*.sdf +*.cachefile +*.VC.db +*.VC.VC.opendb + +# Visual Studio profiler +*.psess +*.vsp +*.vspx +*.sap + +# Visual Studio Trace Files +*.e2e + +# TFS 2012 Local Workspace +$tf/ + +# Guidance Automation Toolkit +*.gpState + +# ReSharper is a .NET coding add-in +_ReSharper*/ +*.[Rr]e[Ss]harper +*.DotSettings.user + +# TeamCity is a build add-in +_TeamCity* + +# DotCover is a Code Coverage Tool +*.dotCover + +# AxoCover is a Code Coverage Tool +.axoCover/* +!.axoCover/settings.json + +# Visual Studio code coverage results +*.coverage +*.coveragexml + +# NCrunch +_NCrunch_* +.*crunch*.local.xml +nCrunchTemp_* + +# MightyMoose +*.mm.* +AutoTest.Net/ + +# Web workbench (sass) +.sass-cache/ + +# Installshield output folder +[Ee]xpress/ + +# DocProject is a documentation generator add-in +DocProject/buildhelp/ +DocProject/Help/*.HxT +DocProject/Help/*.HxC +DocProject/Help/*.hhc +DocProject/Help/*.hhk +DocProject/Help/*.hhp +DocProject/Help/Html2 +DocProject/Help/html + +# Click-Once directory +publish/ + +# Publish Web Output +*.[Pp]ublish.xml +*.azurePubxml +# Note: Comment the next line if you want to checkin your web deploy settings, +# but database connection strings (with potential passwords) will be unencrypted +*.pubxml +*.publishproj + +# Microsoft Azure Web App publish settings. Comment the next line if you want to +# checkin your Azure Web App publish settings, but sensitive information contained +# in these scripts will be unencrypted +PublishScripts/ + +# NuGet Packages +*.nupkg +# NuGet Symbol Packages +*.snupkg +# The packages folder can be ignored because of Package Restore +**/[Pp]ackages/* +# except build/, which is used as an MSBuild target. +!**/[Pp]ackages/build/ +# Uncomment if necessary however generally it will be regenerated when needed +#!**/[Pp]ackages/repositories.config +# NuGet v3's project.json files produces more ignorable files +*.nuget.props +*.nuget.targets + +# Microsoft Azure Build Output +csx/ +*.build.csdef + +# Microsoft Azure Emulator +ecf/ +rcf/ + +# Windows Store app package directories and files +AppPackages/ +BundleArtifacts/ +Package.StoreAssociation.xml +_pkginfo.txt +*.appx +*.appxbundle +*.appxupload + +# Visual Studio cache files +# files ending in .cache can be ignored +*.[Cc]ache +# but keep track of directories ending in .cache +!?*.[Cc]ache/ + +# Others +ClientBin/ +~$* +*~ +*.dbmdl +*.dbproj.schemaview +*.jfm +*.pfx +*.publishsettings +orleans.codegen.cs + +# Including strong name files can present a security risk +# (https://github.com/github/gitignore/pull/2483#issue-259490424) +#*.snk + +# Since there are multiple workflows, uncomment next line to ignore bower_components +# (https://github.com/github/gitignore/pull/1529#issuecomment-104372622) +#bower_components/ + +# RIA/Silverlight projects +Generated_Code/ + +# Backup & report files from converting an old project file +# to a newer Visual Studio version. Backup files are not needed, +# because we have git ;-) +_UpgradeReport_Files/ +Backup*/ +UpgradeLog*.XML +UpgradeLog*.htm +ServiceFabricBackup/ +*.rptproj.bak + +# SQL Server files +*.mdf +*.ldf +*.ndf + +# Business Intelligence projects +*.rdl.data +*.bim.layout +*.bim_*.settings +*.rptproj.rsuser +*- [Bb]ackup.rdl +*- [Bb]ackup ([0-9]).rdl +*- [Bb]ackup ([0-9][0-9]).rdl + +# Microsoft Fakes +FakesAssemblies/ + +# GhostDoc plugin setting file +*.GhostDoc.xml + +# Node.js Tools for Visual Studio +.ntvs_analysis.dat +node_modules/ + +# Visual Studio 6 build log +*.plg + +# Visual Studio 6 workspace options file +*.opt + +# Visual Studio 6 auto-generated workspace file (contains which files were open etc.) +*.vbw + +# Visual Studio LightSwitch build output +**/*.HTMLClient/GeneratedArtifacts +**/*.DesktopClient/GeneratedArtifacts +**/*.DesktopClient/ModelManifest.xml +**/*.Server/GeneratedArtifacts +**/*.Server/ModelManifest.xml +_Pvt_Extensions + +# Paket dependency manager +.paket/paket.exe +paket-files/ + +# FAKE - F# Make +.fake/ + +# CodeRush personal settings +.cr/personal + +# Python Tools for Visual Studio (PTVS) +__pycache__/ +*.pyc + +# Cake - Uncomment if you are using it +# tools/** +# !tools/packages.config + +# Tabs Studio +*.tss + +# Telerik's JustMock configuration file +*.jmconfig + +# BizTalk build output +*.btp.cs +*.btm.cs +*.odx.cs +*.xsd.cs + +# OpenCover UI analysis results +OpenCover/ + +# Azure Stream Analytics local run output +ASALocalRun/ + +# MSBuild Binary and Structured Log +*.binlog + +# NVidia Nsight GPU debugger configuration file +*.nvuser + +# MFractors (Xamarin productivity tool) working folder +.mfractor/ + +# Local History for Visual Studio +.localhistory/ + +# BeatPulse healthcheck temp database +healthchecksdb + +# Backup folder for Package Reference Convert tool in Visual Studio 2017 +MigrationBackup/ + +# Ionide (cross platform F# VS Code tools) working folder +.ionide/ diff --git a/nginx-aspnet-mysql/backend/Dockerfile b/nginx-aspnet-mysql/backend/Dockerfile index dd5d671..12446dd 100755 --- a/nginx-aspnet-mysql/backend/Dockerfile +++ b/nginx-aspnet-mysql/backend/Dockerfile @@ -1,8 +1,8 @@ -FROM mcr.microsoft.com/dotnet/aspnet:5.0 as base +FROM mcr.microsoft.com/dotnet/aspnet:6.0 as base WORKDIR /app -FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build +FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build COPY . /src WORKDIR /src RUN ls diff --git a/nginx-aspnet-mysql/backend/Program.cs b/nginx-aspnet-mysql/backend/Program.cs index 535d9b8..d4b0e63 100644 --- a/nginx-aspnet-mysql/backend/Program.cs +++ b/nginx-aspnet-mysql/backend/Program.cs @@ -1,84 +1,62 @@ -using System; -using System.IO; -using System.Collections.Generic; -using System.Threading.Tasks; -using Microsoft.AspNetCore; -using Microsoft.AspNetCore.Builder; -using Microsoft.AspNetCore.Hosting; -using Microsoft.AspNetCore.Http; -using Microsoft.AspNetCore.Routing; -using Microsoft.Extensions.Primitives; -using MySql.Data; -using MySql.Data.MySqlClient; +using MySqlConnector; -class Program -{ - public static void Main(string[] args) => WebHost.CreateDefaultBuilder(args) - .Configure(async app => +var builder = WebApplication.CreateBuilder(args); + +string password = File.ReadAllText("/run/secrets/db-password"); +string connectionString = $"server=db;user=root;database=example;port=3306;password={password}"; + +builder.Services.AddTransient((_provider) => new MySqlConnection(connectionString)); + +var app = builder.Build(); + +app.MapGet("/", (MySqlConnection connection) => { + var titles = new List(); + + try + { + Console.WriteLine("Connecting to MySQL..."); + connection.Open(); + + string sql = "SELECT title FROM blog"; + using var cmd = new MySqlCommand(sql, connection); + using MySqlDataReader reader = cmd.ExecuteReader(); + + while (reader.Read()) { - app.UseRouting(); - - string password = File.ReadAllText("/run/secrets/db-password"); - string connectionString = $"server=db;user=root;database=example;port=3306;password={password}"; - - app.UseEndpoints(e => - { - e.MapGet("/", context => { - using MySqlConnection connection = new MySqlConnection(connectionString); - var titles = new List(); - - try - { - Console.WriteLine("Connecting to MySQL..."); - connection.Open(); - - string sql = "SELECT title FROM blog"; - using var cmd = new MySqlCommand(sql, connection); - using MySqlDataReader reader = cmd.ExecuteReader(); - - while (reader.Read()) - { - titles.Add(reader.GetString(0)); - } - reader.Close(); - } - catch (Exception ex) - { - Console.WriteLine(ex.ToString()); - context.Response.StatusCode = 500; - return Task.CompletedTask; - } - connection.Close(); - - context.Response.StatusCode = 200; - context.Response.WriteAsJsonAsync(titles); - - return Task.CompletedTask; - }); - }); - Prepare(connectionString); - - }).Build().Run(); - - private static void Prepare(string connectionString) - { - using MySqlConnection connection = new MySqlConnection(connectionString); - - connection.Open(); - using var transation = connection.BeginTransaction(); - - using MySqlCommand cmd1 = new MySqlCommand("DROP TABLE IF EXISTS blog", connection, transation); - cmd1.ExecuteNonQuery(); - - using MySqlCommand cmd2 = new MySqlCommand("CREATE TABLE IF NOT EXISTS blog (id int NOT NULL AUTO_INCREMENT, title varchar(255), PRIMARY KEY (id))", connection, transation); - cmd2.ExecuteNonQuery(); - - for (int i = 0; i < 5; i++) - { - using MySqlCommand insertCommand = new MySqlCommand( $"INSERT INTO blog (title) VALUES ('Blog post #{i}');", connection, transation); - insertCommand.ExecuteNonQuery(); - } - transation.Commit(); - connection.Close(); + titles.Add(reader.GetString(0)); } -} \ No newline at end of file + reader.Close(); + } + catch (Exception ex) + { + return Results.Problem(detail: ex.ToString()); + } + connection.Close(); + + return Results.Ok(titles); +}); +Prepare(connectionString); + +app.Run(); + +void Prepare(string connectionString) +{ + using MySqlConnection connection = new MySqlConnection(connectionString); + + connection.Open(); + using var transation = connection.BeginTransaction(); + + using MySqlCommand cmd1 = new MySqlCommand("DROP TABLE IF EXISTS blog", connection, transation); + cmd1.ExecuteNonQuery(); + + using MySqlCommand cmd2 = new MySqlCommand("CREATE TABLE IF NOT EXISTS blog (id int NOT NULL AUTO_INCREMENT, title varchar(255), PRIMARY KEY (id))", connection, transation); + cmd2.ExecuteNonQuery(); + + for (int i = 0; i < 5; i++) + { + using MySqlCommand insertCommand = new MySqlCommand( $"INSERT INTO blog (title) VALUES ('Blog post #{i}');", connection, transation); + insertCommand.ExecuteNonQuery(); + } + transation.Commit(); + connection.Close(); +} diff --git a/nginx-aspnet-mysql/backend/aspnetapp.csproj b/nginx-aspnet-mysql/backend/aspnetapp.csproj index 1d82f20..0032321 100644 --- a/nginx-aspnet-mysql/backend/aspnetapp.csproj +++ b/nginx-aspnet-mysql/backend/aspnetapp.csproj @@ -1,8 +1,10 @@ - net5.0 + net6.0 + enable + - + - \ No newline at end of file +