Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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 .github/workflows/build-core-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
dotnet-quality: preview
dotnet-quality: ga

# Build

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_demo.yml
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
dotnet-quality: preview
dotnet-quality: ga

- name: NPM Install
uses: actions/setup-node@v4
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/deploy_preview.yml
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: 10.0.x
dotnet-quality: preview
dotnet-quality: ga

- name: NPM Install
uses: actions/setup-node@v4
Expand Down
8 changes: 4 additions & 4 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
<RuntimeVersion9>9.0.9</RuntimeVersion9>
<AspNetCoreVersion9>9.0.9</AspNetCoreVersion9>
<EfCoreVersion9>9.0.9</EfCoreVersion9>
<RuntimeVersion10>10.0.0-rc.1.25451.107</RuntimeVersion10>
<AspNetCoreVersion10>10.0.0-rc.1.25451.107</AspNetCoreVersion10>
<EfCoreVersion10>10.0.0-rc.1.25451.107</EfCoreVersion10>
<RuntimeVersion10>10.0.0</RuntimeVersion10>
<AspNetCoreVersion10>10.0.0</AspNetCoreVersion10>
<EfCoreVersion10>10.0.0</EfCoreVersion10>
</PropertyGroup>
<ItemGroup>
<!-- For Sample Apps -->
Expand Down Expand Up @@ -88,4 +88,4 @@
<PackageVersion Include="System.Text.Encodings.Web" Version="$(RuntimeVersion10)" />
<PackageVersion Include="System.Text.Json" Version="$(RuntimeVersion9)" />
</ItemGroup>
</Project>
</Project>
2 changes: 1 addition & 1 deletion eng/pipelines/build-all-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -141,7 +141,7 @@ extends:
displayName: 'Install .NET 10.0'
inputs:
version: 10.0.x
includePreviewVersions: true
includePreviewVersions: false

# Set version number (exclude some folders)
- task: PowerShell@2
Expand Down
2 changes: 1 addition & 1 deletion eng/pipelines/build-core-lib.yml
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ extends:
displayName: 'Install .NET 10.0'
inputs:
version: 10.0.x
includePreviewVersions: true
includePreviewVersions: false

# Set version number (exclude some folders)
- task: PowerShell@2
Expand Down
25 changes: 17 additions & 8 deletions src/Templates/Microsoft.FluentUI.AspNetCore.Templates.csproj
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk" InitialTargets="AddTemplatesToPackageAsContent">
<PropertyGroup>
<TargetFramework>net9.0</TargetFramework>
<TargetFramework>net10.0</TargetFramework>
<Authors>Microsoft</Authors>
<ContentTargetFolders>Content</ContentTargetFolders>
<Copyright>© Microsoft Corporation. All rights reserved.</Copyright>
Expand All @@ -24,12 +24,16 @@

