Skip to content

Commit fc0a0e5

Browse files
vnbaaijvnbaaij
authored
- Update to .NET 10 GA SDK (#4326)
- Update Aspire templates (13 + 9.5.2)
1 parent 27e759e commit fc0a0e5

File tree

90 files changed

+375
-441
lines changed

Some content is hidden

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

90 files changed

+375
-441
lines changed

‎.github/workflows/build-core-lib.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ jobs:
5252
uses: actions/setup-dotnet@v4
5353
with:
5454
dotnet-version: 10.0.x
55-
dotnet-quality: preview
55+
dotnet-quality: ga
5656

5757
# Build
5858

‎.github/workflows/deploy_demo.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ jobs:
4747
uses: actions/setup-dotnet@v4
4848
with:
4949
dotnet-version: 10.0.x
50-
dotnet-quality: preview
50+
dotnet-quality: ga
5151

5252
- name: NPM Install
5353
uses: actions/setup-node@v4

‎.github/workflows/deploy_preview.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ jobs:
4848
uses: actions/setup-dotnet@v4
4949
with:
5050
dotnet-version: 10.0.x
51-
dotnet-quality: preview
51+
dotnet-quality: ga
5252

5353
- name: NPM Install
5454
uses: actions/setup-node@v4

‎Directory.Packages.props‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
<RuntimeVersion9>9.0.9</RuntimeVersion9>
88
<AspNetCoreVersion9>9.0.9</AspNetCoreVersion9>
99
<EfCoreVersion9>9.0.9</EfCoreVersion9>
10-
<RuntimeVersion10>10.0.0-rc.1.25451.107</RuntimeVersion10>
11-
<AspNetCoreVersion10>10.0.0-rc.1.25451.107</AspNetCoreVersion10>
12-
<EfCoreVersion10>10.0.0-rc.1.25451.107</EfCoreVersion10>
10+
<RuntimeVersion10>10.0.0</RuntimeVersion10>
11+
<AspNetCoreVersion10>10.0.0</AspNetCoreVersion10>
12+
<EfCoreVersion10>10.0.0</EfCoreVersion10>
1313
</PropertyGroup>
1414
<ItemGroup>
1515
<!-- For Sample Apps -->
@@ -88,4 +88,4 @@
8888
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
8989
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
9090
</ItemGroup>
91-
</Project>
91+
</Project>

‎eng/pipelines/build-all-lib.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ extends:
141141
displayName: 'Install .NET 10.0'
142142
inputs:
143143
version: 10.0.x
144-
includePreviewVersions: true
144+
includePreviewVersions: false
145145

146146
# Set version number (exclude some folders)
147147
- task: PowerShell@2

‎eng/pipelines/build-core-lib.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ extends:
171171
displayName: 'Install .NET 10.0'
172172
inputs:
173173
version: 10.0.x
174-
includePreviewVersions: true
174+
includePreviewVersions: false
175175

176176
# Set version number (exclude some folders)
177177
- task: PowerShell@2

‎src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="AddTemplatesToPackageAsContent">
22
<PropertyGroup>
3-
<TargetFramework>net9.0</TargetFramework>
3+
<TargetFramework>net10.0</TargetFramework>
44
<Authors>Microsoft</Authors>
55
<ContentTargetFolders>Content</ContentTargetFolders>
66
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
@@ -24,12 +24,16 @@
2424

2525
<PropertyGroup>
2626
<!-- for templates -->
27-
<AspirePackageVersion>9.3.2</AspirePackageVersion>
28-
<MicrosoftExtensionsHttpResiliencePackageVersion>9.7.0</MicrosoftExtensionsHttpResiliencePackageVersion>
29-
<MicrosoftAspNetCorePackageVersionForNet8>8.0.18</MicrosoftAspNetCorePackageVersionForNet8>
30-
<MicrosoftAspNetCorePackageVersionForNet9>9.0.7</MicrosoftAspNetCorePackageVersionForNet9>
31-
<MicrosoftAspNetCorePackageVersionForNet10>10.0.0-preview.6.25358.103</MicrosoftAspNetCorePackageVersionForNet10>
32-
<OpenTelemetryLTSVersion>1.9.0</OpenTelemetryLTSVersion>
27+
<AspirePackageVersion>13.0</AspirePackageVersion>
28+
<MicrosoftExtensionsHttpResiliencePackageVersion>10.0.0</MicrosoftExtensionsHttpResiliencePackageVersion>
29+
<MicrosoftExtensionsServiceDiscoveryVersion>10.0.0</MicrosoftExtensionsServiceDiscoveryVersion>
30+
<MicrosoftAspNetCorePackageVersionForNet8>8.0.20</MicrosoftAspNetCorePackageVersionForNet8>
31+
<MicrosoftAspNetCorePackageVersionForNet9>9.0.9</MicrosoftAspNetCorePackageVersionForNet9>
32+
<MicrosoftAspNetCorePackageVersionForNet10>10.0.0</MicrosoftAspNetCorePackageVersionForNet10>
33+
<MicrosoftAspNetCoreOpenApiVersion>9.0.11</MicrosoftAspNetCoreOpenApiVersion>
34+
<MicrosoftAspNetCoreOpenApiPreviewVersion>10.0.0</MicrosoftAspNetCoreOpenApiPreviewVersion>
35+
<OpenTelemetryNet8Version>1.9.0</OpenTelemetryNet8Version>
36+
<OpenTelemetryLTSVersion>1.12.0</OpenTelemetryLTSVersion>
3337
<OpenTelemetryInstrumentationAspNetCoreVersion>1.12.0</OpenTelemetryInstrumentationAspNetCoreVersion>
3438
<OpenTelemetryInstrumentationHttpVersion>1.12.0</OpenTelemetryInstrumentationHttpVersion>
3539
<OpenTelemetryInstrumentationExtensionsHostingVersion>1.12.0</OpenTelemetryInstrumentationExtensionsHostingVersion>
@@ -100,12 +104,17 @@
100104
.Replace('!!REPLACE_WITH_ASPNETCORE_9_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet9)')
101105
.Replace('!!REPLACE_WITH_ASPNETCORE_10_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet10)')
102106
.Replace('!!REPLACE_WITH_DOTNET_EXTENSIONS_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersion)')
107+
.Replace('!!REPLACE_WITH_SERVICE_DISCOVERY_VERSION!!', '$(MicrosoftExtensionsServiceDiscoveryVersion)')
108+
.Replace('!!REPLACE_WITH_OTEL_NET8_VERSION!!', '$(OpenTelemetryNet8Version)')
103109
.Replace('!!REPLACE_WITH_OTEL_LTS_VERSION!!', '$(OpenTelemetryLTSVersion)')
104110
.Replace('!!REPLACE_WITH_OTEL_EXPORTER_VERSION!!', '$(OpenTelemetryExporterOpenTelemetryProtocolVersion)')
105111
.Replace('!!REPLACE_WITH_OTEL_HOSTING_VERSION!!', '$(OpenTelemetryInstrumentationExtensionsHostingVersion)')
106112
.Replace('!!REPLACE_WITH_OTEL_ASPNETCORE_VERSION!!', '$(OpenTelemetryInstrumentationAspNetCoreVersion)')
107113
.Replace('!!REPLACE_WITH_OTEL_HTTP_VERSION!!', '$(OpenTelemetryInstrumentationHttpVersion)')
108-
.Replace('!!REPLACE_WITH_OTEL_RUNTIME_VERSION!!', '$(OpenTelemetryInstrumentationRuntimeVersion)') )"
114+
.Replace('!!REPLACE_WITH_OTEL_RUNTIME_VERSION!!', '$(OpenTelemetryInstrumentationRuntimeVersion)')
115+
.Replace('!!REPLACE_WITH_ASPNETCORE_OPENAPI_9_VERSION!!', '$(MicrosoftAspNetCoreOpenApiVersion)')
116+
.Replace('!!REPLACE_WITH_ASPNETCORE_OPENAPI_10_VERSION!!', '$(MicrosoftAspNetCoreOpenApiPreviewVersion)') )"
117+
109118
Overwrite="true" />
110119
</Target>
111120

