Changing SDK detectin logic

timheuer · Nov 1, 2023 · ac8059a · ac8059a
1 parent dc48d71
commit ac8059a
Show file tree

Hide file tree

Showing 3 changed files with 41 additions and 5 deletions.
diff --git a/src/templatepack.csproj b/src/templatepack.csproj
@@ -16,7 +16,7 @@
     <IncludeContentInPack>true</IncludeContentInPack>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <ContentTargetFolders>content</ContentTargetFolders>
-    <Version>1.1.6</Version>
+    <Version>1.1.7</Version>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/templates/.template.config/dotnetcli.host.json b/src/templates/.template.config/dotnetcli.host.json
@@ -4,6 +4,9 @@
     "sdk-version": {
       "longName": "sdk-version",
       "shortName": "sdk"
+    },
+    "dotnet-cli-version": {
+      "isHidden": "true"
     }
   },
   "usageExamples": [

diff --git a/src/templates/.template.config/template.json b/src/templates/.template.config/template.json
@@ -9,6 +9,7 @@
     ],
     "identity": "TimHeuer.GitHubWorkflows",
     "name": "GitHub Actions workflow for .NET Core",
+    "generatorVersions": "[1.0.0.0-*)",
     "description": "A workflow file for .NET Core apps to use in GitHub Actions",
     "shortName": "workflow",
     "sourceName": "ci_build",
@@ -23,17 +24,49 @@
     },
     "defaultName": "build",
     "symbols": {
+        "HostIdentifier": {
+            "type": "bind",
+            "binding": "HostIdentifier"
+        },
         "sdk-version": {
             "description": "The SDK version for the generated workflow",
-            "replaces": "Workflow.SDKVersion",
             "type": "parameter",
-            "defaultValue": "7.0.x"
+            "datatype": "string",
+            "displayName": "SDK version"
         },
         "branch": {
             "description": "The branch for the workflow to operate on",
             "replaces": "Workflow.Branch",
             "type": "parameter",
-            "defaultValue": "main"
+            "defaultValue": "main",
+            "datatype": "string",
+            "displayName": "Branch"
+        },
+        "dotnet-cli-version": {
+            "type": "parameter",
+            "datatype": "string",
+            "displayName": "dotnet CLI version"
+        },
+        "CombinedVersion": {
+            "type": "generated",
+            "generator": "coalesce",
+            "parameters": {
+                "sourceVariableName": "sdk-version",
+                "fallbackVariableName": "dotnet-cli-version"
+            },
+            "replaces": "Workflow.SDKVersion"
+        }
+    },
+    "postActions": [
+        {
+            "id": "open-file",
+            "description": "Open the workflow file in the editor",
+            "condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
+            "args": {
+                "files": "0"
+            },
+            "actionId": "84C0DA21-51C8-4541-9940-6CA19AF04EE6",
+            "continueOnError": true
         }
-    }
+    ]
 }