Net core 3.1 support (#1823)

* update the tests and tooling to run on .NET Core 3.1 * update TestProjectGenerator submodule
SpecFlowOSS · Dec 18, 2019 · 054d3dd · 054d3dd
1 parent b6c4d72
commit 054d3dd
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 17 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -38,10 +38,10 @@
     <SpecFlow_Core_Generator_TFM>netstandard2.0</SpecFlow_Core_Generator_TFM>
 
     <SpecFlow_FullFramework_Test_TFM>net471</SpecFlow_FullFramework_Test_TFM>
-    <SpecFlow_Core_Test_TFM>netcoreapp2.1;netcoreapp3.0</SpecFlow_Core_Test_TFM>
+    <SpecFlow_Core_Test_TFM>netcoreapp2.1;netcoreapp3.1</SpecFlow_Core_Test_TFM>
 
     <SpecFlow_FullFramework_Specs_TFM>net471</SpecFlow_FullFramework_Specs_TFM>
-    <SpecFlow_Core_Specs_TFM>netcoreapp3.0</SpecFlow_Core_Specs_TFM>
+    <SpecFlow_Core_Specs_TFM>netcoreapp3.1</SpecFlow_Core_Specs_TFM>
 
     <SpecFlow_FullFramework_Tools_TFM>net471</SpecFlow_FullFramework_Tools_TFM>
     <SpecFlow_Core_Tools_TFM>netcoreapp2.0</SpecFlow_Core_Tools_TFM>

diff --git a/ExternalRepositories/SpecFlow.TestProjectGenerator b/ExternalRepositories/SpecFlow.TestProjectGenerator
diff --git a/...chTalk.SpecFlow.Templates.DotNet/templates/SpecFlowProject/.template.config/template.json b/...chTalk.SpecFlow.Templates.DotNet/templates/SpecFlowProject/.template.config/template.json
@@ -15,11 +15,11 @@
             "type": "parameter",
             "description": "Target Framework",
             "datatype": "choice",
-            "defaultValue": "netcoreapp3.0",
+            "defaultValue": "netcoreapp3.1",
             "replaces": "$target$",
             "choices": [
                 {
-                    "choice": "netcoreapp3.0",
+                    "choice": "netcoreapp3.1",
                     "description": ".NET Core 3"
                 },
                 {

diff --git a/...ow.MsBuildNetSdk.IntegrationTests/TechTalk.SpecFlow.MsBuildNetSdk.IntegrationTests.csproj b/...ow.MsBuildNetSdk.IntegrationTests/TechTalk.SpecFlow.MsBuildNetSdk.IntegrationTests.csproj
@@ -8,7 +8,7 @@
   <Import Project="..\..\SpecFlow.Tools.MsBuild.Generation\build\SpecFlow.Tools.MsBuild.Generation.props" />
 
   <PropertyGroup>
-    <TargetFramework>netcoreapp3.0</TargetFramework>
+    <TargetFramework>$(SpecFlow_Core_Specs_TFM)</TargetFramework>
     <RunPostBuildEvent>Always</RunPostBuildEvent>
   </PropertyGroup>
 

diff --git a/Tests/TechTalk.SpecFlow.Specs.Generator.SpecFlowPlugin/MultiFeatureGenerator.cs b/Tests/TechTalk.SpecFlow.Specs.Generator.SpecFlowPlugin/MultiFeatureGenerator.cs
@@ -127,7 +127,7 @@ private IEnumerable<KeyValuePair<Combination, IFeatureGenerator>> GetFilteredFea
                         if (onlyDotNetCore)
                         {
                             if (ShouldCompileForNetCore21(featureGenerator.Key)
-                                || ShouldCompileForNetCore30(featureGenerator.Key))
+                                || ShouldCompileForNetCore31(featureGenerator.Key))
                             {
                                 yield return featureGenerator;
                             }
@@ -158,7 +158,7 @@ private IEnumerable<KeyValuePair<Combination, IFeatureGenerator>> GetFilteredFea
                             if (onlyDotNetCore)
                             {
                                 if (ShouldCompileForNetCore21(featureGenerator.Key)
-                                    || ShouldCompileForNetCore30(featureGenerator.Key))
+                                    || ShouldCompileForNetCore31(featureGenerator.Key))
                                 {
                                     yield return featureGenerator;
                                 }
@@ -178,9 +178,9 @@ public bool ShouldCompileForNetCore21(Combination combination)
                    && RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
         }
 
-        public bool ShouldCompileForNetCore30(Combination combination)
+        public bool ShouldCompileForNetCore31(Combination combination)
         {
-            return combination.TargetFramework == TestRunCombinations.TfmEnumValueNetCore30;
+            return combination.TargetFramework == TestRunCombinations.TfmEnumValueNetCore31;
         }
 
         private bool IsForUnitTestProvider(KeyValuePair<Combination, IFeatureGenerator> featureGenerator, string unitTestProvider)

diff --git a/Tests/TechTalk.SpecFlow.Specs.Generator.SpecFlowPlugin/TestRunCombinations.cs b/Tests/TechTalk.SpecFlow.Specs.Generator.SpecFlowPlugin/TestRunCombinations.cs
@@ -6,27 +6,27 @@ public class TestRunCombinations
     {
         public const string TfmEnumValueNet452 = "Net452";
         public const string TfmEnumValueNetCore21 = "Netcoreapp21";
-        public const string TfmEnumValueNetCore30 = "Netcoreapp30";
+        public const string TfmEnumValueNetCore31 = "Netcoreapp31";
 
         public static List<Combination> List { get; } = new List<Combination>()
         {
 #if XUNIT_SPECS
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "Old", TargetFramework = TfmEnumValueNet452, UnitTestProvider = "xUnit", ConfigFormat = "Config"},
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNet452, UnitTestProvider = "xUnit", ConfigFormat = "Config"},
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore21, UnitTestProvider = "xUnit", ConfigFormat = "Json"},
-            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore30, UnitTestProvider = "xUnit", ConfigFormat = "Json"},
+            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore31, UnitTestProvider = "xUnit", ConfigFormat = "Json"},
 #endif
 
 #if MSTEST_SPECS
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNet452, UnitTestProvider = "MSTest", ConfigFormat = "Config"},
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore21, UnitTestProvider = "MSTest", ConfigFormat = "Json"},
-            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore30, UnitTestProvider = "MSTest", ConfigFormat = "Json"},
+            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore31, UnitTestProvider = "MSTest", ConfigFormat = "Json"},
 #endif
 
 #if NUNIT_SPECS
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNet452, UnitTestProvider = "NUnit3", ConfigFormat = "Config"},
             new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore21, UnitTestProvider = "NUnit3", ConfigFormat = "Json"},
