Skip to content

Commit faf0844

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/5.0-preview8' changes
2 parents 90621bb + 99e223f commit faf0844

File tree

24 files changed

+359
-32
lines changed

24 files changed

+359
-32
lines changed

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -73,6 +77,27 @@
7377
"path": "MainWindow.xaml"
7478
}
7579
],
80+
"sources": [
81+
{
82+
"modifiers": [
83+
{
84+
"condition": "(UseWindowsDesktopSdk)",
85+
"exclude": [
86+
"Company.WpfApplication1.csproj"
87+
],
88+
"rename": {
89+
"Company.WpfApplication3x1.csproj": "Company.WpfApplication1.csproj"
90+
}
91+
},
92+
{
93+
"condition": "(!UseWindowsDesktopSdk)",
94+
"exclude": [
95+
"Company.WpfApplication3x1.csproj"
96+
]
97+
}
98+
]
99+
}
100+
],
76101
"defaultName": "WpfApp1",
77102
"postActions": [
78103
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

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

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter</TargetFramework>
6+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
7+
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfApplication1</RootNamespace>
8+
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
9+
<UseWPF>true</UseWPF>
10+
</PropertyGroup>
11+
12+
</Project>

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -73,6 +77,27 @@
7377
"path": "MainWindow.xaml"
7478
}
7579
],
80+
"sources": [
81+
{
82+
"modifiers": [
83+
{
84+
"condition": "(UseWindowsDesktopSdk)",
85+
"exclude": [
86+
"Company.WpfApplication1.vbproj"
87+
],
88+
"rename": {
89+
"Company.WpfApplication3x1.vbproj": "Company.WpfApplication1.vbproj"
90+
}
91+
},
92+
{
93+
"condition": "(!UseWindowsDesktopSdk)",
94+
"exclude": [
95+
"Company.WpfApplication3x1.vbproj"
96+
]
97+
}
98+
]
99+
}
100+
],
76101
"defaultName": "WpfApp1",
77102
"postActions": [
78103
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
6-
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter-windows</TargetFramework>
6+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride-windows</TargetFramework>
77
<RootNamespace>Company.WpfApplication1</RootNamespace>
88
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
99
<UseWPF>true</UseWPF>

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

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<OutputType>WinExe</OutputType>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter</TargetFramework>
6+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
7+
<RootNamespace>Company.WpfApplication1</RootNamespace>
8+
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
9+
<UseWPF>true</UseWPF>
10+
</PropertyGroup>
11+
12+
<ItemGroup>
13+
<Import Include="System.Windows" />
14+
<Import Include="System.Windows.Controls" />
15+
<Import Include="System.Windows.Data" />
16+
<Import Include="System.Windows.Documents" />
17+
<Import Include="System.Windows.Input" />
18+
<Import Include="System.Windows.Media" />
19+
<Import Include="System.Windows.Media.Imaging" />
20+
<Import Include="System.Windows.Navigation" />
21+
<Import Include="System.Windows.Shapes" />
22+
</ItemGroup>
23+
24+
</Project>

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -69,6 +73,27 @@
6973
"path": "Class1.cs"
7074
}
7175
],
76+
"sources": [
77+
{
78+
"modifiers": [
79+
{
80+
"condition": "(UseWindowsDesktopSdk)",
81+
"exclude": [
82+
"Company.ClassLibrary1.csproj"
83+
],
84+
"rename": {
85+
"Company.ClassLibrary3x1.csproj": "Company.ClassLibrary1.csproj"
86+
}
87+
},
88+
{
89+
"condition": "(!UseWindowsDesktopSdk)",
90+
"exclude": [
91+
"Company.ClassLibrary3x1.csproj"
92+
]
93+
}
94+
]
95+
}
96+
],
7297
"defaultName": "WpfLibrary1",
7398
"postActions": [
7499
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

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

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

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6+
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.ClassLibrary1</RootNamespace>
7+
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
8+
<UseWPF>true</UseWPF>
9+
</PropertyGroup>
10+
11+
</Project>

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -69,6 +73,27 @@
6973
"path": "Class1.vb"
7074
}
7175
],
76+
"sources": [
77+
{
78+
"modifiers": [
79+
{
80+
"condition": "(UseWindowsDesktopSdk)",
81+
"exclude": [
82+
"Company.ClassLibrary1.vbproj"
83+
],
84+
"rename": {
85+
"Company.ClassLibrary3x1.vbproj": "Company.ClassLibrary1.vbproj"
86+
}
87+
},
88+
{
89+
"condition": "(!UseWindowsDesktopSdk)",
90+
"exclude": [
91+
"Company.ClassLibrary3x1.vbproj"
92+
]
93+
}
94+
]
95+
}
96+
],
7297
"defaultName": "WpfLibrary1",
7398
"postActions": [
7499
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<RootNamespace>Company.ClassLibrary1</RootNamespace>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
6-
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter-windows</TargetFramework>
6+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride-windows</TargetFramework>
77
<RootNamespace>Company.ClassLibrary1</RootNamespace>
88
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
99
<UseWPF>true</UseWPF>

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

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<RootNamespace>Company.ClassLibrary1</RootNamespace>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter</TargetFramework>
6+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
7+
<RootNamespace>Company.ClassLibrary1</RootNamespace>
8+
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
9+
<UseWPF>true</UseWPF>
10+
</PropertyGroup>
11+
12+
</Project>

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -69,6 +73,27 @@
6973
"path": "CustomControl1.cs"
7074
}
7175
],
76+
"sources": [
77+
{
78+
"modifiers": [
79+
{
80+
"condition": "(UseWindowsDesktopSdk)",
81+
"exclude": [
82+
"Company.WpfCustomControlLibrary.csproj"
83+
],
84+
"rename": {
85+
"Company.WpfCustomControlLibrary3x.csproj": "Company.WpfCustomControlLibrary.csproj"
86+
}
87+
},
88+
{
89+
"condition": "(!UseWindowsDesktopSdk)",
90+
"exclude": [
91+
"Company.WpfCustomControlLibrary3x.csproj"
92+
]
93+
}
94+
]
95+
}
96+
],
7297
"defaultName": "WpfCustomControlLibrary1",
7398
"postActions": [
7499
{

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net5.0</TargetFramework>
5-
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter-windows</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride-windows</TargetFramework>
66
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfCustomControlLibrary</RootNamespace>
77
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
88
<UseWPF>true</UseWPF>

‎packaging/Microsoft.Dotnet.Wpf.ProjectTemplates/content/WpfCustomControlLibrary-CSharp/Company.WpfCustomControlLibrary3x.csproj

+11
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
2+
3+
<PropertyGroup>
4+
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">FrameworkParameter</TargetFramework>
5+
<TargetFramework Condition="'$(TargetFrameworkOverride)' != ''">TargetFrameworkOverride</TargetFramework>
6+
<RootNamespace Condition="'$(name)' != '$(name{-VALUE-FORMS-}safe_namespace)'">Company.WpfCustomControlLibrary</RootNamespace>
7+
<LangVersion Condition="'$(langVersion)' != ''">$(ProjectLanguageVersion)</LangVersion>
8+
<UseWPF>true</UseWPF>
9+
</PropertyGroup>
10+
11+
</Project>

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

+26-1
Original file line numberDiff line numberDiff line change
@@ -41,9 +41,13 @@
4141
"description": "Target net5.0"
4242
}
4343
],
44-
"replaces": "net5.0",
44+
"replaces": "FrameworkParameter",
4545
"defaultValue": "net5.0"
4646
},
47+
"UseWindowsDesktopSdk": {
48+
"type": "computed",
49+
"value": "(Framework == \"netcoreapp3.1\" || Framework == \"netcoreapp3.0\")"
50+
},
4751
"langVersion": {
4852
"type": "parameter",
4953
"datatype": "text",
@@ -69,6 +73,27 @@
6973
"path": "CustomControl1.vb"
7074
}
7175
],
76+
"sources": [
77+
{
78+
"modifiers": [
79+
{
80+
"condition": "(UseWindowsDesktopSdk)",
81+
"exclude": [
82+
"Company.WpfCustomControlLibrary.vbproj"
83+
],
84+
"rename": {
85+
"Company.WpfCustomControlLibrary3x.vbproj": "Company.WpfCustomControlLibrary.vbproj"
86+
}
87+
},
88+
{
89+
"condition": "(!UseWindowsDesktopSdk)",
90+
"exclude": [
91+
"Company.WpfCustomControlLibrary3x.vbproj"
92+
]
93+
}
94+
]
95+
}
96+
],
7297
"defaultName": "WpfCustomControlLibrary1",
7398
"postActions": [
7499
{

0 commit comments

Comments
 (0)