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

Create project templates target to 10.0 #44349

Merged
merged 6 commits into from
Nov 8, 2024
Merged

Create project templates target to 10.0 #44349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
795b68c
Create project templates target to 10.0
v-wuzhai Oct 22, 2024
3176d3d
Merge branch 'main' of https://github.com/dotnet/sdk into dev/Jason/c…
v-wuzhai Nov 6, 2024
1f21b51
Fix capitalization
v-wuzhai Nov 6, 2024
372a651
Update regex pattern based on review feedback
v-wuzhai Nov 6, 2024
4b595f0
Fix a bunch of failing tests
v-wuzhai Nov 6, 2024
6595efe
Fix failing template test due to .NET version update
v-wuzhai Nov 6, 2024
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 TemplateEngine.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"test\\dotnet-new.Tests\\dotnet-new.IntegrationTests.csproj",
"test\\dotnet.Tests\\dotnet.Tests.csproj",
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.9.0\\Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj"
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
]
}
}
2 changes: 1 addition & 1 deletion sdk.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -382,7 +382,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template_feed", "template_f
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Common.ItemTemplates", "template_feed\Microsoft.DotNet.Common.ItemTemplates\Microsoft.DotNet.Common.ItemTemplates.csproj", "{92F4E400-8C28-41B9-9D7D-8E9A4535636B}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Common.ProjectTemplates.9.0", "template_feed\Microsoft.DotNet.Common.ProjectTemplates.9.0\Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj", "{AB7ADCF8-48AC-4885-9C70-16D752B97168}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.DotNet.Common.ProjectTemplates.10.0", "template_feed\Microsoft.DotNet.Common.ProjectTemplates.10.0\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj", "{AB7ADCF8-48AC-4885-9C70-16D752B97168}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-new.IntegrationTests", "test\dotnet-new.Tests\dotnet-new.IntegrationTests.csproj", "{8868D816-C072-4B66-84D6-7E014EA16D48}"
EndProject
Expand Down
2 changes: 1 addition & 1 deletion source-build.slnf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
"src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj",
"src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj",
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.9.0\\Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj"
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
]
}
}
2 changes: 1 addition & 1 deletion src/Layout/redist/targets/OverlaySdkOnLKG.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
<Error Text="SDK Stage 0 has more than one folder with templates: @(TemplatesFolderPath->'%(Identity)'). Please delete all but one and rebuild" Condition="@(TemplatesFolderPath->Count()) > 1"></Error>

<!--Prepare Microsoft.DotNet.Common.*.nupkg and pack them directly to target <redist root>\templates\<runtime version> folder. -->
<Exec Command="$(DotnetTool) pack $(RepoRoot)template_feed\Microsoft.DotNet.Common.ProjectTemplates.9.0 --configuration $(Configuration) --output $(RedistLayoutPath)\templates\@(TemplatesFolderPath->'%(FolderName)')\" />
<Exec Command="$(DotnetTool) pack $(RepoRoot)template_feed\Microsoft.DotNet.Common.ProjectTemplates.10.0 --configuration $(Configuration) --output $(RedistLayoutPath)\templates\@(TemplatesFolderPath->'%(FolderName)')\" />
<Exec Command="$(DotnetTool) pack $(RepoRoot)template_feed\Microsoft.DotNet.Common.ItemTemplates --configuration $(Configuration) --output $(RedistLayoutPath)\templates\@(TemplatesFolderPath->'%(FolderName)')\" />

<!-- 2. Other template packages will be included from SDK Stage 0. -->
Expand Down
2 changes: 1 addition & 1 deletion ...icrosoft.DotNet.Common.ItemTemplates/content/Record-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
"generator": "regexMatch",
"datatype": "bool",
"parameters": {
"pattern": "^(net5.0|net6.0|net7.0|net8.0|net9.0)$*",
"pattern": "^(net5.0|net6.0|net7.0|net8.0|net9.0|net10.0)$*",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
"pattern": "^(net5.0|net6.0|net7.0|net8.0|net9.0|net10.0)$*",
"pattern": "^net([5-9]|[1-9]\\d{1,})\\.0$*",

as done in

sdk/test/Microsoft.NET.Publish.Tests/GivenThatWeWantToPublishANetCoreAppForTelemetry.cs

Line 53 in bd5b082

"\"Crossgen2PackVersion\":\"([5-9]|[1-9]\\d{1,})\\..+\"");

