Skip to content

Commit

Permalink
Create project templates target to 10.0 (#44349)
Browse files Browse the repository at this point in the history
  • Loading branch information
v-wuzhai authored Nov 8, 2024
2 parents 3247fe5 + 6595efe commit c87de36
Show file tree
Hide file tree
Showing 150 changed files with 327 additions and 329 deletions.
2 changes: 1 addition & 1 deletion TemplateEngine.slnf
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,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
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
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": "^net([5-9]|[1-9]\\d{1,})\\.0$*",
"source": "TargetFramework"
}
},
Expand Down
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
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
}
},
"usageExamples": [
"--framework net9.0"
"--framework net10.0"
]
}
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": "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": "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
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": "Ziel netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Ziel netstandard2.0",
Expand Down
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
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
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 cadre cible",
"symbols/Framework/description": "Framework cible du projet.",
"symbols/Framework/choices/net9.0/description": "Net9.0 cible",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Net10.0 cible",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/netstandard2.1/description": "Cible netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Cible netstandard2.0",
Expand Down
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": "Net9.0 di destinazione",
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
"symbols/Framework/choices/net10.0/description": "Net10.0 di destinazione",
"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
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
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": "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": "대상 netstandard 2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "대상 netstandard2.0",
Expand Down
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
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": "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": "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
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
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
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
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
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
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
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,6 @@
}
},
"usageExamples": [
"--framework net9.0"
"--framework net10.0"
]
}
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": "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": "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
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": "Ziel netstandard2.1",
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
"symbols/Framework/choices/netstandard2.0/description": "Ziel netstandard2.0",
Expand Down
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

0 comments on commit c87de36

Please sign in to comment.