From 580e032f5a5cd257be9c1188827f7a2fa93d916a Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sun, 17 Jan 2021 21:33:46 +0000 Subject: [PATCH 1/2] WIP --- ...essagingService.BusinessLogic.Tests.csproj | 12 +++---- .../MessagingService.BusinessLogic.csproj | 6 ++-- .../MessagingService.Client.csproj | 4 +-- ...essagingService.DataTransferObjects.csproj | 2 +- ...ssagingService.EmailAggregate.Tests.csproj | 12 +++---- ...ngService.EmailMessage.DomainEvents.csproj | 4 +-- ...sagingService.EmailMessageAggregate.csproj | 4 +-- .../Email/SendEmail.feature.cs | 10 +++--- .../MessagingService.IntegrationTests.csproj | 20 +++++------ .../MessagingService.Testing.csproj | 2 +- .../MessagingService.Tests.csproj | 12 +++---- MessagingService/Dockerfile | 4 +-- MessagingService/MessagingService.csproj | 33 ++++++++++--------- 13 files changed, 63 insertions(+), 62 deletions(-) diff --git a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj index ab41e42..45ad108 100644 --- a/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj +++ b/MessagingService.BusinessLogic.Tests/MessagingService.BusinessLogic.Tests.csproj @@ -1,21 +1,21 @@  - netcoreapp3.1 + net5.0 None false - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj index feee804..690ae6e 100644 --- a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj +++ b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 @@ -9,8 +9,8 @@ - - + + diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj index 1ff9c48..532db01 100644 --- a/MessagingService.Client/MessagingService.Client.csproj +++ b/MessagingService.Client/MessagingService.Client.csproj @@ -1,12 +1,12 @@ - netstandard2.0 + net5.0 $(TargetsForTfmSpecificBuildOutput);IncludeP2PAssets - + diff --git a/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj b/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj index 9f5c4f4..f208d30 100644 --- a/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj +++ b/MessagingService.DataTransferObjects/MessagingService.DataTransferObjects.csproj @@ -1,7 +1,7 @@ - netstandard2.0 + net5.0 diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index b4e5b90..77e2339 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -1,21 +1,21 @@  - netcoreapp3.1 + net5.0 None false - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj index 906fd7a..efba07d 100644 --- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj +++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj @@ -1,11 +1,11 @@  - netstandard2.1 + net5.0 - + diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj index e76dc8b..677c3da 100644 --- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj +++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj @@ -1,11 +1,11 @@  - netcoreapp3.1 + net5.0 - + diff --git a/MessagingService.IntegrationTests/Email/SendEmail.feature.cs b/MessagingService.IntegrationTests/Email/SendEmail.feature.cs index c01f1f5..2535e67 100644 --- a/MessagingService.IntegrationTests/Email/SendEmail.feature.cs +++ b/MessagingService.IntegrationTests/Email/SendEmail.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (https://www.specflow.org/). -// SpecFlow Version:3.3.0.0 -// SpecFlow Generator Version:3.1.0.0 +// SpecFlow Version:3.5.0.0 +// SpecFlow Generator Version:3.5.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -17,7 +17,7 @@ namespace MessagingService.IntegrationTests.Email using System.Linq; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.5.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [Xunit.TraitAttribute("Category", "base")] [Xunit.TraitAttribute("Category", "shared")] @@ -46,7 +46,7 @@ public SendEmailFeature(SendEmailFeature.FixtureData fixtureData, MessagingServi public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "SendEmail", null, ProgrammingLanguage.CSharp, new string[] { + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "Email", "SendEmail", null, ProgrammingLanguage.CSharp, new string[] { "base", "shared", "email"}); @@ -190,7 +190,7 @@ public virtual void SendEmail() this.ScenarioCleanup(); } - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.5.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class FixtureData : System.IDisposable { diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index c181ff1..66b127c 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -1,26 +1,26 @@  - netcoreapp3.1 + net5.0 false - + - - - - - - + + + + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService.Testing/MessagingService.Testing.csproj b/MessagingService.Testing/MessagingService.Testing.csproj index 7e8fb56..1b9c043 100644 --- a/MessagingService.Testing/MessagingService.Testing.csproj +++ b/MessagingService.Testing/MessagingService.Testing.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 None diff --git a/MessagingService.Tests/MessagingService.Tests.csproj b/MessagingService.Tests/MessagingService.Tests.csproj index 1714751..c71df0b 100644 --- a/MessagingService.Tests/MessagingService.Tests.csproj +++ b/MessagingService.Tests/MessagingService.Tests.csproj @@ -1,21 +1,21 @@  - netcoreapp3.1 + net5.0 None false - - - + + + - + all runtime; build; native; contentfiles; analyzers; buildtransitive - + all runtime; build; native; contentfiles; analyzers; buildtransitive diff --git a/MessagingService/Dockerfile b/MessagingService/Dockerfile index 8e9c518..0b15134 100644 --- a/MessagingService/Dockerfile +++ b/MessagingService/Dockerfile @@ -1,9 +1,9 @@ #See https://aka.ms/containerfastmode to understand how Visual Studio uses this Dockerfile to build your images for faster debugging. -FROM mcr.microsoft.com/dotnet/core/aspnet:3.1-buster-slim AS base +FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base WORKDIR /app -FROM mcr.microsoft.com/dotnet/core/sdk:3.1-buster AS build +FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build WORKDIR /src COPY ["MessagingService/NuGet.Config", "."] COPY ["MessagingService/MessagingService.csproj", "MessagingService/"] diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj index fe59665..0daebc0 100644 --- a/MessagingService/MessagingService.csproj +++ b/MessagingService/MessagingService.csproj @@ -1,28 +1,29 @@ - netcoreapp3.1 + net5.0 Linux - - + + + - - + + - - - - - - - - - - - + + + + + + + + + + + From a371ce9e9193e3517f945f402027db13f64d2052 Mon Sep 17 00:00:00 2001 From: Stuart Ferguson Date: Sun, 17 Jan 2021 22:14:33 +0000 Subject: [PATCH 2/2] Upgrade to net5 complete --- .../MessagingService.BusinessLogic.csproj | 2 +- MessagingService.Client/MessagingService.Client.csproj | 4 ++-- .../MessagingService.EmailAggregate.Tests.csproj | 2 +- .../MessagingService.EmailMessage.DomainEvents.csproj | 2 +- .../MessagingService.EmailMessageAggregate.csproj | 2 +- .../MessagingService.IntegrationTests.csproj | 4 ++-- .../SMS/SendSMS.feature.cs | 10 +++++----- .../MessagingService.SMSAggregate.Tests.csproj | 6 +++--- .../MessagingService.SMSMessage.DomainEvents.csproj | 4 ++-- .../MessagingService.SMSMessageAggregate.csproj | 6 +++--- MessagingService/MessagingService.csproj | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) diff --git a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj index 102f1a3..45d5460 100644 --- a/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj +++ b/MessagingService.BusinessLogic/MessagingService.BusinessLogic.csproj @@ -10,7 +10,7 @@ - + diff --git a/MessagingService.Client/MessagingService.Client.csproj b/MessagingService.Client/MessagingService.Client.csproj index 532db01..da1aada 100644 --- a/MessagingService.Client/MessagingService.Client.csproj +++ b/MessagingService.Client/MessagingService.Client.csproj @@ -1,4 +1,4 @@ - + net5.0 @@ -6,7 +6,7 @@ - + diff --git a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj index 77e2339..04d7a14 100644 --- a/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj +++ b/MessagingService.EmailAggregate.Tests/MessagingService.EmailAggregate.Tests.csproj @@ -8,7 +8,7 @@ - + diff --git a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj index efba07d..a05fc10 100644 --- a/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj +++ b/MessagingService.EmailMessage.DomainEvents/MessagingService.EmailMessage.DomainEvents.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj index 677c3da..1c67cf2 100644 --- a/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj +++ b/MessagingService.EmailMessageAggregate/MessagingService.EmailMessageAggregate.csproj @@ -5,7 +5,7 @@ - + diff --git a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj index 6c11715..c854b3d 100644 --- a/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj +++ b/MessagingService.IntegrationTests/MessagingService.IntegrationTests.csproj @@ -7,11 +7,11 @@ - + - + diff --git a/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs b/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs index 75012e1..2598a3a 100644 --- a/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs +++ b/MessagingService.IntegrationTests/SMS/SendSMS.feature.cs @@ -1,8 +1,8 @@ // ------------------------------------------------------------------------------ // // This code was generated by SpecFlow (https://www.specflow.org/). -// SpecFlow Version:3.3.0.0 -// SpecFlow Generator Version:3.1.0.0 +// SpecFlow Version:3.5.0.0 +// SpecFlow Generator Version:3.5.0.0 // // Changes to this file may cause incorrect behavior and will be lost if // the code is regenerated. @@ -17,7 +17,7 @@ namespace MessagingService.IntegrationTests.SMS using System.Linq; - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.5.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] [Xunit.TraitAttribute("Category", "base")] [Xunit.TraitAttribute("Category", "shared")] @@ -46,7 +46,7 @@ public SendSMSFeature(SendSMSFeature.FixtureData fixtureData, MessagingService_I public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "SendSMS", null, ProgrammingLanguage.CSharp, new string[] { + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "SMS", "SendSMS", null, ProgrammingLanguage.CSharp, new string[] { "base", "shared", "sms"}); @@ -180,7 +180,7 @@ public virtual void SendSMS() this.ScenarioCleanup(); } - [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.3.0.0")] + [System.CodeDom.Compiler.GeneratedCodeAttribute("TechTalk.SpecFlow", "3.5.0.0")] [System.Runtime.CompilerServices.CompilerGeneratedAttribute()] public class FixtureData : System.IDisposable { diff --git a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj index 4b5bfa0..8a74820 100644 --- a/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj +++ b/MessagingService.SMSAggregate.Tests/MessagingService.SMSAggregate.Tests.csproj @@ -1,20 +1,20 @@ - netcoreapp3.1 + net5.0 None false - + runtime; build; native; contentfiles; analyzers; buildtransitive all - + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj index 906fd7a..8fe400e 100644 --- a/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj +++ b/MessagingService.SMSMessage.DomainEvents/MessagingService.SMSMessage.DomainEvents.csproj @@ -1,11 +1,11 @@  - netstandard2.1 + net5.0 - + diff --git a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj index 04b66c5..938bfac 100644 --- a/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj +++ b/MessagingService.SMSMessageAggregate/MessagingService.SMSMessageAggregate.csproj @@ -1,11 +1,11 @@ - + - netcoreapp3.1 + net5.0 - + diff --git a/MessagingService/MessagingService.csproj b/MessagingService/MessagingService.csproj index 16440ed..99b2e82 100644 --- a/MessagingService/MessagingService.csproj +++ b/MessagingService/MessagingService.csproj @@ -10,8 +10,8 @@ - - + +