Skip to content

Commit ad99a85

Browse files
ViktorHofergenalt
ViktorHofer
and
genalt
authored
Update .NET 5 templates with net5.0 tfm (#3042) (#3048)
Co-authored-by: grinrag <[email protected]>
1 parent b0d2569 commit ad99a85

File tree

17 files changed

+51
-51
lines changed

17 files changed

+51
-51
lines changed

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/Microsoft.DotNet.Wpf.ProjectTemplates.ArchNeutral.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<ProjectGuid>{BFF6C118-3369-43B5-ACA6-D65ED00EEBE0}</ProjectGuid>
4-
<TargetFramework>netcoreapp5.0</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<Platforms>AnyCPU;x64</Platforms>
66
</PropertyGroup>
77

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/.template.config/template.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"description": "Target netcoreapp3.1"
3838
},
3939
{
40-
"choice": "netcoreapp5.0",
41-
"description": "Target netcoreapp5.0"
40+
"choice": "net5.0",
41+
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "netcoreapp5.0",
45-
"defaultValue": "netcoreapp5.0"
44+
"replaces": "net5.0",
45+
"defaultValue": "net5.0"
4646
},
4747
"langVersion": {
4848
"type": "parameter",

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-CSharp/Company.WpfApplication1.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,11 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
66
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
77
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfApplication1</RootNamespace>
88
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
99
<UseWPF>true</UseWPF>
1010
</PropertyGroup>
1111

12-
</Project>
12+
</Project>

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/.template.config/template.json‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"description": "Target netcoreapp3.1"
3838
},
3939
{
40-
"choice": "netcoreapp5.0",
41-
"description": "Target netcoreapp5.0"
42-
}
40+
"choice": "net5.0",
41+
"description": "Target net5.0"
42+
}
4343
],
44-
"replaces": "netcoreapp5.0",
45-
"defaultValue": "netcoreapp5.0"
44+
"replaces": "net5.0",
45+
"defaultValue": "net5.0"
4646
},
4747
"langVersion": {
4848
"type": "parameter",
@@ -68,7 +68,7 @@
6868
"condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
6969
"path": "MainWindow.xaml.vb"
7070
},
71-
{
71+
{
7272
"condition": "(HostIdentifier != \"dotnetcli\" && HostIdentifier != \"dotnetcli-preview\")",
7373
"path": "MainWindow.xaml"
7474
}

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfApplication-VisualBasic/Company.WpfApplication1.vbproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
66
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
77
<RootNamespace>Company.WpfApplication1</RootNamespace>
88
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
@@ -21,4 +21,4 @@
2121
<Import Include="System.Windows.Shapes" />
2222
</ItemGroup>
2323

24-
</Project>
24+
</Project>

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/.template.config/template.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"description": "Target netcoreapp3.1"
3838
},
3939
{
40-
"choice": "netcoreapp5.0",
41-
"description": "Target netcoreapp5.0"
42-
}
40+
"choice": "net5.0",
41+
"description": "Target net5.0"
42+
}
4343
],
44-
"replaces": "netcoreapp5.0",
45-
"defaultValue": "netcoreapp5.0"
44+
"replaces": "net5.0",
45+
"defaultValue": "net5.0"
4646
},
4747
"langVersion": {
4848
"type": "parameter",

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-CSharp/Company.ClassLibrary1.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
55
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
66
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ClassLibrary1</RootNamespace>
77
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/.template.config/template.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"description": "Target netcoreapp3.1"
3838
},
3939
{
40-
"choice": "netcoreapp5.0",
41-
"description": "Target netcoreapp5.0"
42-
}
40+
"choice": "net5.0",
41+
"description": "Target net5.0"
42+
}
4343
],
44-
"replaces": "netcoreapp5.0",
45-
"defaultValue": "netcoreapp5.0"
44+
"replaces": "net5.0",
45+
"defaultValue": "net5.0"
4646
},
4747
"langVersion": {
4848
"type": "parameter",

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfClassLibrary-VisualBasic/Company.ClassLibrary1.vbproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<RootNamespace>Company.ClassLibrary1</RootNamespace>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">netcoreapp5.0</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
66
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
77
<RootNamespace>Company.ClassLibrary1</RootNamespace>
88
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/.template.config/template.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -37,12 +37,12 @@
3737
"description": "Target netcoreapp3.1"
3838
},
3939
{
40-
"choice": "netcoreapp5.0",
41-
"description": "Target netcoreapp5.0"
42-
}
40+
"choice": "net5.0",
41+
"description": "Target net5.0"
42+
}
4343
],
44-
"replaces": "netcoreapp5.0",
45-
"defaultValue": "netcoreapp5.0"
44+
"replaces": "net5.0",
45+
"defaultValue": "net5.0"
4646
},
4747
"langVersion": {
4848
"type": "parameter",

0 commit comments

Comments
 (0)