Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion TemplateEngine.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"test\\dotnet-new.IntegrationTests\\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.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj"
]
}
}
2 changes: 1 addition & 1 deletion sdk.slnx
Original file line number Diff line number Diff line change
Expand Up @@ -310,7 +310,7 @@
</Folder>
<Folder Name="/template_feed/">
<Project Path="template_feed/Microsoft.DotNet.Common.ItemTemplates/Microsoft.DotNet.Common.ItemTemplates.csproj" />
<Project Path="template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj" />
<Project Path="template_feed/Microsoft.DotNet.Common.ProjectTemplates.11.0/Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj" />
</Folder>
<Folder Name="/test/">
<Project Path="src/Tasks/Microsoft.NET.Build.Extensions.Tasks.UnitTests/Microsoft.NET.Build.Extensions.Tasks.UnitTests.csproj" />
Expand Down
2 changes: 1 addition & 1 deletion source-build.slnf
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,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.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.11.0\\Microsoft.DotNet.Common.ProjectTemplates.11.0.csproj"
]
}
}
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.10.0</PackageId>
<PackageId>Microsoft.DotNet.Common.ProjectTemplates.11.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 net10.0"
"--framework net11.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/net10.0/description": "Cíl net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Cíl net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Ziel.-NET10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Ziel.-NET11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Target net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Target net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Destino net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Destino net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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": "Le cadre cible du projet.",
"symbols/Framework/choices/net10.0/description": "Net10.0 cible",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Net11.0 cible",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Destinazione net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Destinazione net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "ターゲット net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "ターゲット net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "대상 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "대상 net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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": "Zastąpienie struktury docelowej",
"symbols/Framework/description": "Platforma docelowa dla tego projektu.",
"symbols/Framework/choices/net10.0/description": "Docelowa platforma net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Docelowa platforma net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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 para o projeto.",
"symbols/Framework/choices/net10.0/description": "Net10.0 de destino",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Net11.0 de destino",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Целевая платформа .NET 10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Целевая платформа .NET 11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Hedef net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Hedef net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "目标 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "目标 net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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": "目標架構覆寫",
"symbols/Framework/description": "專案的目標架構。",
"symbols/Framework/choices/net10.0/description": "目標 net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "目標 net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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": "12000",
"identity": "Microsoft.Common.Library.CSharp.10.0",
"precedence": "13000",
"identity": "Microsoft.Common.Library.CSharp.11.0",
"shortName": "classlib",
"tags": {
"language": "C#",
Expand All @@ -22,7 +22,7 @@
"app": {
"description": "Target .NET",
"defaultOverrides": {
"Framework": "net10.0"
"Framework": "net11.0"
}
},
"standard": {
Expand All @@ -47,9 +47,9 @@
"datatype": "choice",
"choices": [
{
"choice": "net10.0",
"description": "Target net10.0",
"displayName": ".NET 10.0"
"choice": "net11.0",
"description": "Target net11.0",
"displayName": ".NET 11.0"
},
{
"choice": "netstandard2.1",
Expand All @@ -62,8 +62,8 @@
"displayName": ".NET Standard 2.0"
}
],
"replaces": "net10.0",
"defaultValue": "net10.0",
"replaces": "net11.0",
"defaultValue": "net11.0",
"displayName": "Framework"
},
"langVersion": {
Expand Down Expand Up @@ -113,11 +113,11 @@
},
"csharpFeature_ImplicitUsings": {
"type": "computed",
"value": "Framework == \"net10.0\" && csharp10orLater == \"true\""
"value": "Framework == \"net11.0\" && csharp10orLater == \"true\""
},
"csharpFeature_FileScopedNamespaces": {
"type": "computed",
"value": "(Framework == \"net10.0\" || langVersion != \"\") && csharp10orLater == \"true\""
"value": "(Framework == \"net11.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)' == ''">net10.0</TargetFramework>
<TargetFramework Condition="'$(TargetFrameworkOverride)' == ''">net11.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 net10.0"
"--framework net11.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/net10.0/description": "Cíl net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Cíl net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Ziel.-NET10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Ziel.-NET11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Target net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Target net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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/net10.0/description": "Destino net10.0",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Destino net11.0",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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": "Le cadre cible du projet.",
"symbols/Framework/choices/net10.0/description": "Net10.0 cible",
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
"symbols/Framework/choices/net11.0/description": "Net11.0 cible",
"symbols/Framework/choices/net11.0/displayName": ".NET 11.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
Loading
Loading