Skip to content

Update framework symbol on dotnet new template #1512 #1630

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jan 7, 2021
Merged

Update framework symbol on dotnet new template #1512 #1630

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2cbbb2
update template framework variable to be passed from option with defa…
ExceptionCaught Jan 6, 2021
3139a26
refine the framework parameters.
ExceptionCaught Jan 7, 2021
7035cd2
remove duplicate infomation.
ExceptionCaught Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
45 changes: 43 additions & 2 deletions .../templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,49 @@
"frameworks": {
"type": "parameter",
"datatype": "string",
"description": "The target framework(s) for the project (e.g. netstandard2.0;net472).",
"defaultValue": "netstandard2.0",
"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",
"defaultValue": ""
},
"frameworksDefaults": {
"type": "generated",
"generator": "switch",
"description": "generate a default framework value based on consoleApp",
"parameters": {
"evaluator": "C++",
"datatype": "string",
"cases": [
{
"condition": "(frameworks == '' && consoleApp == true)",
"value": "net5.0"
},
{
"condition": "(frameworks == '' && consoleApp == false)",
"value": "netstandard2.0"
},
{
"condition": "(frameworks != '')",
"value": ""
}
]
},
"replaces": "$(Frameworks)"
},
"frameworksValue": {
"type": "generated",
"generator": "join",
"description": "join frameworks and frameworksDefaults",
"parameters": {
"symbols": [
{
"type": "ref",
"value": "frameworks"
},
{
"type": "ref",
"value": "frameworksDefaults"
}
]
},
"replaces": "$(Frameworks)"
},
"config": {
Expand Down
6 changes: 1 addition & 5 deletions ...s/templates/BenchmarkDotNet.BenchmarkProjectTemplate.CSharp/_BenchmarkProjectName_.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition="'$(consoleApp)' == 'true'">
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without OutputType, we get the following error when consoleApp was selected during the project creation:

Unable to run your project.
Ensure you have a runnable project type and ensure 'dotnet run' supports this project.
A runnable project should target a runnable TFM (for instance, net5.0) and have OutputType 'Exe'.
The current OutputType is 'Library'.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Without OutputType

@am11 great catch, thank you! @ExceptionCaught could you please address that in a separate PR?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hi @am11 , what was the dotnet version that you run new on? I did a few dry run on my local. with or without the consoleapp, could not see the error you mentioned.
image
image

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The command which gives the error is 'dotnet run'.

</PropertyGroup>
<PropertyGroup Condition="'$(consoleApp)' == 'false'">
<PropertyGroup>
<TargetFrameworks>$(Frameworks)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
Expand Down
45 changes: 43 additions & 2 deletions .../templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,49 @@
"frameworks": {
"type": "parameter",
"datatype": "string",
"description": "The target framework(s) for the project (e.g. netstandard2.0;net472).",
"defaultValue": "netstandard2.0",
"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",
"defaultValue": ""
},
"frameworksDefaults": {
"type": "generated",
"generator": "switch",
"description": "generate a default framework value based on consoleApp",
"parameters": {
"evaluator": "C++",
"datatype": "string",
"cases": [
{
"condition": "(frameworks == '' && consoleApp == true)",
"value": "net5.0"
},
{
"condition": "(frameworks == '' && consoleApp == false)",
"value": "netstandard2.0"
},
{
"condition": "(frameworks != '')",
"value": ""
}
]
},
"replaces": "$(Frameworks)"
},
"frameworksValue": {
"type": "generated",
"generator": "join",
"description": "join frameworks and frameworksDefaults",
"parameters": {
"symbols": [
{
"type": "ref",
"value": "frameworks"
},
{
"type": "ref",
"value": "frameworksDefaults"
}
]
},
"replaces": "$(Frameworks)"
},
"config": {
Expand Down
6 changes: 1 addition & 5 deletions ...s/templates/BenchmarkDotNet.BenchmarkProjectTemplate.FSharp/_BenchmarkProjectName_.fsproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition="'$(consoleApp)' == 'true'">
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(consoleApp)' == 'false'">
<PropertyGroup>
<TargetFrameworks>$(Frameworks)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
Expand Down
45 changes: 43 additions & 2 deletions ...ates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,8 +32,49 @@
"frameworks": {
"type": "parameter",
"datatype": "string",
"description": "The target framework(s) for the project (e.g. netstandard2.0;net472).",
"defaultValue": "netstandard2.0",
"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",
"defaultValue": ""
},
"frameworksDefaults": {
"type": "generated",
"generator": "switch",
"description": "generate a default framework value based on consoleApp",
"parameters": {
"evaluator": "C++",
"datatype": "string",
"cases": [
{
"condition": "(frameworks == '' && consoleApp == true)",
"value": "net5.0"
},
{
"condition": "(frameworks == '' && consoleApp == false)",
"value": "netstandard2.0"
},
{
"condition": "(frameworks != '')",
"value": ""
}
]
},
"replaces": "$(Frameworks)"
},
"frameworksValue": {
"type": "generated",
"generator": "join",
"description": "join frameworks and frameworksDefaults",
"parameters": {
"symbols": [
{
"type": "ref",
"value": "frameworks"
},
{
"type": "ref",
"value": "frameworksDefaults"
}
]
},
"replaces": "$(Frameworks)"
},
"config": {
Expand Down
6 changes: 1 addition & 5 deletions ...lates/templates/BenchmarkDotNet.BenchmarkProjectTemplate.VB/_BenchmarkProjectName_.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,5 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup Condition="'$(consoleApp)' == 'true'">
<TargetFramework>netcoreapp3.0</TargetFramework>
<OutputType>Exe</OutputType>
</PropertyGroup>
<PropertyGroup Condition="'$(consoleApp)' == 'false'">
<PropertyGroup>
<TargetFrameworks>$(Frameworks)</TargetFrameworks>
</PropertyGroup>
<PropertyGroup>
Expand Down