use coalesce instead of join

dotnet · Oct 5, 2023 · 00628ab · 00628ab
1 parent 2d379b3
commit 00628ab
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 54 deletions.
diff --git a/.../templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json b/.../templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json
@@ -90,35 +90,22 @@
         "datatype": "string",
         "cases": [
           {
-            "condition": "(framework == '' && consoleApp == true)",
+            "condition": "(consoleApp == true)",
             "value": "net6.0"
           },
           {
-            "condition": "(framework == '' && consoleApp == false)",
+            "condition": "(consoleApp == false)",
             "value": "netstandard2.0"
-          },
-          {
-            "condition": "(framework != '')",
-            "value": ""
           }
         ]
       }
     },
     "frameworkValue": {
       "type": "generated",
-      "generator": "join",
-      "description": "join framework and frameworkDefault",
+      "generator": "coalesce",
       "parameters": {
-        "symbols": [
-          {
-            "type": "ref",
-            "value": "framework"
-          },
-          {
-            "type": "ref",
-            "value": "frameworkDefault"
-          }
-        ]
+        "sourceVariableName": "framework",
+        "fallbackVariableName": "frameworkDefault"
       },
       "replaces": "$(Framework)"
     },

diff --git a/.../templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json b/.../templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json
@@ -90,35 +90,22 @@
         "datatype": "string",
         "cases": [
           {
-            "condition": "(framework == '' && consoleApp == true)",
+            "condition": "(consoleApp == true)",
             "value": "net6.0"
           },
           {
-            "condition": "(framework == '' && consoleApp == false)",
+            "condition": "(consoleApp == false)",
             "value": "netstandard2.0"
-          },
-          {
-            "condition": "(framework != '')",
-            "value": ""
           }
         ]
       }
     },
     "frameworkValue": {
       "type": "generated",
-      "generator": "join",
-      "description": "join framework and frameworkDefault",
+      "generator": "coalesce",
       "parameters": {
-        "symbols": [
-          {
-            "type": "ref",
-            "value": "framework"
-          },
-          {
-            "type": "ref",
-            "value": "frameworkDefault"
-          }
-        ]
+        "sourceVariableName": "framework",
+        "fallbackVariableName": "frameworkDefault"
       },
       "replaces": "$(Framework)"
     },

diff --git a/...ates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json b/...ates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json
@@ -90,35 +90,22 @@
         "datatype": "string",
         "cases": [
           {
-            "condition": "(framework == '' && consoleApp == true)",
+            "condition": "(consoleApp == true)",
             "value": "net6.0"
           },
           {
-            "condition": "(framework == '' && consoleApp == false)",
+            "condition": "(consoleApp == false)",
             "value": "netstandard2.0"
-          },
-          {
-            "condition": "(framework != '')",
-            "value": ""
           }
         ]
       }
     },
     "frameworkValue": {
       "type": "generated",
-      "generator": "join",
-      "description": "join framework and frameworkDefault",
+      "generator": "coalesce",
       "parameters": {
-        "symbols": [
-          {
-            "type": "ref",
-            "value": "framework"
-          },
-          {
-            "type": "ref",
-            "value": "frameworkDefault"
-          }
-        ]
+        "sourceVariableName": "framework",
+        "fallbackVariableName": "frameworkDefault"
       },
       "replaces": "$(Framework)"
     },