<PropertyGroup>
<!-- for templates -->
<AspirePackageVersion>9.3.2</AspirePackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>9.7.0</MicrosoftExtensionsHttpResiliencePackageVersion>
<MicrosoftAspNetCorePackageVersionForNet8>8.0.18</MicrosoftAspNetCorePackageVersionForNet8>
<MicrosoftAspNetCorePackageVersionForNet9>9.0.7</MicrosoftAspNetCorePackageVersionForNet9>
<MicrosoftAspNetCorePackageVersionForNet10>10.0.0-preview.6.25358.103</MicrosoftAspNetCorePackageVersionForNet10>
<OpenTelemetryLTSVersion>1.9.0</OpenTelemetryLTSVersion>
<AspirePackageVersion>13.0</AspirePackageVersion>
<MicrosoftExtensionsHttpResiliencePackageVersion>10.0.0</MicrosoftExtensionsHttpResiliencePackageVersion>
<MicrosoftExtensionsServiceDiscoveryVersion>10.0.0</MicrosoftExtensionsServiceDiscoveryVersion>
<MicrosoftAspNetCorePackageVersionForNet8>8.0.20</MicrosoftAspNetCorePackageVersionForNet8>
<MicrosoftAspNetCorePackageVersionForNet9>9.0.9</MicrosoftAspNetCorePackageVersionForNet9>
<MicrosoftAspNetCorePackageVersionForNet10>10.0.0</MicrosoftAspNetCorePackageVersionForNet10>
<MicrosoftAspNetCoreOpenApiVersion>9.0.11</MicrosoftAspNetCoreOpenApiVersion>
<MicrosoftAspNetCoreOpenApiPreviewVersion>10.0.0</MicrosoftAspNetCoreOpenApiPreviewVersion>
<OpenTelemetryNet8Version>1.9.0</OpenTelemetryNet8Version>
<OpenTelemetryLTSVersion>1.12.0</OpenTelemetryLTSVersion>
<OpenTelemetryInstrumentationAspNetCoreVersion>1.12.0</OpenTelemetryInstrumentationAspNetCoreVersion>
<OpenTelemetryInstrumentationHttpVersion>1.12.0</OpenTelemetryInstrumentationHttpVersion>
<OpenTelemetryInstrumentationExtensionsHostingVersion>1.12.0</OpenTelemetryInstrumentationExtensionsHostingVersion>
Expand Down Expand Up @@ -100,12 +104,17 @@
.Replace('!!REPLACE_WITH_ASPNETCORE_9_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet9)')
.Replace('!!REPLACE_WITH_ASPNETCORE_10_VERSION!!', '$(MicrosoftAspNetCorePackageVersionForNet10)')
.Replace('!!REPLACE_WITH_DOTNET_EXTENSIONS_VERSION!!', '$(MicrosoftExtensionsHttpResiliencePackageVersion)')
.Replace('!!REPLACE_WITH_SERVICE_DISCOVERY_VERSION!!', '$(MicrosoftExtensionsServiceDiscoveryVersion)')
.Replace('!!REPLACE_WITH_OTEL_NET8_VERSION!!', '$(OpenTelemetryNet8Version)')
.Replace('!!REPLACE_WITH_OTEL_LTS_VERSION!!', '$(OpenTelemetryLTSVersion)')
.Replace('!!REPLACE_WITH_OTEL_EXPORTER_VERSION!!', '$(OpenTelemetryExporterOpenTelemetryProtocolVersion)')
.Replace('!!REPLACE_WITH_OTEL_HOSTING_VERSION!!', '$(OpenTelemetryInstrumentationExtensionsHostingVersion)')
.Replace('!!REPLACE_WITH_OTEL_ASPNETCORE_VERSION!!', '$(OpenTelemetryInstrumentationAspNetCoreVersion)')
.Replace('!!REPLACE_WITH_OTEL_HTTP_VERSION!!', '$(OpenTelemetryInstrumentationHttpVersion)')
.Replace('!!REPLACE_WITH_OTEL_RUNTIME_VERSION!!', '$(OpenTelemetryInstrumentationRuntimeVersion)') )"
.Replace('!!REPLACE_WITH_OTEL_RUNTIME_VERSION!!', '$(OpenTelemetryInstrumentationRuntimeVersion)')
.Replace('!!REPLACE_WITH_ASPNETCORE_OPENAPI_9_VERSION!!', '$(MicrosoftAspNetCoreOpenApiVersion)')
.Replace('!!REPLACE_WITH_ASPNETCORE_OPENAPI_10_VERSION!!', '$(MicrosoftAspNetCoreOpenApiPreviewVersion)') )"

