Skip to content

Update .NET 5 templates with net5.0 tfm (#3042) #3048

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 1 commit into from
May 26, 2020
Merged

Update .NET 5 templates with net5.0 tfm (#3042) #3048

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...soft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
<TargetFramework>netcoreapp5.0</TargetFramework>
<TargetFramework>net5.0</TargetFramework>
<Platforms>AnyCPU;x64</Platforms>
</PropertyGroup>

Expand Down
8 changes: 4 additions & 4 deletions ....Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
4 changes: 2 additions & 2 deletions ....Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,11 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfApplication1</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
<UseWPF>true</UseWPF>
</PropertyGroup>

</Project>
</Project>
12 changes: 6 additions & 6 deletions ...et.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand All @@ -68,7 +68,7 @@
"condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
"path": "MainWindow.xaml.vb"
},
{
{
"condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
"path": "MainWindow.xaml"
}
Expand Down
4 changes: 2 additions & 2 deletions ...et.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>WinExe</OutputType>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace>Company.WpfApplication1</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand All @@ -21,4 +21,4 @@
<Import Include="System.Windows.Shapes" />
</ItemGroup>

</Project>
</Project>
10 changes: 5 additions & 5 deletions ...Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...t.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ClassLibrary1</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down
10 changes: 5 additions & 5 deletions ...t.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...net.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<RootNamespace>Company.ClassLibrary1</RootNamespace>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace>Company.ClassLibrary1</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down
10 changes: 5 additions & 5 deletions ...pf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...ctTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfCustomControlLibrary</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down
10 changes: 5 additions & 5 deletions ...ojectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...plates/content/WpfCustomControlLibrary-VisualBasic/Company.WpfCustomControlLibrary.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace>Company.WpfCustomControlLibrary</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down
10 changes: 5 additions & 5 deletions ....Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...pf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/Company.WpfControlLibrary.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfControlLibrary</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down
10 changes: 5 additions & 5 deletions ...ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,12 +37,12 @@
"description": "Target netcoreapp3.1"
},
{
"choice": "netcoreapp5.0",
"description": "Target netcoreapp5.0"
}
"choice": "net5.0",
"description": "Target net5.0"
}
],
"replaces": "netcoreapp5.0",
"defaultValue": "netcoreapp5.0"
"replaces": "net5.0",
"defaultValue": "net5.0"
},
"langVersion": {
"type": "parameter",
Expand Down
2 changes: 1 addition & 1 deletion ...ojectTemplates/content/WpfUserControlLibrary-VisualBasic/Company.WpfControlLibrary.vbproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
<RootNamespace>Company.WpfControlLibrary</RootNamespace>
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
Expand Down