Skip to content

Commit 81019fc

Browse files
authored
Update templates to 10.0 (#10332)
1 parent b604067 commit 81019fc

File tree

8 files changed

+76
-36
lines changed

8 files changed

+76
-36
lines changed

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a .NET WPF Application",
88
"groupIdentity": "Microsoft.Common.WPF",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.CSharp.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.CSharp.10.0",
1111
"shortName": "wpf",
1212
"tags": {
1313
"language": "C#",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {
@@ -128,11 +133,11 @@
128133
},
129134
"csharpFeature_ImplicitUsings" : {
130135
"type": "computed",
131-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
132137
},
133138
"csharpFeature_FileScopedNamespaces" : {
134139
"type": "computed",
135-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
140+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136141
}
137142
},
138143
"primaryOutputs": [
@@ -161,7 +166,7 @@
161166
},
162167
{
163168
"exclude": [ "**/[Bb]in/**", "**/[Oo]bj/**", ".template.config/**/*", "**/*.filelist", "**/*.lock.json" ],
164-
"condition": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
169+
"condition": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
165170
"source": "./net6.0",
166171
"target": "./"
167172
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a .NET WPF Application",
88
"groupIdentity": "Microsoft.Common.WPF",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.VisualBasic.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.VisualBasic.10.0",
1111
"shortName": "wpf",
1212
"tags": {
1313
"language": "VB",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a class library that targets a .NET WPF Application",
88
"groupIdentity": "Microsoft.Common.WPF.Library",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.Library.CSharp.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.Library.CSharp.10.0",
1111
"shortName": "wpflib",
1212
"tags": {
1313
"language": "C#",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {
@@ -128,11 +133,11 @@
128133
},
129134
"csharpFeature_ImplicitUsings" : {
130135
"type": "computed",
131-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
132137
},
133138
"csharpFeature_FileScopedNamespaces" : {
134139
"type": "computed",
135-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
140+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136141
}
137142
},
138143
"primaryOutputs": [
@@ -157,7 +162,7 @@
157162
},
158163
{
159164
"exclude": [ "**/[Bb]in/**", "**/[Oo]bj/**", ".template.config/**/*", "**/*.filelist", "**/*.lock.json" ],
160-
"condition": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
165+
"condition": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
161166
"source": "./net6.0",
162167
"target": "./"
163168
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a class library that targets a .NET WPF Application",
88
"groupIdentity": "Microsoft.Common.WPF.Library",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.Library.VisualBasic.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.Library.VisualBasic.10.0",
1111
"shortName": "wpflib",
1212
"tags": {
1313
"language": "VB",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a custom control library for .NET WPF Applications",
88
"groupIdentity": "Microsoft.Common.WPF.CustomControl",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.CustomControl.CSharp.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.CustomControl.CSharp.10.0",
1111
"shortName": "wpfcustomcontrollib",
1212
"tags": {
1313
"language": "C#",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {
@@ -128,11 +133,11 @@
128133
},
129134
"csharpFeature_ImplicitUsings" : {
130135
"type": "computed",
131-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
132137
},
133138
"csharpFeature_FileScopedNamespaces" : {
134139
"type": "computed",
135-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
140+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136141
}
137142
},
138143
"primaryOutputs": [
@@ -157,7 +162,7 @@
157162
},
158163
{
159164
"exclude": [ "**/[Bb]in/**", "**/[Oo]bj/**", ".template.config/**/*", "**/*.filelist", "**/*.lock.json" ],
160-
"condition": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
165+
"condition": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
161166
"source": "./net6.0",
162167
"target": "./"
163168
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a custom control library for .NET WPF Applications",
88
"groupIdentity": "Microsoft.Common.WPF.CustomControl",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.CustomControl.VisualBasic.10.0",
1111
"shortName": "wpfcustomcontrollib",
1212
"tags": {
1313
"language": "VB",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {

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

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a user control library for .NET WPF Applications",
88
"groupIdentity": "Microsoft.Common.WPF.Control",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.Control.CSharp.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.Control.CSharp.10.0",
1111
"shortName": "wpfusercontrollib",
1212
"tags": {
1313
"language": "C#",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {
@@ -128,11 +133,11 @@
128133
},
129134
"csharpFeature_ImplicitUsings" : {
130135
"type": "computed",
131-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
132137
},
133138
"csharpFeature_FileScopedNamespaces" : {
134139
"type": "computed",
135-
"value": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
140+
"value": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\") && csharp9orOlder == \"false\""
136141
}
137142
},
138143
"primaryOutputs": [
@@ -161,7 +166,7 @@
161166
},
162167
{
163168
"exclude": [ "**/[Bb]in/**", "**/[Oo]bj/**", ".template.config/**/*", "**/*.filelist", "**/*.lock.json" ],
164-
"condition": "(Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
169+
"condition": "(Framework == \"net10.0\" || Framework == \"net9.0\" || Framework == \"net8.0\" || Framework == \"net7.0\" || Framework == \"net6.0\")",
165170
"source": "./net6.0",
166171
"target": "./"
167172
}

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

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@
66
"generatorVersions": "[1.0.0.0-*)",
77
"description": "A project for creating a user control library for .NET WPF Applications",
88
"groupIdentity": "Microsoft.Common.WPF.Control",
9-
"precedence": "9000",
10-
"identity": "Microsoft.Common.WPF.Control.VisualBasic.9.0",
9+
"precedence": "10000",
10+
"identity": "Microsoft.Common.WPF.Control.VisualBasic.10.0",
1111
"shortName": "wpfusercontrollib",
1212
"tags": {
1313
"language": "VB",
@@ -63,10 +63,15 @@
6363
"choice": "net9.0",
6464
"description": "Target net9.0",
6565
"displayName": ".NET 9.0"
66+
},
67+
{
68+
"choice": "net10.0",
69+
"description": "Target net10.0",
70+
"displayName": ".NET 10.0"
6671
}
6772
],
6873
"replaces": "FrameworkParameter",
69-
"defaultValue": "net9.0",
74+
"defaultValue": "net10.0",
7075
"displayName": "Framework"
7176
},
7277
"UseWindowsDesktopSdk": {

0 commit comments

Comments
 (0)