Overwrite="true" />
</Target>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,19 +1,13 @@
{
"$schema": "https://json.schemastore.org/dotnetcli.host",
"$schema": "http://json.schemastore.org/dotnetcli.host",
"symbolInfo": {
"Framework": {
"longName": "framework"
},
"AspireVersionCli": {
"AspireVersion": {
"shortName": "",
"longName": "aspire-version"
},
"AspireVersion": {
"isHidden": true
},
"AspireVersionNet9": {
"isHidden": true
},
"XUnitVersion": {
"shortName": "",
"longName": "xunit-version",
Expand All @@ -31,6 +25,12 @@
"appHostOtlpHttpsPort": {
"isHidden": true
},
"appHostMcpHttpPort": {
"isHidden": true
},
"appHostMcpHttpsPort": {
"isHidden": true
},
"appHostResourceHttpPort": {
"isHidden": true
},
Expand Down Expand Up @@ -60,6 +60,10 @@
"TestFx": {
"longName": "test-framework",
"shortName": "t"
},
"LocalhostTld": {
"longName": "localhost-tld",
"shortName": ""
}
},
"usageExamples": [
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,9 @@
}
],
"symbolInfo": [
{
"id": "AspireVersionCli",
"isVisible": false
},
{
"id": "AspireVersion",
"isVisible": true,
"persistenceScope": "shared",
"persistenceScopeName": "aspireTemplates"
},
{
"id": "AspireVersionNet9",
"isVisible": true,
"persistenceScope": "shared",
"persistenceScopeName": "aspireTemplates"
"isVisible": true
},
{
"id": "XUnitVersion",
Expand All @@ -41,6 +29,12 @@
"id": "TestFx",
"isVisible": true,
"persistenceScope": "templateGroup"
},
{
"id": "LocalhostTld",
"isVisible": true,
"persistenceScope": "shared",
"persistenceScopeName": "Aspire"
}
]
}
Original file line number Diff line number Diff line change
@@ -1,28 +1,17 @@
{
"author": "Microsoft",
"name": "Úvodní aplikace Fluent .NET Aspire",
"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.",
"name": "Úvodní aplikace Fluent Aspire",
"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.",
"symbols/Framework/description": "Cílová architektura pro projekt",
"symbols/Framework/choices/net8.0/description": "Cílový net8.0",
"symbols/Framework/choices/net9.0/description": "Cílit na net9.0",
"symbols/AspireVersionCli/description": "Verze .NET Aspire, která se má použít",
"symbols/AspireVersionCli/displayName": "Verze .NET Aspire",
"symbols/AspireVersionCli/choices/9.2/displayName": "9.2",
"symbols/AspireVersionCli/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
"symbols/AspireVersionCli/choices/9.3/displayName": "9.3",
"symbols/AspireVersionCli/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
"symbols/AspireVersion/description": "Verze .NET Aspire, která se má použít.",
"symbols/AspireVersion/displayName": "Verze .NET Aspire",
"symbols/AspireVersion/choices/9.2/displayName": "9.2",
"symbols/AspireVersion/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
"symbols/AspireVersion/choices/9.3/displayName": "9.3",
"symbols/AspireVersion/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
"symbols/AspireVersionNet9/description": "Verze .NET Aspire, která se má použít",
"symbols/AspireVersionNet9/displayName": "Verze .NET Aspire",
"symbols/AspireVersionNet9/choices/9.2/displayName": "9.2",
"symbols/AspireVersionNet9/choices/9.2/description": "Zvolí .NET Aspire 9.2.",
"symbols/AspireVersionNet9/choices/9.3/displayName": "9.3",
"symbols/AspireVersionNet9/choices/9.3/description": "Zvolí .NET Aspire 9.3.",
"symbols/Framework/choices/net10.0/description": "Cíl net10.0",
"symbols/AspireVersion/description": "Verze Aspire, která se má použít.",
"symbols/AspireVersion/displayName": "Verze Aspire",
"symbols/AspireVersion/choices/13.0/displayName": "13.0",
"symbols/AspireVersion/choices/13.0/description": "Zvolí Aspire 13.0",
"symbols/AspireVersion/choices/9.5/displayName": "9.5",
"symbols/AspireVersion/choices/9.5/description": "Zvolí Aspire 9.5",
"symbols/UseRedisCache/displayName": "Po_užít Redis pro ukládání do mezipaměti (vyžaduje Docker)",
"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.",
"symbols/TestFx/displayName": "Vytvoření projektu _test",
Expand All @@ -41,16 +30,20 @@
"symbols/XUnitVersion/choices/v3mtp/description": "Zvolí xUnit.net v3 s testovací platformou Microsoft (pouze Aspire ve verzi 9.2 a novější)",
"symbols/appHostHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json projektu AppHost.",
"symbols/appHostOtlpHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP OTLP v launchSettings.json projektu AppHost.",
"symbols/appHostMcpHttpPort/description": "Číslo portu, který se má použít pro koncový bod MCP HTTP v launchSettings.json projektu AppHost.",
"symbols/appHostResourceHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP služby prostředků v launchSettings.json projektu AppHost.",
"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.",
"symbols/appHostOtlpHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS OTLP v launchSettings.json projektu AppHost.",
"symbols/appHostMcpHttpsPort/description": "Číslo portu, který se má použít pro koncový bod MCP HTTPS v launchSettings.json projektu AppHost.",
"symbols/appHostResourceHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS služby prostředků v launchSettings.json projektu AppHost.",
"symbols/webHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json webového projektu.",
"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.",
"symbols/apiServiceHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v launchSettings.json projektu ApiService.",
"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.",
"symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
"symbols/NoHttps/description": "Určuje, jestli se má vypnout protokol HTTPS.",
"symbols/LocalhostTld/displayName": "Použití TLD .dev.localhost v adrese URL aplikace",
"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.",
"postActions/set-startup-project/description": "Nastaví projekt po spuštění v řešení",
"postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
"postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
Expand Down
Loading
Loading