Skip to content

Commit c87de36

Browse files
author
v-wuzhai
authored
Create project templates target to 10.0 (#44349)
2 parents 3247fe5 + 6595efe commit c87de36

File tree

150 files changed

+327
-329
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

150 files changed

+327
-329
lines changed

‎TemplateEngine.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
"test\\dotnet-new.Tests\\dotnet-new.IntegrationTests.csproj",
2020
"test\\dotnet.Tests\\dotnet.Tests.csproj",
2121
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
22-
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.9.0\\Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj"
22+
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
2323
]
2424
}
2525
}

‎sdk.sln‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -382,7 +382,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "template_feed", "template_f
382382
EndProject
383383
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}"
384384
EndProject
385-
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}"
385+
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}"
386386
EndProject
387387
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "dotnet-new.IntegrationTests", "test\dotnet-new.Tests\dotnet-new.IntegrationTests.csproj", "{8868D816-C072-4B66-84D6-7E014EA16D48}"
388388
EndProject

‎source-build.slnf‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"src\\WebSdk\\Web\\Tasks\\Microsoft.NET.Sdk.Web.Tasks.csproj",
4747
"src\\WebSdk\\Worker\\Tasks\\Microsoft.NET.Sdk.Worker.Tasks.csproj",
4848
"template_feed\\Microsoft.DotNet.Common.ItemTemplates\\Microsoft.DotNet.Common.ItemTemplates.csproj",
49-
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.9.0\\Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj"
49+
"template_feed\\Microsoft.DotNet.Common.ProjectTemplates.10.0\\Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj"
5050
]
5151
}
5252
}

‎src/Layout/redist/targets/OverlaySdkOnLKG.targets‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
<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>
2828

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

3333
<!-- 2. Other template packages will be included from SDK Stage 0. -->

‎template_feed/Microsoft.DotNet.Common.ItemTemplates/content/Record-CSharp/.template.config/template.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
"generator": "regexMatch",
3939
"datatype": "bool",
4040
"parameters": {
41-
"pattern": "^(net5.0|net6.0|net7.0|net8.0|net9.0)$*",
41+
"pattern": "^net([5-9]|[1-9]\\d{1,})\\.0$*",
4242
"source": "TargetFramework"
4343
}
4444
},

‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/Microsoft.DotNet.Common.ProjectTemplates.9.0.csproj‎ renamed to ‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/Microsoft.DotNet.Common.ProjectTemplates.10.0.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<IsShippingPackage>true</IsShippingPackage>
1313
<NoWarn>2008;NU5105</NoWarn>
1414
<NoPackageAnalysis>true</NoPackageAnalysis>
15-
<PackageId>Microsoft.DotNet.Common.ProjectTemplates.9.0</PackageId>
15+
<PackageId>Microsoft.DotNet.Common.ProjectTemplates.10.0</PackageId>
1616
<Authors>Microsoft</Authors>
1717
<Description>Common .NET Project Templates</Description>
1818
<language>en-US</language>

‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json‎ renamed to ‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/ClassLibrary-CSharp/.template.config/dotnetcli.host.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,6 @@
1919
}
2020
},
2121
"usageExamples": [
22-
"--framework net9.0"
22+
"--framework net10.0"
2323
]
2424
}

‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/ClassLibrary-CSharp/.template.config/ide.host.json‎ renamed to ‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/ClassLibrary-CSharp/.template.config/ide.host.json‎

File renamed without changes.

‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/ClassLibrary-CSharp/.template.config/ide/icon.ico‎ renamed to ‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/ClassLibrary-CSharp/.template.config/ide/icon.ico‎

File renamed without changes.

‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.9.0/content/ClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json‎ renamed to ‎template_feed/Microsoft.DotNet.Common.ProjectTemplates.10.0/content/ClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
"symbols/TargetFrameworkOverride/description": "Přepíše cílovou architekturu.",
66
"symbols/TargetFrameworkOverride/displayName": "Přepsání cílové architektury",
77
"symbols/Framework/description": "Cílová architektura pro projekt",
8-
"symbols/Framework/choices/net9.0/description": "Target net9.0",
9-
"symbols/Framework/choices/net9.0/displayName": ".NET 9.0",
8+
"symbols/Framework/choices/net10.0/description": "Target net10.0",
9+
"symbols/Framework/choices/net10.0/displayName": ".NET 10.0",
1010
"symbols/Framework/choices/netstandard2.1/description": "Cílit na netstandard2.1",
1111
"symbols/Framework/choices/netstandard2.1/displayName": ".NET Standard 2.1",
1212
"symbols/Framework/choices/netstandard2.0/description": "Cílit na netstandard2.0",

0 commit comments

Comments
 (0)