diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json index ee3057ff34..d078cb9d9f 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json @@ -29,13 +29,13 @@ "FileRename": "_BenchmarkName_", "replaces": "$(BenchmarkName)" }, - "frameworks": { + "framework": { "type": "parameter", "datatype": "string", - "description": "The target framework(s) for the project (e.g. netstandard2.0;net472). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is true", + "description": "The target framework for the project (e.g. netstandard2.0). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is false", "defaultValue": "" }, - "frameworksDefaults": { + "frameworkDefault": { "type": "generated", "generator": "switch", "description": "generate a default framework value based on consoleApp", @@ -44,38 +44,37 @@ "datatype": "string", "cases": [ { - "condition": "(frameworks == '' && consoleApp == true)", + "condition": "(framework == '' && consoleApp == true)", "value": "net5.0" }, { - "condition": "(frameworks == '' && consoleApp == false)", + "condition": "(framework == '' && consoleApp == false)", "value": "netstandard2.0" }, { - "condition": "(frameworks != '')", + "condition": "(framework != '')", "value": "" } ] - }, - "replaces": "$(Frameworks)" + } }, - "frameworksValue": { + "frameworkValue": { "type": "generated", "generator": "join", - "description": "join frameworks and frameworksDefaults", + "description": "join framework and frameworkDefault", "parameters": { "symbols": [ { "type": "ref", - "value": "frameworks" + "value": "framework" }, { "type": "ref", - "value": "frameworksDefaults" + "value": "frameworkDefault" } ] }, - "replaces": "$(Frameworks)" + "replaces": "$(Framework)" }, "config": { "type": "parameter", @@ -99,7 +98,7 @@ "type": "parameter", "datatype": "string", "description": "Version of BenchmarkDotNet that will be referenced.", - "defaultValue": "0.12.0", + "defaultValue": "0.12.1", "replaces": "$(BenchmarkDotNetVersion)" } }, diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/_BenchmarkProjectName_.csproj b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/_BenchmarkProjectName_.csproj index 783e194c29..1103a2fa11 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/_BenchmarkProjectName_.csproj +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/_BenchmarkProjectName_.csproj @@ -1,7 +1,11 @@ - - $(Frameworks) + + $(Framework) + Exe + + $(Framework) + AnyCPU portable diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json index 7abd02e798..43d30c88cc 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json @@ -29,13 +29,13 @@ "FileRename": "_BenchmarkName_", "replaces": "$(BenchmarkName)" }, - "frameworks": { + "framework": { "type": "parameter", "datatype": "string", - "description": "The target framework(s) for the project (e.g. netstandard2.0;net472). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is true", + "description": "The target framework for the project (e.g. netstandard2.0). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is false", "defaultValue": "" }, - "frameworksDefaults": { + "frameworkDefault": { "type": "generated", "generator": "switch", "description": "generate a default framework value based on consoleApp", @@ -44,38 +44,37 @@ "datatype": "string", "cases": [ { - "condition": "(frameworks == '' && consoleApp == true)", + "condition": "(framework == '' && consoleApp == true)", "value": "net5.0" }, { - "condition": "(frameworks == '' && consoleApp == false)", + "condition": "(framework == '' && consoleApp == false)", "value": "netstandard2.0" }, { - "condition": "(frameworks != '')", + "condition": "(framework != '')", "value": "" } ] - }, - "replaces": "$(Frameworks)" + } }, - "frameworksValue": { + "frameworkValue": { "type": "generated", "generator": "join", - "description": "join frameworks and frameworksDefaults", + "description": "join framework and frameworkDefault", "parameters": { "symbols": [ { "type": "ref", - "value": "frameworks" + "value": "framework" }, { "type": "ref", - "value": "frameworksDefaults" + "value": "frameworkDefault" } ] }, - "replaces": "$(Frameworks)" + "replaces": "$(Framework)" }, "config": { "type": "parameter", @@ -99,7 +98,7 @@ "type": "parameter", "datatype": "string", "description": "Version of BenchmarkDotNet that will be referenced.", - "defaultValue": "0.12.0", + "defaultValue": "0.12.1", "replaces": "$(BenchmarkDotNetVersion)" } }, diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/_BenchmarkProjectName_.fsproj b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/_BenchmarkProjectName_.fsproj index 6e50bc89fd..d86c3103e9 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/_BenchmarkProjectName_.fsproj +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/_BenchmarkProjectName_.fsproj @@ -1,6 +1,10 @@  - - $(Frameworks) + + $(Framework) + Exe + + + $(Framework) AnyCPU diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json index 841f94dbe3..923c83620e 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json @@ -29,13 +29,13 @@ "FileRename": "_BenchmarkName_", "replaces": "$(BenchmarkName)" }, - "frameworks": { + "framework": { "type": "parameter", "datatype": "string", - "description": "The target framework(s) for the project (e.g. netstandard2.0;net472). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is true", + "description": "The target framework for the project (e.g. netstandard2.0). Default \"net5.0\" if \"--console-app\" is true, \"netstandard2.0\" if \"--console-app\" is false", "defaultValue": "" }, - "frameworksDefaults": { + "frameworkDefault": { "type": "generated", "generator": "switch", "description": "generate a default framework value based on consoleApp", @@ -44,38 +44,37 @@ "datatype": "string", "cases": [ { - "condition": "(frameworks == '' && consoleApp == true)", + "condition": "(framework == '' && consoleApp == true)", "value": "net5.0" }, { - "condition": "(frameworks == '' && consoleApp == false)", + "condition": "(framework == '' && consoleApp == false)", "value": "netstandard2.0" }, { - "condition": "(frameworks != '')", + "condition": "(framework != '')", "value": "" } ] - }, - "replaces": "$(Frameworks)" + } }, - "frameworksValue": { + "frameworkValue": { "type": "generated", "generator": "join", - "description": "join frameworks and frameworksDefaults", + "description": "join framework and frameworkDefault", "parameters": { "symbols": [ { "type": "ref", - "value": "frameworks" + "value": "framework" }, { "type": "ref", - "value": "frameworksDefaults" + "value": "frameworkDefault" } ] }, - "replaces": "$(Frameworks)" + "replaces": "$(Framework)" }, "config": { "type": "parameter", @@ -99,7 +98,7 @@ "type": "parameter", "datatype": "string", "description": "Version of BenchmarkDotNet that will be referenced.", - "defaultValue": "0.12.0", + "defaultValue": "0.12.1", "replaces": "$(BenchmarkDotNetVersion)" } }, diff --git a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/_BenchmarkProjectName_.vbproj b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/_BenchmarkProjectName_.vbproj index 783e194c29..0a50e51029 100644 --- a/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/_BenchmarkProjectName_.vbproj +++ b/templates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/_BenchmarkProjectName_.vbproj @@ -1,6 +1,10 @@ - - $(Frameworks) + + $(Framework) + Exe + + + $(Framework) AnyCPU