‎src/Templates/templates/aspire-starter/.template.config/dotnetcli.host.json‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
{
2-
"$schema": "https://json.schemastore.org/dotnetcli.host",
2+
"$schema": "http://json.schemastore.org/dotnetcli.host",
33
"symbolInfo": {
44
"Framework": {
55
"longName": "framework"
66
},
7-
"AspireVersionCli": {
7+
"AspireVersion": {
88
"shortName": "",
99
"longName": "aspire-version"
1010
},
11-
"AspireVersion": {
12-
"isHidden": true
13-
},
14-
"AspireVersionNet9": {
15-
"isHidden": true
16-
},
1711
"XUnitVersion": {
1812
"shortName": "",
1913
"longName": "xunit-version",
@@ -31,6 +25,12 @@
3125
"appHostOtlpHttpsPort": {
3226
"isHidden": true
3327
},
28+
"appHostMcpHttpPort": {
29+
"isHidden": true
30+
},
31+
"appHostMcpHttpsPort": {
32+
"isHidden": true
33+
},
3434
"appHostResourceHttpPort": {
3535
"isHidden": true
3636
},
@@ -60,6 +60,10 @@
6060
"TestFx": {
6161
"longName": "test-framework",
6262
"shortName": "t"
63+
},
64+
"LocalhostTld": {
65+
"longName": "localhost-tld",
66+
"shortName": ""
6367
}
6468
},
6569
"usageExamples": [

‎src/Templates/templates/aspire-starter/.template.config/ide.host.json‎

Lines changed: 7 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,21 +10,9 @@
1010
}
1111
],
1212
"symbolInfo": [
13-
{
14-
"id": "AspireVersionCli",
15-
"isVisible": false
16-
},
1713
{
1814
"id": "AspireVersion",
19-
"isVisible": true,
20-
"persistenceScope": "shared",
21-
"persistenceScopeName": "aspireTemplates"
22-
},
23-
{
24-
"id": "AspireVersionNet9",
25-
"isVisible": true,
26-
"persistenceScope": "shared",
27-
"persistenceScopeName": "aspireTemplates"
15+
"isVisible": true
2816
},
2917
{
3018
"id": "XUnitVersion",
@@ -41,6 +29,12 @@
4129
"id": "TestFx",
4230
"isVisible": true,
4331
"persistenceScope": "templateGroup"
32+
},
33+
{
34+
"id": "LocalhostTld",
35+
"isVisible": true,
36+
"persistenceScope": "shared",
37+
"persistenceScopeName": "Aspire"
4438
}
4539
]
4640
}

‎src/Templates/templates/aspire-starter/.template.config/localize/templatestrings.cs.json‎

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,17 @@
11
{
22
"author": "Microsoft",
3-
"name": "Úvodní aplikace Fluent .NET Aspire",
4-
"description": "Šablona projektu pro vytvoření aplikace Fluent .NET Aspire s webovým front-endem Blazor a back-endovou službou webového rozhraní API, volitelně s využitím Redisu pro ukládání do mezipaměti.",
3+
"name": "Úvodní aplikace Fluent Aspire",
4+
"description": "Šablona projektu pro vytvoření aplikace Fluent Aspire s webovým front-endem Blazor a back-endovou službou webového rozhraní API, volitelně s využitím Redisu pro ukládání do mezipaměti.",
55
"symbols/Framework/description": "Cílová architektura pro projekt",
66
"symbols/Framework/choices/net8.0/description": "Cílový net8.0",
77
"symbols/Framework/choices/net9.0/description": "Cílit na net9.0",
8-
"symbols/AspireVersionCli/description": "Verze .NET Aspire, která se má použít",
9-
"symbols/AspireVersionCli/displayName": "Verze .NET Aspire",
10-
"symbols/AspireVersionCli/choices/9.2/displayName": "9.2",
11-
"symbols/AspireVersionCli/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
12-
"symbols/AspireVersionCli/choices/9.3/displayName": "9.3",
13-
"symbols/AspireVersionCli/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
14-
"symbols/AspireVersion/description": "Verze .NET Aspire, která se má použít.",
15-
"symbols/AspireVersion/displayName": "Verze .NET Aspire",
16-
"symbols/AspireVersion/choices/9.2/displayName": "9.2",
17-
"symbols/AspireVersion/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
18-
"symbols/AspireVersion/choices/9.3/displayName": "9.3",
19-
"symbols/AspireVersion/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
20-
"symbols/AspireVersionNet9/description": "Verze .NET Aspire, která se má použít",
21-
"symbols/AspireVersionNet9/displayName": "Verze .NET Aspire",
22-
"symbols/AspireVersionNet9/choices/9.2/displayName": "9.2",
23-
"symbols/AspireVersionNet9/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
24-
"symbols/AspireVersionNet9/choices/9.3/displayName": "9.3",
25-
"symbols/AspireVersionNet9/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
8+
"symbols/Framework/choices/net10.0/description": "Cíl net10.0",
9+
"symbols/AspireVersion/description": "Verze Aspire, která se má použít.",
10+
"symbols/AspireVersion/displayName": "Verze Aspire",
11+
"symbols/AspireVersion/choices/13.0/displayName": "13.0",
12+
"symbols/AspireVersion/choices/13.0/description": "Zvolí Aspire 13.0",
13+
"symbols/AspireVersion/choices/9.5/displayName": "9.5",
14+
"symbols/AspireVersion/choices/9.5/description": "Zvolí Aspire 9.5",
2615
"symbols/UseRedisCache/displayName": "Po_užít Redis pro ukládání do mezipaměti (vyžaduje Docker)",
2716
"symbols/UseRedisCache/description": "Nakonfiguruje, jestli se má aplikace nastavit tak, aby pro ukládání do mezipaměti používala Redis. K místnímu spouštění se vyžaduje podporovaný modul runtime kontejneru. Další podrobnosti najdete na https://aka.ms/dotnet/aspire/containers.",
2817
"symbols/TestFx/displayName": "Vytvoření projektu _test",
@@ -41,16 +30,20 @@
4130
"symbols/XUnitVersion/choices/v3mtp/description": "Zvolí xUnit.net v3 s testovací platformou Microsoft (pouze Aspire ve verzi 9.2 a novější)",
4231
"symbols/appHostHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json projektu AppHost.",
4332
"symbols/appHostOtlpHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP OTLP v launchSettings.json projektu AppHost.",
33+
"symbols/appHostMcpHttpPort/description": "Číslo portu, který se má použít pro koncový bod MCP HTTP v launchSettings.json projektu AppHost.",
4434
"symbols/appHostResourceHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP služby prostředků v launchSettings.json projektu AppHost.",
4535
"symbols/appHostHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v launchSettings.json projektu AppHost. Tato možnost se dá použít jenom v případě, že se nepoužívá parametr no-https.",
4636
"symbols/appHostOtlpHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS OTLP v launchSettings.json projektu AppHost.",
37+
"symbols/appHostMcpHttpsPort/description": "Číslo portu, který se má použít pro koncový bod MCP HTTPS v launchSettings.json projektu AppHost.",
4738
"symbols/appHostResourceHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS služby prostředků v launchSettings.json projektu AppHost.",
4839
"symbols/webHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json webového projektu.",
4940
"symbols/webHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v launchSettings.json webového projektu. Tato možnost se dá použít jenom v případě, že se nepoužívá parametr no-https.",
5041
"symbols/apiServiceHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json projektu ApiService.",
5142
"symbols/apiServiceHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v launchSettings.json projektu ApiService. Tato možnost se dá použít jenom v případě, že se nepoužívá parametr no-https.",
5243
"symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
5344
"symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS.",
45+
"symbols/LocalhostTld/displayName": "Použití TLD .dev.localhost v adrese URL aplikace",
46+
"symbols/LocalhostTld/description": "Určuje, jestli se má název projektu zkombinovat s TLD .dev.localhost v adrese URL aplikace pro místní vývoj, například https://myapp.dev.localhost:12345. Podporováno v .NET 10 a novějších verzích.",
5447
"postActions/set-startup-project/description": "Nastaví projekt po spuštění v řešení",
5548
"postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
5649
"postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"

0 commit comments

Comments
 (0)