From a8ad5cad816d449fa4ef3328111a917c7ab61d76 Mon Sep 17 00:00:00 2001 From: Gennady Verdel Date: Wed, 18 Nov 2020 21:25:03 +0200 Subject: [PATCH 1/2] feat(net5): using .NET 5 --- common/Common.Bootstrapping/Common.Bootstrapping.csproj | 2 +- .../LogoFX.Cli.Dotnet.Specs.Features.csproj | 2 +- .../Model Generation.feature.cs | 6 +++--- .../Service Generation.feature.cs | 4 ++-- .../Solution Generation.feature.cs | 4 ++-- .../Template Pack Setup.feature.cs | 4 ++-- .../LogoFX.Cli.Dotnet.Specs.Launcher.csproj | 2 +- .../LogoFX.Cli.Dotnet.Specs.Steps.csproj | 2 +- .../LogoFX.Templates.Data.Fake.Providers.csproj | 2 +- .../LogoFX.Templates.Data.Real.Providers.csproj | 2 +- .../LogoFX.Templates.WPF.Data.Fake.Providers.csproj | 2 +- .../LogoFX.Templates.WPF.Data.Real.Providers.csproj | 2 +- .../LogoFX.Templates.WPF.Launcher.csproj | 4 ++-- .../LogoFX.Templates.WPF.Presentation.Shell.csproj | 4 ++-- 14 files changed, 21 insertions(+), 21 deletions(-) diff --git a/common/Common.Bootstrapping/Common.Bootstrapping.csproj b/common/Common.Bootstrapping/Common.Bootstrapping.csproj index e6ced28..4e23ea9 100644 --- a/common/Common.Bootstrapping/Common.Bootstrapping.csproj +++ b/common/Common.Bootstrapping/Common.Bootstrapping.csproj @@ -1,7 +1,7 @@  - netcoreapp3.0 + net5.0 false Debug;Release diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Features/LogoFX.Cli.Dotnet.Specs.Features.csproj b/specs/LogoFX.Cli.Dotnet.Specs.Features/LogoFX.Cli.Dotnet.Specs.Features.csproj index 3160c2c..0794d64 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Features/LogoFX.Cli.Dotnet.Specs.Features.csproj +++ b/specs/LogoFX.Cli.Dotnet.Specs.Features/LogoFX.Cli.Dotnet.Specs.Features.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 false false diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Features/Model Generation.feature.cs b/specs/LogoFX.Cli.Dotnet.Specs.Features/Model Generation.feature.cs index eb08f71..b77bb12 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Features/Model Generation.feature.cs +++ b/specs/LogoFX.Cli.Dotnet.Specs.Features/Model Generation.feature.cs @@ -40,9 +40,9 @@ public ModelGenerationFeature(ModelGenerationFeature.FixtureData fixtureData, Lo public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Model Generation", "\tIn order to provide tools to developers who want to add model layer objects\n\tAs " + - "an app developer\n\tI want to be able to install and use the correspondent templat" + - "e via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Model Generation", "\tIn order to provide tools to developers who want to add model layer objects\r\n\tAs" + + " an app developer\r\n\tI want to be able to install and use the correspondent templ" + + "ate via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Features/Service Generation.feature.cs b/specs/LogoFX.Cli.Dotnet.Specs.Features/Service Generation.feature.cs index 844b7b9..cadad9d 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Features/Service Generation.feature.cs +++ b/specs/LogoFX.Cli.Dotnet.Specs.Features/Service Generation.feature.cs @@ -41,8 +41,8 @@ public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Data Service Generation", "\tIn order to provide tools to developers who want to add data service layer objec" + - "ts\n\tAs an app developer\n\tI want to be able to install and use the correspondent " + - "template via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); + "ts\r\n\tAs an app developer\r\n\tI want to be able to install and use the corresponden" + + "t template via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Features/Solution Generation.feature.cs b/specs/LogoFX.Cli.Dotnet.Specs.Features/Solution Generation.feature.cs index 793203d..e3ecd20 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Features/Solution Generation.feature.cs +++ b/specs/LogoFX.Cli.Dotnet.Specs.Features/Solution Generation.feature.cs @@ -41,8 +41,8 @@ public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Solution Generation", "\tIn order to provide tools to developers who want to scaffold LogoFX-based soluti" + - "ons\n\tAs a framework developer\n\tI want to be able to install and use the correspo" + - "ndent template via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); + "ons\r\n\tAs a framework developer\r\n\tI want to be able to install and use the corres" + + "pondent template via existing dotnet means", ProgrammingLanguage.CSharp, ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Features/Template Pack Setup.feature.cs b/specs/LogoFX.Cli.Dotnet.Specs.Features/Template Pack Setup.feature.cs index 354e97c..e9f04dd 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Features/Template Pack Setup.feature.cs +++ b/specs/LogoFX.Cli.Dotnet.Specs.Features/Template Pack Setup.feature.cs @@ -40,8 +40,8 @@ public TemplatePackSetupFeature(TemplatePackSetupFeature.FixtureData fixtureData public static void FeatureSetup() { testRunner = TechTalk.SpecFlow.TestRunnerManager.GetTestRunner(); - TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Template Pack Setup", "\tIn order to write LogoFX-based code in a fast and efficient way\n\tAs an app devel" + - "oper\n\tI want to be able to add new LogoFX-based elements via cli", ProgrammingLanguage.CSharp, ((string[])(null))); + TechTalk.SpecFlow.FeatureInfo featureInfo = new TechTalk.SpecFlow.FeatureInfo(new System.Globalization.CultureInfo("en-US"), "", "Template Pack Setup", "\tIn order to write LogoFX-based code in a fast and efficient way\r\n\tAs an app deve" + + "loper\r\n\tI want to be able to add new LogoFX-based elements via cli", ProgrammingLanguage.CSharp, ((string[])(null))); testRunner.OnFeatureStart(featureInfo); } diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Launcher/LogoFX.Cli.Dotnet.Specs.Launcher.csproj b/specs/LogoFX.Cli.Dotnet.Specs.Launcher/LogoFX.Cli.Dotnet.Specs.Launcher.csproj index b6413ae..3069090 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Launcher/LogoFX.Cli.Dotnet.Specs.Launcher.csproj +++ b/specs/LogoFX.Cli.Dotnet.Specs.Launcher/LogoFX.Cli.Dotnet.Specs.Launcher.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 false diff --git a/specs/LogoFX.Cli.Dotnet.Specs.Steps/LogoFX.Cli.Dotnet.Specs.Steps.csproj b/specs/LogoFX.Cli.Dotnet.Specs.Steps/LogoFX.Cli.Dotnet.Specs.Steps.csproj index 619e5f6..aec3c77 100644 --- a/specs/LogoFX.Cli.Dotnet.Specs.Steps/LogoFX.Cli.Dotnet.Specs.Steps.csproj +++ b/specs/LogoFX.Cli.Dotnet.Specs.Steps/LogoFX.Cli.Dotnet.Specs.Steps.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net5.0 false diff --git a/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Fake.Providers/LogoFX.Templates.Data.Fake.Providers.csproj b/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Fake.Providers/LogoFX.Templates.Data.Fake.Providers.csproj index ef21762..298eea4 100644 --- a/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Fake.Providers/LogoFX.Templates.Data.Fake.Providers.csproj +++ b/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Fake.Providers/LogoFX.Templates.Data.Fake.Providers.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 false DebugWithFake;Release;DebugWithReal diff --git a/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Real.Providers/LogoFX.Templates.Data.Real.Providers.csproj b/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Real.Providers/LogoFX.Templates.Data.Real.Providers.csproj index 41a9677..ccaeeec 100644 --- a/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Real.Providers/LogoFX.Templates.Data.Real.Providers.csproj +++ b/templates/LogoFX.Templates.Service/LogoFX.Templates.Data.Real.Providers/LogoFX.Templates.Data.Real.Providers.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 DebugWithFake;Release;DebugWithReal diff --git a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Fake.Providers/LogoFX.Templates.WPF.Data.Fake.Providers.csproj b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Fake.Providers/LogoFX.Templates.WPF.Data.Fake.Providers.csproj index a1ade40..fe782a5 100644 --- a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Fake.Providers/LogoFX.Templates.WPF.Data.Fake.Providers.csproj +++ b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Fake.Providers/LogoFX.Templates.WPF.Data.Fake.Providers.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 false DebugWithFake;Release;DebugWithReal diff --git a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Real.Providers/LogoFX.Templates.WPF.Data.Real.Providers.csproj b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Real.Providers/LogoFX.Templates.WPF.Data.Real.Providers.csproj index 13a548d..aaaa899 100644 --- a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Real.Providers/LogoFX.Templates.WPF.Data.Real.Providers.csproj +++ b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Data.Real.Providers/LogoFX.Templates.WPF.Data.Real.Providers.csproj @@ -1,7 +1,7 @@ - netcoreapp3.1 + net5.0 DebugWithFake;Release;DebugWithReal diff --git a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj index 309e385..6ba40ef 100644 --- a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj +++ b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj @@ -1,8 +1,8 @@ - + WinExe - netcoreapp3.1 + net5.0-windows false true DebugWithFake;Release;DebugWithReal diff --git a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Presentation/LogoFX.Templates.WPF.Presentation.Shell.csproj b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Presentation/LogoFX.Templates.WPF.Presentation.Shell.csproj index a0a6344..ebf3794 100644 --- a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Presentation/LogoFX.Templates.WPF.Presentation.Shell.csproj +++ b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Presentation/LogoFX.Templates.WPF.Presentation.Shell.csproj @@ -1,7 +1,7 @@ - + - netcoreapp3.1 + net5.0-windows false true DebugWithFake;Release;DebugWithReal From cb54a566dec95147d338d58def1d6f7661bbbb7e Mon Sep 17 00:00:00 2001 From: Gennady Verdel Date: Wed, 18 Nov 2020 21:36:46 +0200 Subject: [PATCH 2/2] feat(net5): bump deps --- common/Common.Bootstrapping/Common.Bootstrapping.csproj | 4 ++-- .../LogoFX.Templates.WPF.Launcher.csproj | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/common/Common.Bootstrapping/Common.Bootstrapping.csproj b/common/Common.Bootstrapping/Common.Bootstrapping.csproj index 4e23ea9..be75ae6 100644 --- a/common/Common.Bootstrapping/Common.Bootstrapping.csproj +++ b/common/Common.Bootstrapping/Common.Bootstrapping.csproj @@ -28,8 +28,8 @@ false - - + + diff --git a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj index 6ba40ef..51f1a66 100644 --- a/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj +++ b/templates/LogoFX.Templates.WPF/LogoFX.Templates.WPF.Launcher/LogoFX.Templates.WPF.Launcher.csproj @@ -28,7 +28,7 @@ - +