"source": "TargetFramework"
}
},
Expand Down
2 changes: 1 addition & 1 deletion ...DotNet.Common.ProjectTemplates.9.0.csproj → ...otNet.Common.ProjectTemplates.10.0.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<IsShippingPackage>true</IsShippingPackage>
<NoWarn>2008;NU5105</NoWarn>
<NoPackageAnalysis>true</NoPackageAnalysis>
<PackageId>Microsoft.DotNet.Common.ProjectTemplates.9.0</PackageId>
<PackageId>Microsoft.DotNet.Common.ProjectTemplates.10.0</PackageId>
<Authors>Microsoft</Authors>
<Description>Common .NET Project Templates</Description>
<language>en-US</language>
Expand Down
2 changes: 1 addition & 1 deletion ...harp/.template.config/dotnetcli.host.json → ...harp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}
},
"usageExamples": [
"--framework net9.0"
"--framework net10.0"
]
}
0 ...ary-CSharp/.template.config/ide.host.json → ...ary-CSharp/.template.config/ide.host.json
View file
Open in desktop
File renamed without changes.
0 ...rary-CSharp/.template.config/ide/icon.ico → ...rary-CSharp/.template.config/ide/icon.ico
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.cs.json → ...e.config/localize/templatestrings.cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
"symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury",
"symbols/Framework/description": "Cílová architektura pro projekt",
"symbols/Framework/choices/net9.0/description": "Cílový net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Cílový net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Cílit na netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Cílit na netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.de.json → ...e.config/localize/templatestrings.de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
"symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung",
"symbols/Framework/description": "Das Zielframework für das Projekt.",
"symbols/Framework/choices/net9.0/description": "Ziel net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Ziel net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Auf „netstandard2.1“ abzielen",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Auf „netstandard2.0“ abzielen",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.en.json → ...e.config/localize/templatestrings.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Overrides the target framework",
"symbols/TargetFrameworkOverride/displayName": "Target framework override",
"symbols/Framework/description": "The target framework for the project.",
"symbols/Framework/choices/net9.0/description": "Target net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Target net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Target netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Target netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.es.json → ...e.config/localize/templatestrings.es.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Invalida la plataforma de destino",
"symbols/TargetFrameworkOverride/displayName": "Invalidación de la plataforma de destino",
"symbols/Framework/description": "Marco de destino del proyecto.",
"symbols/Framework/choices/net9.0/description": "NET9.0 de destino",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "NET10.0 de destino",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Objetivo netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Objetivo netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.fr.json → ...e.config/localize/templatestrings.fr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Remplace l’infrastructure cible",
"symbols/TargetFrameworkOverride/displayName": "Remplacement du frame cible",
"symbols/Framework/description": "Framework cible du projet.",
"symbols/Framework/choices/net9.0/description": "Cible net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Cible net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "netstandard2.1 cible",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "netstandard2.0 cible",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.it.json → ...e.config/localize/templatestrings.it.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Ignora il framework di destinazione",
"symbols/TargetFrameworkOverride/displayName": "Override del framework di destinazione",
"symbols/Framework/description": "Il framework di destinazione per il progetto.",
"symbols/Framework/choices/net9.0/description": "Destinazione net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Destinazione net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Netstandard2.1 di destinazione",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Netstandard2.0 di destinazione",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.ja.json → ...e.config/localize/templatestrings.ja.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "ターゲット フレームワークをオーバーライドする",
"symbols/TargetFrameworkOverride/displayName": "ターゲット フレームワークのオーバーライド",
"symbols/Framework/description": "プロジェクトのターゲット フレームワークです。",
"symbols/Framework/choices/net9.0/description": "ターゲット net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "ターゲット net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "ターゲット netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "ターゲット netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.ko.json → ...e.config/localize/templatestrings.ko.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "대상 프레임워크를 재정의합니다",
"symbols/TargetFrameworkOverride/displayName": "대상 프레임워크 재정의",
"symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.",
"symbols/Framework/choices/net9.0/description": "대상 net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "대상 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "대상 netstandard 2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "대상 netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.pl.json → ...e.config/localize/templatestrings.pl.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Zastępuje platformę docelową",
"symbols/TargetFrameworkOverride/displayName": "Odrzucenie platformy docelowej",
"symbols/Framework/description": "Platforma docelowa dla tego projektu.",
"symbols/Framework/choices/net9.0/description": "Docelowa platforma net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Docelowy netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Docelowy netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...onfig/localize/templatestrings.pt-BR.json → ...onfig/localize/templatestrings.pt-BR.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Substitui a estrutura de destino",
"symbols/TargetFrameworkOverride/displayName": "Substituição da estrutura de destino",
"symbols/Framework/description": "A estrutura de destino do projeto.",
"symbols/Framework/choices/net9.0/description": "Destino net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Destino net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Netstandard2.1 de destino",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Netstandard2.0 de destino",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.ru.json → ...e.config/localize/templatestrings.ru.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Переопределяет целевую платформу",
"symbols/TargetFrameworkOverride/displayName": "Переопределение целевой платформы",
"symbols/Framework/description": "Целевая платформа для проекта.",
"symbols/Framework/choices/net9.0/description": "Целевая среда net9.0",
"symbols/Framework/choices/net9.0/displayName": "NET 9.0",
"symbols/Framework/choices/net10.0/description": "Целевая среда net10.0",
"symbols/Framework/choices/net10.0/displayName": "NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Целевая платформа: netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Целевая платформа: netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.tr.json → ...e.config/localize/templatestrings.tr.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Hedef çerçeveyi geçersiz kılar",
"symbols/TargetFrameworkOverride/displayName": "Hedef çerçeveyi geçersiz kılma",
"symbols/Framework/description": "Projenin hedef çerçevesi.",
"symbols/Framework/choices/net9.0/description": "Hedef net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Hedef net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Hedef netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Hedef netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...fig/localize/templatestrings.zh-Hans.json → ...fig/localize/templatestrings.zh-Hans.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "替代目标框架",
"symbols/TargetFrameworkOverride/displayName": "目标框架替代",
"symbols/Framework/description": "项目的目标框架。",
"symbols/Framework/choices/net9.0/description": "目标 net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "目标 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "目标 netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "目标 netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...fig/localize/templatestrings.zh-Hant.json → ...fig/localize/templatestrings.zh-Hant.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "覆寫目標 Framework",
"symbols/TargetFrameworkOverride/displayName": "目標 Framework 覆寫",
"symbols/Framework/description": "專案的目標 Framework。",
"symbols/Framework/choices/net9.0/description": "目標 net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "目標 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "目標 netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "目標 netstandard2.0",
Expand Down
20 changes: 10 additions & 10 deletions ...ary-CSharp/.template.config/template.json → ...ary-CSharp/.template.config/template.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"generatorVersions": "[1.0.0.0-*)",
"description": "A project for creating a class library that targets .NET or .NET Standard",
"groupIdentity": "Microsoft.Common.Library",
"precedence": "11000",
"identity": "Microsoft.Common.Library.CSharp.9.0",
"precedence": "12000",
"identity": "Microsoft.Common.Library.CSharp.10.0",
"shortName": "classlib",
"tags": {
"language": "C#",
Expand All @@ -22,7 +22,7 @@
"app": {
"description": "Target .NET",
"defaultOverrides": {
"Framework": "net9.0"
"Framework": "net10.0"
}
},
"standard": {
Expand All @@ -47,9 +47,9 @@
"datatype": "choice",
"choices": [
{
"choice": "net9.0",
"description": "Target net9.0",
"displayName": ".NET 9.0"
"choice": "net10.0",
"description": "Target net10.0",
"displayName": ".NET 10.0"
},
{
"choice": "netstandard2.1",
Expand All @@ -62,8 +62,8 @@
"displayName": ".NET Standard 2.0"
}
],
"replaces": "net9.0",
"defaultValue": "net9.0",
"replaces": "net10.0",
"defaultValue": "net10.0",
"displayName": "Framework"
},
"langVersion": {
Expand Down Expand Up @@ -113,11 +113,11 @@
},
"csharpFeature_ImplicitUsings": {
"type": "computed",
"value": "Framework == \"net9.0\" && csharp10orLater == \"true\""
"value": "Framework == \"net10.0\" && csharp10orLater == \"true\""
},
"csharpFeature_FileScopedNamespaces": {
"type": "computed",
"value": "(Framework == \"net9.0\" || langVersion != \"\") && csharp10orLater == \"true\""
"value": "(Framework == \"net10.0\" || langVersion != \"\") && csharp10orLater == \"true\""
},
"csharpFeature_Nullable": {
"type": "computed",
Expand Down
0 ...9.0/content/ClassLibrary-CSharp/Class1.cs → ...0.0/content/ClassLibrary-CSharp/Class1.cs
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...brary-CSharp/Company.ClassLibrary1.csproj → ...brary-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">

<PropertyGroup>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net9.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net10.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
2 changes: 1 addition & 1 deletion ...harp/.template.config/dotnetcli.host.json → ...harp/.template.config/dotnetcli.host.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
}
},
"usageExamples": [
"--framework net9.0"
"--framework net10.0"
]
}
0 ...ary-FSharp/.template.config/ide.host.json → ...ary-FSharp/.template.config/ide.host.json
View file
Open in desktop
File renamed without changes.
0 ...rary-FSharp/.template.config/ide/icon.ico → ...rary-FSharp/.template.config/ide/icon.ico
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.cs.json → ...e.config/localize/templatestrings.cs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
"symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury",
"symbols/Framework/description": "Cílová architektura pro projekt",
"symbols/Framework/choices/net9.0/description": "Cílový net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Cílový net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Cílit na netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Cílit na netstandard2.0",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.de.json → ...e.config/localize/templatestrings.de.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Überschreibt das Zielframework",
"symbols/TargetFrameworkOverride/displayName": "Zielframeworküberschreibung",
"symbols/Framework/description": "Das Zielframework für das Projekt.",
"symbols/Framework/choices/net9.0/description": "Ziel net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Ziel net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Auf „netstandard2.1“ abzielen",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Auf „netstandard2.0“ abzielen",
Expand Down
4 changes: 2 additions & 2 deletions ...e.config/localize/templatestrings.en.json → ...e.config/localize/templatestrings.en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
"symbols/TargetFrameworkOverride/description": "Overrides the target framework",
"symbols/TargetFrameworkOverride/displayName": "Target framework override",
"symbols/Framework/description": "The target framework for the project.",
"symbols/Framework/choices/net9.0/description": "Target net9.0",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Target net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Target netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Target netstandard2.0",
Expand Down
Loading
Loading