Skip to content
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

Adjust project templates to support .NET 6.0 (and default to it) #3976

Merged
merged 2 commits into from
Jan 11, 2021
+50 −18
Merged

Adjust project templates to support .NET 6.0 (and default to it) #3976

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
899b726
Adjust templates to support .NET 6.0
thomasclaudiushuber Jan 11, 2021
8bd82ba
Update Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
thomasclaudiushuber Jan 11, 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
2 changes: 1 addition & 1 deletion ...soft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj
View file
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@
<PropertyGroup>
<PackageName>$(MSBuildProjectName.Replace('.ArchNeutral',''))$(TransportPackageNameSuffix)</PackageName>
<AssemblyName>$(PackageName)</AssemblyName>
<PackageDescription>Project templates for .NET Core WPF Projects</PackageDescription>
<PackageDescription>Project templates for .NET WPF Projects</PackageDescription>
</PropertyGroup>

<ItemGroup>
10 changes: 7 additions & 3 deletions ....Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Application",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a .NET Core WPF Application",
"description": "A project for creating a .NET WPF Application",
"groupIdentity": "Microsoft.Common.WPF",
"precedence": "3000",
"identity": "Microsoft.Common.WPF",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
}
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...et.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Application",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a .NET Core WPF Application",
"description": "A project for creating a .NET WPF Application",
"groupIdentity": "Microsoft.Common.WPF",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.VisualBasic.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Class Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a class library that targets a .NET Core WPF Application",
"description": "A project for creating a class library that targets a .NET WPF Application",
"groupIdentity": "Microsoft.Common.WPF.Library",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.Library.CSharp.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...t.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Class Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a class library that targets a .NET Core WPF Application",
"description": "A project for creating a class library that targets a .NET WPF Application",
"groupIdentity": "Microsoft.Common.WPF.Library",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.Library.VisualBasic.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...pf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Custom Control Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a custom control library for .NET Core WPF Applications",
"description": "A project for creating a custom control library for .NET WPF Applications",
"groupIdentity": "Microsoft.Common.WPF.CustomControl",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.CustomControl.CSharp.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...ojectTemplates/content/WpfCustomControlLibrary-VisualBasic/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF Custom Control Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a custom control library for .NET Core WPF Applications",
"description": "A project for creating a custom control library for .NET WPF Applications",
"groupIdentity": "Microsoft.Common.WPF.CustomControl",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ....Wpf.ProjectTemplates/content/WpfUserControlLibrary-CSharp/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF User Control Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a user control library for .NET Core WPF Applications",
"description": "A project for creating a user control library for .NET WPF Applications",
"groupIdentity": "Microsoft.Common.WPF.Control",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.Control.CSharp.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",
8 changes: 6 additions & 2 deletions ...ProjectTemplates/content/WpfUserControlLibrary-VisualBasic/.template.config/template.json
View file
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"classifications": ["Common", "WPF"],
"name": "WPF User Control Library",
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a user control library for .NET Core WPF Applications",
"description": "A project for creating a user control library for .NET WPF Applications",
"groupIdentity": "Microsoft.Common.WPF.Control",
"precedence": "3000",
"identity": "Microsoft.Common.WPF.Control.VisualBasic.5.0",
@@ -39,10 +39,14 @@
{
"choice": "net5.0",
"description": "Target net5.0"
},
{
"choice": "net6.0",
"description": "Target net6.0"
}
],
"replaces": "FrameworkParameter",
"defaultValue": "net5.0"
"defaultValue": "net6.0"
},
"UseWindowsDesktopSdk": {
"type": "computed",