-            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore30, UnitTestProvider = "NUnit3", ConfigFormat = "Json"},
+            new Combination() {ProgrammingLanguage = "CSharp", ProjectFormat = "New", TargetFramework = TfmEnumValueNetCore31, UnitTestProvider = "NUnit3", ConfigFormat = "Json"},
 #endif
         };
     }

diff --git a/Tests/TechTalk.SpecFlow.Specs/StepDefinitions/TestFileSteps.cs b/Tests/TechTalk.SpecFlow.Specs/StepDefinitions/TestFileSteps.cs
@@ -35,7 +35,7 @@ public void WhenTheParsedResultIsSavedTo(string parsedFileName)
         {
             var assemblyFolder = AssemblyFolderHelper.GetAssemblyFolder();
 
-            assemblyFolder.Should().EndWith(@"\bin\Debug\netcoreapp3.0", "parsed file saving can only be done from a development environment");
+            assemblyFolder.Should().EndWith(@"\bin\Debug\netcoreapp3.1", "parsed file saving can only be done from a development environment");
             parserDriver.SaveSerializedFeatureTo(Path.Combine(assemblyFolder, @"..\..\..\TestFiles", parsedFileName));
         }
 

diff --git a/build.yml b/build.yml
@@ -2,7 +2,7 @@ parameters:
   name: ''
   pool: ''
   nugetVersion: 5.1.0
-  sdkVersion: 3.0.100
+  sdkVersion: 3.1.100
   artifactFileName: ''
   appInsightsInstrumentationKey: ''
 

diff --git a/global.json b/global.json
@@ -1,5 +1,5 @@
 {
     "sdk": {
-        "version": "3.0.100"
+        "version": "3.1.100"
     }
 }