From 6078327c581b58125f9192cd6e5b52823c0070e4 Mon Sep 17 00:00:00 2001 From: Bertrand Thomas Date: Tue, 21 Jan 2020 21:38:40 +0100 Subject: [PATCH] Migrate to .NET Core 3.1 and do minor changes --- dotnet/KeepTrack.sln | 184 +++++++++--------- dotnet/README.md | 54 ++++- dotnet/src/Api/Api.csproj | 18 +- dotnet/src/Api/AppConfiguration.cs | 2 +- dotnet/src/Api/Controllers/MovieController.cs | 2 +- dotnet/src/Api/Startup.cs | 12 ++ dotnet/src/ConsoleApp/AppConfiguration.cs | 2 +- dotnet/src/ConsoleApp/ConsoleApp.csproj | 18 +- .../Repositories/RepositoryBase.cs | 1 + .../CarComponent.Domain.UnitTests.csproj | 26 --- 10 files changed, 169 insertions(+), 150 deletions(-) delete mode 100644 dotnet/test/CarComponent.Domain.UnitTests/CarComponent.Domain.UnitTests.csproj diff --git a/dotnet/KeepTrack.sln b/dotnet/KeepTrack.sln index 4fd01ba3..b906ca68 100644 --- a/dotnet/KeepTrack.sln +++ b/dotnet/KeepTrack.sln @@ -1,95 +1,89 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29409.12 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dal.MongoDb", "src\Dal.MongoDb\Dal.MongoDb.csproj", "{6A10979B-FBAE-488A-B5BC-0E45716DFE88}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{215584EC-8DFC-4DAD-B3A0-D419CEC24260}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Applications", "Applications", "{61C528CD-816E-4FC5-ADFA-C5C25A3C4052}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Components", "Components", "{59B2BDBC-F7DE-47F8-880E-248202630B1A}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Car", "Car", "{A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Movie", "Movie", "{A6A8275A-6360-43E7-AB5A-D8A1E96BED06}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\ConsoleApp\ConsoleApp.csproj", "{3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarComponent.Domain", "src\CarComponent.Domain\CarComponent.Domain.csproj", "{A2193B19-8191-4A28-9E64-23D9083A0531}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarComponent.Infrastructure.MongoDb", "src\CarComponent.Infrastructure.MongoDb\CarComponent.Infrastructure.MongoDb.csproj", "{F7250DAA-718B-44FB-990B-AD7DFC488AA7}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{73A074B8-D41E-4CCD-AC4B-95DB716EC6C6}" - ProjectSection(SolutionItems) = preProject - CodeCoverage.runsettings = CodeCoverage.runsettings - README.md = README.md - EndProjectSection -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Api", "src\Api\Api.csproj", "{5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CarComponent.Domain.UnitTests", "test\CarComponent.Domain.UnitTests\CarComponent.Domain.UnitTests.csproj", "{2079D00A-8489-4A43-BC2E-0B7CFB772CE7}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieComponent.Domain", "src\MovieComponent.Domain\MovieComponent.Domain.csproj", "{A08241ED-8F29-4DF7-9BCF-2E310A9C8187}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MovieComponent.Infrastructure.MongoDb", "src\MovieComponent.Infrastructure.MongoDb\MovieComponent.Infrastructure.MongoDb.csproj", "{E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Release|Any CPU.Build.0 = Release|Any CPU - {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Debug|Any CPU.Build.0 = Debug|Any CPU - {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Release|Any CPU.ActiveCfg = Release|Any CPU - {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Release|Any CPU.Build.0 = Release|Any CPU - {A2193B19-8191-4A28-9E64-23D9083A0531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A2193B19-8191-4A28-9E64-23D9083A0531}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A2193B19-8191-4A28-9E64-23D9083A0531}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A2193B19-8191-4A28-9E64-23D9083A0531}.Release|Any CPU.Build.0 = Release|Any CPU - {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Release|Any CPU.Build.0 = Release|Any CPU - {5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560}.Debug|Any CPU.Build.0 = Debug|Any CPU - {5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560}.Release|Any CPU.ActiveCfg = Release|Any CPU - {5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560}.Release|Any CPU.Build.0 = Release|Any CPU - {2079D00A-8489-4A43-BC2E-0B7CFB772CE7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2079D00A-8489-4A43-BC2E-0B7CFB772CE7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2079D00A-8489-4A43-BC2E-0B7CFB772CE7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2079D00A-8489-4A43-BC2E-0B7CFB772CE7}.Release|Any CPU.Build.0 = Release|Any CPU - {A08241ED-8F29-4DF7-9BCF-2E310A9C8187}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A08241ED-8F29-4DF7-9BCF-2E310A9C8187}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A08241ED-8F29-4DF7-9BCF-2E310A9C8187}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A08241ED-8F29-4DF7-9BCF-2E310A9C8187}.Release|Any CPU.Build.0 = Release|Any CPU - {E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50}.Debug|Any CPU.Build.0 = Debug|Any CPU - {E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50}.Release|Any CPU.ActiveCfg = Release|Any CPU - {E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {6A10979B-FBAE-488A-B5BC-0E45716DFE88} = {215584EC-8DFC-4DAD-B3A0-D419CEC24260} - {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} = {59B2BDBC-F7DE-47F8-880E-248202630B1A} - {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} = {59B2BDBC-F7DE-47F8-880E-248202630B1A} - {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57} = {61C528CD-816E-4FC5-ADFA-C5C25A3C4052} - {A2193B19-8191-4A28-9E64-23D9083A0531} = {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} - {F7250DAA-718B-44FB-990B-AD7DFC488AA7} = {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} - {5B65EF04-3F7A-4042-8D8B-DFB3AD7CC560} = {61C528CD-816E-4FC5-ADFA-C5C25A3C4052} - {2079D00A-8489-4A43-BC2E-0B7CFB772CE7} = {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} - {A08241ED-8F29-4DF7-9BCF-2E310A9C8187} = {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} - {E7BCC402-E50E-4AA1-AA7C-1A9C95DBDB50} = {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {876333E7-72D4-4F43-B6F9-9432CA2B7425} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29409.12 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Dal.MongoDb", "src\Dal.MongoDb\Dal.MongoDb.csproj", "{6A10979B-FBAE-488A-B5BC-0E45716DFE88}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "1 - Shared", "1 - Shared", "{215584EC-8DFC-4DAD-B3A0-D419CEC24260}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "3 - Applications", "3 - Applications", "{61C528CD-816E-4FC5-ADFA-C5C25A3C4052}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "2 - Components", "2 - Components", "{59B2BDBC-F7DE-47F8-880E-248202630B1A}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Car", "Car", "{A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Movie", "Movie", "{A6A8275A-6360-43E7-AB5A-D8A1E96BED06}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ConsoleApp", "src\ConsoleApp\ConsoleApp.csproj", "{3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarComponent.Domain", "src\CarComponent.Domain\CarComponent.Domain.csproj", "{A2193B19-8191-4A28-9E64-23D9083A0531}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CarComponent.Infrastructure.MongoDb", "src\CarComponent.Infrastructure.MongoDb\CarComponent.Infrastructure.MongoDb.csproj", "{F7250DAA-718B-44FB-990B-AD7DFC488AA7}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "0 - Solution Items", "0 - Solution Items", "{73A074B8-D41E-4CCD-AC4B-95DB716EC6C6}" + ProjectSection(SolutionItems) = preProject + .editorconfig = .editorconfig + CodeCoverage.runsettings = CodeCoverage.runsettings + README.md = README.md + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Api", "src\Api\Api.csproj", "{651432D5-8481-4807-A422-552EEB4DE8C2}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MovieComponent.Domain", "src\MovieComponent.Domain\MovieComponent.Domain.csproj", "{FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "MovieComponent.Infrastructure.MongoDb", "src\MovieComponent.Infrastructure.MongoDb\MovieComponent.Infrastructure.MongoDb.csproj", "{02479358-D65A-4EF1-BA14-BD21706FBA20}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6A10979B-FBAE-488A-B5BC-0E45716DFE88}.Release|Any CPU.Build.0 = Release|Any CPU + {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Debug|Any CPU.Build.0 = Debug|Any CPU + {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Release|Any CPU.ActiveCfg = Release|Any CPU + {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57}.Release|Any CPU.Build.0 = Release|Any CPU + {A2193B19-8191-4A28-9E64-23D9083A0531}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A2193B19-8191-4A28-9E64-23D9083A0531}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A2193B19-8191-4A28-9E64-23D9083A0531}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A2193B19-8191-4A28-9E64-23D9083A0531}.Release|Any CPU.Build.0 = Release|Any CPU + {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {F7250DAA-718B-44FB-990B-AD7DFC488AA7}.Release|Any CPU.Build.0 = Release|Any CPU + {651432D5-8481-4807-A422-552EEB4DE8C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {651432D5-8481-4807-A422-552EEB4DE8C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {651432D5-8481-4807-A422-552EEB4DE8C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {651432D5-8481-4807-A422-552EEB4DE8C2}.Release|Any CPU.Build.0 = Release|Any CPU + {FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B}.Release|Any CPU.Build.0 = Release|Any CPU + {02479358-D65A-4EF1-BA14-BD21706FBA20}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {02479358-D65A-4EF1-BA14-BD21706FBA20}.Debug|Any CPU.Build.0 = Debug|Any CPU + {02479358-D65A-4EF1-BA14-BD21706FBA20}.Release|Any CPU.ActiveCfg = Release|Any CPU + {02479358-D65A-4EF1-BA14-BD21706FBA20}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {6A10979B-FBAE-488A-B5BC-0E45716DFE88} = {215584EC-8DFC-4DAD-B3A0-D419CEC24260} + {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} = {59B2BDBC-F7DE-47F8-880E-248202630B1A} + {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} = {59B2BDBC-F7DE-47F8-880E-248202630B1A} + {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57} = {61C528CD-816E-4FC5-ADFA-C5C25A3C4052} + {A2193B19-8191-4A28-9E64-23D9083A0531} = {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} + {F7250DAA-718B-44FB-990B-AD7DFC488AA7} = {A52EF787-A7DD-4F2F-99B1-9A62CBE1DE5B} + {651432D5-8481-4807-A422-552EEB4DE8C2} = {61C528CD-816E-4FC5-ADFA-C5C25A3C4052} + {FAD8CE20-6164-4986-B3C1-6DF1EFF3C58B} = {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} + {02479358-D65A-4EF1-BA14-BD21706FBA20} = {A6A8275A-6360-43E7-AB5A-D8A1E96BED06} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {876333E7-72D4-4F43-B6F9-9432CA2B7425} + EndGlobalSection +EndGlobal diff --git a/dotnet/README.md b/dotnet/README.md index f159eca4..4780fb5e 100644 --- a/dotnet/README.md +++ b/dotnet/README.md @@ -6,16 +6,54 @@ ## Dependencies -- SDK: .NET Core 3.0 -- DB: MongoDB 4.2 +- [.NET Core 3.1 SDK](dot.net) +- MongoDB 4.2 database + - Local server + - Docker + + ```bash + docker run --name mongodb422 -d -p 27017:27017 mongo + ``` + + - MongoDB Atlas cluster ## Configuration -- Value for key `KeepTrack_MongoDbConnectionString`: .NET connection string to access MongoDB cluster, ideally set as an environment variable. +Key | Description | Default value +--- | ----------- | ------------- +`Infrastructure:MongoDB:ConnectionString` | MongoDB connection string | +`Infrastructure:MongoDB:DatabaseName` | MongoDB connection string | inventory + +This values can be easily provided as environment variables (replace ":" by "__") or by configuration (json). + +## Build & debug + +- Clone the solution + +```bash +git clone https://github.com/devpro/keep-track.git +``` + +- Build the solution + +```bash +dotnet build +``` + +- Run the tests + +```bash +dotnet build +``` + +- Run the console application: + +```bash +dotnet src\ConsoleApp\bin\Debug\netcoreapp3.1\KeepTrack.ConsoleApp.dll -a CarDemo +``` -## Local run +- Run the web api application: -- Clone the solution: `git clone ...` -- Build the solution: `dotnet build` -- Run the console: `dotnet dotnet src\ConsoleApp\bin\Debug\netcoreapp3.0\KeepTrack.ConsoleApp.dll ...` -- Run the web api: `dotnet run --project src\Api` +```bash +dotnet run --project src\Api +``` diff --git a/dotnet/src/Api/Api.csproj b/dotnet/src/Api/Api.csproj index f4757386..7e85391a 100644 --- a/dotnet/src/Api/Api.csproj +++ b/dotnet/src/Api/Api.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + netcoreapp3.1 KeepTrack.Api KeepTrack.Api {651432D5-8481-4807-A422-552EEB4DE8C2} @@ -14,14 +14,14 @@ - - - - - - - - + + + + + + + + diff --git a/dotnet/src/Api/AppConfiguration.cs b/dotnet/src/Api/AppConfiguration.cs index 8fb69239..b036352b 100644 --- a/dotnet/src/Api/AppConfiguration.cs +++ b/dotnet/src/Api/AppConfiguration.cs @@ -37,7 +37,7 @@ public AppConfiguration(IConfiguration configurationRoot) /// MongoDB connection string => secret! /// This is really a sensitive information so better defined as an environment variable. /// - public string ConnectionString => ConfigurationRoot.TryGetSection("KeepTrack_MongoDbConnectionString").Value; + public string ConnectionString => ConfigurationRoot.TryGetSection("Infrastructure:MongoDB:ConnectionString").Value; /// /// MongoDB collection name. diff --git a/dotnet/src/Api/Controllers/MovieController.cs b/dotnet/src/Api/Controllers/MovieController.cs index 0d2a3101..21710dd7 100644 --- a/dotnet/src/Api/Controllers/MovieController.cs +++ b/dotnet/src/Api/Controllers/MovieController.cs @@ -14,7 +14,7 @@ namespace KeepTrack.Api.Controllers [ApiController] [Authorize] [Route("api/movies")] - public class MovieController : KeepTrack.Api.Controllers.ControllerBase + public class MovieController : ControllerBase { private readonly IMapper _mapper; private readonly IMovieRepository _movieRepository; diff --git a/dotnet/src/Api/Startup.cs b/dotnet/src/Api/Startup.cs index c8f01ac1..3a432dd2 100644 --- a/dotnet/src/Api/Startup.cs +++ b/dotnet/src/Api/Startup.cs @@ -23,6 +23,8 @@ namespace KeepTrack.Api /// public class Startup { + #region Private fields & constructor + private readonly AppConfiguration _configuration; /// @@ -34,6 +36,10 @@ public Startup(IConfiguration configuration) _configuration = new AppConfiguration(configuration); } + #endregion + + #region Public methods + /// /// Configure services. /// @@ -90,6 +96,10 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env) }); } + #endregion + + #region Private methods + private static void ConfigureAutoMapper(IServiceCollection serviceCollection) { var mappingConfig = new MapperConfiguration(x => @@ -159,5 +169,7 @@ private static void ConfigureSwagger(IServiceCollection serviceCollection, OpenA c.IncludeXmlComments(xmlPath); }); } + + #endregion } } diff --git a/dotnet/src/ConsoleApp/AppConfiguration.cs b/dotnet/src/ConsoleApp/AppConfiguration.cs index dafe8925..273a51ae 100644 --- a/dotnet/src/ConsoleApp/AppConfiguration.cs +++ b/dotnet/src/ConsoleApp/AppConfiguration.cs @@ -20,7 +20,7 @@ public AppConfiguration(IConfigurationRoot configurationRoot) #region IMongoDbConfiguration properties - public string ConnectionString => _configurationRoot.GetSection("KeepTrack_MongoDbConnectionString").Value; + public string ConnectionString => _configurationRoot.GetSection("Infrastructure:MongoDB:ConnectionString").Value; public string DatabaseName => "inventory"; diff --git a/dotnet/src/ConsoleApp/ConsoleApp.csproj b/dotnet/src/ConsoleApp/ConsoleApp.csproj index 52fa8ab9..5b309b42 100644 --- a/dotnet/src/ConsoleApp/ConsoleApp.csproj +++ b/dotnet/src/ConsoleApp/ConsoleApp.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.0 + netcoreapp3.1 KeepTrack.ConsoleApp KeepTrack.ConsoleApp {3C4E6452-A0A7-4860-83F1-4AF7A0CF1E57} @@ -15,14 +15,14 @@ - - - - - - - - + + + + + + + + diff --git a/dotnet/src/Dal.MongoDb/Repositories/RepositoryBase.cs b/dotnet/src/Dal.MongoDb/Repositories/RepositoryBase.cs index 5ce011f8..def1f1b7 100644 --- a/dotnet/src/Dal.MongoDb/Repositories/RepositoryBase.cs +++ b/dotnet/src/Dal.MongoDb/Repositories/RepositoryBase.cs @@ -55,6 +55,7 @@ protected static ObjectId ParseObjectId(string id, string message = null) { throw new ArgumentException($"{message}{id} is not a valid id.", nameof(id)); } + return objectId; } } diff --git a/dotnet/test/CarComponent.Domain.UnitTests/CarComponent.Domain.UnitTests.csproj b/dotnet/test/CarComponent.Domain.UnitTests/CarComponent.Domain.UnitTests.csproj deleted file mode 100644 index 781da62b..00000000 --- a/dotnet/test/CarComponent.Domain.UnitTests/CarComponent.Domain.UnitTests.csproj +++ /dev/null @@ -1,26 +0,0 @@ - - - - netcoreapp3.0 - - false - - - - - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - all - runtime; build; native; contentfiles; analyzers; buildtransitive - - - - - - - -