Skip to content

Commit 11822d0

Browse files
committed
Merge branch 'release/8.0' into merge/release/8.0-rc2-to-release/8.0
2 parents 3dbfa81 + 0cbe08f commit 11822d0

17 files changed

+503
-502
lines changed

eng/Version.Details.xml

Lines changed: 158 additions & 158 deletions
Large diffs are not rendered by default.

eng/Versions.props

Lines changed: 81 additions & 80 deletions
Large diffs are not rendered by default.

eng/targets/Helix.props

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
<HelixTimeout>00:45:00</HelixTimeout>
1313
<HelixTestName>$(MSBuildProjectName)--$(TargetFramework)</HelixTestName>
1414
<LoggingTestingDisableFileLogging Condition="'$(IsHelixJob)' == 'true'">false</LoggingTestingDisableFileLogging>
15-
<NodeVersion>16.11.0</NodeVersion>
15+
<NodeVersion>20.7.0</NodeVersion>
1616

1717
<!--
1818
Many tests depend on the .dotnet/ layouts but only a few (those that restore or test packages) require

global.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
},
2828
"msbuild-sdks": {
2929
"Yarn.MSBuild": "1.22.10",
30-
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23451.1",
31-
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23451.1"
30+
"Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.23463.1",
31+
"Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.23463.1"
3232
}
3333
}
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
{
1+
{
22
"author": "Microsoft",
3-
"name": "Webová aplikace Blazor",
4-
"description": "Šablona projektu pro vytvoření webové aplikace Blazor, která podporuje vykreslování na straně serveru i interaktivitu klienta. Tato šablona se dá použít pro webové aplikace s bohatými dynamickými uživatelskými rozhraními (UI).",
5-
"symbols/Framework/description": "Cílová architektura pro projekt",
6-
"symbols/Framework/choices/net8.0/description": "Cílový net8.0",
3+
"name": "Blazor Web App",
4+
"description": "A project template for creating a Blazor web app that supports both server-side rendering and client interactivity. This template can be used for web apps with rich dynamic user interfaces (UIs).",
5+
"symbols/Framework/description": "The target framework for the project.",
6+
"symbols/Framework/choices/net8.0/description": "Target net8.0",
77
"symbols/UserSecretsId/description": "The ID to use for secrets (use with Individual auth).",
8-
"symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.",
9-
"symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.",
10-
"symbols/kestrelHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v souboru launchSettings.json.",
11-
"symbols/kestrelHttpsPort/description": "Číslo portu, který se má použít pro koncový bod HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije IndividualAuth nebo OrganizationalAuth).",
12-
"symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.",
13-
"symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json. Tato možnost se dá použít jenom v případě, že se nepoužije parametr no-https (no-https se bude ignorovat, pokud se použije IndividualAuth nebo OrganizationalAuth).",
8+
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
9+
"symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
10+
"symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.",
11+
"symbols/kestrelHttpsPort/description": "Port number to use for the HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).",
12+
"symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
13+
"symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).",
1414
"symbols/InteractivityPlatform/displayName": "_Interactivity type",
1515
"symbols/InteractivityPlatform/description": "Chooses which hosting platform to use for interactive components",
1616
"symbols/InteractivityPlatform/choices/None/displayName": "None",
@@ -23,22 +23,22 @@
2323
"symbols/InteractivityPlatform/choices/Auto/description": "Uses Server while downloading WebAssembly assets, then uses WebAssembly",
2424
"symbols/InteractivityLocation/displayName": "_Interactivity location",
2525
"symbols/InteractivityLocation/description": "Chooses which components will have interactive rendering enabled",
26-
"symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page or component",
26+
"symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page/component",
2727
"symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interactivity is applied on a per-page or per-component basis",
2828
"symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
2929
"symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interactivity is applied at the root level",
30-
"symbols/IncludeSampleContent/displayName": "_Zahrnout ukázkové stránky",
31-
"symbols/IncludeSampleContent/description": "Nastavuje, jestli se mají přidávat ukázkové stránky a styly pro demonstraci základních vzorů použití.",
32-
"symbols/Empty/description": "Nastavuje, jestli se mají vynechat ukázkové stránky a styly, které demonstrují základní vzory použití.",
30+
"symbols/IncludeSampleContent/displayName": "_Include sample pages",
31+
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns.",
32+
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
3333
"symbols/auth/choices/None/description": "No authentication",
3434
"symbols/auth/choices/Individual/description": "Individual authentication",
3535
"symbols/auth/description": "The type of authentication to use",
3636
"symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual is specified.",
3737
"symbols/AllInteractive/displayName": "_Enable interactive rendering globally throughout the site",
3838
"symbols/AllInteractive/description": "Configures whether to make every page interactive by applying an interactive render mode at the top level. If false, pages will use static server rendering by default, and can be marked interactive on a per-page or per-component basis.",
39-
"symbols/NoHttps/description": "Určuje, jestli se má protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.",
40-
"symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně",
41-
"symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.",
42-
"postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.",
43-
"postActions/restore/manualInstructions/default/text": "Spustit dotnet restore"
39+
"symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual isn't used for --auth.",
40+
"symbols/UseProgramMain/displayName": "Do not use _top-level statements",
41+
"symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
42+
"postActions/restore/description": "Restore NuGet packages required by this project.",
43+
"postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
4444
}
Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
1-
{
1+
{
22
"author": "Microsoft",
3-
"name": "Blazor-Web-App",
4-
"description": "Eine Projektvorlage zum Erstellen einer Blazor-Web-App, die sowohl serverseitiges Rendering als auch Clientinteraktivität unterstützt. Diese Vorlage kann für Web-Apps mit umfangreichen dynamischen Benutzeroberflächen (UIs) verwendet werden.",
5-
"symbols/Framework/description": "Das Zielframework für das Projekt.",
6-
"symbols/Framework/choices/net8.0/description": "Ziel net8.0",
3+
"name": "Blazor Web App",
4+
"description": "A project template for creating a Blazor web app that supports both server-side rendering and client interactivity. This template can be used for web apps with rich dynamic user interfaces (UIs).",
5+
"symbols/Framework/description": "The target framework for the project.",
6+
"symbols/Framework/choices/net8.0/description": "Target net8.0",
77
"symbols/UserSecretsId/description": "The ID to use for secrets (use with Individual auth).",
8-
"symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.",
9-
"symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.",
10-
"symbols/kestrelHttpPort/description": "Portnummer, die für den HTTP Endpunkt in launchSettings.json verwendet werden soll.",
11-
"symbols/kestrelHttpsPort/description": "Portnummer, die für den HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn entweder IndividualAuth oder OrganizationalAuth verwendet wird).",
12-
"symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.",
13-
"symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express HTTPS Endpunkt in launchSettings.json verwendet werden soll. Diese Option ist nur anwendbar, wenn der Parameter no-https nicht verwendet wird (no-https wird ignoriert, wenn entweder IndividualAuth oder OrganizationalAuth verwendet wird).",
8+
"symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.",
9+
"symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.",
10+
"symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.",
11+
"symbols/kestrelHttpsPort/description": "Port number to use for the HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).",
12+
"symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.",
13+
"symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json. This option is only applicable when the parameter no-https is not used (no-https will be ignored if Individual auth is used).",
1414
"symbols/InteractivityPlatform/displayName": "_Interactivity type",
1515
"symbols/InteractivityPlatform/description": "Chooses which hosting platform to use for interactive components",
1616
"symbols/InteractivityPlatform/choices/None/displayName": "None",
@@ -23,22 +23,22 @@
2323
"symbols/InteractivityPlatform/choices/Auto/description": "Uses Server while downloading WebAssembly assets, then uses WebAssembly",
2424
"symbols/InteractivityLocation/displayName": "_Interactivity location",
2525
"symbols/InteractivityLocation/description": "Chooses which components will have interactive rendering enabled",
26-
"symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page or component",
26+
"symbols/InteractivityLocation/choices/InteractivePerPage/displayName": "Per page/component",
2727
"symbols/InteractivityLocation/choices/InteractivePerPage/description": "Interactivity is applied on a per-page or per-component basis",
2828
"symbols/InteractivityLocation/choices/InteractiveGlobal/displayName": "Global",
2929
"symbols/InteractivityLocation/choices/InteractiveGlobal/description": "Interactivity is applied at the root level",
30-
"symbols/IncludeSampleContent/displayName": "_Include Beispielseiten",
31-
"symbols/IncludeSampleContent/description": "Konfiguriert, ob Beispielseiten und Stile hinzugefügt werden, um grundlegende Verwendungsmuster zu veranschaulichen.",
32-
"symbols/Empty/description": "Konfiguriert, ob Beispielseiten und Formatierungen weggelassen werden sollen, die grundlegende Verwendungsmuster veranschaulichen.",
30+
"symbols/IncludeSampleContent/displayName": "_Include sample pages",
31+
"symbols/IncludeSampleContent/description": "Configures whether to add sample pages and styling to demonstrate basic usage patterns.",
32+
"symbols/Empty/description": "Configures whether to omit sample pages and styling that demonstrate basic usage patterns.",
3333
"symbols/auth/choices/None/description": "No authentication",
3434
"symbols/auth/choices/Individual/description": "Individual authentication",
3535
"symbols/auth/description": "The type of authentication to use",
3636
"symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual is specified.",
3737
"symbols/AllInteractive/displayName": "_Enable interactive rendering globally throughout the site",
3838
"symbols/AllInteractive/description": "Configures whether to make every page interactive by applying an interactive render mode at the top level. If false, pages will use static server rendering by default, and can be marked interactive on a per-page or per-component basis.",
39-
"symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.",
40-
"symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden",
41-
"symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.",
42-
"postActions/restore/description": "NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.",
43-
"postActions/restore/manualInstructions/default/text": "dotnet restore“ ausführen"
39+
"symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual isn't used for --auth.",
40+
"symbols/UseProgramMain/displayName": "Do not use _top-level statements",
41+
"symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.",
42+
"postActions/restore/description": "Restore NuGet packages required by this project.",
43+
"postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'"
4444
}

0 commit comments

Comments
 (0)