Fix targetFramework selection (Fix #15)

reqnroll · Jul 26, 2024 · 8dd97c5 · 8dd97c5
1 parent 319a76f
commit 8dd97c5
Show file tree

Hide file tree

Showing 7 changed files with 26 additions and 134 deletions.
diff --git a/projectTemplates/ReqnrollProject/.template.config/template.json b/projectTemplates/ReqnrollProject/.template.config/template.json
@@ -11,36 +11,38 @@
     },
     "sourceName": "Template",
     "symbols": {
-        "targetFramework": {
+        "Framework": {
             "type": "parameter",
             "description": "Target Framework",
             "datatype": "choice",
-            "defaultValue": "net6.0",
+            "defaultValue": "net8.0",
             "replaces": "$target$",
+            "allowMultipleValues": false,
+            "isRequired": true,
             "choices": [
                 {
                     "choice": "net8.0",
-                    "description": "net8.0"
-                },                
+                    "displayName": "net8.0"
+                },
                 {
                     "choice": "net7.0",
-                    "description": "net7.0"
-                },                
+                    "displayName": "net7.0"
+                },
                 {
                     "choice": "net6.0",
-                    "description": "net6.0"
-                },                
+                    "displayName": "net6.0"
+                },
                 {
                     "choice": "net481",
-                    "description": ".Net Framework v4.8.1"
+                    "displayName": ".Net Framework v4.8.1"
                 },
                 {
                     "choice": "net48",
-                    "description": ".Net Framework v4.8"
+                    "displayName": ".Net Framework v4.8"
                 },
                 {
                     "choice": "net472",
-                    "description": ".Net Framework v4.7.2"
+                    "displayName": ".Net Framework v4.7.2"
                 },
                 {
                     "choice": "net471",
@@ -61,18 +63,20 @@
             "description": "Provider for Unit Tests",
             "datatype": "choice",
             "defaultValue": "nunit",
+            "allowMultipleValues": false,
+            "isRequired": true,
             "choices": [
                 {
                     "choice": "nunit",
-                    "description": "NUnit"
+                    "displayName": "NUnit"
                 },
                 {
                     "choice": "xunit",
-                    "description": "xUnit"
-                },                
+                    "displayName": "xUnit"
+                },
                 {
                     "choice": "mstest",
-                    "description": "MSTest"
+                    "displayName": "MSTest"
                 }
             ]
         },
@@ -82,21 +86,6 @@
             "description": "Add FluentAssertions library",
             "defaultValue": "true"
         },
-        "LangVersion": {
-            "type": "generated",
-            "generator": "switch",
-            "replaces": "$langVersion$",
-            "parameters": {
-                "evaluator": "C++",
-                "datatype": "string",
-                "cases": [
-                    {
-                        "condition": "(targetFramework != 'net6.0')",
-                        "value": "\r\n<LangVersion>10</LangVersion>"
-                    }
-                ]
-            }
-        },
         "ReqnrollNugetPackages": {
             "type": "generated",
             "generator": "switch",

diff --git a/projectTemplates/ReqnrollProject/Template.csproj b/projectTemplates/ReqnrollProject/Template.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>$target$</TargetFramework>$langVersion$
+    <TargetFramework>$target$</TargetFramework>
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
   </PropertyGroup>

diff --git a/...harperPlugin.ReqnrollRiderPlugin/Caching/ReqnrollJsonSettings/ReqnrollSettingsProvider.cs b/...harperPlugin.ReqnrollRiderPlugin/Caching/ReqnrollJsonSettings/ReqnrollSettingsProvider.cs
@@ -25,7 +25,12 @@ public class ReqnrollSettingsProvider
         /// <returns>true if it changes the current project config</returns>
         public bool TryUpdate(IProject project, ConfigSource source, ReqnrollSettings? settings)
         {
-            var lifetime = project.GetSolution().GetSolutionLifetimes().UntilSolutionCloseLifetime;
+            var solution = project.GetSolution();
+            // GetSolution() return null when the project is deleted
+            // ReSharper disable once ConditionIsAlwaysTrueOrFalseAccordingToNullableAPIContract
+            if (solution is null)
+                return false;
+            var lifetime = solution.GetSolutionLifetimes().UntilSolutionCloseLifetime;
 
             RegisterProjectLifetime(project, lifetime);
 

diff --git a/.../ReSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/TargetFrameworkProvider.cs b/.../ReSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/TargetFrameworkProvider.cs
diff --git a/...rPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/TargetFrameworkProviderParameter.cs b/...rPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/TargetFrameworkProviderParameter.cs
diff --git a/src/dotnet/ReSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/UnitTestProvider.cs b/src/dotnet/ReSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/UnitTestProvider.cs
diff --git a/...eSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/UnitTestProviderParameter.cs b/...eSharperPlugin.ReqnrollRiderPlugin/ProjectTemplateParameters/UnitTestProviderParameter.cs