From 03a9832f53a9dd12cc7815596dd78fcee8c29f4a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 20:08:39 -0700 Subject: [PATCH 01/60] [main] Update dependencies from dotnet/efcore, dotnet/runtime (#58090) * Update dependencies from https://github.com/dotnet/runtime build 20240925.8 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24474.2 -> To Version 10.0.0-alpha.1.24475.8 * Update dependencies from https://github.com/dotnet/runtime build 20240926.10 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24475.8 -> To Version 10.0.0-alpha.1.24476.10 * Update dependencies from https://github.com/dotnet/efcore build 20240927.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 10.0.0-alpha.1.24473.6 -> To Version 10.0.0-alpha.1.24477.1 * Update dependencies from https://github.com/dotnet/runtime build 20240927.10 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24476.10 -> To Version 10.0.0-alpha.1.24477.10 * Update dependencies from https://github.com/dotnet/runtime build 20240928.1 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24477.10 -> To Version 10.0.0-alpha.1.24478.1 * Update dependencies from https://github.com/dotnet/runtime build 20240929.4 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24478.1 -> To Version 10.0.0-alpha.1.24479.4 * Update dependencies from https://github.com/dotnet/efcore build 20240930.3 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 10.0.0-alpha.1.24477.1 -> To Version 10.0.0-alpha.1.24480.3 * Update dependencies from https://github.com/dotnet/runtime build 20240930.6 Microsoft.Bcl.AsyncInterfaces , Microsoft.Bcl.TimeProvider , Microsoft.Extensions.Caching.Abstractions , Microsoft.Extensions.Caching.Memory , Microsoft.Extensions.Configuration , Microsoft.Extensions.Configuration.Abstractions , Microsoft.Extensions.Configuration.Binder , Microsoft.Extensions.Configuration.CommandLine , Microsoft.Extensions.Configuration.EnvironmentVariables , Microsoft.Extensions.Configuration.FileExtensions , Microsoft.Extensions.Configuration.Ini , Microsoft.Extensions.Configuration.Json , Microsoft.Extensions.Configuration.UserSecrets , Microsoft.Extensions.Configuration.Xml , Microsoft.Extensions.DependencyInjection , Microsoft.Extensions.DependencyInjection.Abstractions , Microsoft.Extensions.DependencyModel , Microsoft.Extensions.Diagnostics , Microsoft.Extensions.Diagnostics.Abstractions , Microsoft.Extensions.FileProviders.Abstractions , Microsoft.Extensions.FileProviders.Composite , Microsoft.Extensions.FileProviders.Physical , Microsoft.Extensions.FileSystemGlobbing , Microsoft.Extensions.HostFactoryResolver.Sources , Microsoft.Extensions.Hosting , Microsoft.Extensions.Hosting.Abstractions , Microsoft.Extensions.Http , Microsoft.Extensions.Logging , Microsoft.Extensions.Logging.Abstractions , Microsoft.Extensions.Logging.Configuration , Microsoft.Extensions.Logging.Console , Microsoft.Extensions.Logging.Debug , Microsoft.Extensions.Logging.EventLog , Microsoft.Extensions.Logging.EventSource , Microsoft.Extensions.Logging.TraceSource , Microsoft.Extensions.Options , Microsoft.Extensions.Options.ConfigurationExtensions , Microsoft.Extensions.Options.DataAnnotations , Microsoft.Extensions.Primitives , Microsoft.Internal.Runtime.AspNetCore.Transport , Microsoft.NET.Runtime.MonoAOTCompiler.Task , Microsoft.NET.Runtime.WebAssembly.Sdk , Microsoft.NETCore.App.Ref , Microsoft.NETCore.App.Runtime.AOT.win-x64.Cross.browser-wasm , Microsoft.NETCore.App.Runtime.win-x64 , Microsoft.NETCore.BrowserDebugHost.Transport , Microsoft.NETCore.Platforms , System.Collections.Immutable , System.Composition , System.Configuration.ConfigurationManager , System.Diagnostics.DiagnosticSource , System.Diagnostics.EventLog , System.Diagnostics.PerformanceCounter , System.DirectoryServices.Protocols , System.IO.Hashing , System.IO.Pipelines , System.Net.Http.Json , System.Net.Http.WinHttpHandler , System.Net.ServerSentEvents , System.Reflection.Metadata , System.Resources.Extensions , System.Runtime.Caching , System.Security.Cryptography.Pkcs , System.Security.Cryptography.Xml , System.Security.Permissions , System.ServiceProcess.ServiceController , System.Text.Encodings.Web , System.Text.Json , System.Threading.AccessControl , System.Threading.Channels , System.Threading.RateLimiting , Microsoft.SourceBuild.Intermediate.runtime.linux-x64 From Version 10.0.0-alpha.1.24479.4 -> To Version 10.0.0-alpha.1.24480.6 * Update dependencies from https://github.com/dotnet/efcore build 20241001.1 dotnet-ef , Microsoft.EntityFrameworkCore , Microsoft.EntityFrameworkCore.Design , Microsoft.EntityFrameworkCore.InMemory , Microsoft.EntityFrameworkCore.Relational , Microsoft.EntityFrameworkCore.Sqlite , Microsoft.EntityFrameworkCore.SqlServer , Microsoft.EntityFrameworkCore.Tools From Version 10.0.0-alpha.1.24480.3 -> To Version 10.0.0-alpha.1.24501.1 * Update to net10.0 * Fix CurrentLtsTargetFramework * Suppress linker error * Another suppression * Using * More suppressions * Update TFM workarounds * Revert "More suppressions" This reverts commit 416f56dab241c9da43f2da86a709b24bcb1527f1. * Revert "Using" This reverts commit 5ee5bd0577e78894655eaf857f4d3ba027ce63c9. * Revert "Another suppression" This reverts commit 672aae021ca35625a49343dcb1ecce6f64e0b0d1. * Revert "Suppress linker error" This reverts commit 1ce3bde58d5edfd56cbc6cade233685c098fb0ba. * Repotasks 9 * Fix double commas --------- Co-authored-by: dotnet-maestro[bot] Co-authored-by: wtgodbe --- .devcontainer/devcontainer.json | 2 +- docs/DailyBuilds.md | 13 + eng/DotNetBuild.props | 2 +- eng/Version.Details.xml | 320 +++++++++--------- eng/Versions.props | 164 ++++----- eng/helix/helix.proj | 2 +- .../SupportFiles/Directory.Build.targets | 12 +- .../GenerateFiles/Directory.Build.targets.in | 16 +- .../HelixTestRunner/HelixTestRunner.csproj | 2 +- eng/tools/RepoTasks/RepoTasks.csproj | 4 +- eng/tools/RepoTasks/RepoTasks.tasks | 2 +- .../{net9.0 => net10.0}/PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 ...ft.AspNetCore.Components.netcoreapp.nuspec | 2 +- .../blazor-devserver.runtimeconfig.json.in | 2 +- .../WebHostFunctionalTests.cs | 4 +- ....FileProviders.Embedded.multitarget.nuspec | 2 +- ...s.FileProviders.Embedded.netcoreapp.nuspec | 2 +- .../App.Ref/src/CompatibilitySuppressions.xml | 2 +- .../src/CompatibilitySuppressions.xml | 2 +- .../test/Verifiers/CSharpAnalyzerVerifier.cs | 8 +- .../src/Common/Tfm.cs | 3 +- .../OutputCachingSample/.vscode/launch.json | 2 +- .../Autobahn/AutobahnTester.cs | 2 +- .../Microsoft.AspNetCore.Mvc.Testing.targets | 2 +- .../Less/.template.config/template.json | 4 +- .../Scss/.template.config/template.json | 4 +- .../TypeScript/.template.config/template.json | 4 +- .../.template.config/template.json | 4 +- .../.template.config/template.json | 4 +- .../Protobuf/.template.config/template.json | 4 +- .../.template.config/template.json | 4 +- .../RazorPage/.template.config/template.json | 4 +- .../RazorView/.template.config/template.json | 4 +- .../.template.config/template.json | 4 +- .../ViewStart/.template.config/template.json | 4 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 14 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 14 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 10 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 10 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 14 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 14 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 14 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../localize/templatestrings.cs.json | 2 +- .../localize/templatestrings.de.json | 2 +- .../localize/templatestrings.en.json | 2 +- .../localize/templatestrings.es.json | 2 +- .../localize/templatestrings.fr.json | 2 +- .../localize/templatestrings.it.json | 2 +- .../localize/templatestrings.ja.json | 2 +- .../localize/templatestrings.ko.json | 2 +- .../localize/templatestrings.pl.json | 2 +- .../localize/templatestrings.pt-BR.json | 2 +- .../localize/templatestrings.ru.json | 2 +- .../localize/templatestrings.tr.json | 2 +- .../localize/templatestrings.zh-Hans.json | 2 +- .../localize/templatestrings.zh-Hant.json | 2 +- .../.template.config/template.json | 12 +- .../scripts/Run-BlazorWasm-Locally.ps1 | 2 +- .../Run-BlazorWasmProgramMain-Locally.ps1 | 2 +- .../scripts/Run-BlazorWeb-Locally.ps1 | 2 +- .../scripts/Run-EmptyWeb-Locally.ps1 | 2 +- .../Run-EmptyWebProgramMain-Locally.ps1 | 2 +- .../scripts/Run-GrpcNativeAot-Locally.ps1 | 2 +- .../scripts/Run-Razor-Locally.ps1 | 2 +- .../scripts/Run-RazorProgramMain-Locally.ps1 | 2 +- .../scripts/Run-Starterweb-Locally.ps1 | 2 +- .../Run-StarterwebProgramMain-Locally.ps1 | 2 +- .../scripts/Run-WebApi-Locally.ps1 | 2 +- .../scripts/Run-WebApiAot-Locally.ps1 | 2 +- .../Run-WebApiAotProgramMain-Locally.ps1 | 2 +- .../scripts/Run-WebApiMinimal-Locally.ps1 | 2 +- .../scripts/Run-WebApiProgamMain-Locally.ps1 | 2 +- .../Run-WebApiProgamMainMinimal-Locally.ps1 | 2 +- .../scripts/Run-Worker-Locally.ps1 | 2 +- .../scripts/Run-WorkerNativeAot-Locally.ps1 | 2 +- .../scripts/Run-WorkerProgramMain-Locally.ps1 | 2 +- .../scripts/Run-gRPC-Locally.ps1 | 2 +- .../scripts/Test-Template.ps1 | 4 +- .../scripts/Test-Template.psm1 | 2 +- .../{net9.0 => net10.0}/PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../{net9.0 => net10.0}/PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 .../BenchmarkRunner/DefaultCoreConfig.cs | 2 + src/Shared/ErrorPage/GeneratePage.ps1 | 2 +- .../ts/FunctionalTests/scripts/run-tests.ts | 2 +- .../{net9.0 => net10.0}/PublicAPI.Shipped.txt | 0 .../PublicAPI.Unshipped.txt | 0 src/SignalR/publish-apps.ps1 | 2 +- ...ft.Extensions.ApiDescription.Server.nuspec | 2 +- .../test/OpenApiTestBase.cs | 2 +- .../test/UserJwtsTestFixture.cs | 2 +- .../test/UserSecretsTestFixture.cs | 2 +- startvscode.cmd | 2 +- startvscode.sh | 2 +- 284 files changed, 632 insertions(+), 616 deletions(-) rename src/Caching/StackExchangeRedis/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Shipped.txt (100%) rename src/Caching/StackExchangeRedis/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Unshipped.txt (100%) rename src/Security/Authorization/Core/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Shipped.txt (100%) rename src/Security/Authorization/Core/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Unshipped.txt (100%) rename src/Servers/Connections.Abstractions/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Shipped.txt (100%) rename src/Servers/Connections.Abstractions/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Unshipped.txt (100%) rename src/SignalR/common/SignalR.Common/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Shipped.txt (100%) rename src/SignalR/common/SignalR.Common/src/PublicAPI/{net9.0 => net10.0}/PublicAPI.Unshipped.txt (100%) diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index c1dd2960976b..339afbaa9e14 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -31,7 +31,7 @@ "remoteEnv": { "PATH": "${containerWorkspaceFolder}/.dotnet:${containerEnv:PATH}", "DOTNET_MULTILEVEL_LOOKUP": "0", - "TARGET": "net9.0", + "TARGET": "net10.0", "DOTNET_WATCH_SUPPRESS_LAUNCH_BROWSER": "true" }, // Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root. diff --git a/docs/DailyBuilds.md b/docs/DailyBuilds.md index 09121497f18b..0362cd8e2657 100644 --- a/docs/DailyBuilds.md +++ b/docs/DailyBuilds.md @@ -33,6 +33,19 @@ If you want to download the latest daily build and use it in a project, then you ``` +## .NET 10 + + ```xml + + + + + + + + + ``` + *NOTE: This NuGet.Config should be with your application unless you want nightly packages to potentially start being restored for other apps on the machine.* Some features, such as new target frameworks, may require prerelease tooling builds for Visual Studio. diff --git a/eng/DotNetBuild.props b/eng/DotNetBuild.props index 8f6e67aba60f..2329c796b537 100644 --- a/eng/DotNetBuild.props +++ b/eng/DotNetBuild.props @@ -5,7 +5,7 @@ aspnetcore true - netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0 + netstandard2.0%3bnetstandard2.1%3bnetcoreapp2.1%3bnetcoreapp3.1%3bnet5.0%3bnet6.0%3bnet7.0%3bnet8.0%3bnet9.0%3bnet10.0 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/efcore - 5fb4e085b90530b53cb9456dd9001bc28f29029e + 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f @@ -380,9 +380,9 @@ - + https://github.com/dotnet/runtime - 0f3d6fafc184b76e89c5a4ede02b6f5198a36e2e + 13e55a4d617f949fd60e3847841cc70d6bd8e85f https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 5c8dcb5ccaaa..364413f44b69 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -43,11 +43,11 @@ src\Components\WebAssembly\Sdk\testassets\Directory.Build.props, and src\Razor\test\testassets\Directory.Build.props when this changes. --> - net9.0 + net10.0 - net8.0 + net10.0 @@ -67,92 +67,92 @@ --> - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 - 10.0.0-alpha.1.24474.2 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24480.6 9.0.0-preview.9.24472.1 9.0.0-preview.9.24472.1 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 - 10.0.0-alpha.1.24473.6 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24501.1 4.11.0-1.24218.5 4.11.0-1.24218.5 diff --git a/eng/helix/helix.proj b/eng/helix/helix.proj index f31e201d516e..bf7b4ea6addf 100644 --- a/eng/helix/helix.proj +++ b/eng/helix/helix.proj @@ -74,7 +74,7 @@ - diff --git a/eng/testing/linker/SupportFiles/Directory.Build.targets b/eng/testing/linker/SupportFiles/Directory.Build.targets index 0b4c65ac90c2..eb82d94bec27 100644 --- a/eng/testing/linker/SupportFiles/Directory.Build.targets +++ b/eng/testing/linker/SupportFiles/Directory.Build.targets @@ -13,24 +13,24 @@ - - + - - - - diff --git a/eng/tools/GenerateFiles/Directory.Build.targets.in b/eng/tools/GenerateFiles/Directory.Build.targets.in index a056fb9edcfa..ec8c64945c50 100644 --- a/eng/tools/GenerateFiles/Directory.Build.targets.in +++ b/eng/tools/GenerateFiles/Directory.Build.targets.in @@ -7,35 +7,35 @@ Condition=" '$(UpdateAspNetCoreKnownFramework)' == '' ">true - + @@ -44,7 +44,7 @@ - net9.0 + net10.0 Exe $(NoWarn);CA2007;NU5104 diff --git a/eng/tools/RepoTasks/RepoTasks.csproj b/eng/tools/RepoTasks/RepoTasks.csproj index c462a7517ae0..24f833af9b18 100644 --- a/eng/tools/RepoTasks/RepoTasks.csproj +++ b/eng/tools/RepoTasks/RepoTasks.csproj @@ -1,6 +1,6 @@ - $(DefaultNetCoreTargetFramework) + net9.0 $(TargetFrameworks);net472 $(DefineConstants);BUILD_MSI_TASKS false @@ -31,7 +31,7 @@ - + diff --git a/eng/tools/RepoTasks/RepoTasks.tasks b/eng/tools/RepoTasks/RepoTasks.tasks index b6cd9a820d1e..0ad5b3ae45b5 100644 --- a/eng/tools/RepoTasks/RepoTasks.tasks +++ b/eng/tools/RepoTasks/RepoTasks.tasks @@ -1,6 +1,6 @@ - <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">$(DefaultNetCoreTargetFramework) + <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' == 'core'">net9.0 <_RepoTaskAssemblyFolder Condition="'$(MSBuildRuntimeType)' != 'core'">net472 <_RepoTaskAssembly>$(ArtifactsBinDir)RepoTasks\Release\$(_RepoTaskAssemblyFolder)\RepoTasks.dll diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Shipped.txt rename to src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Shipped.txt diff --git a/src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Caching/StackExchangeRedis/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt rename to src/Caching/StackExchangeRedis/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt diff --git a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec index 2ec67a3f538c..41a3ecd9d4a1 100644 --- a/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec +++ b/src/Components/Components/src/Microsoft.AspNetCore.Components.netcoreapp.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in index 9758c3a7ba71..86b74ad8275a 100644 --- a/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in +++ b/src/Components/WebAssembly/DevServer/src/blazor-devserver.runtimeconfig.json.in @@ -1,6 +1,6 @@ { "runtimeOptions": { - "tfm": "net9.0", + "tfm": "net10.0", "framework": { "name": "Microsoft.AspNetCore.App", "version": "${FrameworkVersion}" diff --git a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs index 3c236faad156..94a64ffc74fc 100644 --- a/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs +++ b/src/DefaultBuilder/test/Microsoft.AspNetCore.FunctionalTests/WebHostFunctionalTests.cs @@ -153,7 +153,7 @@ public async Task RunsInIISExpressInProcess() var applicationName = "CreateDefaultBuilderApp"; var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.IISExpress, RuntimeFlavor.CoreClr, RuntimeArchitecture.x64) { - TargetFramework = "net9.0", + TargetFramework = "net10.0", HostingModel = HostingModel.InProcess }; @@ -208,7 +208,7 @@ private async Task ExecuteTestApp(string applicationName, { var deploymentParameters = new DeploymentParameters(Path.Combine(GetTestSitesPath(), applicationName), ServerType.Kestrel, RuntimeFlavor.CoreClr, RuntimeArchitectures.Current) { - TargetFramework = "net9.0", + TargetFramework = "net10.0", }; if (setTestEnvVars) diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec index dd3bb5c6e72e..57b12455fa31 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.multitarget.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec index 2b341ad296d5..a463d21643b1 100644 --- a/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec +++ b/src/FileProviders/Embedded/src/Microsoft.Extensions.FileProviders.Embedded.netcoreapp.nuspec @@ -3,7 +3,7 @@ $CommonMetadataElements$ - + diff --git a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml index 5fd58d407c27..ecd8cd0d2dea 100644 --- a/src/Framework/App.Ref/src/CompatibilitySuppressions.xml +++ b/src/Framework/App.Ref/src/CompatibilitySuppressions.xml @@ -3,6 +3,6 @@ PKV004 - net9.0 + net10.0 \ No newline at end of file diff --git a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml index 044b90f8b6da..117ec7137b65 100644 --- a/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml +++ b/src/Framework/App.Runtime/src/CompatibilitySuppressions.xml @@ -3,6 +3,6 @@ PKV0001 - net9.0 + net10.0 \ No newline at end of file diff --git a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs index 9afed98bd962..325b0c230955 100644 --- a/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs +++ b/src/Framework/AspNetCoreAnalyzers/test/Verifiers/CSharpAnalyzerVerifier.cs @@ -53,15 +53,15 @@ internal static ReferenceAssemblies GetReferenceAssemblies() Environment.GetEnvironmentVariable("HELIX_WORKITEM_ROOT"), "NuGet.config") : Path.Combine(TestData.GetRepoRoot(), "NuGet.config"); - var net8Ref = new ReferenceAssemblies( - "net9.0", + var net10Ref = new ReferenceAssemblies( + "net10.0", new PackageIdentity( "Microsoft.NETCore.App.Ref", TestData.GetMicrosoftNETCoreAppRefPackageVersion()), - Path.Combine("ref", "net9.0")) + Path.Combine("ref", "net10.0")) .WithNuGetConfigFilePath(nugetConfigPath); - return net8Ref.AddAssemblies(ImmutableArray.Create( + return net10Ref.AddAssemblies(ImmutableArray.Create( TrimAssemblyExtension(typeof(System.IO.Pipelines.PipeReader).Assembly.Location), TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Authorization.IAuthorizeData).Assembly.Location), TrimAssemblyExtension(typeof(Microsoft.AspNetCore.Mvc.ModelBinding.IBinderTypeProviderMetadata).Assembly.Location), diff --git a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs index 3df9f24e0dcb..997b995c24e5 100644 --- a/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs +++ b/src/Hosting/Server.IntegrationTesting/src/Common/Tfm.cs @@ -16,7 +16,8 @@ public static class Tfm public const string Net70 = "net7.0"; public const string Net80 = "net8.0"; public const string Net90 = "net9.0"; - public const string Default = Net90; + public const string Net100 = "net10.0"; + public const string Default = Net100; public static bool Matches(string tfm1, string tfm2) { diff --git a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json index 4ccd32c4500c..9b86ded6edb0 100644 --- a/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json +++ b/src/Middleware/OutputCaching/samples/OutputCachingSample/.vscode/launch.json @@ -10,7 +10,7 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceFolder}/bin/Debug/net9.0/OutputCachingSample.dll", + "program": "${workspaceFolder}/bin/Debug/net10.0/OutputCachingSample.dll", "args": [], "cwd": "${workspaceFolder}", "stopAtEntry": false, diff --git a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs index 57468bf4ee71..c1db5bc928c1 100644 --- a/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs +++ b/src/Middleware/WebSockets/test/ConformanceTests/Autobahn/AutobahnTester.cs @@ -135,7 +135,7 @@ public async Task DeployTestAndAddToSpec(ServerType server, bool ssl, string env { Scheme = (ssl ? Uri.UriSchemeHttps : Uri.UriSchemeHttp), ApplicationType = ApplicationType.Portable, - TargetFramework = "Net9.0", + TargetFramework = "Net10.0", EnvironmentName = environment, SiteName = "HttpTestSite", // This is configured in the Http.config ServerConfigTemplateContent = (server == ServerType.IISExpress) ? File.ReadAllText(configPath) : null, diff --git a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets index 77f1bd087290..7a67a26f5c9c 100644 --- a/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets +++ b/src/Mvc/Mvc.Testing/src/buildTransitive/Microsoft.AspNetCore.Mvc.Testing.targets @@ -1,3 +1,3 @@ - + diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json index e3b7f9e5f22e..9f38172c4503 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Less/.template.config/template.json @@ -6,8 +6,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "LESS is a language that compiles into CSS", "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Less", - "precedence": "9900", - "identity": "Microsoft.DotNet.Web.ClientItems.Less.9.0", + "precedence": "10000", + "identity": "Microsoft.DotNet.Web.ClientItems.Less.10.0", "shortName": "less", "sourceName": "styleSheet1", "tags": { diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json index c10c19831857..8e3400fd9ffc 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/Scss/.template.config/template.json @@ -6,8 +6,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "SCSS is a language that compiles into CSS", "groupIdentity": "Microsoft.DotNet.Web.ClientItems.Scss", - "precedence": "9900", - "identity": "Microsoft.DotNet.Web.ClientItems.Scss.9.0", + "precedence": "10000", + "identity": "Microsoft.DotNet.Web.ClientItems.Scss.10.0", "shortName": "scss", "sourceName": "styleSheet1", "tags": { diff --git a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json index 246dfa8684cd..7a340a53b7a3 100644 --- a/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json +++ b/src/ProjectTemplates/Web.Client.ItemTemplates/content/TypeScript/.template.config/template.json @@ -6,8 +6,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A blank TypeScript source file", "groupIdentity": "Microsoft.DotNet.Web.ClientItems.TypeScript", - "precedence": "9900", - "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.9.0", + "precedence": "10000", + "identity": "Microsoft.DotNet.Web.ClientItems.TypeScript.10.0", "shortName": "tsfile", "sourceName": "file1", "tags": { diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json index ac14bc534137..a5b8aef8d3da 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ApiController/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ApiController", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.ApiController.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.ApiController.10.0", "shortName": "apicontroller", "sourceName": "ValueController", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json index 72f1e2e06407..4a03a91f4897 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/MvcController/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.MvcController", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.MvcController.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.MvcController.10.0", "shortName": "mvccontroller", "sourceName": "HomeController", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json index 03923ac46931..b4c2db526398 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/Protobuf/.template.config/template.json @@ -13,8 +13,8 @@ "type": "item" }, "groupIdentity": "Microsoft.Web.Grpc.Protobuf", - "precedence": "9900", - "identity": "Microsoft.Web.Grpc.Protobuf.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Grpc.Protobuf.10.0", "shortname": "proto", "sourceName": "protobuf", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json index b75b1a77c8dc..37e89b7c41f7 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorComponent/.template.config/template.json @@ -13,8 +13,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Components.RazorComponent", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Components.RazorComponent.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Components.RazorComponent.10.0", "shortname": "razorcomponent", "sourceName": "Component1", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json index 89b455ced96f..e3d340cee888 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorPage/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorPage", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.RazorPage.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.RazorPage.10.0", "shortName": "page", "sourceName": "Index", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json index 719c8bf6d311..8d05235d6994 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/RazorView/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.RazorView", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.RazorView.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.RazorView.10.0", "shortName": "view", "sourceName": "Index", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json index f494407ea34c..454f475a3a0c 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewImports/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewImports", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.ViewImports.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.ViewImports.10.0", "shortName": "viewimports", "sourceName": "ignoreme", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json index 22db64ef38be..3c8a010849e3 100644 --- a/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json +++ b/src/ProjectTemplates/Web.ItemTemplates/content/ViewStart/.template.config/template.json @@ -10,8 +10,8 @@ "type": "item" }, "groupIdentity": "Microsoft.AspNetCore.Mvc.ViewStart", - "precedence": "9900", - "identity": "Microsoft.AspNetCore.Mvc.ViewStart.9.0", + "precedence": "10000", + "identity": "Microsoft.AspNetCore.Mvc.ViewStart.10.0", "shortName": "viewstart", "sourceName": "ignoreme", "primaryOutputs": [ diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json index a934cfaf8154..9a0438cc6e29 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,7 @@ "name": "Webová aplikace Blazor", "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).", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "ID, které se má použít pro tajné kódy (používá se s individuálním ověřováním).", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json index 4edfb2d91b11..3edbf79d26e4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,7 @@ "name": "Blazor-Web-App", "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.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "Die für Geheimnisse zu verwendende ID (Verwendung mit individueller Authentifizierung).", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json index 6d6fb4ad6791..5ad4270f3018 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,7 @@ "name": "Blazor Web App", "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).", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "The ID to use for secrets (use with Individual auth).", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json index 5ee91daa5bd8..0350071063e4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,7 @@ "name": "Aplicación web Blazor", "description": "Plantilla de proyecto para crear una aplicación web de Blazor que admita tanto la representación del lado del servidor como la interactividad del cliente. Esta plantilla se puede usar para las aplicaciones web con interfaces de usuario dinámicas enriquecidas.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "Identificador que se va a usar para los secretos (se usa con la autenticación individual).", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json index 0d25340346e5..f148b55bec34 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,7 @@ "name": "Application web Blazor", "description": "Modèle de projet pour la création d’une application web Blazor qui prend en charge le rendu côté serveur et l’interactivité du client. Ce modèle peut être utilisé pour les applications web avec des interfaces utilisateur dynamiques enrichies.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "ID à utiliser pour les secrets (à utiliser avec l’authentification individuelle).", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json index bd5443326efe..cea4b2f49543 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,7 @@ "name": "App Web Blazor", "description": "Modello di progetto per la creazione di un'app Web Blazor che supporta sia il rendering lato server sia l'interattività client. Questo modello può essere usato per app Web con interfacce utente dinamiche avanzate.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "ID da usare per i segreti (usare con l'autenticazione Individual).", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json index 1c23498c0257..3220b5f1203f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,7 @@ "name": "Blazor Web アプリ", "description": "サーバー側のレンダリングとクライアントの対話機能の両方をサポートする Blazor Web アプリを作成するためのプロジェクト テンプレートです。このテンプレートは、リッチな動的ユーザー インターフェイス (UI) を持つ Web アプリに使用できます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "シークレットで使用する ID (IndividualAuth で使用)。", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json index e204607ccac2..89ccd3f24353 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,7 @@ "name": "Blazor 웹앱", "description": "서버 측 렌더링 및 클라이언트 대화형 작업을 모두 지원하는 Blazor 웹앱을 만들기 위한 프로젝트 템플릿입니다. 이 템플릿은 풍부한 동적 UI(사용자 인터페이스)가 있는 웹앱에 사용할 수 있습니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "비밀에 사용할 ID입니다(개별 인증과 함께 사용).", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json index 680c85b1ccc1..ec0bde46a666 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,7 @@ "name": "Aplikacja internetowa Blazor", "description": "Szablon projektu służący do tworzenia aplikacji internetowej platformy Blazor, która obsługuje renderowanie po stronie serwera i interakcyjność klienta. Ten szablon może być używany dla aplikacji internetowych z zaawansowanymi dynamicznymi interfejsami użytkownika.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "Identyfikator do użycia dla wpisów tajnych (używany z indywidualnym uwierzytelnianym).", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json index 95709542acd4..65e5e169043c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,7 @@ "name": "Aplicativo Web Blazor", "description": "Um modelo de projeto para criar um aplicativo Web Blazor que dá suporte à renderização do lado do servidor e à interatividade do cliente. Este modelo pode ser usado para aplicativos da Web com interfaces de usuário (UIs) dinâmicas avançadas.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "O ID a ser usado para segredos (usado com autenticação individual).", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json index 2a2f7b50097b..a0a35deb529d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,7 @@ "name": "Веб-приложение Blazor", "description": "Шаблон проекта для создания приложения Blazor, поддерживающего как отрисовку на стороне сервера, так и интерактивные возможности клиента. Этот шаблон можно использовать для веб-приложений с многофункциональными динамическими пользовательскими интерфейсами (UI).", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "Идентификатор, используемый для секретов (применяется с индивидуальной проверкой подлинности).", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json index aebc293d040f..72233fadfc01 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,7 @@ "name": "Blazor Web Uygulaması", "description": "Hem sunucu tarafı işlemeyi hem de istemci etkileşimini destekleyen bir Blazor web uygulaması oluşturmaya yönelik proje şablonu. Bu şablon, zengin dinamik kullanıcı arabirimlerine (UI) sahip web uygulamaları için kullanılabilir.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "Gizli diziler için kullanılacak kimlik (Bireysel kimlik doğrulamayla kullanın).", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 01048e225981..590428f16663 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,7 @@ "name": "Blazor Web 应用", "description": "用于创建支持服务器端呈现和客户端交互的 Blazor Web 应用的项目模板。此模板可用于具有丰富动态用户界面 (UI) 的 Web 应用。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "用于机密的 ID (与个人身份验证一起使用)。", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json index b34e4fd9fb33..8550f96f1578 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,7 @@ "name": "Blazor Web 應用程式", "description": "用於建立同時支援伺服器端轉譯和用戶端互動的 Blazor Web 應用程式的專案範本。此範本可用於具有豐富動態使用者介面 (UI) 的 Web 應用程式。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/UserSecretsId/description": "用於祕密的識別碼 (搭配個別驗證使用)。", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json index 04d9fe1b2e0c..5eab4b589a89 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/.template.config/template.json @@ -10,15 +10,15 @@ "defaultName": "BlazorApp", "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).", "groupIdentity": "Microsoft.Web.Blazor", - "precedence": "9900", + "precedence": "10000", "guids": [ "4C26868E-5E7C-458D-82E3-040509D0C71F", "5990939C-7E7B-4CFA-86FF-44CA5756498A", "650B3CE7-2E93-4CC4-9F46-466686815EAA", "53bc9b9d-9d6a-45d4-8429-2a2761773502" ], - "identity": "Microsoft.Web.Blazor.CSharp.9.0", - "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", + "identity": "Microsoft.Web.Blazor.CSharp.10.0", + "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices", "preferNameDirectory": true, "primaryOutputs": [ { @@ -197,12 +197,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json index 4210811fe25e..ce56d400d75e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,7 @@ "name": "Samostatná aplikace Blazor WebAssembly", "description": "Šablona projektu pro vytvoření aplikace Blazor, která běží ve WebAssembly. Tato šablona se dá využít pro webové aplikace s propracovanými dynamickými uživatelskými rozhraními (UI).", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/auth/choices/None/description": "Bez ověřování", "symbols/auth/choices/Individual/description": "Ověřování Individual", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json index ea4f4c5475dd..1143bf3f9a0d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,7 @@ "name": "Eigenständige Blazor WebAssembly-App", "description": "Eine Projektvorlage für das Erstellen einer Blazor-App, die in WebAssembly ausgeführt wird. Diese Vorlage kann für Web-Apps mit umfangreichen dynamischen Benutzeroberflächen verwendet werden.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/auth/choices/None/description": "Keine Authentifizierung", "symbols/auth/choices/Individual/description": "Individuelle Authentifizierung", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json index 8df8a92cbc50..36fa5e417dfe 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly Standalone App", "description": "A project template for creating a Blazor app that runs on WebAssembly. This template can be used for web apps with rich dynamic user interfaces (UIs).", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/auth/choices/None/description": "No authentication", "symbols/auth/choices/Individual/description": "Individual authentication", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json index 3f9385eaae2d..843b70fa8ff0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,7 @@ "name": "Aplicación independiente WebAssembly de Blazor", "description": "Plantilla de proyecto para crear una aplicación Blazor que se ejecuta en WebAssembly. Esta plantilla se puede usar para las aplicaciones web con interfaces de usuario dinámicas enriquecidas.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/auth/choices/None/description": "Sin autenticación", "symbols/auth/choices/Individual/description": "Autenticación individual", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json index 5f6d956057bc..c8ea4a4cfd00 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,7 @@ "name": "Application Blazor WebAssembly autonome", "description": "Modèle de projet permettant de créer une application Blazor qui s'exécute sur WebAssembly. Vous pouvez utiliser ce modèle pour les applications web ayant des IU (interfaces utilisateur) dynamiques riches.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/auth/choices/None/description": "Aucune authentification", "symbols/auth/choices/Individual/description": "Authentification individuelle", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json index 46f45f71c317..938cba697eca 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,7 @@ "name": "App autonoma Blazor WebAssembly", "description": "Modello di progetto per la creazione di un'app Blazor eseguita in WebAssembly. Questo modello può essere usato per app Web con interfacce utente dinamiche.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/auth/choices/None/description": "Nessuna autenticazione", "symbols/auth/choices/Individual/description": "Autenticazione singola", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json index 851403e67623..0eb17ad2623c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly スタンドアロン アプリ", "description": "WebAssembly で実行される Blazor アプリを作成するためのプロジェクト テンプレート。このテンプレートは、高度でダイナミックなユーザー インターフェイス (UI) を備えた Web アプリに使用できます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/auth/choices/None/description": "認証なし", "symbols/auth/choices/Individual/description": "個別の認証", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json index b9d37fa5d211..17fcd3236b1f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly 독립 실행형 앱", "description": "WebAssembly에서 실행되는 Blazor 앱을 만드는 데 사용되는 프로젝트 템플릿입니다. 이 템플릿을 사용하여 다양한 동적 UI(사용자 인터페이스)가 포함된 웹앱을 만들 수 있습니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/auth/choices/None/description": "인증 없음", "symbols/auth/choices/Individual/description": "개별 인증", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json index 663443e609fa..7be097346d8d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,7 @@ "name": "Autonomiczna aplikacja zestawu WebAssembly platformy Blazor", "description": "Szablon projektu służący do tworzenia aplikacji Blazor działającej na zestawie WebAssembly. Ten szablon może być używany dla aplikacji internetowych z rozbudowanymi, dynamicznymi interfejsami użytkowników.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/auth/choices/None/description": "Bez uwierzytelniania", "symbols/auth/choices/Individual/description": "Uwierzytelnianie indywidualne", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json index c3155a7f52ba..f2490235a8f5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,7 @@ "name": "Aplicativo Autônomo Blazor WebAssembly", "description": "Um modelo de projeto para criar um aplicativo Blazor que é executado no WebAssembly. Esse modelo pode ser usado para aplicativos Web com UIs (interfaces do usuário) completas e dinâmicas.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/auth/choices/None/description": "Sem autenticação", "symbols/auth/choices/Individual/description": "Autenticação individual", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json index 50dff05cdd60..c0866f098a4a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,7 @@ "name": "Изолированное приложение Blazor WebAssembly", "description": "Шаблон проекта для создания приложения Blazor, которое запускается в WebAssembly. Этот шаблон можно использовать для веб-приложений с полнофункциональными динамическими пользовательскими интерфейсами.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/auth/choices/None/description": "Без проверки подлинности", "symbols/auth/choices/Individual/description": "Индивидуальная проверка подлинности", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json index ffce943575d0..8d256bc6548f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly Tek Başına Uygulaması", "description": "WebAssembly üzerinde çalışan bir Blazor uygulaması oluşturmaya yönelik proje şablonu. Bu şablon, zengin dinamik kullanıcı arabirimlerine (UI) sahip web uygulamaları için kullanılabilir.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/auth/choices/None/description": "Kimlik doğrulaması yok", "symbols/auth/choices/Individual/description": "Bireysel kimlik doğrulaması", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json index d86e38d146d6..94b26f38b596 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly 独立应用", "description": "用于创建在 WebAssembly 上运行的 Blazor 应用的项目模板。此模板可用于具有丰富动态用户界面(UI)的 Web 应用。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/auth/choices/None/description": "无身份验证", "symbols/auth/choices/Individual/description": "个人身份验证", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 11b2c13e641d..4a91bbf5c9d4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,7 @@ "name": "Blazor WebAssembly 獨立應用程式", "description": "用來建立在 WebAssembly 上執行之 Blazor 應用程式的專案範本。此範本可用於具有豐富動態使用者介面 (UI) 的 Web 應用程式。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/auth/choices/None/description": "沒有驗證", "symbols/auth/choices/Individual/description": "個別驗證", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json index 81cac9ca4dfa..66cdb208eee5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/.template.config/template.json @@ -11,7 +11,7 @@ "defaultName": "BlazorApp", "description": "A project template for creating a Blazor app that runs on WebAssembly. This template can be used for web apps with rich dynamic user interfaces (UIs).", "groupIdentity": "Microsoft.Web.Blazor.Wasm", - "precedence": "9900", + "precedence": "10000", "guids": [ "4C26868E-5E7C-458D-82E3-040509D0C71F", "5990939C-7E7B-4CFA-86FF-44CA5756498A", @@ -19,8 +19,8 @@ "0AFFA7FD-4E37-4636-AB91-3753E746DB98", "53bc9b9d-9d6a-45d4-8429-2a2761773502" // Client ID ], - "identity": "Microsoft.Web.Blazor.Wasm.CSharp.9.0", - "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", + "identity": "Microsoft.Web.Blazor.Wasm.CSharp.10.0", + "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices", "preferNameDirectory": true, "primaryOutputs": [ { @@ -139,12 +139,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json index d9bc635d952e..2fba868338f9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.cs.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.", "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).", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "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á protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.", "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json index c222a5a8eaee..4825236fe673 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.de.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.", "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).", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json index 820711e04f34..58c9060451c5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.en.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.", "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 either IndividualAuth or OrganizationalAuth is used).", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "symbols/UseProgramMain/displayName": "Do not use _top-level statements", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json index 856249111029..15aac4d43973 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.es.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.", "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.", "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json index 78a27a517d23..b439d9ad40c9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.fr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.", "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json index 760b84e45760..9837b497a1e2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.it.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.", "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json index 4b2547d827e6..6cd5c0e34be5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ja.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。", "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json index 5ec8d2f2d918..de921ffc31bb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ko.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json index 31770af7003e..ee7c9549460c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pl.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.", "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.", "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json index a41675cb17b1..c288fb2554fd 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.", "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json index 2a6a53f67902..56527efdab35 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.ru.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.", "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.", "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json index f0927891bb28..41769356d200 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.tr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 38ced259fff7..55cb2de190cd 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。", "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 0ab6b4e20d12..69ea1b895f18 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。", "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json index 07143857e4ef..fd234aa5dd58 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-CSharp/.template.config/template.json @@ -9,8 +9,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "9900", - "identity": "Microsoft.Web.Empty.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Empty.CSharp.10.0", "shortName": "web", "tags": { "language": "C#", @@ -145,12 +145,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json index 7e1b4852e43d..c26bfd895a54 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.cs.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.", "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).", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "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á protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.", "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json index cf85cbc7194c..3c3928f02344 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.de.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.", "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).", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json index b3c2492ff2cc..26ae4ccf3d39 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.en.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.", "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 either IndividualAuth or OrganizationalAuth is used).", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "postActions/restore/description": "Restore NuGet packages required by this project.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json index 63cd8d7b7cb8..11011544d885 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.es.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.", "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.", "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json index 6ea28d5d0df3..875bddbe7b34 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.fr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.", "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json index 2d50da2f913e..8b3d5cd58dd5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.it.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.", "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json index b0a308b783b2..bf4bc0521010 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ja.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。", "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json index 2c78f08201a7..1849ebfaf7cf 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ko.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json index e42c512ea66a..fbdb41d4c7ec 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pl.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.", "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.", "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json index db260382f645..271d40a3e665 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.", "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json index d14134988328..12e874dcf7e3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.ru.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.", "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.", "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json index 38f891d5cbae..b9cee49a5b04 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.tr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json index fd89f25fc0b5..ebf73498ab05 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。", "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "postActions/restore/description": "还原此项目所需的 NuGet 包。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 1cef17a7451c..71eed7173d9d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。", "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "postActions/restore/description": "還原此專案所需的 NuGet 套件。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json index 306cd23c02ed..a8d459dbfa34 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/EmptyWeb-FSharp/.template.config/template.json @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating an ASP.NET Core application. This template does not have any content in it.", "groupIdentity": "Microsoft.Web.Empty", - "precedence": "9900", - "identity": "Microsoft.Web.Empty.FSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Empty.FSharp.10.0", "shortName": "web", "tags": { "language": "F#", @@ -126,12 +126,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json index 7fc5c6f1a4ac..0b882e1a5fb8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,7 @@ "name": "Služba ASP.NET Core gRPC", "description": "Šablona projektu pro vytvoření služby gRPC pomocí ASP.NET Core s volitelnou podporou publikování jako native AOT.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/kestrelHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v souboru launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json index 0b105942628c..d77a4ffdcf2f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core-gRPC-Dienst", "description": "Eine Projektvorlage zum Erstellen eines gRPC-Diensts mit ASP.NET Core, mit optionaler Unterstützung für die Veröffentlichung als native AOT.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/kestrelHttpPort/description": "Portnummer, die für den HTTP Endpunkt in launchSettings.json verwendet werden soll.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json index 46c6210ab756..8a7b46b2bfee 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC Service", "description": "A project template for creating a gRPC service using ASP.NET Core, with optional support for publishing as native AOT.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json index c4555f52c755..679f8bb81f38 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,7 @@ "name": "Servicio gRPC de ASP.NET Core", "description": "Una plantilla de proyecto para crear un servicio gRPC utilizando ASP.NET Core, con soporte opcional para publicar como native AOT.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/kestrelHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP en launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json index 2ec999826851..b75c18bbbfc5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,7 @@ "name": "Service gRPC ASP.NET Core", "description": "Modèle de projet pour la création d’un service gRPC à l’aide de ASP.NET Core, avec prise en charge facultative de la publication en tant qu’AOT natif.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/kestrelHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP dans launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json index e75c53331b76..3a25675bc9eb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,7 @@ "name": "Servizio gRPC ASP.NET Core", "description": "Modello di progetto per la creazione di un servizio gRPC tramite ASP.NET Core, con supporto facoltativo per la pubblicazione come native AOT.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/kestrelHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json index e04e048c7454..50f33374c04c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC サービス", "description": "ASP.NET Core を使用して gRPC サービスを作成するプロジェクト テンプレート。native AOT としての公開もオプションでサポートされます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/kestrelHttpPort/description": "launchSettings.json の HTTP エンドポイントに使用するポート番号。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json index 2adf8c95a69a..4e79025b793e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC 서비스", "description": "ASP.NET Core를 사용하여 gRPC 서비스를 만들기 위한 프로젝트 템플릿으로, native AOT로 게시를 선택적으로 지원합니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/kestrelHttpPort/description": "launchSettings.json의 HTTP 엔드포인트에 사용할 포트 번호입니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json index c05f6412e7f6..5a8c9820e6c0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,7 @@ "name": "Usługa gRPC platformy ASP.NET Core", "description": "Szablon projektu służący do tworzenia usługi platformy gRPC przy użyciu platformy ASP.NET Core z opcjonalną obsługą publikowania jako native AOT.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/kestrelHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP w pliku launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json index af70f53a143d..d6dd60f47f6a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,7 @@ "name": "Serviço gRPC do ASP.NET Core", "description": "Um modelo de projeto para criar um serviço gRPC usando ASP.NET Core, com suporte opcional para publicação como native AOT.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/kestrelHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP em launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json index 76359e8da78b..a2343f5bbef1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,7 @@ "name": "Служба gRPC ASP.NET Core", "description": "Шаблон проекта для создания службы gRPC с помощью ASP.NET Core с необязательной поддержкой публикации в качестве «native AOT».", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/kestrelHttpPort/description": "Номер порта, используемый для конечной точки HTTP в launchSettings.json.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json index 3f4abddb1caf..600f4f1a1186 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC Hizmeti", "description": "Yerel AOT olarak yayımlamak için isteğe bağlı destek ile ASP.NET Core kullanarak gRPC hizmeti oluşturmaya yönelik proje şablonu.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/kestrelHttpPort/description": "launchSettings.json içinde HTTP uç noktası için kullanılacak bağlantı noktası numarası.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json index c2bc4bff62d4..dc0c127151a6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC 服务", "description": "用于使用 ASP.NET Core 创建 gRPC 服务的项目模板，可选择支持发布为 native AOT。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/kestrelHttpPort/description": "要用于 launchSettings.json 中 HTTP 终结点的端口号。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 387968b36ebd..307d4beaefb2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,7 @@ "name": "ASP.NET Core gRPC 服務", "description": "使用 ASP.NET Core 建立 gRPC 服務的專案範本，選擇性支援發佈為 Native AOT。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/kestrelHttpPort/description": "launchSettings.json 中 HTTP 端點要使用的連接埠號碼。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json index d79a6af2dabd..44d84749a755 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/GrpcService-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a gRPC service using ASP.NET Core, with optional support for publishing as native AOT.", "groupIdentity": "Microsoft.Web.Grpc", - "precedence": "9900", - "identity": "Microsoft.Grpc.Service.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Grpc.Service.CSharp.10.0", "shortName": "grpc", "tags": { "language": "C#", @@ -58,11 +58,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "defaultValue": "net9.0" + "defaultValue": "net10.0" }, "ExcludeLaunchSettings": { "type": "parameter", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json index b224d0bb72e0..b8ba6b7e802b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.cs.json @@ -3,7 +3,7 @@ "name": "Knihovna tříd Razor", "description": "Projekt pro vytvoření knihovny tříd Razor, která cílí na .NET", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/SupportPagesAndViews/displayName": "Stránky podpory a zobrazení", "symbols/SupportPagesAndViews/description": "Určuje, jestli se má podporovat přidávání dalších stránek a zobrazení Razor do této knihovny.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json index e20cac42a291..225c58f1b8dc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.de.json @@ -3,7 +3,7 @@ "name": "Razor Klassenbibliothek", "description": "Ein Projekt zum Erstellen einer Razor-Klassenbibliothek für .NET", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/SupportPagesAndViews/displayName": "Seiten und Ansichten unterstützen", "symbols/SupportPagesAndViews/description": "Gibt an, ob das Hinzufügen herkömmlicher Razor Pages und Ansichten zu dieser Bibliothek unterstützt werden soll.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json index a9a3200d5478..cb0066c83dc6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.en.json @@ -3,7 +3,7 @@ "name": "Razor Class Library", "description": "A project for creating a Razor class library that targets .NET", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/SupportPagesAndViews/displayName": "Support pages and views", "symbols/SupportPagesAndViews/description": "Whether to support adding traditional Razor pages and Views to this library.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json index 9cd47795d6b0..e5bdec097952 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.es.json @@ -3,7 +3,7 @@ "name": "Biblioteca de clases de Razor", "description": "Proyecto para crear una biblioteca de clases de Razor destinada a .NET", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/SupportPagesAndViews/displayName": "Páginas y vistas de soporte técnico", "symbols/SupportPagesAndViews/description": "Indica si se admite la adición de vistas y Razor Pages tradicionales a esta biblioteca.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json index 110b498adad4..849b33a0a4c6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.fr.json @@ -3,7 +3,7 @@ "name": "Bibliothèque de classes Razor", "description": "Projet de création d’une bibliothèque de classes Razor qui cible .NET", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/SupportPagesAndViews/displayName": "Prendre en charge les pages et les vues", "symbols/SupportPagesAndViews/description": "Indique si l’ajout de pages et de vues Razor classiques à cette bibliothèque.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json index 45c26a766cc3..ebcbcff392ca 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.it.json @@ -3,7 +3,7 @@ "name": "Libreria di classi Razor", "description": "Progetto per la creazione di una libreria di classi Razor destinata a .NET", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/SupportPagesAndViews/displayName": "Supporta pagine e visualizzazioni", "symbols/SupportPagesAndViews/description": "Indica se supportare l'aggiunta di pagine e visualizzazioni Razor tradizionali a questa libreria.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json index aab9f370303d..1420081416ea 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ja.json @@ -3,7 +3,7 @@ "name": "Razor クラス ライブラリ", "description": ".NET を対象とする Razor クラス ライブラリを作成するためのプロジェクト", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/SupportPagesAndViews/displayName": "サポート ページとビュー", "symbols/SupportPagesAndViews/description": "このライブラリに対して、従来の Razor ページとビューの追加をサポートするかどうか。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json index 09e1d2a49894..92e3a64fcafc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ko.json @@ -3,7 +3,7 @@ "name": "Razor 클래스 라이브러리", "description": ".NET을 대상으로 하는 Razor 클래스 라이브러리를 생성하기 위한 프로젝트", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/SupportPagesAndViews/displayName": "지원 페이지 및 보기", "symbols/SupportPagesAndViews/description": "이 라이브러리에 기존 Razor 페이지 및 보기 추가를 지원할지 여부입니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json index 13eb05e58dc6..ebf4e636b875 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pl.json @@ -3,7 +3,7 @@ "name": "Biblioteka klas Razor", "description": "Projekt do tworzenia biblioteki klas Razor przeznaczonej dla platformy .NET Standard", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/SupportPagesAndViews/displayName": "Strony i widoki pomocy technicznej", "symbols/SupportPagesAndViews/description": "Określa, czy obsługiwać dodawanie tradycyjnych stron Razor i wyświetleń do tej biblioteki.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json index b872222095a0..edb3279f7807 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -3,7 +3,7 @@ "name": "Biblioteca de Classes Razor", "description": "Um projeto para criar uma biblioteca de classes Razor voltada para .NET", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/SupportPagesAndViews/displayName": "Páginas e visualizações de suporte", "symbols/SupportPagesAndViews/description": "Se é necessário dar suporte à adição de páginas e exibições tradicionais do Razor a esta biblioteca.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json index f41d53b9e886..5169795e2543 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.ru.json @@ -3,7 +3,7 @@ "name": "Библиотека классов Razor", "description": "Проект для создания библиотеки классов Razor, предназначенной для .NET", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/SupportPagesAndViews/displayName": "Поддержка страниц и представлений", "symbols/SupportPagesAndViews/description": "Следует ли поддерживать добавление традиционных страниц и представлений Razor в эту библиотеку.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json index 676acb065796..d6ccbc13e955 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.tr.json @@ -3,7 +3,7 @@ "name": "Razor Sınıf Kitaplığı", "description": ".NET’i hedefleyen bir Razor sınıf kitaplığı oluşturma projesi.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/SupportPagesAndViews/displayName": "Destek sayfaları ve görünümleri", "symbols/SupportPagesAndViews/description": "Bu kitaplığa geleneksel Razor sayfaları ve görünümleri eklemenin desteklenip desteklenmeyeceği.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json index b30e4ffdd44c..4b308bfb108e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -3,7 +3,7 @@ "name": "Razor 类库", "description": "用于创建目标为 .NET 的 Razor 类库的项目", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/SupportPagesAndViews/displayName": "支持页面和视图", "symbols/SupportPagesAndViews/description": "是否支持将传统的 Razor Pages 和视图添加到此库。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 6d97af8cf399..d24e98d91eeb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -3,7 +3,7 @@ "name": "Razor 類別庫", "description": "用於建立以 .NET 為目標之 Razor 類別庫的專案", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/SupportPagesAndViews/displayName": "支援頁面及檢視", "symbols/SupportPagesAndViews/description": "是否支援將傳統 Razor 頁面及檢視新增至此程式庫。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json index 0deb4c551fbd..f6494f592fc4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorClassLibrary-CSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project for creating a Razor class library that targets .NET", "groupIdentity": "Microsoft.Web.Razor", - "precedence": "9900", - "identity": "Microsoft.Web.Razor.Library.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Razor.Library.CSharp.10.0", "shortName": "razorclasslib", "tags": { "language": "C#", @@ -48,11 +48,11 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "defaultValue": "net9.0" + "defaultValue": "net10.0" }, "HostIdentifier": { "type": "bind", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json index 0148a219d873..2b4ea4128633 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.cs.json @@ -30,7 +30,7 @@ "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í IndividualB2C, SingleOrg ani MultiOrg.", "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg nebo --auth MultiOrg.", "symbols/CalledApiScopes/description": "Obory, které se mají požádat o volání rozhraní API z webové aplikace Tato možnost platí jenom v případě, že je zadaná možnost --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json index d9283a0d2d5b..0330fed6eb8e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.de.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.", "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web-App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg oder --auth MultiOrg angegeben ist.", "symbols/CalledApiScopes/description": "Anzufordernde Bereiche zum Aufrufen der API von der Web-App. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json index 35b7c85d36b3..c1ca1d2e0074 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.en.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.", "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg or --auth MultiOrg is specified.", "symbols/CalledApiScopes/description": "Scopes to request to call the API from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json index e702b847c90e..2f858d0ec0b1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.es.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para --auth.", "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth MultiOrg.", "symbols/CalledApiScopes/description": "Ámbitos para solicitar llamar a la API desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json index 0921cfe778b7..ed7ee75608c0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.fr.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.", "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg ou --auth MultiOrg est spécifié.", "symbols/CalledApiScopes/description": "Étendues pour demander à appeler l’API à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json index 8bdaa0307fff..e8f65b0404d8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.it.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se si specifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth MultiOrg.", "symbols/CalledApiScopes/description": "Ambiti per richiedere di chiamare l'API dall'app Web. Questa opzione si applica solo se è specificato --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json index 75fd505fc449..3e0c1d318e04 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ja.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg または --auth MultiOrg が指定されている場合にのみ適用されます。", "symbols/CalledApiScopes/description": "Web アプリから API を呼び出す要求へのスコープ。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json index 21fbbe07394c..f17028517682 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ko.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg 또는 --auth MultiOrg가 지정된 경우에만 적용됩니다.", "symbols/CalledApiScopes/description": "웹앱에서 API 호출을 요청할 범위입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json index e9c7ba87877f..bdce1716bcc2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pl.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.", "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth MultiOrg.", "symbols/CalledApiScopes/description": "Zakresy do żądania wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json index 377f50325f22..cba761046a06 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.", "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg ou --auth MultiOrg for especificado.", "symbols/CalledApiScopes/description": "Escopos a serem solicitados para chamar a API do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json index 3c18a314f1d1..c133d75e5521 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.ru.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.", "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg или --auth MultiOrg.", "symbols/CalledApiScopes/description": "Области для запроса вызова API из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json index 4f6a65631745..9fd6e329018a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.tr.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg veya --auth MultiOrg belirtilirse geçerlidir.", "symbols/CalledApiScopes/description": "Web uygulamasından API çağırma istek kapsamları. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json index b857d18e531d..fb8b6a463025 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。", "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 或 --auth MultiOrg 时，此选项才适用。", "symbols/CalledApiScopes/description": "请求从 Web 应用调用 API 的范围。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json index a5fc8ee9e4ec..fdbacfba40ff 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -30,7 +30,7 @@ "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。", "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 或 --auth MultiOrg 時，才適用此選項。", "symbols/CalledApiScopes/description": "要求從 Web 應用程式呼叫 API 的範圍。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json index 1ab543330a58..6e9ffc26ce22 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/RazorPagesWeb-CSharp/.template.config/template.json @@ -10,13 +10,13 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core Razor Pages content", "groupIdentity": "Microsoft.Web.RazorPages", - "precedence": "9900", - "identity": "Microsoft.Web.RazorPages.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.RazorPages.CSharp.10.0", "shortName": [ "webapp", "razor" ], - "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices", "tags": { "language": "C#", "type": "project" @@ -383,12 +383,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json index d18251c02a02..ec541976042b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.cs.json @@ -29,7 +29,7 @@ "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í IndividualB2C, SingleOrg ani MultiOrg.", "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg, --auth MultiOrg nebo --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg nebo --auth MultiOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json index 616fdd240b86..94f56b2d0920 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.de.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg, --auth MultiOrg oder --auth IndividualB2C angegeben ist.", "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web-App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg oder --auth MultiOrg angegeben ist.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json index 9998411febcc..701903e81a0a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.en.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg, --auth MultiOrg or --auth IndividualB2C is specified.", "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg or --auth MultiOrg is specified.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json index 3b7263cba55c..4bae809c9a95 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.es.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para la autenticación.", "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth MultiOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json index 5dd270711bc5..112c53bbfe03 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.fr.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C est spécifié.", "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg ou --auth MultiOrg est spécifié.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json index 20771f90cfcb..a724a8b65a06 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.it.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se si specifica --auth SingleOrg, --auth MultiOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth MultiOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json index 7cf1d33548fb..1511ef7ae609 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ja.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg、--auth MultiOrg、または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg または --auth MultiOrg が指定されている場合にのみ適用されます。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json index 13169220ec1b..43064785acff 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ko.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg, --auth MultiOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg 또는 --auth MultiOrg가 지정된 경우에만 적용됩니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json index d2c4d33dcf00..1c5513ffd890 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pl.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.", "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg, --auth MultiOrg lub --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth MultiOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json index 59203f10bb59..267140edc53b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Esta opção só se aplica se --auth SingleOrg, --auth MultiOrg ou --auth IndividualB2C for especificado.", "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg ou --auth MultiOrg for especificado.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json index d3371c5ce0a6..4879b5fb4560 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.ru.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.", "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg, --auth MultiOrg или --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg или --auth MultiOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json index 0a7b2326c292..1a1819cd240c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.tr.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg, --auth MultiOrg veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg veya --auth MultiOrg belirtilirse geçerlidir.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 1c4c8a7d9807..a1a3e952a6b4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 时，此选项才适用。", "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 或 --auth MultiOrg 时，此选项才适用。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 31c83a540677..7851e8973b1e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -29,7 +29,7 @@ "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg、--auth MultiOrg 或 --auth IndividualB2C 時，才適用此選項。", "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 或 --auth MultiOrg 時，才適用此選項。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json index 84dc40535a92..79478ad13720 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-CSharp/.template.config/template.json @@ -9,10 +9,10 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "9900", - "identity": "Microsoft.Web.Mvc.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Mvc.CSharp.10.0", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices", "tags": { "language": "C#", "type": "project" @@ -373,12 +373,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json index 78a7a036a820..c1606f1ffe6b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.cs.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.", "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).", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "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á protokol HTTPS vypnout. Tato možnost platí jenom v případě, že se pro --auth nepoužívají Individual, IndividualB2C, SingleOrg ani MultiOrg.", "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json index 1628809dfbb1..0875ea15ea6f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.de.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.", "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).", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn Individual, IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json index c870fe3a1c3e..ed6bdec5c069 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.en.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.", "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 either IndividualAuth or OrganizationalAuth is used).", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if Individual, IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "postActions/restore/description": "Restore NuGet packages required by this project.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json index d1f9e80aafcf..78e61ab295e5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.es.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.", "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json. Esta opción solo es aplicable cuando no se usa el parámetro no-https (no-https se omitirá si se usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/NoHttps/description": "Si se va a desactivar HTTPS. Esta opción solo se aplica si Individual, IndividualB2C, SingleOrg o MultiOrg no se usan para --auth.", "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json index 0674ee947ab0..4a57601a2dfc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.fr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.", "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json. Cette option s’applique uniquement lorsque le paramètre no-https n’est pas utilisé (no-https sera ignoré si IndividualAuth ou OrganizationalAuth est utilisé).", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si Individual, IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json index 78cc7ae8f58e..cd23d8ecc28a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.it.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.", "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json. Questa opzione è applicabile solo quando il parametro no-https non viene usato (no-https verrà ignorato se si usa IndividualAuth o OrganizationalAuth).", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se Individual, IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json index d86d696eeb7c..570ebf4e897a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ja.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。", "symbols/iisHttpsPort/description": "launchSettings.json で IIS Express HTTPS エンドポイントに使用するポート番号。このオプションは、HTTPS 以外のパラメーターが使用されていない場合にのみ適用されます (IndividualAuth または OrganizationalAuth が使用されている場合は、HTTPS 以外は無視されます)。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、Individual、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json index 13adc18487e4..58e87b3d4703 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ko.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express 엔드포인트에 사용할 포트 번호입니다. 이 옵션은 매개 변수 no-https가 사용되지 않은 경우에만 적용됩니다(IndividualAuth 또는 OrganizationalAuth가 사용되는 경우 no-https는 무시됨).", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 Individual, IndividualB2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json index 72bef26c9a38..eb37b59d1ca2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pl.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.", "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS usług IIS Express w pliku launchSettings.json. Ta opcja ma zastosowanie tylko wtedy, gdy nie jest używany parametr no-https (jeśli zostanie użyte uwierzytelnianie IndividualAuth lub OrganizationalAuth, parametr no-https zostanie zignorowana).", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy dla uwierzytelniania --auth nie są używane elementy Individual, IndividualB2C, SingleOrg lub MultiOrg.", "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json index 5ad40fd99fda..7f0a2ef37184 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.", "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json. Essa opção só é aplicável quando o parâmetro no-https não é usado (no-https será ignorado se IndividualAuth ou OrganizationalAuth for usado).", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção se aplica somente se Individual, IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json index badfe6cdde99..449cffc3ee13 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.ru.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.", "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json. Этот параметр применим только в том случае, если no-https не используется (при использовании IndividualAuth или OrganizationalAuth no-https игнорируется).", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются Individual, IndividualB2C, SingleOrg или MultiOrg.", "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json index d39ae0fc92e2..83b2f40f2bcb 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.tr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası. Bu seçenek yalnızca no-https parametresi kullanılmazsa uygulanabilir (IndividualAuth veya OrganizationalAuth kullanılırsa no-https yoksayılır).", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca Bireysel, IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 2d0fe15b2efa..334f23168bfc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。", "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。仅当不使用参数 no-https 时，此选项才适用(如果使用 IndividualAuth 或 OrganizationalAuth，则将忽略 no-https)。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 Individual、IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "postActions/restore/description": "还原此项目所需的 NuGet 包。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json index b91f007edb0a..5639c1ff4d80 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。", "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。只有在未使用參數 no-https 時，才適用此選項 (如果使用 IndividualAuth 或 OrganizationalAuth，則會忽略 no-https)。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 Individual、IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "postActions/restore/description": "還原此專案所需的 NuGet 套件。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json index b8ee9bfa2635..7507fabddd48 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/StarterWeb-FSharp/.template.config/template.json @@ -9,10 +9,10 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with example ASP.NET Core MVC Views and Controllers. This template can also be used for RESTful HTTP services.", "groupIdentity": "Microsoft.Web.Mvc", - "precedence": "9900", - "identity": "Microsoft.Web.Mvc.FSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.Mvc.FSharp.10.0", "shortName": "mvc", - "thirdPartyNotices": "https://aka.ms/aspnetcore/9.0-third-party-notices", + "thirdPartyNotices": "https://aka.ms/aspnetcore/10.0-third-party-notices", "tags": { "language": "F#", "type": "project" @@ -131,12 +131,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json index 328b518b3c38..59143f2ab1f6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.cs.json @@ -24,7 +24,7 @@ "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í IndividualB2C, SingleOrg ani MultiOrg.", "symbols/UseLocalDB/description": "Určuje, jestli se má použít LocalDB namísto SQLite. Tato možnost platí jenom v případě, že je zadáno --auth Individual nebo --auth IndividualB2C.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/CalledApiUrl/description": "Adresa URL rozhraní API, která se má volat z webové aplikace. Tato možnost platí jenom v případě, že je zadáno --auth SingleOrg nebo --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Určuje, jestli webová aplikace volá Microsoft Graph. Tato možnost platí pouze v případě, že je zadáno --auth SingleOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json index 6dba235cace0..4eeba169d572 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.de.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll. Diese Option gilt nur, wenn IndividualB2C, SingleOrg oder MultiOrg nicht für --auth verwendet werden.", "symbols/UseLocalDB/description": "Ob LocalDB anstelle von SQLite verwendet werden soll. Diese Option gilt nur, wenn --auth Individual oder --auth IndividualB2C angegeben ist.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/CalledApiUrl/description": "URL der API, die von der Web-App aufgerufen werden soll. Diese Option gilt nur, wenn --auth SingleOrg oder --auth IndividualB2C angegeben ist.", "symbols/CallsMicrosoftGraph/description": "Gibt an, ob die Web App Microsoft Graph aufruft. Diese Option gilt nur, wenn --auth SingleOrg angegeben ist.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json index 04b743643b08..4383693bc546 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.en.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Whether to turn off HTTPS. This option only applies if IndividualB2C, SingleOrg, or MultiOrg aren't used for --auth.", "symbols/UseLocalDB/description": "Whether to use LocalDB instead of SQLite. This option only applies if --auth Individual or --auth IndividualB2C is specified.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/CalledApiUrl/description": "URL of the API to call from the web app. This option only applies if --auth SingleOrg or --auth IndividualB2C is specified.", "symbols/CallsMicrosoftGraph/description": "Specifies if the web app calls Microsoft Graph. This option only applies if --auth SingleOrg is specified.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json index 9347e1157c03..603376d472c4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.es.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Ya sea para desactivar HTTPS. Esta opción solo se aplica si no se utilizan IndividualB2C, SingleOrg o MultiOrg para --auth.", "symbols/UseLocalDB/description": "Indica si se va a usar LocalDB en lugar de SQLite. Esta opción solo se aplica si se especifica --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/CalledApiUrl/description": "Dirección URL de la API a la que se va a llamar desde la aplicación web. Esta opción solo se aplica si se especifica --auth SingleOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Especifica si la aplicación web llama a Microsoft Graph. Esta opción solo se aplica si se especifica --auth SingleOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json index a1ffcb05cabe..52de31851ada 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.fr.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS. Cette option s’applique uniquement si IndividualB2C, SingleOrg ou MultiOrg ne sont pas utilisés pour --auth.", "symbols/UseLocalDB/description": "Indique s’il faut utiliser localDB au lieu de SQLite. Cette option s’applique uniquement si --auth Individual ou --auth IndividualB2C est spécifié.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/CalledApiUrl/description": "URL de l’API à appeler à partir de l’application web. Cette option s’applique uniquement si --auth SingleOrg ou --auth IndividualB2C est spécifié.", "symbols/CallsMicrosoftGraph/description": "Spécifie si l’application web appelle Microsoft Graph. Cette option s’applique uniquement si --auth SingleOrg est spécifié.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json index 2dddc1c30c29..4b6271cea6f3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.it.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Indica se disattivare HTTPS. Questa opzione si applica solo se IndividualB2C, SingleOrg o MultiOrg non vengono usati per --auth.", "symbols/UseLocalDB/description": "Indica se usare LocalDB invece di SQLite. Questa opzione si applica solo se è specificato --auth Individual o --auth IndividualB2C.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/CalledApiUrl/description": "URL dell'API da chiamare dall'app Web. Questa opzione si applica solo se è specificato --auth SingleOrg o --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Specifica se l'app Web chiama Microsoft Graph. Questa opzione si applica solo se è specificato --auth SingleOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json index 15a8539a8218..b5182fdb30d3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ja.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "HTTPS をオフにするかどうか。このオプションは、IndividualB2C、SingleOrg、または MultiOrg が --auth に使用されていない場合にのみ適用されます。", "symbols/UseLocalDB/description": "SQLite の代わりに LocalDB を使用するかどうか。このオプションは、--auth Individual または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/CalledApiUrl/description": "Web アプリから呼び出す API の URL。このオプションは、--auth SingleOrg または --auth IndividualB2C が指定されている場合にのみ適用されます。", "symbols/CallsMicrosoftGraph/description": "Web アプリが Microsoft Graph を呼び出すかどうかを指定します。このオプションは、--auth SingleOrg が指定されている場合にのみ適用されます。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json index 434847738040..339a83f3c24c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ko.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다. 이 옵션은 개별B2C, SingleOrg 또는 MultiOrg가 --auth에 사용되지 않는 경우에만 적용됩니다.", "symbols/UseLocalDB/description": "SQLite 대신 LocalDB를 사용할지 여부입니다. 이 옵션은 --auth Individual 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/CalledApiUrl/description": "웹앱에서 호출할 API의 URL입니다. 이 옵션은 --auth SingleOrg 또는 --auth IndividualB2C가 지정된 경우에만 적용됩니다.", "symbols/CallsMicrosoftGraph/description": "웹앱이 Microsoft Graph를 호출하는지 여부를 지정합니다. 이 옵션은 --auth SingleOrg가 지정된 경우에만 적용됩니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json index 0116babcf78e..f9567e1361b0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pl.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS. Ta opcja ma zastosowanie tylko wtedy, gdy elementy IndividualB2C, SingleOrg lub MultiOrg nie są używane dla uwierzytelniania --auth.", "symbols/UseLocalDB/description": "Określa, czy używać bazy danych LocalDB zamiast oprogramowania SQLite. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth Individual lub --auth IndividualB2C.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/CalledApiUrl/description": "Adres URL interfejsu API do wywołania z aplikacji internetowej. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg lub --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Określa, czy aplikacja internetowa wywołuje program Microsoft Graph. Ta opcja ma zastosowanie tylko wtedy, gdy określono uwierzytelnianie --auth SingleOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json index c2d2629e81d7..8d8191d3b1e3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Se o HTTPS deve ser desativado. Essa opção só se aplica se IndividualB2C, SingleOrg ou MultiOrg não forem usados para --auth.", "symbols/UseLocalDB/description": "Se deve usar LocalDB em vez de SQLite. Esta opção só se aplica se --auth Individual ou --auth IndividualB2C for especificado.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/CalledApiUrl/description": "URL da API para chamar do aplicativo Web. Essa opção se aplica somente se --auth SingleOrg ou --auth IndividualB2C for especificado.", "symbols/CallsMicrosoftGraph/description": "Especifica se o aplicativo Web chama o Microsoft Graph. Esta opção só se aplica se --auth SingleOrg for especificado.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json index 84b09f6ff279..f948a7a94b6f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.ru.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "Следует ли отключить HTTPS. Этот параметр применяется, только если для --auth не используются IndividualB2C, SingleOrg или MultiOrg.", "symbols/UseLocalDB/description": "Следует ли использовать LocalDB вместо SQLite. Этот параметр применяется, только если указывается --auth Individual или --auth IndividualB2C.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/CalledApiUrl/description": "URL-адрес API для вызова из веб-приложения. Этот параметр применяется, только если указывается --auth SingleOrg или --auth IndividualB2C.", "symbols/CallsMicrosoftGraph/description": "Указывает, вызывает ли веб-приложение Microsoft Graph. Этот параметр применяется, только если указывается --auth SingleOrg.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json index f841252f1871..6620e54f3e0d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.tr.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı. Bu seçenek yalnızca IndividualB2C, SingleOrg veya MultiOrg -- auth için kullanılmazsa geçerlidir.", "symbols/UseLocalDB/description": "SQLite yerine LocalDB'nin kullanılıp kullanılmayacağı. Bu seçenek yalnızca --auth Individual veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/CalledApiUrl/description": "Web uygulamasından çağrılan API URL'si. Bu seçenek yalnızca --auth SingleOrg veya --auth IndividualB2C belirtilirse geçerlidir.", "symbols/CallsMicrosoftGraph/description": "Web uygulamasının Microsoft Graph çağırıp çağırmadığını belirtir. Bu seçenek yalnızca --auth SingleOrg belirtilirse geçerlidir.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 830ed78b25d1..e81403834d0c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "是否禁用 HTTPS。仅当 IndividualB2C、SingleOrg 或 MultiOrg 不用于 --auth 时，此选项才适用。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而不是 SQLite。仅当指定了 --auth Individual 或 --auth IndividualB2C 时，此选项才适用。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/CalledApiUrl/description": "要从 Web 应用调用的 API 的 URL。仅当指定了 --auth SingleOrg 或 --auth IndividualB2C 时，此选项才适用。", "symbols/CallsMicrosoftGraph/description": "指定 Web 应用是否调用 Microsoft Graph。仅当指定了 --auth SingleOrg 时，此选项才适用。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json index e08d9e050b26..8b0aad011b0b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -24,7 +24,7 @@ "symbols/NoHttps/description": "是否要關閉 HTTPS。只有當 IndividualB2C、SingleOrg 或 MultiOrg 未用於 --auth 時，才適用此選項。", "symbols/UseLocalDB/description": "是否使用 LocalDB 而非 SQLite。只有在已指定 --auth Individual 或 --auth IndividualB2C 時，才適用此選項。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/CalledApiUrl/description": "要從 Web 應用程式呼叫的 API URL。只有在已指定 --auth SingleOrg 或 --auth IndividualB2C 時，才適用此選項。", "symbols/CallsMicrosoftGraph/description": "指定 Web 應用程式呼叫是否 Microsoft Graph。只有在已指定 --auth SingleOrg 時，才適用此選項。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json index a69bf11bf222..c581b5457d40 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a RESTful Web API using ASP.NET Core controllers or minimal APIs, with optional support for OpenAPI and authentication.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "9900", - "identity": "Microsoft.Web.WebApi.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.WebApi.CSharp.10.0", "shortName": "webapi", "tags": { "language": "C#", @@ -325,12 +325,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json index 0a57fc2aa26a..cc60692253b9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.cs.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.", "symbols/iisHttpsPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTPS v souboru launchSettings.json.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "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.", "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json index 02f2eb974fdc..7acda57ed39a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.de.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.", "symbols/iisHttpsPort/description": "Portnummer, die für den IIS Express-HTTPS-Endpunkt in launchSettings.json verwendet werden soll.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/NoHttps/description": "Ob HTTPS deaktiviert werden soll.", "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json index 1d8122dcc2ee..04dbf0c01ec5 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.en.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.", "symbols/iisHttpsPort/description": "Port number to use for the IIS Express HTTPS endpoint in launchSettings.json.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/NoHttps/description": "Whether to turn off HTTPS.", "postActions/restore/description": "Restore NuGet packages required by this project.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json index 62dba41229ab..848f23f4e2f3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.es.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.", "symbols/iisHttpsPort/description": "Número de puerto que se va a usar para el punto de conexión HTTPS de IIS Express en launchSettings.json.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/NoHttps/description": "Si se va a desactivar HTTPS.", "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json index 031cc2c192c7..1b238391cd0c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.fr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.", "symbols/iisHttpsPort/description": "Numéro de port à utiliser pour le point de terminaison HTTPS IIS Express dans launchSettings.json.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/NoHttps/description": "Indique s’il faut désactiver HTTPS.", "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json index 92f8c7a0936e..40fd7e026eb2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.it.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP IIS Express in launchSettings.json.", "symbols/iisHttpsPort/description": "Numero di porta da usare per l'endpoint HTTPS IIS Express in launchSettings.json.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/NoHttps/description": "Indica se disattivare HTTPS.", "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json index 93317d2a769a..48ab6deac5ef 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ja.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。", "symbols/iisHttpsPort/description": "launchSettings.json の IIS Express HTTPS エンドポイントに使用するポート番号。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/NoHttps/description": "HTTPS をオフにするかどうか。", "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json index c52a04ce98bb..e53657a49d33 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ko.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/iisHttpsPort/description": "launchSettings.json의 IIS Express HTTPS 엔드포인트에 사용할 포트 번호입니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/NoHttps/description": "HTTPS를 끌지 여부입니다.", "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json index 01205d20761a..c1e363eec11a 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pl.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.", "symbols/iisHttpsPort/description": "Numer portu do użycia dla punktu końcowego HTTPS programu IIS Express w pliku launchSettings.json.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/NoHttps/description": "Określa, czy wyłączyć protokół HTTPS.", "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json index 08ab2b515297..bc1ed0417b0c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.", "symbols/iisHttpsPort/description": "Número da porta a ser usada para o ponto de extremidade HTTPS do IIS Express em launchSettings.json.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/NoHttps/description": "Se o HTTPS deve ser desativado.", "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json index 0f8f73600c03..b4461a6dcb51 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.ru.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.", "symbols/iisHttpsPort/description": "Номер порта, используемый для конечной точки HTTPS IIS Express в launchSettings.json.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/NoHttps/description": "Следует ли отключить HTTPS.", "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json index 49fcba439fdf..30b672104c02 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.tr.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/iisHttpsPort/description": "launchSettings.json içinde IIS Express HTTPS uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/NoHttps/description": "HTTPS'nin kapatılıp kapatılmayacağı.", "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json index 6af11ca4efed..75314c22b412 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。", "symbols/iisHttpsPort/description": "要用于 launchSettings.json 中 IIS Express HTTPS 终结点的端口号。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/NoHttps/description": "是否禁用 HTTPS。", "postActions/restore/description": "还原此项目所需的 NuGet 包。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 56f400f67239..d40e83531fac 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -8,7 +8,7 @@ "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。", "symbols/iisHttpsPort/description": "launchSettings.json 中 IIS Express HTTPS 端點要使用的連接埠號碼。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/NoHttps/description": "是否要關閉 HTTPS。", "postActions/restore/description": "還原此專案所需的 NuGet 套件。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json index 87b2fbc2faf6..ae7a8a90a4e4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApi-FSharp/.template.config/template.json @@ -8,8 +8,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating an ASP.NET Core application with an example Controller for a RESTful HTTP service. This template can also be used for ASP.NET Core MVC Views and Controllers.", "groupIdentity": "Microsoft.Web.WebApi", - "precedence": "9900", - "identity": "Microsoft.Web.WebApi.FSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.WebApi.FSharp.10.0", "shortName": "webapi", "tags": { "language": "F#", @@ -126,12 +126,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json index 6d9ccb908419..d9f5aba08d8d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.cs.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Číslo portu, který se má použít pro koncový bod HTTP v souboru launchSettings.json.", "symbols/iisHttpPort/description": "Číslo portu, který se má použít pro koncový bod IIS Express HTTP v souboru launchSettings.json.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně", "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json index 6e286ca19253..82c0bf5121ef 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.de.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Portnummer, die für den HTTP Endpunkt in launchSettings.json verwendet werden soll.", "symbols/iisHttpPort/description": "Portnummer, die für den IIS Express HTTP Endpunkt in launchSettings.json verwendet werden soll.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden", "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json index 8cd862b9d7a6..0805132c3eb8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.en.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Port number to use for the HTTP endpoint in launchSettings.json.", "symbols/iisHttpPort/description": "Port number to use for the IIS Express HTTP endpoint in launchSettings.json.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/UseProgramMain/displayName": "Do not use _top-level statements", "symbols/UseProgramMain/description": "Whether to generate an explicit Program class and Main method instead of top-level statements.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json index 7311b2989198..538c473b54a8 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.es.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP en launchSettings.json.", "symbols/iisHttpPort/description": "Número de puerto que se va a usar para el punto de conexión HTTP de IIS Express en launchSettings.json.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior", "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json index 6398f3787e23..463429e219a1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.fr.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP dans launchSettings.json.", "symbols/iisHttpPort/description": "Numéro de port à utiliser pour le point de terminaison HTTP IIS Express dans launchSettings.json.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.", "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json index d506375db154..15792378214e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.it.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.", "symbols/iisHttpPort/description": "Numero di porta da usare per l'endpoint HTTP in launchSettings.json.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello", "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json index 06f2985050d7..16fad5c66aa0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ja.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "launchSettings.json の HTTP エンドポイントに使用するポート番号。", "symbols/iisHttpPort/description": "launchSettings.json の IIS Express HTTP エンドポイントに使用するポート番号。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)", "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json index 430137e66cea..763695fd5a3e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ko.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "launchSettings.json의 HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/iisHttpPort/description": "launchSettings.json의 IIS Express HTTP 엔드포인트에 사용할 포트 번호입니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)", "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json index c29a92f94359..f85ea12cb58c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pl.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP w pliku launchSettings.json.", "symbols/iisHttpPort/description": "Numer portu do użycia dla punktu końcowego HTTP usług IIS Express w pliku launchSettings.json.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu", "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json index 1824fd3c610c..d56c2f98339b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP em launchSettings.json.", "symbols/iisHttpPort/description": "Número da porta a ser usada para o ponto de extremidade HTTP do IIS Express em launchSettings.json.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior", "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json index 36debc4470a0..b1303ffe207e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.ru.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "Номер порта, используемый для конечной точки HTTP в launchSettings.json.", "symbols/iisHttpPort/description": "Номер порта, используемый для конечной точки HTTP IIS Express в launchSettings.json.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня", "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json index e44572fe0c1c..008a53a65f0f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.tr.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "launchSettings.json içinde HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/iisHttpPort/description": "launchSettings.json içinde IIS Express HTTP uç noktası için kullanılacak bağlantı noktası numarası.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın", "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json index e3e2e3397b1a..2247dc6d4b36 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "要用于 launchSettings.json 中 HTTP 终结点的端口号。", "symbols/iisHttpPort/description": "要用于 launchSettings.json 中 IIS Express HTTP 终结点的端口号。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)", "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json index 975e14f97abe..7691752108c9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -6,7 +6,7 @@ "symbols/kestrelHttpPort/description": "launchSettings.json 中 HTTP 端點要使用的連接埠號碼。", "symbols/iisHttpPort/description": "launchSettings.json 中 IIS Express HTTP 端點要使用的連接埠號碼。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)", "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json index ed7c61efb897..bbc12adc0cc1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/WebApiAot-CSharp/.template.config/template.json @@ -11,8 +11,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "A project template for creating a RESTful Web API using ASP.NET Core minimal APIs published as native AOT.", "groupIdentity": "Microsoft.Web.WebApiAot", - "precedence": "9900", - "identity": "Microsoft.Web.WebApiAot.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Web.WebApiAot.CSharp.10.0", "shortName": "webapiaot", "tags": { "language": "C#", @@ -103,12 +103,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json index 0cd426cd94f6..4aeefb4b0bbd 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.cs.json @@ -4,7 +4,7 @@ "description": "Šablona prázdného projektu pro vytvoření služby Worker Service", "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "symbols/UseProgramMain/displayName": "Nepoužívat _příkazy nejvyšší úrovně", "symbols/UseProgramMain/description": "Určuje, jestli se má místo příkazů nejvyšší úrovně generovat explicitní třída Program a metoda Main.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json index 62d49dcf6a2d..07c042c71f6c 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.de.json @@ -4,7 +4,7 @@ "description": "Eine leere Projektvorlage zum Erstellen eines Workerdiensts.", "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "symbols/UseProgramMain/displayName": "Keine Anweisungen_der obersten Ebene verwenden", "symbols/UseProgramMain/description": "Gibt an, ob anstelle von Anweisungen der obersten Ebene eine explizite Programmklasse und eine Main-Methode generiert werden soll.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json index 4b764666b67e..7d51cff86822 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.en.json @@ -4,7 +4,7 @@ "description": "An empty project template for creating a worker service.", "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "symbols/UseProgramMain/displayName": "Do not use _top-level statements", "_symbols/UseProgramMain/displayName.comment": "Use '_' as accelerator key when translating.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json index 40944c609908..874724e1c86f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.es.json @@ -4,7 +4,7 @@ "description": "Una plantilla de proyecto vacía para crear un servicio Worker.", "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "symbols/UseProgramMain/displayName": "No usar instrucciones de _nivel superior", "symbols/UseProgramMain/description": "Indica si se debe generar una clase Program explícita y un método Main en lugar de instrucciones de nivel superior.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json index bb5ae729a3f8..d702fca1cad3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.fr.json @@ -4,7 +4,7 @@ "description": "Modèle de projet vide pour la création d'un service Worker.", "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "symbols/UseProgramMain/displayName": "N’utilisez pas _d’instructions de niveau supérieur.", "symbols/UseProgramMain/description": "Indique s’il faut générer une classe Programme explicite et une méthode Main au lieu d’instructions de niveau supérieur.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json index 3fdf342ef919..ef7c92feafd6 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.it.json @@ -4,7 +4,7 @@ "description": "Modello di progetto vuoto per la creazione di un'istanza di Worker Service.", "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "symbols/UseProgramMain/displayName": "Non usare_istruzioni di primo livello", "symbols/UseProgramMain/description": "Indica se generare una classe Program esplicita e un metodo Main anziché istruzioni di primo livello.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json index 08552b60fd2f..d4dbfc90d5cc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ja.json @@ -4,7 +4,7 @@ "description": "Worker Service を作成するための空のプロジェクト テンプレート。", "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "symbols/UseProgramMain/displayName": "最上位レベルのステートメントを使用しない(_T)", "symbols/UseProgramMain/description": "最上位レベルのステートメントではなく、明示的な Program クラスと Main メソッドを生成するかどうか。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json index e99b4756af63..8b993f95ca6b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ko.json @@ -4,7 +4,7 @@ "description": "Worker Service를 만드는 데 사용하는 빈 프로젝트 템플릿입니다.", "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "symbols/UseProgramMain/displayName": "최상위 문 사용 안 함(_T)", "symbols/UseProgramMain/description": "최상위 문 대신 명시적 Program 클래스 및 Main 메서드를 생성할지 여부입니다.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json index 1dd5f142101f..0a00ea5fbe8f 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pl.json @@ -4,7 +4,7 @@ "description": "Szablon pustego projektu służący do tworzenia usługi procesu roboczego.", "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "symbols/UseProgramMain/displayName": "Nie używaj ins_trukcji najwyższego poziomu", "symbols/UseProgramMain/description": "Określa, czy wygenerować jawną klasę Program i metodę Main zamiast instrukcji najwyższego poziomu.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json index 46991e230716..66492ca73311 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.pt-BR.json @@ -4,7 +4,7 @@ "description": "Um modelo de projeto vazio para criar um worker service.", "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "symbols/UseProgramMain/displayName": "Não use ins_truções de nível superior", "symbols/UseProgramMain/description": "Se deve gerar uma classe de Programa explícita e um método principal em vez de instruções de nível superior.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json index 09e94223de7e..6db1686a9970 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.ru.json @@ -4,7 +4,7 @@ "description": "Шаблон пустого проекта для создания службы Worker Service.", "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "symbols/UseProgramMain/displayName": "Не использовать _операторы верхнего уровня", "symbols/UseProgramMain/description": "Следует ли создавать явный класс Program и метод Main вместо операторов верхнего уровня.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json index 1297a4a813c5..1aeef5b948ec 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.tr.json @@ -4,7 +4,7 @@ "description": "Çalışan hizmeti oluşturmaya yönelik boş proje şablonu.", "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "symbols/UseProgramMain/displayName": "_Üst düzey deyimler kullanmayın", "symbols/UseProgramMain/description": "Üst düzey deyimler yerine açık bir Program sınıfı ve Ana yöntem oluşturup oluşturulmayacağını belirtir.", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json index 2db1bd2f6d23..0b68bf0345d3 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -4,7 +4,7 @@ "description": "用于创建 worker service 的空项目模板。", "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "symbols/UseProgramMain/displayName": "不使用顶级语句(_T)", "symbols/UseProgramMain/description": "是否生成显式程序类和主方法，而不是顶级语句。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json index dd0dde40b8c6..ab0f2dd1579d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -4,7 +4,7 @@ "description": "用於建立 Worker Service 的空白專案範本。", "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "symbols/UseProgramMain/displayName": "不要使用最上層陳述式(_T)", "symbols/UseProgramMain/description": "是否要產生明確的 Program 類別和 Main 方法，而非最上層語句。", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json index e28a913b8f1c..934552d8bfca 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-CSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating a worker service.", "groupIdentity": "Microsoft.Worker.Empty", - "precedence": "9900", - "identity": "Microsoft.Worker.Empty.CSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Worker.Empty.CSharp.10.0", "shortName": "worker", "tags": { "language": "C#", @@ -62,12 +62,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json index e1f5a8846d50..6ab4511147d2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.cs.json @@ -4,7 +4,7 @@ "description": "Šablona prázdného projektu pro vytvoření služby Worker Service", "symbols/ExcludeLaunchSettings/description": "Určuje, jestli se má z vygenerované šablony vyloučit soubor launchSettings.json.", "symbols/Framework/description": "Cílová architektura pro projekt", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Pokud se tato možnost zadá, přeskočí automatické obnovení projektu při vytvoření.", "postActions/restore/description": "Obnoví balíčky NuGet vyžadované tímto projektem.", "postActions/restore/manualInstructions/default/text": "Spustit dotnet restore" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json index b31745f8f0cc..1b54f298641e 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.de.json @@ -4,7 +4,7 @@ "description": "Eine leere Projektvorlage zum Erstellen eines Workerdiensts.", "symbols/ExcludeLaunchSettings/description": "Ob launchSettings.json aus der generierten Vorlage ausgeschlossen werden soll.", "symbols/Framework/description": "Das Zielframework für das Projekt.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Wenn angegeben, wird die automatische Wiederherstellung des Projekts beim Erstellen übersprungen.", "postActions/restore/description": "„NuGet-Pakete“ wiederherstellen, die für dieses Projekt erforderlich sind.", "postActions/restore/manualInstructions/default/text": "„dotnet restore“ ausführen" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json index 0fd990d039ac..30684c10f80b 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.en.json @@ -4,7 +4,7 @@ "description": "An empty project template for creating a worker service.", "symbols/ExcludeLaunchSettings/description": "Whether to exclude launchSettings.json from the generated template.", "symbols/Framework/description": "The target framework for the project.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "If specified, skips the automatic restore of the project on create.", "postActions/restore/description": "Restore NuGet packages required by this project.", "postActions/restore/manualInstructions/default/text": "Run 'dotnet restore'" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json index 1fff8efdb6c8..0fae8a2a7af1 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.es.json @@ -4,7 +4,7 @@ "description": "Una plantilla de proyecto vacía para crear un servicio Worker.", "symbols/ExcludeLaunchSettings/description": "Indica si se va a excluir launchSettings.json de la plantilla generada.", "symbols/Framework/description": "Marco de destino del proyecto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Si se especifica, se omite la restauración automática del proyecto durante la creación.", "postActions/restore/description": "Restaure los paquetes NuGet necesarios para este proyecto.", "postActions/restore/manualInstructions/default/text": "Ejecutar \"dotnet restore\"" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json index df347759a2e3..76645238a1f4 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.fr.json @@ -4,7 +4,7 @@ "description": "Modèle de projet vide pour la création d'un service Worker.", "symbols/ExcludeLaunchSettings/description": "Indique s’il faut exclure launchSettings.json du modèle généré.", "symbols/Framework/description": "Framework cible du projet.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "S’il est spécifié, ignore la restauration automatique du projet lors de la création.", "postActions/restore/description": "Restaurez les packages NuGet requis par ce projet.", "postActions/restore/manualInstructions/default/text": "Exécuter « dotnet restore »" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json index 2e3bc12c41d8..7992ba3738f0 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.it.json @@ -4,7 +4,7 @@ "description": "Modello di progetto vuoto per la creazione di un'istanza di Worker Service.", "symbols/ExcludeLaunchSettings/description": "Indica se escludere launchSettings.json dal modello generato.", "symbols/Framework/description": "Il framework di destinazione per il progetto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se specificato, ignora il ripristino automatico del progetto durante la creazione.", "postActions/restore/description": "Ripristina i pacchetti NuGet richiesti da questo progetto.", "postActions/restore/manualInstructions/default/text": "Esegui 'dotnet restore'" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json index 14b9a604d0da..66838a7fcafe 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ja.json @@ -4,7 +4,7 @@ "description": "Worker Service を作成するための空のプロジェクト テンプレート。", "symbols/ExcludeLaunchSettings/description": "生成されたテンプレートから launchSettings.json を除外するかどうか。", "symbols/Framework/description": "プロジェクトのターゲット フレームワークです。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "指定した場合、作成時にプロジェクトの自動復元がスキップされます。", "postActions/restore/description": "このプロジェクトに必要な NuGet パッケージを復元します。", "postActions/restore/manualInstructions/default/text": "'dotnet restore' を実行する" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json index abab2e07f927..fedf17a8e429 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ko.json @@ -4,7 +4,7 @@ "description": "Worker Service를 만드는 데 사용하는 빈 프로젝트 템플릿입니다.", "symbols/ExcludeLaunchSettings/description": "생성된 템플릿에서 launchSettings.json을 제외할지 여부입니다.", "symbols/Framework/description": "프로젝트에 대한 대상 프레임워크입니다.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "지정된 경우, 프로젝트 생성 시 자동 복원을 건너뜁니다.", "postActions/restore/description": "이 프로젝트에 필요한 NuGet 패키지를 복원합니다.", "postActions/restore/manualInstructions/default/text": "'dotnet restore' 실행" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json index bf6bb21aed97..09e66f80558d 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pl.json @@ -4,7 +4,7 @@ "description": "Szablon pustego projektu służący do tworzenia usługi procesu roboczego.", "symbols/ExcludeLaunchSettings/description": "Określa, czy wykluczyć plik launchSettings.json z wygenerowanego szablonu.", "symbols/Framework/description": "Platforma docelowa dla tego projektu.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Jeśli ta opcja jest określona, pomija automatyczne przywracanie projektu podczas tworzenia.", "postActions/restore/description": "Przywróć pakiety NuGet wymagane przez ten projekt.", "postActions/restore/manualInstructions/default/text": "Uruchom polecenie \"dotnet restore\"" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json index f50d362504cd..e8e4134c8ce7 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.pt-BR.json @@ -4,7 +4,7 @@ "description": "Um modelo de projeto vazio para criar um worker service.", "symbols/ExcludeLaunchSettings/description": "Se deve excluir launchSettings.json do modelo gerado.", "symbols/Framework/description": "A estrutura de destino do projeto.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Se especificado, ignora a restauração automática do projeto sendo criado.", "postActions/restore/description": "Restaure os pacotes NuGet exigidos por este projeto.", "postActions/restore/manualInstructions/default/text": "Executar 'dotnet restore'" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json index b8dd4e726213..1d3cf0d4e998 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.ru.json @@ -4,7 +4,7 @@ "description": "Шаблон пустого проекта для создания службы Worker Service.", "symbols/ExcludeLaunchSettings/description": "Следует ли исключить launchSettings.json из созданного шаблона.", "symbols/Framework/description": "Целевая платформа для проекта.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Если установлено, автоматическое восстановление проекта при создании пропускается.", "postActions/restore/description": "Восстановление пакетов NuGet, необходимых для этого проекта.", "postActions/restore/manualInstructions/default/text": "Выполнить команду \"dotnet restore\"" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json index d33af3b32a9a..6f9bc21aa205 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.tr.json @@ -4,7 +4,7 @@ "description": "Çalışan hizmeti oluşturmaya yönelik boş proje şablonu.", "symbols/ExcludeLaunchSettings/description": "launchSettings.json öğesinin oluşturulan şablondan dışlanıp dışlanmayacağı.", "symbols/Framework/description": "Projenin hedef çerçevesi.", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "Belirtilirse, oluşturma sırasında projenin otomatik geri yüklenmesini atlar.", "postActions/restore/description": "Bu projenin gerektirdiği NuGet paketlerini geri yükleyin.", "postActions/restore/manualInstructions/default/text": "'dotnet restore' çalıştır" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json index b62be8d7d1b5..45ce0ee5a0bc 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hans.json @@ -4,7 +4,7 @@ "description": "用于创建 worker service 的空项目模板。", "symbols/ExcludeLaunchSettings/description": "是否从生成的模板中排除 launchSettings.json。", "symbols/Framework/description": "项目的目标框架。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "如果指定，则在创建时跳过项目的自动还原。", "postActions/restore/description": "还原此项目所需的 NuGet 包。", "postActions/restore/manualInstructions/default/text": "运行 \"dotnet restore\"" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json index 539b7d527125..9aaa6d3fc863 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/localize/templatestrings.zh-Hant.json @@ -4,7 +4,7 @@ "description": "用於建立 Worker Service 的空白專案範本。", "symbols/ExcludeLaunchSettings/description": "是否要從產生的範本排除 launchSettings.json。", "symbols/Framework/description": "專案的目標 Framework。", - "symbols/Framework/choices/net9.0/description": "Target net9.0", + "symbols/Framework/choices/net10.0/description": "Target net10.0", "symbols/skipRestore/description": "若指定，會在建立時跳過專案的自動還原。", "postActions/restore/description": "還原此專案所需的 NuGet 套件。", "postActions/restore/manualInstructions/default/text": "執行 'dotnet restore'" diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json index 06603a7f8382..2215f34b7ca2 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/Worker-FSharp/.template.config/template.json @@ -10,8 +10,8 @@ "generatorVersions": "[1.0.0.0-*)", "description": "An empty project template for creating a worker service.", "groupIdentity": "Microsoft.Worker.Empty", - "precedence": "9900", - "identity": "Microsoft.Worker.Empty.FSharp.9.0", + "precedence": "10000", + "identity": "Microsoft.Worker.Empty.FSharp.10.0", "shortName": "worker", "tags": { "language": "F#", @@ -47,12 +47,12 @@ "datatype": "choice", "choices": [ { - "choice": "net9.0", - "description": "Target net9.0" + "choice": "net10.0", + "description": "Target net10.0" } ], - "replaces": "net9.0", - "defaultValue": "net9.0" + "replaces": "net10.0", + "defaultValue": "net10.0" }, "copyrightYear": { "type": "generated", diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 index 074ca0a24dc9..bc6cfc024486 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWasm-Locally.ps1 @@ -5,7 +5,7 @@ [CmdletBinding(PositionalBinding = $false)] param( [ValidateSet("net9.0", "net10.0")] - [string] $Framework = "net9.0", + [string] $Framework = "net10.0", [Parameter(Mandatory = $false)] [switch] $NoRestore, [Parameter(Mandatory = $false)] diff --git a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 index 8a32a0a399c4..8802c4253ed8 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWasmProgramMain-Locally.ps1 @@ -10,4 +10,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $true +Test-Template "blazorwasm" "blazorwasm --use-program-main --hosted --auth Individual" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $true diff --git a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 index f1daceb45196..1259b5245f5d 100644 --- a/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-BlazorWeb-Locally.ps1 @@ -6,7 +6,7 @@ param( [Parameter(Mandatory = $false, Position = 0)] [ValidateSet("net9.0", "net10.0")] - [string] $Framework = "net9.0", + [string] $Framework = "net10.0", [Parameter(Mandatory = $false)] [switch] $NoRestore, [Parameter(Mandatory = $false)] diff --git a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 index e938b8498d9b..f4ae7e245cd1 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWeb-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "web" "web" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 index cf966878f2a2..22581d162ac8 100644 --- a/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-EmptyWebProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "web" "web --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 index d43afebf1f96..aa09ad999f20 100644 --- a/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-GrpcNativeAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "grpc" "grpc -aot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 index 7092049ff90b..48f59ef2687d 100644 --- a/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Razor-Locally.ps1 @@ -6,7 +6,7 @@ param( [Parameter(Mandatory = $false, Position = 0)] [ValidateSet("net9.0", "net10.0")] - [string] $Framework = "net9.0", + [string] $Framework = "net10.0", [Parameter(Mandatory = $false)] [switch] $ExcludeLaunchSettings, [Parameter(Mandatory = $false)] diff --git a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 index 12d9f00fec4d..4d5126ac846b 100644 --- a/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-RazorProgramMain-Locally.ps1 @@ -6,4 +6,4 @@ param() . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapp" "webapp -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 index 66478355f72c..96ae7d82c485 100644 --- a/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Starterweb-Locally.ps1 @@ -6,7 +6,7 @@ param( [Parameter(Mandatory = $false, Position = 0)] [ValidateSet("net9.0", "net10.0")] - [string] $Framework = "net9.0", + [string] $Framework = "net10.0", [Parameter(Mandatory = $false)] [switch] $ExcludeLaunchSettings, [Parameter(Mandatory = $false)] diff --git a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 index ab438f0aee18..21c562e39eeb 100644 --- a/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-StarterwebProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "mvc" "mvc -au Individual --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 index 3dfb1fa512c5..08d3c77a95e7 100644 --- a/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApi-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 index ddff4253d418..87cf5e9bf244 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapiaot" "webapiaot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 index 556b07f3c5ee..f091c99571fa 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiAotProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapiaot" "webapiaot --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 index 336a48339996..0fce1d0504e9 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiMinimal-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapimin" "webapi -minimal" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 index da6595100039..94cf103fa768 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 index 72f9c1c1568a..05861f77b9b9 100644 --- a/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WebApiProgamMainMinimal-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "webapi" "webapi --use-program-main --use-minimal-apis" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 index 538c7d8e1d7c..f21cfd6df2f6 100644 --- a/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-Worker-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "worker" "worker" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 index c86024ad16e9..20aa3389f909 100644 --- a/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WorkerNativeAot-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "worker" "worker -aot" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 index c2d16ddaa02f..7e25ec93e49a 100644 --- a/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-WorkerProgramMain-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "worker" "worker --use-program-main" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 index 391eb8fc6638..ab9df1dd1ff5 100644 --- a/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 +++ b/src/ProjectTemplates/scripts/Run-gRPC-Locally.ps1 @@ -9,4 +9,4 @@ $ErrorActionPreference = 'Stop' . $PSScriptRoot\Test-Template.ps1 -Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.9.0.9.0.0-dev.nupkg" $false +Test-Template "grpc" "grpc" "Microsoft.DotNet.Web.ProjectTemplates.10.0.10.0.0-dev.nupkg" $false diff --git a/src/ProjectTemplates/scripts/Test-Template.ps1 b/src/ProjectTemplates/scripts/Test-Template.ps1 index 1ad286adbd88..1319769c747b 100644 --- a/src/ProjectTemplates/scripts/Test-Template.ps1 +++ b/src/ProjectTemplates/scripts/Test-Template.ps1 @@ -47,10 +47,10 @@ function Test-Template($templateName, $templateArgs, $templateNupkg, $isBlazorWa foreach ($projPath in $proj) { $projContent = Get-Content -Path $projPath -Raw if ($isBlazorWasmHosted) { - $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates" + $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net10.0/TestTemplates" } else { - $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net9.0/TestTemplates" + $importPath = "$PSScriptRoot/../test/Templates.Tests/bin/Debug/net10.0/TestTemplates" } $projContent = $projContent -replace ('(?:)', (' diff --git a/src/ProjectTemplates/scripts/Test-Template.psm1 b/src/ProjectTemplates/scripts/Test-Template.psm1 index c8ee0f9c14d4..5fabd27beff3 100644 --- a/src/ProjectTemplates/scripts/Test-Template.psm1 +++ b/src/ProjectTemplates/scripts/Test-Template.psm1 @@ -15,7 +15,7 @@ function Test-Template { [ValidateSet("Debug", "Release")] [string] $Configuration = "Release", [ValidatePattern("net\d+\.\d+")] - [string] $TargetFramework = "net9.0" + [string] $TargetFramework = "net10.0" ) if(-not (Test-Path "$PSScriptRoot/.dotnet")){ diff --git a/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Shipped.txt rename to src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Shipped.txt diff --git a/src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Security/Authorization/Core/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt rename to src/Security/Authorization/Core/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Shipped.txt similarity index 100% rename from src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Shipped.txt rename to src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Shipped.txt diff --git a/src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/Servers/Connections.Abstractions/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt rename to src/Servers/Connections.Abstractions/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt diff --git a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs index 892a7ac124a2..085dbe60714c 100644 --- a/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs +++ b/src/Shared/BenchmarkRunner/DefaultCoreConfig.cs @@ -44,6 +44,8 @@ public DefaultCoreConfig() .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net8.0", null, ".NET Core 8.0"))) #elif NET9_0 .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net9.0", null, ".NET Core 9.0"))) +#elif NET10_0 + .WithToolchain(CsProjCoreToolchain.From(new NetCoreAppSettings("net10.0", null, ".NET Core 10.0"))) #else #error Target frameworks need to be updated. #endif diff --git a/src/Shared/ErrorPage/GeneratePage.ps1 b/src/Shared/ErrorPage/GeneratePage.ps1 index 6e9e51d0618c..ae830e3d4393 100644 --- a/src/Shared/ErrorPage/GeneratePage.ps1 +++ b/src/Shared/ErrorPage/GeneratePage.ps1 @@ -1,5 +1,5 @@ $RepoRoot = Resolve-Path "$PSScriptRoot\..\..\.." -$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net9.0\dotnet-razorpagegenerator.exe" +$ToolPath = Join-Path "$RepoRoot" "artifacts\bin\RazorPageGenerator\Debug\net10.0\dotnet-razorpagegenerator.exe" if (!(Test-Path "$ToolPath")) { throw "Unable to find razor page generator tool at $ToolPath" diff --git a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts index 97a60bd23e50..a00f69a5f677 100644 --- a/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts +++ b/src/SignalR/clients/ts/FunctionalTests/scripts/run-tests.ts @@ -232,7 +232,7 @@ function runJest(httpsUrl: string, httpUrl: string) { (async () => { try { - const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net9.0", "SignalR.Client.FunctionalTestApp.dll"); + const serverPath = path.resolve(ARTIFACTS_DIR, "bin", "SignalR.Client.FunctionalTestApp", configuration, "net10.0", "SignalR.Client.FunctionalTestApp.dll"); debug(`Launching Functional Test Server: ${serverPath}`); let desiredServerUrl = "https://127.0.0.1:0;http://127.0.0.1:0"; diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Shipped.txt similarity index 100% rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Shipped.txt rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Shipped.txt diff --git a/src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt b/src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt similarity index 100% rename from src/SignalR/common/SignalR.Common/src/PublicAPI/net9.0/PublicAPI.Unshipped.txt rename to src/SignalR/common/SignalR.Common/src/PublicAPI/net10.0/PublicAPI.Unshipped.txt diff --git a/src/SignalR/publish-apps.ps1 b/src/SignalR/publish-apps.ps1 index 3247f288225c..2709414ec669 100644 --- a/src/SignalR/publish-apps.ps1 +++ b/src/SignalR/publish-apps.ps1 @@ -1,4 +1,4 @@ -param($RootDirectory = (Get-Location), $Framework = "net9.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber) +param($RootDirectory = (Get-Location), $Framework = "net10.0", $Runtime = "win-x64", $CommitHash, $BranchName, $BuildNumber) # De-Powershell the path $RootDirectory = (Convert-Path $RootDirectory) diff --git a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec index 043c70902c70..575619309d67 100644 --- a/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec +++ b/src/Tools/Extensions.ApiDescription.Server/src/Microsoft.Extensions.ApiDescription.Server.nuspec @@ -12,6 +12,6 @@ - + diff --git a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs index 696e714410b7..455978520136 100644 --- a/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs +++ b/src/Tools/Microsoft.dotnet-openapi/test/OpenApiTestBase.cs @@ -17,7 +17,7 @@ public class OpenApiTestBase : IDisposable protected readonly TextWriter _output = new StringWriter(); protected readonly TextWriter _error = new StringWriter(); protected readonly ITestOutputHelper _outputHelper; - protected const string TestTFM = "net9.0"; + protected const string TestTFM = "net10.0"; protected const string Content = @"{""x-generator"": ""NSwag""}"; protected const string ActualUrl = "https://raw.githubusercontent.com/OAI/OpenAPI-Specification/master/examples/v3.0/api-with-examples.yaml"; diff --git a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs index d584f54d107a..946530df7c6a 100644 --- a/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs +++ b/src/Tools/dotnet-user-jwts/test/UserJwtsTestFixture.cs @@ -14,7 +14,7 @@ public sealed class UserJwtsTestFixture : IDisposable private const string ProjectTemplate = @" Exe - net9.0 + net10.0 {0} false diff --git a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs index cbaae483a57c..91c0d44af10c 100644 --- a/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs +++ b/src/Tools/dotnet-user-secrets/test/UserSecretsTestFixture.cs @@ -36,7 +36,7 @@ public string GetTempSecretProject() private const string ProjectTemplate = @" Exe - net9.0 + net10.0 {0} false diff --git a/startvscode.cmd b/startvscode.cmd index e33ba82e93ea..b70e43831bd4 100644 --- a/startvscode.cmd +++ b/startvscode.cmd @@ -14,7 +14,7 @@ SET DOTNET_MULTILEVEL_LOOKUP=0 SET PATH=%DOTNET_ROOT%;%PATH% :: Sets TFW for Visual Studio Code usage -SET TARGET=net9.0 +SET TARGET=net10.0 SET folder=%~1 diff --git a/startvscode.sh b/startvscode.sh index 57efea9d128c..65ab4fc43599 100755 --- a/startvscode.sh +++ b/startvscode.sh @@ -13,7 +13,7 @@ export DOTNET_MULTILEVEL_LOOKUP=0 export PATH="$DOTNET_ROOT:$PATH" # Sets TFW for Visual Studio Code usage -export TARGET=net9.0 +export TARGET=net10.0 if [ ! -f "$DOTNET_ROOT/dotnet" ]; then echo ".NET Core has not yet been installed. Run `./restore.sh` to install tools." From 71ec6a74bd3170caadd61e65788dd6ff263291f8 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Tue, 1 Oct 2024 21:44:29 -0700 Subject: [PATCH 02/60] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20240930.3 (#58181) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24473.1 -> To Version 10.0.0-alpha.1.24480.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 8a54da653c5a..70c2986c0b7a 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -339,9 +339,9 @@ 4ddd8113a29852380b7b929117bfe67f401ac320 - + https://github.com/dotnet/source-build-reference-packages - 0b091fc31f5379aa6f70be1436c17fc24d4416fe + 6d8940439f10f5f1f997f09fc6a64a9aab039950 diff --git a/eng/Versions.props b/eng/Versions.props index 364413f44b69..7a7fb692801a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ 10.0.0-alpha.1.24473.2 - 10.0.0-alpha.1.24473.1 + 10.0.0-alpha.1.24480.3 2.2.0-beta.24327.2 From 2e938b3dc908b262a6649080bacd098f8f6d6344 Mon Sep 17 00:00:00 2001 From: William Godbe Date: Wed, 2 Oct 2024 11:23:36 -0700 Subject: [PATCH 03/60] Update November milestones (#58208) --- .github/policies/resourceManagement.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/policies/resourceManagement.yml b/.github/policies/resourceManagement.yml index 1a1e626bb1cd..ff6eaac78e41 100644 --- a/.github/policies/resourceManagement.yml +++ b/.github/policies/resourceManagement.yml @@ -576,7 +576,7 @@ configuration: then: - removeMilestone - addMilestone: - milestone: 6.0.34 + milestone: 6.0.36 description: '[Milestone Assignments] Assign Milestone to PRs merged to release/6.0 branch' - if: - payloadType: Pull_Request @@ -587,7 +587,7 @@ configuration: then: - removeMilestone - addMilestone: - milestone: 8.0.9 + milestone: 8.0.11 description: '[Milestone Assignments] Assign Milestone to PRs merged to release/8.0 branch' - if: - payloadType: Issues From bd66b708333e3f9b47c36c4ddd05d4cc2758658a Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 04:25:10 +0000 Subject: [PATCH 04/60] [main] Update dependencies from dotnet/efcore, dotnet/runtime (#58204) [main] Update dependencies from dotnet/efcore, dotnet/runtime --- eng/Version.Details.xml | 320 ++++++++++++++++++++-------------------- eng/Versions.props | 160 ++++++++++---------- 2 files changed, 240 insertions(+), 240 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 70c2986c0b7a..19cb2bf80ff2 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -9,325 +9,325 @@ --> - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/efcore - 23c67d11c4ee1b47de7f31c1c701bd27dc2ab405 + 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b @@ -380,9 +380,9 @@ - + https://github.com/dotnet/runtime - 13e55a4d617f949fd60e3847841cc70d6bd8e85f + e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 7a7fb692801a..6510065f6c2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,92 +67,92 @@ --> - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 - 10.0.0-alpha.1.24480.6 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24501.8 9.0.0-preview.9.24472.1 9.0.0-preview.9.24472.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 - 10.0.0-alpha.1.24501.1 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 + 10.0.0-alpha.1.24502.7 4.11.0-1.24218.5 4.11.0-1.24218.5 From cd314abc1628988bfe0938a56f1a11d04506989d Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 05:55:50 +0000 Subject: [PATCH 05/60] Update dependencies from https://github.com/dotnet/extensions build 20240930.2 (#58155) [main] Update dependencies from dotnet/extensions --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 19cb2bf80ff2..312bf2344279 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/extensions - 43e4b5c99ad3ebcb2b05285ba8aabbfc6acd42e7 + abf85c798e1b1de34373a7f680dab1c6ac79931c - + https://github.com/dotnet/extensions - 43e4b5c99ad3ebcb2b05285ba8aabbfc6acd42e7 + abf85c798e1b1de34373a7f680dab1c6ac79931c https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index 6510065f6c2d..88889fe7b511 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,8 +142,8 @@ 10.0.0-alpha.1.24501.8 10.0.0-alpha.1.24501.8 - 9.0.0-preview.9.24472.1 - 9.0.0-preview.9.24472.1 + 9.0.0-preview.9.24480.2 + 9.0.0-preview.9.24480.2 10.0.0-alpha.1.24502.7 10.0.0-alpha.1.24502.7 From 5c4d00dd6dda909bf43632a133c9492533bc1188 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 14:31:56 +0000 Subject: [PATCH 06/60] Update dependencies from https://github.com/dotnet/runtime build 20241003.1 (#58220) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 2 files changed, 216 insertions(+), 216 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 312bf2344279..3fd3d4573bb7 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://github.com/dotnet/efcore 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d @@ -380,9 +380,9 @@ - + https://github.com/dotnet/runtime - e6d9f74bb6383daf71ed70a5a6ec4b07d58f9d9b + 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 88889fe7b511..14c2018f1c11 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,80 +67,80 @@ --> - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 - 10.0.0-alpha.1.24501.8 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24503.1 9.0.0-preview.9.24480.2 9.0.0-preview.9.24480.2 From 38c1d3a60e1feed3d7acc6abacd694c9eb13e93b Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Thu, 3 Oct 2024 17:37:40 +0000 Subject: [PATCH 07/60] Update dependencies from https://github.com/dotnet/winforms build 20240928.1 (#58156) [main] Update dependencies from dotnet/winforms --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3fd3d4573bb7..c32d006153bf 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -384,9 +384,9 @@ https://github.com/dotnet/runtime 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d - + https://github.com/dotnet/winforms - 66894e21aa2328582c49cf116ac66731b2dccf46 + ff838ac7ac134944d5519c3eedf7e689b2d9f2e5 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 14c2018f1c11..7a9f3a936a6c 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,7 +176,7 @@ 2.2.0-beta.24327.2 - 10.0.0-alpha.1.24472.1 + 10.0.0-alpha.1.24478.1 9.0.0-preview.24476.1 9.0.0-preview.24476.1 From 3bc8d5bfc0dd1c81859e30e487cca8bd937fa94a Mon Sep 17 00:00:00 2001 From: Drew Noakes Date: Fri, 4 Oct 2024 06:42:26 +1000 Subject: [PATCH 08/60] Avoid unnecessary HealthStatus comparison (#58176) It's only necessary to check `currentValue == HealthStatus.Unhealthy` when `currentValue` changes. During the first iteration, it is known to be `Healthy`. --- src/HealthChecks/Abstractions/src/HealthReport.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/HealthChecks/Abstractions/src/HealthReport.cs b/src/HealthChecks/Abstractions/src/HealthReport.cs index 829067fb3cfa..15418441ad7b 100644 --- a/src/HealthChecks/Abstractions/src/HealthReport.cs +++ b/src/HealthChecks/Abstractions/src/HealthReport.cs @@ -66,13 +66,13 @@ private static HealthStatus CalculateAggregateStatus(IEnumerable entry.Status) { currentValue = entry.Status; - } - if (currentValue == HealthStatus.Unhealthy) - { - // Game over, man! Game over! - // (We hit the worst possible status, so there's no need to keep iterating) - return currentValue; + if (currentValue == HealthStatus.Unhealthy) + { + // Game over, man! Game over! + // (We hit the worst possible status, so there's no need to keep iterating) + return currentValue; + } } } From 3ec708fd5b61d159fc83c5474d1fd3276a7d0d4d Mon Sep 17 00:00:00 2001 From: Ronan Burke Date: Thu, 3 Oct 2024 23:28:24 +0100 Subject: [PATCH 09/60] Fix loading progress svg CSS positioning (#57213) --- .../content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css index 44ccc7755ac7..efef290c1836 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/ComponentsWebAssembly-CSharp/wwwroot/css/app.css @@ -70,11 +70,12 @@ a, .btn-link { } .loading-progress { - position: relative; + position: absolute; display: block; width: 8rem; height: 8rem; - margin: 20vh auto 1rem auto; + inset: 20vh 0 auto 0; + margin: 0 auto 0 auto; } .loading-progress circle { From 870eec223cdb09e5ca8cfdc61bfd5fbc2ca9773b Mon Sep 17 00:00:00 2001 From: Stephen Halter Date: Thu, 3 Oct 2024 17:06:28 -0700 Subject: [PATCH 10/60] Unquarantine fixed tests that have not failed in 30 days (#57978) --- .../FormHandlingTests/FormWithParentBindingContextTest.cs | 2 -- src/Components/test/E2ETest/Tests/RoutingTest.cs | 2 -- src/Components/test/E2ETest/Tests/ThreadingAppTest.cs | 5 ----- 3 files changed, 9 deletions(-) diff --git a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs index 8b90ae878f2a..6afe7639ee83 100644 --- a/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs +++ b/src/Components/test/E2ETest/ServerRenderingTests/FormHandlingTests/FormWithParentBindingContextTest.cs @@ -8,7 +8,6 @@ using Microsoft.AspNetCore.Components.E2ETest.Infrastructure; using Microsoft.AspNetCore.Components.E2ETest.Infrastructure.ServerFixtures; using Microsoft.AspNetCore.E2ETesting; -using Microsoft.AspNetCore.InternalTesting; using OpenQA.Selenium; using TestServer; using Xunit.Abstractions; @@ -1251,7 +1250,6 @@ public void PostingFormWithErrorsDoesNotExceedMaximumErrors() } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54447")] public void CanBindToFormWithFiles() { var profilePicture = TempFile.Create(_tempDirectory, "txt", "This is a profile picture."); diff --git a/src/Components/test/E2ETest/Tests/RoutingTest.cs b/src/Components/test/E2ETest/Tests/RoutingTest.cs index 3b9ad5e8bf84..188e7c71f3bf 100644 --- a/src/Components/test/E2ETest/Tests/RoutingTest.cs +++ b/src/Components/test/E2ETest/Tests/RoutingTest.cs @@ -1679,7 +1679,6 @@ public void AnchorWithHrefToSameUrlWithParamQueryAndHash_ScrollsToElementOnTheSa } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47967")] public void AnchorWithHrefContainingHashAnotherPage_NavigatesToPageAndScrollsToElement() { SetUrlViaPushState("/"); @@ -1696,7 +1695,6 @@ public void AnchorWithHrefContainingHashAnotherPage_NavigatesToPageAndScrollsToE } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/47967")] public void NavigationManagerNavigateToAnotherUrlWithHash_NavigatesToPageAndScrollsToElement() { SetUrlViaPushState("/"); diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs index b50b5e787977..c0312202407d 100644 --- a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs +++ b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs @@ -28,14 +28,12 @@ protected override void InitializeAsyncCore() } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")] public void HasTitle() { Assert.Equal("Blazor standalone", Browser.Title); } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")] public void HasHeading() { Assert.Equal("Hello, world!", Browser.Exists(By.TagName("h1")).Text); @@ -69,7 +67,6 @@ public void NavMenuHighlightsCurrentLocation() } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")] public void CounterPageCanUseThreads() { // Navigate to "Counter" @@ -87,7 +84,6 @@ public void CounterPageCanUseThreads() } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")] public void HasFetchDataPage() { // Navigate to "Fetch data" @@ -109,7 +105,6 @@ public void HasFetchDataPage() } [Fact] - [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/54754")] public void IsStarted() { // Read from property From 9497495d4123d4508c0c7a3148fb270ea37dcd87 Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Fri, 4 Oct 2024 13:42:05 -0700 Subject: [PATCH 11/60] Quarantine `ThreadingAppTest.CounterPageCanUseThreads` (#58243) --- src/Components/test/E2ETest/Tests/ThreadingAppTest.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs index c0312202407d..5e4af0c214a7 100644 --- a/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs +++ b/src/Components/test/E2ETest/Tests/ThreadingAppTest.cs @@ -67,6 +67,7 @@ public void NavMenuHighlightsCurrentLocation() } [Fact] + [QuarantinedTest("https://github.com/dotnet/aspnetcore/issues/58242")] public void CounterPageCanUseThreads() { // Navigate to "Counter" From 9dfdca449bd4c25d688976cb8ade2a023f4ea8d5 Mon Sep 17 00:00:00 2001 From: ladeak Date: Fri, 4 Oct 2024 23:53:42 +0200 Subject: [PATCH 12/60] Removing unsafe code in BufferExtensions (#57417) --- .../Core/test/PipelineExtensionTests.cs | 22 ++++++- .../ServerInfrastructure/BufferExtensions.cs | 63 ++++++++----------- 2 files changed, 45 insertions(+), 40 deletions(-) diff --git a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs index 7e0713f4dced..e9dfeff6d9bb 100644 --- a/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs +++ b/src/Servers/Kestrel/Core/test/PipelineExtensionTests.cs @@ -1,13 +1,10 @@ // Licensed to the .NET Foundation under one or more agreements. // The .NET Foundation licenses this file to you under the MIT license. -using System; using System.Buffers; using System.Globalization; using System.IO.Pipelines; using System.Text; -using Microsoft.AspNetCore.Server.Kestrel.Core.Internal.Http; -using Xunit; namespace Microsoft.AspNetCore.Server.Kestrel.Core.Tests; @@ -51,6 +48,25 @@ public void WritesNumericToAscii(ulong number) AssertExtensions.Equal(expected, reader.Buffer.Slice(0, numAsStr.Length).ToArray()); } + [Fact] + public void WritesNumericToAsciiFastPath() + { + for (ulong number = 0; number < 1000; number++) + { + var writerBuffer = _pipe.Writer; + var writer = new BufferWriter(writerBuffer); + writer.WriteNumeric(number); + writer.Commit(); + writerBuffer.FlushAsync().GetAwaiter().GetResult(); + + var readResult = _pipe.Reader.ReadAsync().GetAwaiter().GetResult(); + var numAsStr = number.ToString(CultureInfo.InvariantCulture); + var expected = Encoding.ASCII.GetBytes(numAsStr); + AssertExtensions.Equal(expected, readResult.Buffer.Slice(0, numAsStr.Length).ToArray()); + _pipe.Reader.AdvanceTo(readResult.Buffer.End); + } + } + [Theory] [InlineData(1)] [InlineData(_ulongMaxValueLength / 2)] diff --git a/src/Shared/ServerInfrastructure/BufferExtensions.cs b/src/Shared/ServerInfrastructure/BufferExtensions.cs index d68ccc114560..64a0704edd3e 100644 --- a/src/Shared/ServerInfrastructure/BufferExtensions.cs +++ b/src/Shared/ServerInfrastructure/BufferExtensions.cs @@ -129,52 +129,41 @@ internal static void WriteAscii(ref this BufferWriter buffer, string } [MethodImpl(MethodImplOptions.AggressiveInlining)] - internal static unsafe void WriteNumeric(ref this BufferWriter buffer, ulong number) + internal static void WriteNumeric(ref this BufferWriter bufferWriter, ulong number) { const byte AsciiDigitStart = (byte)'0'; - var span = buffer.Span; - var bytesLeftInBlock = span.Length; + var buffer = bufferWriter.Span; // Fast path, try copying to the available memory directly - var simpleWrite = true; - fixed (byte* output = span) + if (number < 10 && buffer.Length >= 1) { - var start = output; - if (number < 10 && bytesLeftInBlock >= 1) - { - *(start) = (byte)(((uint)number) + AsciiDigitStart); - buffer.Advance(1); - } - else if (number < 100 && bytesLeftInBlock >= 2) - { - var val = (uint)number; - var tens = (byte)((val * 205u) >> 11); // div10, valid to 1028 - - *(start) = (byte)(tens + AsciiDigitStart); - *(start + 1) = (byte)(val - (tens * 10) + AsciiDigitStart); - buffer.Advance(2); - } - else if (number < 1000 && bytesLeftInBlock >= 3) - { - var val = (uint)number; - var digit0 = (byte)((val * 41u) >> 12); // div100, valid to 1098 - var digits01 = (byte)((val * 205u) >> 11); // div10, valid to 1028 - - *(start) = (byte)(digit0 + AsciiDigitStart); - *(start + 1) = (byte)(digits01 - (digit0 * 10) + AsciiDigitStart); - *(start + 2) = (byte)(val - (digits01 * 10) + AsciiDigitStart); - buffer.Advance(3); - } - else - { - simpleWrite = false; - } + buffer[0] = (byte)(((uint)number) + AsciiDigitStart); + bufferWriter.Advance(1); } + else if (number < 100 && buffer.Length >= 2) + { + var val = (uint)number; + var tens = (uint)(byte)((val * 205u) >> 11); // div10, valid to 1028 - if (!simpleWrite) + buffer[0] = (byte)(tens + AsciiDigitStart); + buffer[1] = (byte)(val - (tens * 10) + AsciiDigitStart); + bufferWriter.Advance(2); + } + else if (number < 1000 && buffer.Length >= 3) + { + var val = (uint)number; + var digit0 = (uint)(byte)((val * 41u) >> 12); // div100, valid to 1098 + var digits01 = (uint)(byte)((val * 205u) >> 11); // div10, valid to 1028 + + buffer[0] = (byte)(digit0 + AsciiDigitStart); + buffer[1] = (byte)(digits01 - (digit0 * 10) + AsciiDigitStart); + buffer[2] = (byte)(val - (digits01 * 10) + AsciiDigitStart); + bufferWriter.Advance(3); + } + else { - WriteNumericMultiWrite(ref buffer, number); + WriteNumericMultiWrite(ref bufferWriter, number); } } From c2702edd46640379d968f0a17b6d42d87930b4bd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 4 Oct 2024 16:11:50 -0700 Subject: [PATCH 13/60] [main] (deps): Bump src/submodules/googletest (#58240) Bumps [src/submodules/googletest](https://github.com/google/googletest) from `6dae7eb` to `a1e255a`. - [Release notes](https://github.com/google/googletest/releases) - [Commits](https://github.com/google/googletest/compare/6dae7eb4a5c3a169f3e298392bff4680224aa94a...a1e255a582377e1006bb88a408ac3f933ba7c916) --- updated-dependencies: - dependency-name: src/submodules/googletest dependency-type: direct:production ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- src/submodules/googletest | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/submodules/googletest b/src/submodules/googletest index 6dae7eb4a5c3..a1e255a58237 160000 --- a/src/submodules/googletest +++ b/src/submodules/googletest @@ -1 +1 @@ -Subproject commit 6dae7eb4a5c3a169f3e298392bff4680224aa94a +Subproject commit a1e255a582377e1006bb88a408ac3f933ba7c916 From 6a40a23cd9242fc7ea01a9ae4f58886068f7257c Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 14:05:53 +0000 Subject: [PATCH 14/60] [main] Update dependencies from dotnet/runtime (#58238) [main] Update dependencies from dotnet/runtime --- eng/Version.Details.xml | 288 ++++++++++++++++++++-------------------- eng/Versions.props | 144 ++++++++++---------- 2 files changed, 216 insertions(+), 216 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index c32d006153bf..68958c3923eb 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -42,292 +42,292 @@ https://github.com/dotnet/efcore 5dd577f80bb4b24794c568cbd713f553b4fb9138 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 https://github.com/dotnet/xdt @@ -367,9 +367,9 @@ afa1eb6821f62183651ab017b2f5c3fbeb934904 - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 @@ -380,9 +380,9 @@ - + https://github.com/dotnet/runtime - 2358c592c2efb5b9e5fe48d3332f105c1b2fff0d + 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 https://github.com/dotnet/winforms diff --git a/eng/Versions.props b/eng/Versions.props index 7a9f3a936a6c..812d38a789e7 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -67,80 +67,80 @@ --> - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 - 10.0.0-alpha.1.24503.1 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 + 10.0.0-alpha.1.24504.10 9.0.0-preview.9.24480.2 9.0.0-preview.9.24480.2 From 27476401c5e5295e1b1e90a3bf3b0b502f4793ce Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Thu, 3 Oct 2024 19:09:20 -0700 Subject: [PATCH 15/60] Enable code analysis and fix NULL usage. --- .../AspNetCore/applicationinfo.cpp | 2 +- .../CommonLib/CommonLib.vcxproj | 3 +- .../AspNetCoreModuleV2/CommonLib/sttimer.h | 18 +- .../CommonLibTests/CommonLibTests.vcxproj | 2 +- .../AspNetCoreModuleV2/DefaultRules.ruleset | 130 ++++--- .../IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp | 126 +++---- .../IIS/AspNetCoreModuleV2/IISLib/base64.cpp | 20 +- .../IIS/AspNetCoreModuleV2/IISLib/hashtable.h | 84 ++--- .../IIS/AspNetCoreModuleV2/IISLib/listentry.h | 2 +- .../IIS/AspNetCoreModuleV2/IISLib/multisz.cpp | 32 +- .../AspNetCoreModuleV2/IISLib/multisza.cpp | 32 +- .../IIS/AspNetCoreModuleV2/IISLib/multisza.h | 16 +- .../IIS/AspNetCoreModuleV2/IISLib/reftrace.h | 2 +- .../IIS/AspNetCoreModuleV2/IISLib/rwlock.h | 8 +- .../IIS/AspNetCoreModuleV2/IISLib/stringa.cpp | 67 ++-- .../IIS/AspNetCoreModuleV2/IISLib/tracelog.c | 14 +- .../InProcessRequestHandler/dllmain.cpp | 8 +- .../inprocessapplication.cpp | 6 +- .../inprocesshandler.cpp | 20 +- .../managedexports.cpp | 16 +- .../OutOfProcessRequestHandler/dllmain.cpp | 22 +- .../forwarderconnection.cpp | 2 +- .../forwarderconnection.h | 4 +- .../forwardinghandler.cpp | 252 ++++++------- .../forwardinghandler.h | 2 + .../outprocessapplication.cpp | 12 +- .../processmanager.cpp | 16 +- .../processmanager.h | 24 +- .../responseheaderhash.h | 6 +- .../serverprocess.cpp | 342 +++++++++--------- .../url_utility.cpp | 16 +- .../websockethandler.cpp | 59 +-- .../winhttphelper.cpp | 12 +- .../RequestHandlerLib/filewatcher.cpp | 6 +- .../requesthandler_config.cpp | 60 +-- .../RequestHandlerLib/requesthandler_config.h | 2 +- .../AspNetCoreModuleV2/gtest/gtest.vcxproj | 1 + src/Servers/IIS/Directory.Build.props | 2 +- src/Servers/IIS/build/Build.Common.Settings | 6 + 39 files changed, 748 insertions(+), 706 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp index 519a36da628e..93ef956c00b2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/AspNetCore/applicationinfo.cpp @@ -301,7 +301,7 @@ APPLICATION_INFO::HandleShadowCopy(const ShimOptions& options, IHttpContext& pHt auto shadowCopyBaseDirectory = std::filesystem::directory_entry(shadowCopyPath); if (!shadowCopyBaseDirectory.exists()) { - CreateDirectory(shadowCopyBaseDirectory.path().wstring().c_str(), NULL); + CreateDirectory(shadowCopyBaseDirectory.path().wstring().c_str(), nullptr); } for (auto& entry : std::filesystem::directory_iterator(shadowCopyPath)) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj index 4e8a906e079f..1525039d18a9 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/CommonLib.vcxproj @@ -1,10 +1,11 @@ + {55494E58-E061-4C4C-A0A8-837008E72F85} NewCommon + false - ..\iislib;$(LibNetHostPath) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h index 86b62b6fcf2a..97efaf1fe631 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLib/sttimer.h @@ -13,7 +13,7 @@ class STTIMER public: STTIMER() - : _pTimer( NULL ) + : _pTimer( nullptr ) { fInCanel = FALSE; } @@ -25,7 +25,7 @@ class STTIMER { CancelTimer(); CloseThreadpoolTimer( _pTimer ); - _pTimer = NULL; + _pTimer = nullptr; } } @@ -39,7 +39,7 @@ class STTIMER { _pTimer = CreateThreadpoolTimer( pfnCallback, pContext, - NULL ); + nullptr ); if ( !_pTimer ) { @@ -74,9 +74,9 @@ class STTIMER // re-enabled by setting non-zero initial wait or // period values. // - if (_pTimer != NULL) + if (_pTimer != nullptr) { - SetThreadpoolTimer(_pTimer, NULL, 0, 0); + SetThreadpoolTimer(_pTimer, nullptr, 0, 0); } return; @@ -106,7 +106,7 @@ class STTIMER // Wait until any callbacks queued prior to disabling // have completed. // - if (_pTimer != NULL) + if (_pTimer != nullptr) { WaitForThreadpoolTimerCallbacks(_pTimer, TRUE); } @@ -124,13 +124,13 @@ class STTIMER ) { STRU* pstruLogFilePath = (STRU*)Context; - HANDLE hStdoutHandle = NULL; + HANDLE hStdoutHandle = nullptr; SECURITY_ATTRIBUTES saAttr = { 0 }; HRESULT hr = S_OK; saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; + saAttr.lpSecurityDescriptor = nullptr; hStdoutHandle = CreateFileW(pstruLogFilePath->QueryStr(), FILE_READ_DATA, @@ -138,7 +138,7 @@ class STTIMER &saAttr, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL); + nullptr); if (hStdoutHandle == INVALID_HANDLE_VALUE) { hr = HRESULT_FROM_WIN32(GetLastError()); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj index e85b795c685a..e2e17265c7c8 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/CommonLibTests/CommonLibTests.vcxproj @@ -9,7 +9,7 @@ {1eac8125-1765-4e2d-8cbe-56dc98a1c8c1} Win32Proj Application - $(PlatformToolsetVersion) + v$(PlatformToolsetVersion) Unicode true true diff --git a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset index 1c2bbdaeaf40..147ad0a5677e 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset +++ b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset @@ -1,5 +1,5 @@  - + @@ -12,14 +12,14 @@ - + - + - - + + @@ -27,73 +27,82 @@ - + - - + + - + - - + + - - - + + + - + - + - + - - - + + + - + + + - - - + + + - - - - + + + + + - + - - + + + - - - - - + + + + + - - - - - - + + + + + + - + + + + + + @@ -142,7 +151,7 @@ - + @@ -213,9 +222,9 @@ - - - + + + @@ -239,7 +248,7 @@ - + @@ -282,19 +291,19 @@ - - + + - + - + - + @@ -319,7 +328,7 @@ - + @@ -338,7 +347,7 @@ - + @@ -383,14 +392,14 @@ - + - - - - + + + + @@ -418,6 +427,7 @@ + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp index 449469ea1b0b..8aa85ede2e88 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/ahutil.cpp @@ -43,7 +43,7 @@ SetElementProperty( if( bstrPropName ) { SysFreeString( bstrPropName ); - bstrPropName = NULL; + bstrPropName = nullptr; } return hr; @@ -90,9 +90,9 @@ GetElementStringProperty( { HRESULT hr = S_OK; BSTR bstrPropName = SysAllocString( szPropName ); - IAppHostProperty* pProperty = NULL; + IAppHostProperty* pProperty = nullptr; - *pbstrPropValue = NULL; + *pbstrPropValue = nullptr; if (!bstrPropName) { @@ -140,8 +140,8 @@ GetElementStringProperty( { HRESULT hr = S_OK; BSTR bstrPropName = SysAllocString( szPropName ); - IAppHostProperty* pProperty = NULL; - BSTR bstrPropValue = NULL; + IAppHostProperty* pProperty = nullptr; + BSTR bstrPropValue = nullptr; if (!bstrPropName) { @@ -199,7 +199,7 @@ GetElementChildByName( ) { BSTR bstrElementName = SysAllocString(pszElementName); - if (bstrElementName == NULL) + if (bstrElementName == nullptr) { return E_OUTOFMEMORY; } @@ -235,13 +235,13 @@ GetElementBoolProperty( ) { HRESULT hr = S_OK; - IAppHostProperty * pProperty = NULL; + IAppHostProperty * pProperty = nullptr; VARIANT varValue; VariantInit( &varValue ); BSTR bstrPropertyName = SysAllocString(pszPropertyName); - if ( bstrPropertyName == NULL ) + if ( bstrPropertyName == nullptr ) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -275,16 +275,16 @@ GetElementBoolProperty( VariantClear( &varValue ); - if ( bstrPropertyName != NULL ) + if ( bstrPropertyName != nullptr ) { SysFreeString( bstrPropertyName ); - bstrPropertyName = NULL; + bstrPropertyName = nullptr; } - if ( pProperty != NULL ) + if ( pProperty != nullptr ) { pProperty->Release(); - pProperty = NULL; + pProperty = nullptr; } return hr; @@ -299,13 +299,13 @@ GetElementDWORDProperty( ) { HRESULT hr = S_OK; - IAppHostProperty * pProperty = NULL; + IAppHostProperty * pProperty = nullptr; VARIANT varValue; VariantInit( &varValue ); BSTR bstrName = SysAllocString(pwszName); - if ( bstrName == NULL ) + if ( bstrName == nullptr ) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -338,16 +338,16 @@ GetElementDWORDProperty( VariantClear( &varValue ); - if ( pProperty != NULL ) + if ( pProperty != nullptr ) { pProperty->Release(); - pProperty = NULL; + pProperty = nullptr; } - if ( bstrName != NULL ) + if ( bstrName != nullptr ) { SysFreeString( bstrName ); - bstrName = NULL; + bstrName = nullptr; } return hr; @@ -361,13 +361,13 @@ GetElementLONGLONGProperty( ) { HRESULT hr = S_OK; - IAppHostProperty * pProperty = NULL; + IAppHostProperty * pProperty = nullptr; VARIANT varValue; VariantInit( &varValue ); BSTR bstrName = SysAllocString(pwszName); - if ( bstrName == NULL ) + if ( bstrName == nullptr ) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -400,16 +400,16 @@ GetElementLONGLONGProperty( VariantClear( &varValue ); - if ( pProperty != NULL ) + if ( pProperty != nullptr ) { pProperty->Release(); - pProperty = NULL; + pProperty = nullptr; } - if ( bstrName != NULL ) + if ( bstrName != nullptr ) { SysFreeString( bstrName ); - bstrName = NULL; + bstrName = nullptr; } return hr; @@ -423,13 +423,13 @@ GetElementRawTimeSpanProperty( ) { HRESULT hr = S_OK; - IAppHostProperty * pProperty = NULL; + IAppHostProperty * pProperty = nullptr; VARIANT varValue; VariantInit( &varValue ); BSTR bstrPropertyName = SysAllocString(pszPropertyName); - if ( bstrPropertyName == NULL ) + if ( bstrPropertyName == nullptr ) { hr = HRESULT_FROM_WIN32( ERROR_NOT_ENOUGH_MEMORY ); goto Finished; @@ -463,16 +463,16 @@ GetElementRawTimeSpanProperty( VariantClear( &varValue ); - if ( bstrPropertyName != NULL ) + if ( bstrPropertyName != nullptr ) { SysFreeString( bstrPropertyName ); - bstrPropertyName = NULL; + bstrPropertyName = nullptr; } - if ( pProperty != NULL ) + if ( pProperty != nullptr ) { pProperty->Release(); - pProperty = NULL; + pProperty = nullptr; } return hr; @@ -630,7 +630,7 @@ FindElementInCollection( DWORD count; DWORD i; - BSTR bstrKeyName = NULL; + BSTR bstrKeyName = nullptr; PFN_FIND_COMPARE_PROC compareProc; compareProc = (BehaviorFlags & FIND_ELEMENT_CASE_INSENSITIVE) @@ -738,7 +738,7 @@ VariantAssign( pv->vt = VT_BSTR; pv->bstrVal = bstr; - bstr = NULL; + bstr = nullptr; exit: @@ -761,9 +761,9 @@ GetLocationFromFile( CComPtr pLocationCollection; CComPtr pLocation; - BSTR bstrLocationPath = NULL; + BSTR bstrLocationPath = nullptr; - *ppLocation = NULL; + *ppLocation = nullptr; *pFound = FALSE; hr = GetLocationCollection( pAdminMgr, @@ -819,7 +819,7 @@ GetLocationFromFile( pLocation.Release(); SysFreeString( bstrLocationPath ); - bstrLocationPath = NULL; + bstrLocationPath = nullptr; } exit: @@ -847,10 +847,10 @@ GetSectionFromLocation( VARIANT varIndex; VariantInit( &varIndex ); - BSTR bstrSectionName = NULL; + BSTR bstrSectionName = nullptr; *pFound = FALSE; - *ppSectionElement = NULL; + *ppSectionElement = nullptr; hr = pLocation->get_Count( &count ); if( FAILED(hr) ) @@ -890,7 +890,7 @@ GetSectionFromLocation( pSectionElement.Release(); SysFreeString( bstrSectionName ); - bstrSectionName = NULL; + bstrSectionName = nullptr; } exit: @@ -914,7 +914,7 @@ GetAdminElement( BSTR bstrConfigPath = SysAllocString(szConfigPath); BSTR bstrElementName = SysAllocString(szElementName); - if (bstrConfigPath == NULL || bstrElementName == NULL) + if (bstrConfigPath == nullptr || bstrElementName == nullptr) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -933,15 +933,15 @@ GetAdminElement( exit: - if ( bstrElementName != NULL ) + if ( bstrElementName != nullptr ) { SysFreeString(bstrElementName); - bstrElementName = NULL; + bstrElementName = nullptr; } - if ( bstrConfigPath != NULL ) + if ( bstrConfigPath != nullptr ) { SysFreeString(bstrConfigPath); - bstrConfigPath = NULL; + bstrConfigPath = nullptr; } return hr; @@ -1168,7 +1168,7 @@ CompareElementName( OUT BOOL * pMatched ) { - BSTR bstrElementName = NULL; + BSTR bstrElementName = nullptr; *pMatched = FALSE; // until proven otherwise @@ -1258,9 +1258,9 @@ GetSitesCollection( BSTR bstrConfigPath = SysAllocString(szConfigPath); BSTR bstrSitesSectionName = SysAllocString(L"system.applicationHost/sites"); - *pSitesCollection = NULL; + *pSitesCollection = nullptr; - if (bstrConfigPath == NULL || bstrSitesSectionName == NULL) + if (bstrConfigPath == nullptr || bstrSitesSectionName == nullptr) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -1309,9 +1309,9 @@ GetLocationCollection( CComPtr pConfigFile; BSTR bstrConfigPath = SysAllocString(szConfigPath); - *pLocationCollection = NULL; + *pLocationCollection = nullptr; - if (bstrConfigPath == NULL) + if (bstrConfigPath == nullptr) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -1378,7 +1378,7 @@ FindNextElement( OUT IAppHostElement ** pElement ) { - *pElement = NULL; + *pElement = nullptr; if (pIndex->Index.ulVal >= pIndex->Count) { @@ -1424,7 +1424,7 @@ FindNextChildElement( OUT IAppHostElement ** pElement ) { - *pElement = NULL; + *pElement = nullptr; if (pIndex->Index.ulVal >= pIndex->Count) { @@ -1470,7 +1470,7 @@ FindNextLocation( OUT IAppHostConfigLocation ** pLocation ) { - *pLocation = NULL; + *pLocation = nullptr; if (pIndex->Index.ulVal >= pIndex->Count) { @@ -1516,7 +1516,7 @@ FindNextLocationElement( OUT IAppHostElement ** pElement ) { - *pElement = NULL; + *pElement = nullptr; if (pIndex->Index.ulVal >= pIndex->Count) { @@ -1552,16 +1552,16 @@ Return Value: --*/ { HRESULT hr = S_OK; - IAppHostAdminManager *pAdminManager = NULL; + IAppHostAdminManager *pAdminManager = nullptr; - BSTR bstrConfigPath = NULL; + BSTR bstrConfigPath = nullptr; - IAppHostElement * pConfigRedirSection = NULL; + IAppHostElement * pConfigRedirSection = nullptr; BSTR bstrSectionName = SysAllocString(L"configurationRedirection"); - if ( bstrSectionName == NULL ) + if ( bstrSectionName == nullptr ) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -1569,7 +1569,7 @@ Return Value: } bstrConfigPath = SysAllocString( L"MACHINE/REDIRECTION" ); - if ( bstrConfigPath == NULL ) + if ( bstrConfigPath == nullptr ) { hr = E_OUTOFMEMORY; DBGERROR_HR(hr); @@ -1577,7 +1577,7 @@ Return Value: } hr = CoCreateInstance( CLSID_AppHostAdminManager, - NULL, + nullptr, CLSCTX_INPROC_SERVER, IID_IAppHostAdminManager, (VOID **)&pAdminManager ); @@ -1607,7 +1607,7 @@ Return Value: } pConfigRedirSection->Release(); - pConfigRedirSection = NULL; + pConfigRedirSection = nullptr; exit: @@ -1616,22 +1616,22 @@ Return Value: // dump config exception to setup log file (if available) // - if ( pConfigRedirSection != NULL ) + if ( pConfigRedirSection != nullptr ) { pConfigRedirSection->Release(); } - if ( pAdminManager != NULL ) + if ( pAdminManager != nullptr ) { pAdminManager->Release(); } - if ( bstrConfigPath != NULL ) + if ( bstrConfigPath != nullptr ) { SysFreeString( bstrConfigPath ); } - if ( bstrSectionName != NULL ) + if ( bstrSectionName != nullptr ) { SysFreeString( bstrSectionName ); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp index 0122dcb33ec5..b5c910b9b573 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp @@ -49,11 +49,11 @@ Return Values: // Calculate encoded string size. cchEncoded = 1 + (cbDecodedBufferSize + 2) / 3 * 4; - if (NULL != pcchEncoded) { + if (nullptr != pcchEncoded) { *pcchEncoded = cchEncoded; } - if (cchEncodedStringSize == 0 && pszEncodedString == NULL) { + if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) { return ERROR_SUCCESS; } @@ -177,7 +177,7 @@ constexpr auto NA = (255); BYTE * pbDecodeBuffer = (BYTE *) pDecodeBuffer; cchEncodedSize = (DWORD)wcslen(pszEncodedString); - if (NULL != pcbDecoded) { + if (nullptr != pcbDecoded) { *pcbDecoded = 0; } @@ -199,11 +199,11 @@ constexpr auto NA = (255); } } - if (NULL != pcbDecoded) { + if (nullptr != pcbDecoded) { *pcbDecoded = cbDecoded; } - if (cbDecodeBufferSize == 0 && pDecodeBuffer == NULL) { + if (cbDecodeBufferSize == 0 && pDecodeBuffer == nullptr) { return ERROR_SUCCESS; } @@ -288,11 +288,11 @@ Return Values: // Calculate encoded string size. cchEncoded = 1 + (cbDecodedBufferSize + 2) / 3 * 4; - if (NULL != pcchEncoded) { + if (nullptr != pcchEncoded) { *pcchEncoded = cchEncoded; } - if (cchEncodedStringSize == 0 && pszEncodedString == NULL) { + if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) { return ERROR_SUCCESS; } @@ -416,7 +416,7 @@ Return Values: BYTE * pbDecodeBuffer = (BYTE *) pDecodeBuffer; cchEncodedSize = (DWORD)strlen(pszEncodedString); - if (NULL != pcbDecoded) { + if (nullptr != pcbDecoded) { *pcbDecoded = 0; } @@ -438,11 +438,11 @@ Return Values: } } - if (NULL != pcbDecoded) { + if (nullptr != pcbDecoded) { *pcbDecoded = cbDecoded; } - if (cbDecodeBufferSize == 0 && pDecodeBuffer == NULL) { + if (cbDecodeBufferSize == 0 && pDecodeBuffer == nullptr) { return ERROR_SUCCESS; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h index cde38374fe67..6f0bb9de3610 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h @@ -16,14 +16,14 @@ class HASH_NODE HASH_NODE( _Record * pRecord, DWORD dwHash - ) : _pNext (NULL), + ) : _pNext (nullptr), _pRecord (pRecord), _dwHash (dwHash) {} ~HASH_NODE() { - _ASSERTE(_pRecord == NULL); + _ASSERTE(_pRecord == nullptr); } private: @@ -57,7 +57,7 @@ class HASH_TABLE HASH_TABLE( VOID ) - : _ppBuckets( NULL ), + : _ppBuckets(nullptr), _nBuckets( 0 ), _nItems( 0 ) { @@ -158,7 +158,7 @@ class HASH_TABLE __deref_out HASH_NODE<_Record> ** ppNode, __deref_opt_out - HASH_NODE<_Record> *** pppPreviousNodeNextPointer = NULL + HASH_NODE<_Record> *** pppPreviousNodeNextPointer = nullptr ); VOID @@ -166,10 +166,10 @@ class HASH_TABLE HASH_NODE<_Record> * pNode ) { - if (pNode->_pRecord != NULL) + if (pNode->_pRecord != nullptr) { DereferenceRecord(pNode->_pRecord); - pNode->_pRecord = NULL; + pNode->_pRecord = nullptr; } delete pNode; @@ -210,8 +210,8 @@ HASH_TABLE<_Record,_Key>::Initialize( goto Failed; } - _ASSERTE(_ppBuckets == NULL ); - if ( _ppBuckets != NULL ) + _ASSERTE(_ppBuckets == nullptr); + if (_ppBuckets != nullptr) { hr = E_INVALIDARG; goto Failed; @@ -227,7 +227,7 @@ HASH_TABLE<_Record,_Key>::Initialize( GetProcessHeap(), HEAP_ZERO_MEMORY, nBuckets*sizeof(HASH_NODE<_Record> *)); - if (_ppBuckets == NULL) + if (_ppBuckets == nullptr) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); goto Failed; @@ -243,7 +243,7 @@ HASH_TABLE<_Record,_Key>::Initialize( HeapFree(GetProcessHeap(), 0, _ppBuckets); - _ppBuckets = NULL; + _ppBuckets = nullptr; } return hr; @@ -253,7 +253,7 @@ HASH_TABLE<_Record,_Key>::Initialize( template HASH_TABLE<_Record,_Key>::~HASH_TABLE() { - if (_ppBuckets == NULL) + if (_ppBuckets == nullptr) { return; } @@ -263,7 +263,7 @@ HASH_TABLE<_Record,_Key>::~HASH_TABLE() HeapFree(GetProcessHeap(), 0, _ppBuckets); - _ppBuckets = NULL; + _ppBuckets = nullptr; _nBuckets = 0; } @@ -288,8 +288,8 @@ template VOID HASH_TABLE<_Record,_Key>::Clear() { - HASH_NODE<_Record> *pCurrent; - HASH_NODE<_Record> *pNext; + HASH_NODE<_Record> *pCurrent = nullptr; + HASH_NODE<_Record> *pNext = nullptr; // This is here in the off cases where someone instantiates a hashtable // and then does an automatic "clear" before its destruction WITHOUT @@ -304,8 +304,8 @@ HASH_TABLE<_Record,_Key>::Clear() for (DWORD i=0; i<_nBuckets; i++) { pCurrent = _ppBuckets[i]; - _ppBuckets[i] = NULL; - while (pCurrent != NULL) + _ppBuckets[i] = nullptr; + while (pCurrent != nullptr) { pNext = pCurrent->_pNext; DeleteNode(pCurrent); @@ -318,7 +318,7 @@ HASH_TABLE<_Record,_Key>::Clear() } template -__success(*ppNode != NULL && return != FALSE) +__success(*ppNode != nullptr && return != FALSE) BOOL HASH_TABLE<_Record,_Key>::FindNodeInternal( _Key key, @@ -338,13 +338,13 @@ HASH_TABLE<_Record,_Key>::FindNodeInternal( This routine may be called under either read or write lock --*/ { - HASH_NODE<_Record> **ppPreviousNodeNextPointer; - HASH_NODE<_Record> *pNode; + HASH_NODE<_Record> **ppPreviousNodeNextPointer = nullptr; + HASH_NODE<_Record> *pNode = nullptr; BOOL fFound = FALSE; ppPreviousNodeNextPointer = _ppBuckets + (dwHash % _nBuckets); pNode = *ppPreviousNodeNextPointer; - while (pNode != NULL) + while (pNode != nullptr) { if (pNode->_dwHash == dwHash) { @@ -364,10 +364,10 @@ HASH_TABLE<_Record,_Key>::FindNodeInternal( pNode = *ppPreviousNodeNextPointer; } - __analysis_assume( (pNode == NULL && fFound == FALSE) || - (pNode != NULL && fFound == TRUE ) ); + __analysis_assume( (pNode == nullptr && fFound == FALSE) || + (pNode != nullptr && fFound == TRUE ) ); *ppNode = pNode; - if (pppPreviousNodeNextPointer != NULL) + if (pppPreviousNodeNextPointer != nullptr) { *pppPreviousNodeNextPointer = ppPreviousNodeNextPointer; } @@ -381,16 +381,16 @@ HASH_TABLE<_Record,_Key>::FindKey( _Record ** ppRecord ) { - HASH_NODE<_Record> *pNode; + HASH_NODE<_Record> *pNode = nullptr; - *ppRecord = NULL; + *ppRecord = nullptr; DWORD dwHash = CalcKeyHash(key); _tableLock.SharedAcquire(); if (FindNodeInternal(key, dwHash, &pNode) && - pNode->_pRecord != NULL) + pNode->_pRecord != nullptr) { ReferenceRecord(pNode->_pRecord); *ppRecord = pNode->_pRecord; @@ -421,9 +421,9 @@ HASH_TABLE<_Record,_Key>::InsertRecord( _Key key = ExtractKey(pRecord); DWORD dwHash = CalcKeyHash(key); HRESULT hr = S_OK; - HASH_NODE<_Record> * pNewNode; - HASH_NODE<_Record> * pNextNode; - HASH_NODE<_Record> ** ppPreviousNodeNextPointer; + HASH_NODE<_Record> * pNewNode = nullptr; + HASH_NODE<_Record> * pNextNode = nullptr; + HASH_NODE<_Record> ** ppPreviousNodeNextPointer = nullptr; // // Ownership of pRecord is not transferred to pNewNode yet, so remember @@ -432,7 +432,7 @@ HASH_TABLE<_Record,_Key>::InsertRecord( // which users may view as getting flushed out of the hash-table // pNewNode = new HASH_NODE<_Record>(pRecord, dwHash); - if (pNewNode == NULL) + if (pNewNode == nullptr) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); goto Finished; @@ -451,7 +451,7 @@ HASH_TABLE<_Record,_Key>::InsertRecord( // // If node already there, return error // - pNewNode->_pRecord = NULL; + pNewNode->_pRecord = nullptr; DeleteNode(pNewNode); // @@ -470,10 +470,10 @@ HASH_TABLE<_Record,_Key>::InsertRecord( pNewNode, pNextNode) != pNextNode); // pass ownership of pRecord now - if (pRecord != NULL) + if (pRecord != nullptr) { ReferenceRecord(pRecord); - pRecord = NULL; + pRecord = nullptr; } InterlockedIncrement((LONG *)&_nItems); @@ -498,8 +498,8 @@ HASH_TABLE<_Record,_Key>::DeleteKey( _Key key ) { - HASH_NODE<_Record> *pNode; - HASH_NODE<_Record> **ppPreviousNodeNextPointer; + HASH_NODE<_Record> *pNode = nullptr; + HASH_NODE<_Record> **ppPreviousNodeNextPointer = nullptr; DWORD dwHash = CalcKeyHash(key); @@ -531,7 +531,7 @@ HASH_TABLE<_Record,_Key>::DeleteIf( { ppPreviousNodeNextPointer = _ppBuckets + i; pNode = *ppPreviousNodeNextPointer; - while (pNode != NULL) + while (pNode != nullptr) { // // Non empty nodes deleted based on DeleteIf, empty nodes deleted @@ -569,9 +569,9 @@ HASH_TABLE<_Record,_Key>::Apply( for (DWORD i=0; i<_nBuckets; i++) { pNode = _ppBuckets[i]; - while (pNode != NULL) + while (pNode != nullptr) { - if (pNode->_pRecord != NULL) + if (pNode->_pRecord != nullptr) { pfnApply(pNode->_pRecord, pvContext); } @@ -624,7 +624,7 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded( GetProcessHeap(), HEAP_ZERO_MEMORY, nBuckets*sizeof(HASH_NODE<_Record> *)); - if (ppBuckets == NULL) + if (ppBuckets == nullptr) { goto Finished; } @@ -636,13 +636,13 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded( for (DWORD i=0; i<_nBuckets; i++) { pNode = _ppBuckets[i]; - while (pNode != NULL) + while (pNode != nullptr) { pNextNode = pNode->_pNext; ppNextPointer = ppBuckets + (pNode->_dwHash % nBuckets); pNewNextNode = *ppNextPointer; - while (pNewNextNode != NULL && + while (pNewNextNode != nullptr && pNewNextNode->_dwHash <= pNode->_dwHash) { ppNextPointer = &pNewNextNode->_pNext; @@ -658,7 +658,7 @@ HASH_TABLE<_Record,_Key>::RehashTableIfNeeded( HeapFree(GetProcessHeap(), 0, _ppBuckets); _ppBuckets = ppBuckets; _nBuckets = nBuckets; - ppBuckets = NULL; + ppBuckets = nullptr; Finished: diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h index 80b70e97a937..31f2b9b17c06 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/listentry.h @@ -140,7 +140,7 @@ PopEntryList( { PSINGLE_LIST_ENTRY FirstEntry; FirstEntry = ListHead->Next; - if (FirstEntry != NULL) { + if (FirstEntry != nullptr) { ListHead->Next = FirstEntry->Next; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp index 1342e2ffd28e..393a220d01ab 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisz.cpp @@ -35,7 +35,7 @@ MULTISZ::CalcLength( const WCHAR * str, count++; } - if( pcStrings != NULL ) { + if( pcStrings != nullptr ) { *pcStrings = count; } @@ -51,8 +51,8 @@ MULTISZ::FindString( const WCHAR * str ) const // Sanity check. // - DBG_ASSERT( QueryStr() != NULL ); - DBG_ASSERT( str != NULL ); + DBG_ASSERT( QueryStr() != nullptr ); + DBG_ASSERT( str != nullptr ); DBG_ASSERT( *str != '\0' ); // @@ -85,8 +85,8 @@ MULTISZ::FindStringNoCase( const WCHAR * str ) const // Sanity check. // - DBG_ASSERT( QueryStr() != NULL ); - DBG_ASSERT( str != NULL ); + DBG_ASSERT( QueryStr() != nullptr ); + DBG_ASSERT( str != nullptr ); DBG_ASSERT( *str != '\0' ); // @@ -149,7 +149,7 @@ MULTISZ::AuxInit( const WCHAR * pInit ) BOOL MULTISZ::AuxAppend( const WCHAR * pStr, UINT cbStr, BOOL fAddSlop ) { - DBG_ASSERT( pStr != NULL ); + DBG_ASSERT( pStr != nullptr ); UINT cbThis = QueryCB(); @@ -247,7 +247,7 @@ MULTISZ::CopyToBuffer( WCHAR * lpszBuffer, LPDWORD lpcch) const { BOOL fReturn = TRUE; - if ( lpcch == NULL) { + if ( lpcch == nullptr ) { SetLastError( ERROR_INVALID_PARAMETER); return ( FALSE); } @@ -305,7 +305,7 @@ MULTISZ::CopyToBuffer( __out_ecount_opt(*lpcch) WCHAR * lpszBuffer, LPDWORD lpcc { BOOL fReturn = TRUE; - if ( lpcch == NULL) { + if ( lpcch == nullptr ) { SetLastError( ERROR_INVALID_PARAMETER); return ( FALSE); } @@ -335,7 +335,7 @@ MULTISZ::Equals( // Compares this to pmszRhs, returns TRUE if equal // { - DBG_ASSERT( NULL != pmszRhs ); + DBG_ASSERT( nullptr != pmszRhs ); PCWSTR pszLhs = First( ); PCWSTR pszRhs = pmszRhs->First( ); @@ -345,9 +345,9 @@ MULTISZ::Equals( return FALSE; } - while( NULL != pszLhs ) + while( nullptr != pszLhs ) { - DBG_ASSERT( NULL != pszRhs ); + DBG_ASSERT( nullptr != pszRhs ); if( 0 != wcscmp( pszLhs, pszRhs ) ) { @@ -390,8 +390,8 @@ Return Value: { HRESULT hr = S_OK; - if ( pszList == NULL || - pmszList == NULL ) + if ( pszList == nullptr || + pmszList == nullptr ) { DBG_ASSERT( FALSE ); hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER ); @@ -417,9 +417,9 @@ Return Value: pszCurrent = pszNext + 1, pszNext = wcschr( pszCurrent, L',' ) ) { - PCWSTR pszEnd = NULL; + PCWSTR pszEnd = nullptr; - if ( pszNext != NULL ) + if ( pszNext != nullptr ) { pszEnd = pszNext; } @@ -450,7 +450,7 @@ Return Value: } } - if ( pszNext == NULL ) + if ( pszNext == nullptr ) { break; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp index 0f36fc663cc9..ebd9dc8002f7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.cpp @@ -33,7 +33,7 @@ MULTISZA::CalcLength( const CHAR * str, count++; } - if( pcStrings != NULL ) { + if( pcStrings != nullptr ) { *pcStrings = count; } @@ -49,8 +49,8 @@ MULTISZA::FindString( const CHAR * str ) const // Sanity check. // - DBG_ASSERT( QueryStr() != NULL ); - DBG_ASSERT( str != NULL ); + DBG_ASSERT( QueryStr() != nullptr); + DBG_ASSERT( str != nullptr ); DBG_ASSERT( *str != '\0' ); // @@ -83,8 +83,8 @@ MULTISZA::FindStringNoCase( const CHAR * str ) const // Sanity check. // - DBG_ASSERT( QueryStr() != NULL ); - DBG_ASSERT( str != NULL ); + DBG_ASSERT( QueryStr() != nullptr); + DBG_ASSERT( str != nullptr); DBG_ASSERT( *str != '\0' ); // @@ -96,9 +96,7 @@ MULTISZA::FindStringNoCase( const CHAR * str ) const while( *multisz != '\0' ) { if( !_stricmp( multisz, str ) ) { - return TRUE; - } multisz += strlen( multisz ) + 1; @@ -147,7 +145,7 @@ MULTISZA::AuxInit( const CHAR * pInit ) BOOL MULTISZA::AuxAppend( const CHAR * pStr, UINT cbStr, BOOL fAddSlop ) { - DBG_ASSERT( pStr != NULL ); + DBG_ASSERT( pStr != nullptr); UINT cbThis = QueryCB(); @@ -240,7 +238,7 @@ MULTISZA::CopyToBuffer( __out_ecount_opt(*lpcch) CHAR * lpszBuffer, LPDWORD lpcc { BOOL fReturn = TRUE; - if ( lpcch == NULL) { + if ( lpcch == nullptr) { SetLastError( ERROR_INVALID_PARAMETER); return ( FALSE); } @@ -270,7 +268,7 @@ MULTISZA::Equals( // Compares this to pmszRhs, returns TRUE if equal // { - DBG_ASSERT( NULL != pmszRhs ); + DBG_ASSERT(nullptr != pmszRhs ); PCSTR pszLhs = First( ); PCSTR pszRhs = pmszRhs->First( ); @@ -280,9 +278,9 @@ MULTISZA::Equals( return FALSE; } - while( NULL != pszLhs ) + while( nullptr != pszLhs ) { - DBG_ASSERT( NULL != pszRhs ); + DBG_ASSERT( nullptr != pszRhs ); if( 0 != strcmp( pszLhs, pszRhs ) ) { @@ -325,8 +323,8 @@ Return Value: { HRESULT hr = S_OK; - if ( pszList == NULL || - pmszList == NULL ) + if ( pszList == nullptr || + pmszList == nullptr) { DBG_ASSERT( FALSE ); hr = HRESULT_FROM_WIN32( ERROR_INVALID_PARAMETER ); @@ -352,9 +350,9 @@ Return Value: pszCurrent = pszNext + 1, pszNext = strchr( pszCurrent, L',' ) ) { - PCSTR pszEnd = NULL; + PCSTR pszEnd = nullptr; - if ( pszNext != NULL ) + if ( pszNext != nullptr ) { pszEnd = pszNext; } @@ -385,7 +383,7 @@ Return Value: } } - if ( pszNext == NULL ) + if ( pszNext == nullptr ) { break; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h index 7ea28881f3fb..7748fbc64438 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/multisza.h @@ -69,7 +69,7 @@ class MULTISZA : public BUFFER BOOL IsEmpty( VOID) const { return ( *QueryStr() == L'\0'); } BOOL Append( const CHAR * pchInit ) { - return ((pchInit != NULL) ? (AuxAppend( pchInit, + return ((pchInit != nullptr) ? (AuxAppend( pchInit, (DWORD) (::strlen(pchInit)) * sizeof(CHAR) )) : TRUE); @@ -77,7 +77,7 @@ class MULTISZA : public BUFFER BOOL Append( const CHAR * pchInit, DWORD cchLen ) { - return ((pchInit != NULL) ? (AuxAppend( pchInit, + return ((pchInit != nullptr) ? (AuxAppend( pchInit, cchLen * sizeof(CHAR))) : TRUE); } @@ -88,7 +88,7 @@ class MULTISZA : public BUFFER // Resets the internal string to be NULL string. Buffer remains cached. VOID Reset() - { DBG_ASSERT( QueryPtr() != NULL); + { DBG_ASSERT( QueryPtr() != nullptr ); QueryStr()[0] = L'\0'; QueryStr()[1] = L'\0'; m_cchLen = 2; @@ -97,7 +97,7 @@ class MULTISZA : public BUFFER BOOL Copy( const CHAR * pchInit, IN DWORD cbLen ) { if ( QueryPtr() ) { Reset(); } - return ( (pchInit != NULL) ? + return ( (pchInit != nullptr) ? AuxAppend( pchInit, cbLen, FALSE ): TRUE); } @@ -140,7 +140,7 @@ class MULTISZA : public BUFFER BOOL Clone( OUT MULTISZA * pstrClone) const { - return ((pstrClone == NULL) ? + return ((pstrClone == nullptr) ? (SetLastError(ERROR_INVALID_PARAMETER), FALSE) : (pstrClone->Copy( *this)) ); @@ -160,7 +160,7 @@ class MULTISZA : public BUFFER // static DWORD CalcLength( const CHAR * str, - LPDWORD pcStrings = NULL ); + LPDWORD pcStrings = nullptr ); // // Determine if the MULTISZA contains a specific string. @@ -185,11 +185,11 @@ class MULTISZA : public BUFFER // const CHAR * First( VOID ) const - { return *QueryStr() == L'\0' ? NULL : QueryStr(); } + { return *QueryStr() == L'\0' ? nullptr : QueryStr(); } const CHAR * Next( const CHAR * Current ) const { Current += ::strlen( Current ) + 1; - return *Current == L'\0' ? NULL : Current; } + return *Current == L'\0' ? nullptr : Current; } BOOL Equals( diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h index e90ca0444a71..68e8221eee01 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/reftrace.h @@ -23,7 +23,7 @@ extern "C" { // No-op value for the Context1,2,3 parameters of WriteRefTraceLogEx //#define REF_TRACE_EMPTY_CONTEXT ((PVOID) -1) -#define REF_TRACE_EMPTY_CONTEXT NULL +#define REF_TRACE_EMPTY_CONTEXT nullptr // diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h index dc7ccf834bef..1db1627f0679 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/rwlock.h @@ -160,21 +160,25 @@ class CWSDRWLock return S_OK; } + _Acquires_shared_lock_(this->m_rwLock) void SharedAcquire() { AcquireSRWLockShared(&m_rwLock); } - + + _Releases_shared_lock_(this->m_rwLock) void SharedRelease() { ReleaseSRWLockShared(&m_rwLock); } + _Acquires_exclusive_lock_(this->m_rwLock) void ExclusiveAcquire() { AcquireSRWLockExclusive(&m_rwLock); } - + + _Releases_exclusive_lock_(this->m_rwLock) void ExclusiveRelease() { ReleaseSRWLockExclusive(&m_rwLock); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp index 8e2cbfe9caf0..b8ee1b11962f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp @@ -32,7 +32,7 @@ STRA::STRA( --*/ { - _ASSERTE( NULL != pbInit ); + _ASSERTE( nullptr != pbInit ); _ASSERTE( cchInit > 0 ); _ASSERTE( pbInit[0] == '\0' ); } @@ -51,7 +51,7 @@ STRA::Equals( __in BOOL fIgnoreCase /*= FALSE*/ ) const { - _ASSERTE( NULL != pszRhs ); + _ASSERTE( nullptr != pszRhs ); if( fIgnoreCase ) { @@ -67,7 +67,7 @@ STRA::Equals( __in BOOL fIgnoreCase /*= FALSE*/ ) const { - _ASSERTE( NULL != pstrRhs ); + _ASSERTE( nullptr != pstrRhs ); return Equals( pstrRhs->QueryStr(), fIgnoreCase ); } @@ -142,7 +142,7 @@ STRA::Reset( // Resets the internal string to be NULL string. Buffer remains cached. // { - _ASSERTE( QueryStr() != NULL ); + _ASSERTE( QueryStr() != nullptr ); *(QueryStr()) = '\0'; m_cchLen = 0; } @@ -220,7 +220,7 @@ STRA::Copy( __in const STRA * pstrRhs ) { - _ASSERTE( pstrRhs != NULL ); + _ASSERTE( pstrRhs != nullptr ); return Copy( pstrRhs->QueryStr(), pstrRhs->QueryCCH() ); } @@ -323,7 +323,7 @@ STRA::Append( __in const STRA * pstrRhs ) { - _ASSERTE( pstrRhs != NULL ); + _ASSERTE( pstrRhs != nullptr ); return Append( pstrRhs->QueryStr(), pstrRhs->QueryCCH() ); } @@ -382,8 +382,8 @@ STRA::CopyToBuffer( // Makes a copy of the stored string into the given buffer // { - _ASSERTE( NULL != pszBuffer ); - _ASSERTE( NULL != pcb ); + _ASSERTE( nullptr != pszBuffer ); + _ASSERTE( nullptr != pcb ); HRESULT hr = S_OK; DWORD cbNeeded = QueryCB() + sizeof( CHAR ); @@ -464,6 +464,7 @@ Return Value: HRESULT hr = SafeVsnprintf(pszFormatString, argsList); +#pragma warning(suppress: 26477) va_end( argsList ); return hr; } @@ -675,7 +676,7 @@ Return Value: --*/ { LPCSTR pch = QueryStr(); - __analysis_assume( pch != NULL ); + __analysis_assume( pch != nullptr ); int i = 0; BYTE ch; HRESULT hr = S_OK; @@ -859,8 +860,8 @@ Return Value: 1, static_cast(pDest), 6, - NULL, - NULL); + nullptr, + nullptr); pDest += dwLen; pScan += 6; @@ -1000,7 +1001,7 @@ STRA::AuxAppend( __in DWORD cbOffset ) { - _ASSERTE( NULL != pStr ); + _ASSERTE( nullptr != pStr ); _ASSERTE( cbOffset <= QueryCB() ); ULONGLONG cb64NewSize = static_cast(cbOffset) + cbLen + sizeof( CHAR ); @@ -1070,8 +1071,8 @@ STRA::AuxAppendW( cchAppendW, QueryStr() + cbOffset, cbAvailable, - NULL, - NULL + nullptr, + nullptr ); if( 0 != cbRet ) { @@ -1104,10 +1105,10 @@ STRA::AuxAppendW( dwFlags, pszAppendW, cchAppendW, - NULL, + nullptr, 0, - NULL, - NULL + nullptr, + nullptr ); if( 0 == cbRet ) { @@ -1133,8 +1134,8 @@ STRA::AuxAppendW( cchAppendW, QueryStr() + cbOffset, cbAvailable, - NULL, - NULL + nullptr, + nullptr ); if( 0 == cbRet ) { @@ -1169,7 +1170,7 @@ STRA::AuxAppendWTruncate( // Cheesey WCHAR --> CHAR conversion // { - _ASSERTE( NULL != pszAppendW ); + _ASSERTE( nullptr != pszAppendW ); _ASSERTE( 0 == cbOffset || cbOffset == QueryCB() ); if( !pszAppendW ) @@ -1213,8 +1214,8 @@ STRA::ConvertUnicodeToCodePage( __in UINT uCodePage ) { - _ASSERTE(NULL != pszSrcUnicodeString); - _ASSERTE(NULL != pbufDstAnsiString); + _ASSERTE(nullptr != pszSrcUnicodeString); + _ASSERTE(nullptr != pbufDstAnsiString); DWORD dwFlags; @@ -1233,17 +1234,17 @@ STRA::ConvertUnicodeToCodePage( dwStringLen, static_cast(pbufDstAnsiString->QueryPtr()), static_cast(pbufDstAnsiString->QuerySize()), - NULL, - NULL); + nullptr, + nullptr); if ((iStrLen == 0) && (GetLastError() == ERROR_INSUFFICIENT_BUFFER)) { iStrLen = WideCharToMultiByte(uCodePage, dwFlags, pszSrcUnicodeString, dwStringLen, - NULL, + nullptr, 0, - NULL, - NULL); + nullptr, + nullptr); if (iStrLen != 0) { // add one just for the extra NULL BOOL bTemp = pbufDstAnsiString->Resize(iStrLen + 1); @@ -1259,8 +1260,8 @@ STRA::ConvertUnicodeToCodePage( dwStringLen, static_cast(pbufDstAnsiString->QueryPtr()), static_cast(pbufDstAnsiString->QuerySize()), - NULL, - NULL); + nullptr, + nullptr); } } @@ -1387,7 +1388,7 @@ STRA::StartsWith( __in const STRA * pStraPrefix, __in bool fIgnoreCase) const { - _ASSERTE( pStraPrefix != NULL ); + _ASSERTE( pStraPrefix != nullptr ); return StartsWith(pStraPrefix->QueryStr(), fIgnoreCase); } @@ -1436,7 +1437,7 @@ STRA::StartsWith( __in PCSTR pszPrefix, __in bool fIgnoreCase) const { - if (pszPrefix == NULL) + if (pszPrefix == nullptr) { return FALSE; } @@ -1488,7 +1489,7 @@ STRA::EndsWith( __in const STRA * pStraSuffix, __in bool fIgnoreCase) const { - _ASSERTE( pStraSuffix != NULL ); + _ASSERTE( pStraSuffix != nullptr ); return EndsWith(pStraSuffix->QueryStr(), fIgnoreCase); } @@ -1541,7 +1542,7 @@ STRA::EndsWith( { PSTR pszString = QueryStr(); - if (pszSuffix == NULL) + if (pszSuffix == nullptr) { return FALSE; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c index 6c0d08029932..12c41665bdf8 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/tracelog.c @@ -46,7 +46,7 @@ Return Value: ULONG ulEntrySize = 0; ULONG ulTmpResult = 0; ULONG ulExtraBytesInHeader = 0; - PTRACE_LOG log = NULL; + PTRACE_LOG log = nullptr; HRESULT hr = S_OK; // @@ -74,7 +74,7 @@ Return Value: if ( FAILED(hr) ) { SetLastError( ERROR_ARITHMETIC_OVERFLOW ); - return NULL; + return nullptr; } // @@ -85,7 +85,7 @@ Return Value: if ( FAILED(hr) ) { SetLastError( ERROR_ARITHMETIC_OVERFLOW ); - return NULL; + return nullptr; } // @@ -96,13 +96,13 @@ Return Value: if ( FAILED(hr) ) { SetLastError( ERROR_ARITHMETIC_OVERFLOW ); - return NULL; + return nullptr; } if ( ulTotalSize > (ULONG) 0x7FFFFFFF ) { SetLastError( ERROR_ARITHMETIC_OVERFLOW ); - return NULL; + return nullptr; } // @@ -115,7 +115,7 @@ Return Value: // Initialize it. // - if( log != NULL ) { + if( log != nullptr ) { RtlZeroMemory( log, ulTotalSize ); @@ -151,7 +151,7 @@ Return Value: --*/ { - if ( Log != NULL ) { + if ( Log != nullptr ) { //DBG_ASSERT( Log->Signature == TRACE_LOG_SIGNATURE ); Log->Signature = TRACE_LOG_SIGNATURE_X; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp index 3040e06924a5..509dc3f3e848 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/dllmain.cpp @@ -24,10 +24,10 @@ DECLARE_DEBUG_PRINT_OBJECT("aspnetcorev2_inprocess.dll"); BOOL g_fGlobalInitialize = FALSE; BOOL g_fProcessDetach = FALSE; SRWLOCK g_srwLockRH; -IHttpServer * g_pHttpServer = NULL; +IHttpServer * g_pHttpServer = nullptr; HINSTANCE g_hWinHttpModule; HINSTANCE g_hAspNetCoreModule; -HANDLE g_hEventLog = NULL; +HANDLE g_hEventLog = nullptr; bool g_fInProcessApplicationCreated = false; std::string g_errorPageContent; HINSTANCE g_hServerModule; @@ -50,11 +50,11 @@ InitializeGlobalConfiguration( if (pServer->IsCommandLineLaunch()) { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); } else { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER); } DebugInitializeFromConfig(*pServer, *pHttpApplication); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp index c510ecdb7f97..2fc8b54ba624 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocessapplication.cpp @@ -14,7 +14,7 @@ #include "Environment.h" #include "HostFxr.h" -IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = NULL; +IN_PROCESS_APPLICATION* IN_PROCESS_APPLICATION::s_Application = nullptr; IN_PROCESS_APPLICATION::IN_PROCESS_APPLICATION( IHttpServer& pHttpServer, @@ -327,11 +327,11 @@ IN_PROCESS_APPLICATION::ExecuteApplication() if (m_pConfig->QueryCallStartupHook()) { - PWSTR startupHookValue = NULL; + PWSTR startupHookValue = nullptr; // Will get property not found if the environment variable isn't set. context->m_hostFxr.GetRuntimePropertyValue(DOTNETCORE_STARTUP_HOOK, &startupHookValue); - if (startupHookValue == NULL) + if (startupHookValue == nullptr) { RETURN_IF_NOT_ZERO(context->m_hostFxr.SetRuntimePropertyValue(DOTNETCORE_STARTUP_HOOK, ASPNETCORE_STARTUP_ASSEMBLY)); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp index 8f5e3ae56b75..d4a68da2bafa 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/inprocesshandler.cpp @@ -6,7 +6,7 @@ #include "ShuttingDownApplication.h" #include "ntassert.h" -ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = NULL; +ALLOC_CACHE_HANDLER * IN_PROCESS_HANDLER::sm_pAlloc = nullptr; IN_PROCESS_HANDLER::IN_PROCESS_HANDLER( _In_ std::unique_ptr pApplication, @@ -37,7 +37,7 @@ IN_PROCESS_HANDLER::ExecuteRequestHandler() { ::RaiseEvent(m_pW3Context, nullptr); - if (m_pRequestHandler == NULL) + if (m_pRequestHandler == nullptr) { ::RaiseEvent(m_pW3Context, nullptr, RQ_NOTIFICATION_FINISH_REQUEST); return RQ_NOTIFICATION_FINISH_REQUEST; @@ -198,10 +198,10 @@ IN_PROCESS_HANDLER::SetManagedHttpContext( // static void * IN_PROCESS_HANDLER::operator new(size_t) { - DBG_ASSERT(sm_pAlloc != NULL); - if (sm_pAlloc == NULL) + DBG_ASSERT(sm_pAlloc != nullptr); + if (sm_pAlloc == nullptr) { - return NULL; + return nullptr; } return sm_pAlloc->Alloc(); } @@ -209,8 +209,8 @@ void * IN_PROCESS_HANDLER::operator new(size_t) // static void IN_PROCESS_HANDLER::operator delete(void * pMemory) { - DBG_ASSERT(sm_pAlloc != NULL); - if (sm_pAlloc != NULL) + DBG_ASSERT(sm_pAlloc != nullptr); + if (sm_pAlloc != nullptr) { sm_pAlloc->Free(pMemory); } @@ -234,7 +234,7 @@ HRESULT HRESULT hr = S_OK; sm_pAlloc = new ALLOC_CACHE_HANDLER; - if (sm_pAlloc == NULL) + if (sm_pAlloc == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -255,9 +255,9 @@ HRESULT void IN_PROCESS_HANDLER::StaticTerminate(VOID) { - if (sm_pAlloc != NULL) + if (sm_pAlloc != nullptr) { delete sm_pAlloc; - sm_pAlloc = NULL; + sm_pAlloc = nullptr; } } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index 23639860527a..eea153ca6954 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -29,7 +29,7 @@ class __declspec(uuid("1a2acc57-cae2-4f28-b4ab-00c8f96b12ec")) PCSTR GetTrailer( _In_ PCSTR pszHeaderName, - _Out_ USHORT* pcchHeaderValue = NULL + _Out_ USHORT* pcchHeaderValue = nullptr ) const = 0; virtual @@ -70,7 +70,7 @@ register_callbacks( _In_ VOID* pvShutdownHandlerContext ) { - if (pInProcessApplication == NULL) + if (pInProcessApplication == nullptr) { return E_INVALIDARG; } @@ -117,6 +117,8 @@ http_get_server_variable( PCWSTR pszVariableValue; DWORD cbLength; + *pwszReturn = nullptr; + HRESULT hr = pInProcessHandler ->QueryHttpContext() ->GetServerVariable(pszVariableName, &pszVariableValue, &cbLength); @@ -128,7 +130,7 @@ http_get_server_variable( *pwszReturn = SysAllocString(pszVariableValue); - if (*pwszReturn == NULL) + if (*pwszReturn == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -245,7 +247,7 @@ http_get_application_properties( ) { auto pInProcessApplication = IN_PROCESS_APPLICATION::GetInstance(); - if (pInProcessApplication == NULL) + if (pInProcessApplication == nullptr) { return E_FAIL; } @@ -277,7 +279,7 @@ http_read_request_bytes( { HRESULT hr = S_OK; - if (pInProcessHandler == NULL) + if (pInProcessHandler == nullptr) { return E_FAIL; } @@ -522,7 +524,7 @@ EXTERN_C __declspec(dllexport) HRESULT http_stop_calls_into_managed(_In_ IN_PROCESS_APPLICATION* pInProcessApplication) { - if (pInProcessApplication == NULL) + if (pInProcessApplication == nullptr) { return E_INVALIDARG; } @@ -535,7 +537,7 @@ EXTERN_C __declspec(dllexport) HRESULT http_stop_incoming_requests(_In_ IN_PROCESS_APPLICATION* pInProcessApplication) { - if (pInProcessApplication == NULL) + if (pInProcessApplication == nullptr) { return E_INVALIDARG; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp index a89165dd72b4..449ec6a2877a 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/dllmain.cpp @@ -16,12 +16,12 @@ BOOL g_fProcessDetach = FALSE; DWORD g_OptionalWinHttpFlags = 0; DWORD g_dwTlsIndex = TLS_OUT_OF_INDEXES; SRWLOCK g_srwLockRH; -HINTERNET g_hWinhttpSession = NULL; -IHttpServer * g_pHttpServer = NULL; +HINTERNET g_hWinhttpSession = nullptr; +IHttpServer * g_pHttpServer = nullptr; HINSTANCE g_hWinHttpModule; HINSTANCE g_hOutOfProcessRHModule; HINSTANCE g_hAspNetCoreModule; -HANDLE g_hEventLog = NULL; +HANDLE g_hEventLog = nullptr; VOID InitializeGlobalConfiguration( @@ -45,11 +45,11 @@ InitializeGlobalConfiguration( g_pHttpServer = pServer; if (pServer->IsCommandLineLaunch()) { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_IISEXPRESS_EVENT_PROVIDER); } else { - g_hEventLog = RegisterEventSource(NULL, ASPNETCORE_EVENT_PROVIDER); + g_hEventLog = RegisterEventSource(nullptr, ASPNETCORE_EVENT_PROVIDER); } if (RegOpenKeyEx(HKEY_LOCAL_MACHINE, @@ -65,7 +65,7 @@ InitializeGlobalConfiguration( cbData = sizeof(dwData); if ((RegQueryValueEx(hKey, L"OptionalWinHttpFlags", - NULL, + nullptr, &dwType, (LPBYTE)&dwData, &cbData) == NO_ERROR) && @@ -77,7 +77,7 @@ InitializeGlobalConfiguration( cbData = sizeof(dwData); if ((RegQueryValueEx(hKey, L"EnableReferenceCountTracing", - NULL, + nullptr, &dwType, (LPBYTE)&dwData, &cbData) == NO_ERROR) && @@ -151,12 +151,16 @@ EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication) } } +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header g_hWinhttpSession = WinHttpOpen(L"", WINHTTP_ACCESS_TYPE_NO_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, WINHTTP_FLAG_ASYNC); - FINISHED_LAST_ERROR_IF(g_hWinhttpSession == NULL); +#pragma warning(pop) + + FINISHED_LAST_ERROR_IF(g_hWinhttpSession == nullptr); // // Don't set non-blocking callbacks WINHTTP_OPTION_ASSURED_NON_BLOCKING_CALLBACKS, @@ -171,7 +175,7 @@ EnsureOutOfProcessInitializtion(IHttpApplication *pHttpApplication) FORWARDING_HANDLER::OnWinHttpCompletion, (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_STATUS_SENDING_REQUEST), - NULL) == WINHTTP_INVALID_STATUS_CALLBACK); + 0) == WINHTTP_INVALID_STATUS_CALLBACK); // // Make sure we see the redirects (rather than winhttp doing it diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp index ee49e992422c..bb335374b234 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.cpp @@ -7,7 +7,7 @@ FORWARDER_CONNECTION::FORWARDER_CONNECTION( VOID ) : m_cRefs (1), - m_hConnection (NULL) + m_hConnection (nullptr) { } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h index 232e23988826..89ba58d560c5 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwarderconnection.h @@ -88,10 +88,10 @@ class FORWARDER_CONNECTION ~FORWARDER_CONNECTION() { - if (m_hConnection != NULL) + if (m_hConnection != nullptr) { WinHttpCloseHandle(m_hConnection); - m_hConnection = NULL; + m_hConnection = nullptr; } } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index d30883ea5332..2ebc0c6ddbf8 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -20,10 +20,10 @@ C_ASSERT(sizeof(FORWARDING_HANDLER) <= 632); #define FORWARDING_HANDLER_SIGNATURE ((DWORD)'FHLR') #define FORWARDING_HANDLER_SIGNATURE_FREE ((DWORD)'fhlr') -ALLOC_CACHE_HANDLER * FORWARDING_HANDLER::sm_pAlloc = NULL; -TRACE_LOG * FORWARDING_HANDLER::sm_pTraceLog = NULL; +ALLOC_CACHE_HANDLER * FORWARDING_HANDLER::sm_pAlloc = nullptr; +TRACE_LOG * FORWARDING_HANDLER::sm_pTraceLog = nullptr; PROTOCOL_CONFIG FORWARDING_HANDLER::sm_ProtocolConfig; -RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = NULL; +RESPONSE_HEADER_HASH * FORWARDING_HANDLER::sm_pResponseHeaderHash = nullptr; FORWARDING_HANDLER::FORWARDING_HANDLER( _In_ IHttpContext *pW3Context, @@ -36,12 +36,12 @@ FORWARDING_HANDLER::FORWARDING_HANDLER( m_fDoReverseRewriteHeaders(FALSE), m_fFinishRequest(FALSE), m_fHasError(FALSE), - m_pszHeaders(NULL), + m_pszHeaders(nullptr), m_cchHeaders(0), m_BytesToReceive(0), m_BytesToSend(0), m_fWebSocketEnabled(FALSE), - m_pWebSocket(NULL), + m_pWebSocket(nullptr), m_dwHandlers (1), // default http handler m_fDoneAsyncCompletion(FALSE), m_fHttpHandleInClose(FALSE), @@ -87,7 +87,7 @@ FORWARDING_HANDLER::~FORWARDING_HANDLER( if (m_pWebSocket) { m_pWebSocket->Terminate(); - m_pWebSocket = NULL; + m_pWebSocket = nullptr; } } @@ -100,12 +100,12 @@ FORWARDING_HANDLER::ExecuteRequestHandler() BOOL fRequestLocked = FALSE; BOOL fFailedToStartKestrel = FALSE; BOOL fSecure = FALSE; - HINTERNET hConnect = NULL; + HINTERNET hConnect = nullptr; IHttpRequest *pRequest = m_pW3Context->GetRequest(); IHttpResponse *pResponse = m_pW3Context->GetResponse(); - IHttpConnection *pClientConnection = NULL; + IHttpConnection *pClientConnection = nullptr; PROTOCOL_CONFIG *pProtocol = &sm_ProtocolConfig; - SERVER_PROCESS *pServerProcess = NULL; + SERVER_PROCESS *pServerProcess = nullptr; USHORT cchHostName = 0; @@ -124,13 +124,13 @@ FORWARDING_HANDLER::ExecuteRequestHandler() // check connection pClientConnection = m_pW3Context->GetConnection(); - if (pClientConnection == NULL || + if (pClientConnection == nullptr || !pClientConnection->IsConnected()) { FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET)); } - if (m_pApplication == NULL) + if (m_pApplication == nullptr) { FAILURE(E_INVALIDARG); } @@ -142,13 +142,13 @@ FORWARDING_HANDLER::ExecuteRequestHandler() FAILURE(hr); } - if (pServerProcess == NULL) + if (pServerProcess == nullptr) { fFailedToStartKestrel = TRUE; FAILURE(HRESULT_FROM_WIN32(ERROR_CREATE_FAILED)); } - if (pServerProcess->QueryWinHttpConnection() == NULL) + if (pServerProcess->QueryWinHttpConnection() == nullptr) { FAILURE(HRESULT_FROM_WIN32(ERROR_INVALID_HANDLE)); } @@ -200,11 +200,11 @@ FORWARDING_HANDLER::ExecuteRequestHandler() // before staring a WinHTTP operation. // DBG_ASSERT(fRequestLocked); - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); TlsSetValue(g_dwTlsIndex, this); DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this); - if (m_hRequest == NULL) + if (m_hRequest == nullptr) { FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET)); } @@ -219,7 +219,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler() // DWORD cbContentLength = 0; PCSTR pszContentLength = pRequest->GetHeader(HttpHeaderContentLength); - if (pszContentLength != NULL) + if (pszContentLength != nullptr) { cbContentLength = m_BytesToReceive = atol(pszContentLength); if (m_BytesToReceive == INFINITE) @@ -227,7 +227,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler() FAILURE(HRESULT_FROM_WIN32(WSAECONNRESET)); } } - else if (pRequest->GetHeader(HttpHeaderTransferEncoding) != NULL) + else if (pRequest->GetHeader(HttpHeaderTransferEncoding) != nullptr) { m_BytesToReceive = INFINITE; } @@ -239,7 +239,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler() // if (!WinHttpSetOption(m_hRequest, WINHTTP_OPTION_UPGRADE_TO_WEB_SOCKET, - NULL, + nullptr, 0)) { FINISHED(HRESULT_FROM_WIN32(GetLastError())); @@ -253,13 +253,13 @@ FORWARDING_HANDLER::ExecuteRequestHandler() { ANCMEvents::ANCM_REQUEST_FORWARD_START::RaiseEvent( m_pW3Context->GetTraceContext(), - NULL); + nullptr); } if (!WinHttpSendRequest(m_hRequest, m_pszHeaders, m_cchHeaders, - NULL, + nullptr, 0, cbContentLength, reinterpret_cast(static_cast(this)))) @@ -273,7 +273,7 @@ FORWARDING_HANDLER::ExecuteRequestHandler() { ANCMEvents::ANCM_REQUEST_FORWARD_FAIL::RaiseEvent( m_pW3Context->GetTraceContext(), - NULL, + nullptr, hr); } @@ -338,9 +338,9 @@ FORWARDING_HANDLER::ExecuteRequestHandler() if (fRequestLocked) { DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this); - TlsSetValue(g_dwTlsIndex, NULL); + TlsSetValue(g_dwTlsIndex, nullptr); ReleaseSRWLockShared(&m_RequestLock); - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); } DereferenceRequestHandler(); @@ -382,8 +382,8 @@ REQUEST_NOTIFICATION_STATUS BOOL fClosed = FALSE; BOOL fWebSocketUpgraded = FALSE; - DBG_ASSERT(m_pW3Context != NULL); - __analysis_assume(m_pW3Context != NULL); + DBG_ASSERT(m_pW3Context != nullptr); + __analysis_assume(m_pW3Context != nullptr); // // Take a reference so that object does not go away as a result of @@ -391,7 +391,7 @@ REQUEST_NOTIFICATION_STATUS // ReferenceRequestHandler(); - if (sm_pTraceLog != NULL) + if (sm_pTraceLog != nullptr) { WriteRefTraceLogEx(sm_pTraceLog, m_cRefs, @@ -424,7 +424,7 @@ REQUEST_NOTIFICATION_STATUS // This should be the write completion of the 101 response. // m_pWebSocket = new WEBSOCKET_HANDLER(); - if (m_pWebSocket == NULL) + if (m_pWebSocket == nullptr) { FAILURE(E_OUTOFMEMORY); } @@ -447,7 +447,7 @@ REQUEST_NOTIFICATION_STATUS m_fHttpHandleInClose = TRUE; fClosed = WinHttpCloseHandle(m_hRequest); DBG_ASSERT(fClosed); - m_hRequest = NULL; + m_hRequest = nullptr; if (!fClosed) { @@ -490,7 +490,7 @@ REQUEST_NOTIFICATION_STATUS default: DBG_ASSERT(m_RequestStatus == FORWARDER_DONE); - if (m_hRequest == NULL && m_pWebSocket == NULL) + if (m_hRequest == nullptr && m_pWebSocket == nullptr) { // Request must have been done if (!m_fFinishRequest) @@ -567,7 +567,7 @@ REQUEST_NOTIFICATION_STATUS 0, strDescription.QueryStr(), strDescription.QuerySizeCCH(), - NULL); + nullptr); } else { @@ -598,17 +598,17 @@ REQUEST_NOTIFICATION_STATUS } } - if (m_pWebSocket != NULL && !m_fWebSocketHandleInClose) + if (m_pWebSocket != nullptr && !m_fWebSocketHandleInClose) { m_fWebSocketHandleInClose = TRUE; m_pWebSocket->TerminateRequest(); } - if (m_hRequest != NULL && !m_fHttpHandleInClose) + if (m_hRequest != nullptr && !m_fHttpHandleInClose) { m_fHttpHandleInClose = TRUE; WinHttpCloseHandle(m_hRequest); - m_hRequest = NULL; + m_hRequest = nullptr; } Finished: @@ -694,33 +694,33 @@ HRESULT VOID FORWARDING_HANDLER::StaticTerminate() { - if (sm_pResponseHeaderHash != NULL) + if (sm_pResponseHeaderHash != nullptr) { sm_pResponseHeaderHash->Clear(); delete sm_pResponseHeaderHash; - sm_pResponseHeaderHash = NULL; + sm_pResponseHeaderHash = nullptr; } - if (sm_pTraceLog != NULL) + if (sm_pTraceLog != nullptr) { DestroyRefTraceLog(sm_pTraceLog); - sm_pTraceLog = NULL; + sm_pTraceLog = nullptr; } - if (sm_pAlloc != NULL) + if (sm_pAlloc != nullptr) { delete sm_pAlloc; - sm_pAlloc = NULL; + sm_pAlloc = nullptr; } } // static void * FORWARDING_HANDLER::operator new(size_t) { - DBG_ASSERT(sm_pAlloc != NULL); - if (sm_pAlloc == NULL) + DBG_ASSERT(sm_pAlloc != nullptr); + if (sm_pAlloc == nullptr) { - return NULL; + return nullptr; } return sm_pAlloc->Alloc(); } @@ -728,8 +728,8 @@ void * FORWARDING_HANDLER::operator new(size_t) // static void FORWARDING_HANDLER::operator delete(void * pMemory) { - DBG_ASSERT(sm_pAlloc != NULL); - if (sm_pAlloc != NULL) + DBG_ASSERT(sm_pAlloc != nullptr); + if (sm_pAlloc != nullptr) { sm_pAlloc->Free(pMemory); } @@ -797,13 +797,13 @@ FORWARDING_HANDLER::GetHeaders( // iterate the list of headers to be removed and delete them from the request. // - while (ppHeadersToBeRemoved != NULL) + while (ppHeadersToBeRemoved != nullptr) { m_pW3Context->GetRequest()->DeleteHeader(ppHeadersToBeRemoved); ppHeadersToBeRemoved = mszMsAspNetCoreHeaders.Next(ppHeadersToBeRemoved); } - if (pServerProcess->QueryGuid() != NULL) + if (pServerProcess->QueryGuid() != nullptr) { RETURN_IF_FAILED(m_pW3Context->GetRequest()->SetHeader("MS-ASPNETCORE-TOKEN", pServerProcess->QueryGuid(), @@ -815,10 +815,10 @@ FORWARDING_HANDLER::GetHeaders( (_wcsicmp(m_pW3Context->GetUser()->GetAuthenticationType(), L"negotiate") == 0 || _wcsicmp(m_pW3Context->GetUser()->GetAuthenticationType(), L"ntlm") == 0)) { - if (m_pW3Context->GetUser()->GetPrimaryToken() != NULL && + if (m_pW3Context->GetUser()->GetPrimaryToken() != nullptr && m_pW3Context->GetUser()->GetPrimaryToken() != INVALID_HANDLE_VALUE) { - HANDLE hTargetTokenHandle = NULL; + HANDLE hTargetTokenHandle = nullptr; RETURN_IF_FAILED(pServerProcess->SetWindowsAuthToken(m_pW3Context->GetUser()->GetPrimaryToken(), &hTargetTokenHandle)); @@ -843,7 +843,7 @@ FORWARDING_HANDLER::GetHeaders( strTemp.Reset(); pszCurrentHeader = pRequest->GetHeader(pProtocol->QueryXForwardedForName()->QueryStr(), &cchCurrentHeader); - if (pszCurrentHeader != NULL) + if (pszCurrentHeader != nullptr) { RETURN_IF_FAILED(strTemp.Copy(pszCurrentHeader, cchCurrentHeader)); RETURN_IF_FAILED(strTemp.Append(", ", 2)); @@ -884,7 +884,7 @@ FORWARDING_HANDLER::GetHeaders( { const HTTP_SSL_INFO *pSslInfo = pRequest->GetRawHttpRequest()->pSslInfo; LPSTR pszScheme = "http"; - if (pSslInfo != NULL) + if (pSslInfo != nullptr) { pszScheme = "https"; } @@ -892,7 +892,7 @@ FORWARDING_HANDLER::GetHeaders( strTemp.Reset(); pszCurrentHeader = pRequest->GetHeader(pProtocol->QuerySslHeaderName()->QueryStr(), &cchCurrentHeader); - if (pszCurrentHeader != NULL) + if (pszCurrentHeader != nullptr) { RETURN_IF_FAILED(strTemp.Copy(pszCurrentHeader, cchCurrentHeader)); RETURN_IF_FAILED(strTemp.Append(", ", 2)); @@ -908,8 +908,8 @@ FORWARDING_HANDLER::GetHeaders( if (!pProtocol->QueryClientCertName()->IsEmpty()) { - if (pRequest->GetRawHttpRequest()->pSslInfo == NULL || - pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo == NULL) + if (pRequest->GetRawHttpRequest()->pSslInfo == nullptr || + pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo == nullptr) { pRequest->DeleteHeader(pProtocol->QueryClientCertName()->QueryStr()); } @@ -924,7 +924,7 @@ FORWARDING_HANDLER::GetHeaders( pRequest->GetRawHttpRequest()->pSslInfo->pClientCertInfo->CertEncodedSize, strTemp.QueryStr(), strTemp.QuerySize(), - NULL); + nullptr); strTemp.SyncWithBuffer(); RETURN_IF_FAILED(pRequest->SetHeader( @@ -963,7 +963,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( ) { HRESULT hr = S_OK; - PCWSTR pszVersion = NULL; + PCWSTR pszVersion = nullptr; PCSTR pszVerb; DWORD dwTimeout = INFINITE; STACK_STRU(strVerb, 32); @@ -976,7 +976,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( FINISHED_IF_FAILED(strVerb.CopyA(pszVerb)); //pszVersion = pProtocol->QueryVersion(); - if (pszVersion == NULL) + if (pszVersion == nullptr) { DWORD cchUnused; FINISHED_IF_FAILED(m_pW3Context->GetServerVariable( @@ -985,6 +985,8 @@ FORWARDING_HANDLER::CreateWinHttpRequest( &cchUnused)); } +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header m_hRequest = WinHttpOpenRequest(hConnect, strVerb.QueryStr(), pstrUrl->QueryStr(), @@ -993,6 +995,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( WINHTTP_DEFAULT_ACCEPT_TYPES, WINHTTP_FLAG_ESCAPE_DISABLE_QUERY | g_OptionalWinHttpFlags); +#pragma warning(pop) FINISHED_LAST_ERROR_IF_NULL (m_hRequest); @@ -1038,7 +1041,7 @@ FORWARDING_HANDLER::CreateWinHttpRequest( (WINHTTP_CALLBACK_FLAG_ALL_COMPLETIONS | WINHTTP_CALLBACK_FLAG_HANDLES | WINHTTP_CALLBACK_STATUS_SENDING_REQUEST), - NULL) == WINHTTP_INVALID_STATUS_CALLBACK); + 0) == WINHTTP_INVALID_STATUS_CALLBACK); FINISHED_IF_FAILED(GetHeaders(pProtocol, m_pApplication->QueryConfig()->QueryForwardWindowsAuthToken(), @@ -1060,7 +1063,7 @@ FORWARDING_HANDLER::OnWinHttpCompletion( ) { FORWARDING_HANDLER * pThis = static_cast(reinterpret_cast(dwContext)); - if (pThis == NULL) + if (pThis == nullptr) { //error happened, nothing can be done here return; @@ -1105,11 +1108,11 @@ None BOOL fAnotherCompletionExpected = FALSE; BOOL fDoPostCompletion = FALSE; BOOL fHandleClosing = (dwInternetStatus == WINHTTP_CALLBACK_STATUS_HANDLE_CLOSING); - DWORD dwHandlers = 1; // defaullt for http handler + DWORD dwHandlers = 1; // default for http handler - DBG_ASSERT(m_pW3Context != NULL); - __analysis_assume(m_pW3Context != NULL); + DBG_ASSERT(m_pW3Context != nullptr); + __analysis_assume(m_pW3Context != nullptr); IHttpResponse * pResponse = m_pW3Context->GetResponse(); // Reference the request handler to prevent it from being released prematurely @@ -1117,14 +1120,14 @@ None UNREFERENCED_PARAMETER(dwStatusInformationLength); - if (sm_pTraceLog != NULL) + if (sm_pTraceLog != nullptr) { WriteRefTraceLogEx(sm_pTraceLog, m_cRefs, this, "FORWARDING_HANDLER::OnWinHttpCompletionInternal Enter", reinterpret_cast(static_cast(dwInternetStatus)), - NULL); + nullptr); } //FREB log @@ -1132,7 +1135,7 @@ None { ANCMEvents::ANCM_WINHTTP_CALLBACK::RaiseEvent( m_pW3Context->GetTraceContext(), - NULL, + nullptr, dwInternetStatus); } @@ -1149,11 +1152,11 @@ None if (TlsGetValue(g_dwTlsIndex) != this) { - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); if (m_RequestStatus != FORWARDER_RECEIVED_WEBSOCKET_RESPONSE) { - // Webscoket has already been guarded by critical section - // Only require exclisive lock for non-websocket scenario which has duplex channel + // Websocket has already been guarded by critical section + // Only require exclusive lock for non-websocket scenario which has duplex channel // Otherwise, there will be a deadlock AcquireLockExclusive(); fExclusiveLocked = TRUE; @@ -1195,7 +1198,7 @@ None if (m_RequestStatus == FORWARDER_RECEIVED_WEBSOCKET_RESPONSE) { fAnotherCompletionExpected = TRUE; - if (m_pWebSocket == NULL) + if (m_pWebSocket == nullptr) { goto Finished; } @@ -1280,14 +1283,14 @@ None { ANCMEvents::ANCM_REQUEST_FORWARD_END::RaiseEvent( m_pW3Context->GetTraceContext(), - NULL); + nullptr); } if (m_RequestStatus != FORWARDER_DONE) { hr = LOG_IF_FAILED(ERROR_CONNECTION_ABORTED); fClientError = m_fClientDisconnected; } - m_hRequest = NULL; + m_hRequest = nullptr; fAnotherCompletionExpected = FALSE; break; @@ -1301,14 +1304,14 @@ None // DBG_ASSERT(FALSE); hr = LOG_IF_FAILED(E_UNEXPECTED); - if (sm_pTraceLog != NULL) + if (sm_pTraceLog != nullptr) { WriteRefTraceLogEx(sm_pTraceLog, m_cRefs, this, "FORWARDING_HANDLER::OnWinHttpCompletionInternal Unexpected WinHTTP Status", reinterpret_cast(static_cast(dwInternetStatus)), - NULL); + nullptr); } break; } @@ -1372,7 +1375,7 @@ None 0, strDescription.QueryStr(), strDescription.QuerySizeCCH(), - NULL) == 0) + nullptr) == 0) { LoadString(g_hAspNetCoreModule, IDS_SERVER_ERROR, @@ -1396,7 +1399,7 @@ None { ANCMEvents::ANCM_REQUEST_FORWARD_FAIL::RaiseEvent( m_pW3Context->GetTraceContext(), - NULL, + nullptr, hr); } @@ -1421,10 +1424,10 @@ None RemoveRequest(); m_fFinishRequest = TRUE; fDoPostCompletion = TRUE; - if (m_pWebSocket != NULL) + if (m_pWebSocket != nullptr) { m_pWebSocket->Terminate(); - m_pWebSocket = NULL; + m_pWebSocket = nullptr; } } else if (m_RequestStatus == FORWARDER_DONE) @@ -1433,14 +1436,14 @@ None // Error path // RemoveRequest(); - if (m_hRequest != NULL && !m_fHttpHandleInClose) + if (m_hRequest != nullptr && !m_fHttpHandleInClose) { m_fHttpHandleInClose = TRUE; WinHttpCloseHandle(m_hRequest); - m_hRequest = NULL; + m_hRequest = nullptr; } - if (m_pWebSocket != NULL && !m_fWebSocketHandleInClose) + if (m_pWebSocket != nullptr && !m_fWebSocketHandleInClose) { m_fWebSocketHandleInClose = TRUE; m_pWebSocket->TerminateRequest(); @@ -1475,9 +1478,9 @@ None else if (fSharedLocked) { DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this); - TlsSetValue(g_dwTlsIndex, NULL); + TlsSetValue(g_dwTlsIndex, nullptr); ReleaseSRWLockShared(&m_RequestLock); - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); } DereferenceRequestHandler(); @@ -1502,27 +1505,27 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( // if (m_BytesToReceive > 0) { - if (m_pEntityBuffer == NULL) + if (m_pEntityBuffer == nullptr) { FINISHED_IF_NULL_ALLOC(m_pEntityBuffer = GetNewResponseBuffer( ENTITY_BUFFER_SIZE)); } - if (sm_pTraceLog != NULL) + if (sm_pTraceLog != nullptr) { WriteRefTraceLogEx(sm_pTraceLog, m_cRefs, this, "Calling ReadEntityBody", - NULL, - NULL); + nullptr, + nullptr); } hr = pRequest->ReadEntityBody( m_pEntityBuffer + 6, min(m_BytesToReceive, BUFFER_SIZE), TRUE, // fAsync - NULL, // pcbBytesReceived - NULL); // pfCompletionPending + nullptr, // pcbBytesReceived + nullptr); // pfCompletionPending if (hr == HRESULT_FROM_WIN32(ERROR_HANDLE_EOF)) { DBG_ASSERT(m_BytesToReceive == 0 || @@ -1548,7 +1551,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( if (!WinHttpWriteData(m_hRequest, "0\r\n\r\n", 5, - NULL)) + nullptr)) { FINISHED(HRESULT_FROM_WIN32(GetLastError())); //DereferenceForwardingHandler(); @@ -1577,7 +1580,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( m_RequestStatus = FORWARDER_RECEIVING_RESPONSE; - FINISHED_LAST_ERROR_IF(!WinHttpReceiveResponse(hRequest, NULL)); + FINISHED_LAST_ERROR_IF(!WinHttpReceiveResponse(hRequest, nullptr)); *pfAnotherCompletionExpected = TRUE; Finished: @@ -1605,6 +1608,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( // WinHttpQueryHeaders operates synchronously, // no need for taking reference. // +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header dwHeaderSize = bufHeaderBuffer.QuerySize(); if (!WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_RAW_HEADERS_CRLF, @@ -1629,6 +1634,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( &dwHeaderSize, WINHTTP_NO_HEADER_INDEX)); } +#pragma warning(pop) FINISHED_IF_FAILED(strHeaders.CopyW(reinterpret_cast(bufHeaderBuffer.QueryPtr()))); @@ -1664,8 +1670,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( hr = m_pW3Context->GetResponse()->Flush( TRUE, TRUE, - NULL, - NULL); + nullptr, + nullptr); if (FAILED_LOG(hr)) { @@ -1726,7 +1732,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable( FINISHED_LAST_ERROR_IF(!WinHttpReadData(hRequest, m_pEntityBuffer, min(m_BytesToSend, BUFFER_SIZE), - NULL)); + nullptr)); *pfAnotherCompletionExpected = TRUE; @@ -1799,7 +1805,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( // FINISHED_IF_FAILED(pResponse->Flush(TRUE, // fAsync TRUE, // fMoreData - NULL)); // pcbSent + nullptr)); // pcbSent *pfAnotherCompletionExpected = TRUE; } @@ -1836,13 +1842,13 @@ FORWARDING_HANDLER::OnSendingRequest( RETURN_LAST_ERROR_IF(!WinHttpWriteData(m_hRequest, "0\r\n\r\n", 5, - NULL)); + nullptr)); } else { m_RequestStatus = FORWARDER_RECEIVING_RESPONSE; - RETURN_LAST_ERROR_IF(!WinHttpReceiveResponse(m_hRequest, NULL)); + RETURN_LAST_ERROR_IF(!WinHttpReceiveResponse(m_hRequest, nullptr)); } } else if (SUCCEEDED(hrCompletionStatus)) @@ -1904,7 +1910,7 @@ FORWARDING_HANDLER::OnSendingRequest( RETURN_LAST_ERROR_IF(!WinHttpWriteData(m_hRequest, m_pEntityBuffer + cbOffset, cbCompletion, - NULL)); + nullptr)); } else { @@ -1946,17 +1952,17 @@ FORWARDING_HANDLER::OnReceivingResponse( // // No buffering enabled. // - RETURN_LAST_ERROR_IF(!WinHttpQueryDataAvailable(m_hRequest, NULL)); + RETURN_LAST_ERROR_IF(!WinHttpQueryDataAvailable(m_hRequest, nullptr)); } else { // // Buffering enabled. // - if (m_pEntityBuffer == NULL) + if (m_pEntityBuffer == nullptr) { m_pEntityBuffer = GetNewResponseBuffer(min(m_BytesToSend, BUFFER_SIZE)); - if (m_pEntityBuffer == NULL) + if (m_pEntityBuffer == nullptr) { RETURN_HR(E_OUTOFMEMORY); } @@ -1965,7 +1971,7 @@ FORWARDING_HANDLER::OnReceivingResponse( RETURN_LAST_ERROR_IF(!WinHttpReadData(m_hRequest, m_pEntityBuffer, min(m_BytesToSend, BUFFER_SIZE), - NULL)); + nullptr)); } return S_OK; @@ -1981,15 +1987,15 @@ FORWARDING_HANDLER::GetNewResponseBuffer( !m_buffEntityBuffers.Resize( max(dwNeededSize, m_buffEntityBuffers.QuerySize() * 2))) { - return NULL; + return nullptr; } BYTE *pBuffer = (BYTE *)HeapAlloc(GetProcessHeap(), 0, // dwFlags dwBufferSize); - if (pBuffer == NULL) + if (pBuffer == nullptr) { - return NULL; + return nullptr; } m_buffEntityBuffers.QueryPtr()[m_cEntityBuffers] = pBuffer; @@ -2009,7 +2015,7 @@ FORWARDING_HANDLER::FreeResponseBuffers() pBuffers[i]); } m_cEntityBuffers = 0; - m_pEntityBuffer = NULL; + m_pEntityBuffer = nullptr; m_cBytesBuffered = 0; } @@ -2028,13 +2034,13 @@ FORWARDING_HANDLER::SetStatusAndHeaders( PCSTR pchEndofHeaderValue; BOOL fServerHeaderPresent = FALSE; - _ASSERT(pszHeaders != NULL); + _ASSERT(pszHeaders != nullptr); // // The first line is the status line // PSTR pchStatus = const_cast(strchr(pszHeaders, ' ')); - if (pchStatus == NULL) + if (pchStatus == nullptr) { return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } @@ -2054,7 +2060,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( } pchStatus = strchr(pchStatus, ' '); - if (pchStatus == NULL) + if (pchStatus == nullptr) { return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } @@ -2068,7 +2074,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( } pchNewline = strchr(pchStatus, '\n'); - if (pchNewline == NULL) + if (pchNewline == nullptr) { return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } @@ -2096,7 +2102,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( strHeaderValue.QueryStr(), 0, S_OK, - NULL, + nullptr, TRUE)); } @@ -2114,7 +2120,7 @@ FORWARDING_HANDLER::SetStatusAndHeaders( // pchNewline = const_cast(strchr(pszHeaders + index, '\n')); - if (pchNewline == NULL) + if (pchNewline == nullptr) { return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } @@ -2129,8 +2135,8 @@ FORWARDING_HANDLER::SetStatusAndHeaders( } DBG_ASSERT( - (pchColon != NULL) && (pchColon < pchNewline)); - if ((pchColon == NULL) || (pchColon >= pchNewline)) + (pchColon != nullptr) && (pchColon < pchNewline)); + if ((pchColon == nullptr) || (pchColon >= pchNewline)) { return HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); } @@ -2265,7 +2271,7 @@ FORWARDING_HANDLER::DoReverseRewrite( ) { DBG_ASSERT(pResponse == m_pW3Context->GetResponse()); - BOOL fSecure = (m_pW3Context->GetRequest()->GetRawHttpRequest()->pSslInfo != NULL); + BOOL fSecure = (m_pW3Context->GetRequest()->GetRawHttpRequest()->pSslInfo != nullptr); STRA strTemp; PCSTR pszHeader; PCSTR pszStartHost; @@ -2277,7 +2283,7 @@ FORWARDING_HANDLER::DoReverseRewrite( // http[s]://host/url format // pszHeader = pResponse->GetHeader(HttpHeaderContentLocation); - if (pszHeader != NULL) + if (pszHeader != nullptr) { if (_strnicmp(pszHeader, "http://", 7) == 0) { @@ -2297,7 +2303,7 @@ FORWARDING_HANDLER::DoReverseRewrite( RETURN_IF_FAILED(strTemp.Copy(fSecure ? "https://" : "http://")); RETURN_IF_FAILED(strTemp.Append(m_pszOriginalHostHeader)); - if (pszEndHost != NULL) + if (pszEndHost != nullptr) { RETURN_IF_FAILED(strTemp.Append(pszEndHost)); } @@ -2310,7 +2316,7 @@ FORWARDING_HANDLER::DoReverseRewrite( Location: pszHeader = pResponse->GetHeader(HttpHeaderLocation); - if (pszHeader != NULL) + if (pszHeader != nullptr) { if (_strnicmp(pszHeader, "http://", 7) == 0) { @@ -2330,7 +2336,7 @@ FORWARDING_HANDLER::DoReverseRewrite( RETURN_IF_FAILED(strTemp.Copy(fSecure ? "https://" : "http://")); RETURN_IF_FAILED(strTemp.Append(m_pszOriginalHostHeader)); - if (pszEndHost != NULL) + if (pszEndHost != nullptr) { RETURN_IF_FAILED(strTemp.Append(pszEndHost)); } @@ -2356,7 +2362,7 @@ FORWARDING_HANDLER::DoReverseRewrite( pszHeader = pHeaders->pUnknownHeaders[i].pRawValue; pszStartHost = strchr(pszHeader, ';'); - while (pszStartHost != NULL) + while (pszStartHost != nullptr) { pszStartHost++; while (IsSpace(*pszStartHost)) @@ -2401,7 +2407,7 @@ FORWARDING_HANDLER::DoReverseRewrite( RETURN_IF_FAILED(strTemp.Append(pszEndHost)); pszHeader = (PCSTR)m_pW3Context->AllocateRequestMemory(strTemp.QueryCCH() + 1); - if (pszHeader == NULL) + if (pszHeader == nullptr) { RETURN_HR(E_OUTOFMEMORY); } @@ -2460,20 +2466,22 @@ FORWARDING_HANDLER::NotifyDisconnect() } } +_Acquires_exclusive_lock_(this->m_RequestLock) VOID FORWARDING_HANDLER::AcquireLockExclusive() { - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); AcquireSRWLockExclusive(&m_RequestLock); TlsSetValue(g_dwTlsIndex, this); DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this); } +_Releases_exclusive_lock_(this->m_RequestLock) VOID FORWARDING_HANDLER::ReleaseLockExclusive() { DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == this); - TlsSetValue(g_dwTlsIndex, NULL); + TlsSetValue(g_dwTlsIndex, nullptr); ReleaseSRWLockExclusive(&m_RequestLock); - DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == NULL); + DBG_ASSERT(TlsGetValue(g_dwTlsIndex) == nullptr); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h index c564a7b4f03a..8e5c5c74d250 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.h @@ -77,9 +77,11 @@ class FORWARDING_HANDLER : public REQUEST_HANDLER private: + _Acquires_exclusive_lock_(this->m_RequestLock) VOID AcquireLockExclusive(); + _Releases_exclusive_lock_(this->m_RequestLock) VOID ReleaseLockExclusive(); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp index 897a97d17c05..b2f7fbd1dfff 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/outprocessapplication.cpp @@ -12,17 +12,17 @@ OUT_OF_PROCESS_APPLICATION::OUT_OF_PROCESS_APPLICATION( m_fWebSocketSupported(WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN), m_pConfig(std::move(pConfig)) { - m_pProcessManager = NULL; + m_pProcessManager = nullptr; } OUT_OF_PROCESS_APPLICATION::~OUT_OF_PROCESS_APPLICATION() { SRWExclusiveLock lock(m_stopLock); - if (m_pProcessManager != NULL) + if (m_pProcessManager != nullptr) { m_pProcessManager->Shutdown(); m_pProcessManager->DereferenceProcessManager(); - m_pProcessManager = NULL; + m_pProcessManager = nullptr; } } @@ -30,7 +30,7 @@ HRESULT OUT_OF_PROCESS_APPLICATION::Initialize( ) { - if (m_pProcessManager == NULL) + if (m_pProcessManager == nullptr) { m_pProcessManager = new PROCESS_MANAGER(); RETURN_IF_FAILED(m_pProcessManager->Initialize()); @@ -52,7 +52,7 @@ OUT_OF_PROCESS_APPLICATION::StopInternal(bool fServerInitiated) { AppOfflineTrackingApplication::StopInternal(fServerInitiated); - if (m_pProcessManager != NULL) + if (m_pProcessManager != nullptr) { m_pProcessManager->Shutdown(); } @@ -63,7 +63,7 @@ OUT_OF_PROCESS_APPLICATION::CreateHandler( _In_ IHttpContext *pHttpContext, _Out_ IREQUEST_HANDLER **pRequestHandler) { - IREQUEST_HANDLER* pHandler = NULL; + IREQUEST_HANDLER* pHandler = nullptr; //add websocket check here if (m_fWebSocketSupported == WEBSOCKET_STATUS::WEBSOCKET_UNKNOWN) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp index fdcc7210ad7d..07bdebf13833 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.cpp @@ -32,12 +32,12 @@ PROCESS_MANAGER::Initialize( m_dwRapidFailTickStart = GetTickCount(); - if( m_hNULHandle == NULL ) + if( m_hNULHandle == nullptr ) { SECURITY_ATTRIBUTES saAttr; saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; + saAttr.lpSecurityDescriptor = nullptr; m_hNULHandle = CreateFileW( L"NUL", FILE_WRITE_DATA, @@ -45,7 +45,7 @@ PROCESS_MANAGER::Initialize( &saAttr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL ); + nullptr ); RETURN_LAST_ERROR_IF( m_hNULHandle == INVALID_HANDLE_VALUE ); } @@ -82,7 +82,7 @@ PROCESS_MANAGER::GetProcess( for (DWORD i = 0; i < m_dwProcessesPerApplication; ++i) { - m_ppServerProcessList[i] = NULL; + m_ppServerProcessList[i] = nullptr; } } m_fServerProcessListReady = TRUE; @@ -97,7 +97,7 @@ PROCESS_MANAGER::GetProcess( dwProcessIndex = InterlockedIncrement(&m_dwRouteToProcessIndex); dwProcessIndex = dwProcessIndex % m_dwProcessesPerApplication; - if (m_ppServerProcessList[dwProcessIndex] != NULL && + if (m_ppServerProcessList[dwProcessIndex] != nullptr && m_ppServerProcessList[dwProcessIndex]->IsReady()) { *ppServerProcess = m_ppServerProcessList[dwProcessIndex]; @@ -106,12 +106,12 @@ PROCESS_MANAGER::GetProcess( } // should make the lock per process so that we can start processes simultaneously ? - if (m_ppServerProcessList[dwProcessIndex] == NULL || + if (m_ppServerProcessList[dwProcessIndex] == nullptr || !m_ppServerProcessList[dwProcessIndex]->IsReady()) { auto lock = SRWExclusiveLock(m_srwLock); - if (m_ppServerProcessList[dwProcessIndex] != NULL) + if (m_ppServerProcessList[dwProcessIndex] != nullptr) { if (!m_ppServerProcessList[dwProcessIndex]->IsReady()) { @@ -143,7 +143,7 @@ PROCESS_MANAGER::GetProcess( RETURN_HR(HRESULT_FROM_WIN32(ERROR_SERVER_DISABLED)); } - if (m_ppServerProcessList[dwProcessIndex] == NULL) + if (m_ppServerProcessList[dwProcessIndex] == nullptr) { pSelectedServerProcess = std::make_unique(); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h index 764e77d59563..119c5eb1366f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/processmanager.h @@ -53,12 +53,12 @@ class PROCESS_MANAGER for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i ) { - if( m_ppServerProcessList != NULL && - m_ppServerProcessList[i] != NULL ) + if( m_ppServerProcessList != nullptr && + m_ppServerProcessList[i] != nullptr ) { m_ppServerProcessList[i]->SendSignal(); m_ppServerProcessList[i]->DereferenceServerProcess(); - m_ppServerProcessList[i] = NULL; + m_ppServerProcessList[i] = nullptr; } } @@ -107,8 +107,8 @@ class PROCESS_MANAGER } PROCESS_MANAGER() : - m_ppServerProcessList( NULL ), - m_hNULHandle( NULL ), + m_ppServerProcessList(nullptr), + m_hNULHandle(nullptr), m_cRapidFailCount( 0 ), m_dwProcessesPerApplication( 1 ), m_dwRouteToProcessIndex( 0 ), @@ -116,7 +116,7 @@ class PROCESS_MANAGER m_lStopping(0), m_cRefs( 1 ) { - m_ppServerProcessList = NULL; + m_ppServerProcessList = nullptr; m_fServerProcessListReady = FALSE; InitializeSRWLock( &m_srwLock ); } @@ -151,14 +151,14 @@ class PROCESS_MANAGER { for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i ) { - if( m_ppServerProcessList != NULL && - m_ppServerProcessList[i] != NULL && + if( m_ppServerProcessList != nullptr && + m_ppServerProcessList[i] != nullptr && m_ppServerProcessList[i]->GetPort() == pServerProcess->GetPort() ) { // shutdown pServerProcess if not already shutdown. m_ppServerProcessList[i]->StopProcess(); m_ppServerProcessList[i]->DereferenceServerProcess(); - m_ppServerProcessList[i] = NULL; + m_ppServerProcessList[i] = nullptr; } } } @@ -170,13 +170,13 @@ class PROCESS_MANAGER { for(DWORD i = 0; i < m_dwProcessesPerApplication; ++i ) { - if( m_ppServerProcessList != NULL && - m_ppServerProcessList[i] != NULL ) + if( m_ppServerProcessList != nullptr && + m_ppServerProcessList[i] != nullptr) { // shutdown pServerProcess if not already shutdown. m_ppServerProcessList[i]->SendSignal(); m_ppServerProcessList[i]->DereferenceServerProcess(); - m_ppServerProcessList[i] = NULL; + m_ppServerProcessList[i] = nullptr; } } } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h index 54f9c8295426..05b595f6bdcb 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/responseheaderhash.h @@ -73,10 +73,10 @@ class RESPONSE_HEADER_HASH: public HASH_TABLE PCSTR pszName ) { - HEADER_RECORD * pRecord = NULL; + HEADER_RECORD* pRecord = nullptr; FindKey(pszName, &pRecord); - if (pRecord != NULL) + if (pRecord != nullptr) { return pRecord->_ulHeaderIndex; } @@ -96,7 +96,7 @@ class RESPONSE_HEADER_HASH: public HASH_TABLE return sm_rgHeaders[ulIndex]._pszName; } - return NULL; + return nullptr; } private: diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index 52146c27d5cb..e1aaae6493a0 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -135,13 +135,13 @@ SERVER_PROCESS::SetupListenPort( ) { HRESULT hr = S_OK; - ENVIRONMENT_VAR_ENTRY *pEntry = NULL; + ENVIRONMENT_VAR_ENTRY *pEntry = nullptr; *pfCriticalError = FALSE; pEnvironmentVarTable->FindKey(ASPNETCORE_PORT_ENV_STR, &pEntry); - if (pEntry != NULL) + if (pEntry != nullptr) { - if (pEntry->QueryValue() != NULL && pEntry->QueryValue()[0] != L'\0') + if (pEntry->QueryValue() != nullptr && pEntry->QueryValue()[0] != L'\0') { m_dwPort = (DWORD)_wtoi(pEntry->QueryValue()); if (m_dwPort >MAX_PORT || m_dwPort < MIN_PORT) @@ -161,7 +161,7 @@ SERVER_PROCESS::SetupListenPort( // pEnvironmentVarTable->DeleteKey(ASPNETCORE_PORT_ENV_STR); pEntry->Dereference(); - pEntry = NULL; + pEntry = nullptr; } } @@ -178,7 +178,7 @@ SERVER_PROCESS::SetupListenPort( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) + if (pEntry == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -192,10 +192,10 @@ SERVER_PROCESS::SetupListenPort( } Finished: - if (pEntry != NULL) + if (pEntry != nullptr) { pEntry->Dereference(); - pEntry = NULL; + pEntry = nullptr; } if (FAILED_LOG(hr)) @@ -252,20 +252,20 @@ SERVER_PROCESS::SetupAppToken( { HRESULT hr = S_OK; UUID logUuid; - PSTR pszLogUuid = NULL; + PSTR pszLogUuid = nullptr; BOOL fRpcStringAllocd = FALSE; RPC_STATUS rpcStatus; STRU strAppToken; - ENVIRONMENT_VAR_ENTRY* pEntry = NULL; + ENVIRONMENT_VAR_ENTRY* pEntry = nullptr; pEnvironmentVarTable->FindKey(ASPNETCORE_APP_TOKEN_ENV_STR, &pEntry); - if (pEntry != NULL) + if (pEntry != nullptr) { // user sets the environment variable m_straGuid.Reset(); hr = m_straGuid.CopyW(pEntry->QueryValue()); pEntry->Dereference(); - pEntry = NULL; + pEntry = nullptr; goto Finished; } else @@ -296,7 +296,7 @@ SERVER_PROCESS::SetupAppToken( } pEntry = new ENVIRONMENT_VAR_ENTRY(); - if (pEntry == NULL) + if (pEntry == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -315,12 +315,12 @@ SERVER_PROCESS::SetupAppToken( if (fRpcStringAllocd) { RpcStringFreeA((BYTE **)&pszLogUuid); - pszLogUuid = NULL; + pszLogUuid = nullptr; } - if (pEntry != NULL) + if (pEntry != nullptr) { pEntry->Dereference(); - pEntry = NULL; + pEntry = nullptr; } return hr; } @@ -333,12 +333,12 @@ SERVER_PROCESS::OutputEnvironmentVariables ) { HRESULT hr = S_OK; - LPWSTR pszEnvironmentVariables = NULL; - LPWSTR pszCurrentVariable = NULL; - LPWSTR pszNextVariable = NULL; - LPWSTR pszEqualChar = NULL; + LPWSTR pszEnvironmentVariables = nullptr; + LPWSTR pszCurrentVariable = nullptr; + LPWSTR pszNextVariable = nullptr; + LPWSTR pszEqualChar = nullptr; STRU strEnvVar; - ENVIRONMENT_VAR_ENTRY* pEntry = NULL; + ENVIRONMENT_VAR_ENTRY* pEntry = nullptr; DBG_ASSERT(pmszOutput); DBG_ASSERT(pEnvironmentVarTable); // We added some startup variables @@ -348,7 +348,7 @@ SERVER_PROCESS::OutputEnvironmentVariables pmszOutput->Reset(); pszEnvironmentVariables = GetEnvironmentStringsW(); - if (pszEnvironmentVariables == NULL) + if (pszEnvironmentVariables == nullptr) { hr = HRESULT_FROM_WIN32(ERROR_INVALID_ENVIRONMENT); goto Finished; @@ -358,14 +358,14 @@ SERVER_PROCESS::OutputEnvironmentVariables { pszNextVariable = pszCurrentVariable + wcslen(pszCurrentVariable) + 1; pszEqualChar = wcschr(pszCurrentVariable, L'='); - if (pszEqualChar != NULL) + if (pszEqualChar != nullptr) { if (FAILED_LOG(hr = strEnvVar.Copy(pszCurrentVariable, (DWORD)(pszEqualChar - pszCurrentVariable) + 1))) { goto Finished; } pEnvironmentVarTable->FindKey(strEnvVar.QueryStr(), &pEntry); - if (pEntry != NULL) + if (pEntry != nullptr) { // same env variable is defined in configuration, use it if (FAILED_LOG(hr = strEnvVar.Append(pEntry->QueryValue()))) @@ -377,7 +377,7 @@ SERVER_PROCESS::OutputEnvironmentVariables pEntry->Dereference(); pEnvironmentVarTable->DeleteKey(pEntry->QueryName()); strEnvVar.Reset(); - pEntry = NULL; + pEntry = nullptr; } else { @@ -386,7 +386,7 @@ SERVER_PROCESS::OutputEnvironmentVariables } else { - // env varaible is not well formated + // env variable is not well formatted hr = HRESULT_FROM_WIN32(ERROR_INVALID_ENVIRONMENT); goto Finished; } @@ -397,10 +397,10 @@ SERVER_PROCESS::OutputEnvironmentVariables pEnvironmentVarTable->Apply(ENVIRONMENT_VAR_HELPERS::CopyToMultiSz, pmszOutput); Finished: - if (pszEnvironmentVariables != NULL) + if (pszEnvironmentVariables != nullptr) { FreeEnvironmentStringsW(pszEnvironmentVariables); - pszEnvironmentVariables = NULL; + pszEnvironmentVariables = nullptr; } return hr; } @@ -411,11 +411,11 @@ SERVER_PROCESS::SetupCommandLine( ) { HRESULT hr = S_OK; - LPWSTR pszPath = NULL; - LPWSTR pszFullPath = NULL; + LPWSTR pszPath = nullptr; + LPWSTR pszFullPath = nullptr; STRU strRelativePath; DWORD dwBufferSize = 0; - FILE *file = NULL; + FILE *file = nullptr; DBG_ASSERT(pstrCommandLine); @@ -428,7 +428,7 @@ SERVER_PROCESS::SetupCommandLine( pszPath = m_ProcessPath.QueryStr(); - if ((wcsstr(pszPath, L":") == NULL) && (wcsstr(pszPath, L"%") == NULL)) + if ((wcsstr(pszPath, L":") == nullptr) && (wcsstr(pszPath, L"%") == nullptr)) { // let's check whether it is a relative path if (FAILED_LOG(hr = strRelativePath.Copy(m_struPhysicalPath.QueryStr())) || @@ -440,7 +440,7 @@ SERVER_PROCESS::SetupCommandLine( dwBufferSize = strRelativePath.QueryCCH() + 1; pszFullPath = new WCHAR[dwBufferSize]; - if (pszFullPath == NULL) + if (pszFullPath == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -448,13 +448,13 @@ SERVER_PROCESS::SetupCommandLine( if (_wfullpath(pszFullPath, strRelativePath.QueryStr(), - dwBufferSize) == NULL) + dwBufferSize) == nullptr) { hr = HRESULT_FROM_WIN32(ERROR_INVALID_PARAMETER); goto Finished; } - if ((file = _wfsopen(pszFullPath, L"r", _SH_DENYNO)) != NULL) + if ((file = _wfsopen(pszFullPath, L"r", _SH_DENYNO)) != nullptr) { fclose(file); pszPath = pszFullPath; @@ -469,7 +469,7 @@ SERVER_PROCESS::SetupCommandLine( } Finished: - if (pszFullPath != NULL) + if (pszFullPath != nullptr) { delete pszFullPath; } @@ -578,7 +578,7 @@ SERVER_PROCESS::PostStartCheck( m_dwListeningProcessId = m_dwChildProcessIds[i]; fProcessMatch = TRUE; - if (m_hChildProcessHandles[i] != NULL) + if (m_hChildProcessHandles[i] != nullptr) { if (fDebuggerAttached == FALSE && CheckRemoteDebuggerPresent(m_hChildProcessHandles[i], &fDebuggerAttached) == 0) @@ -664,10 +664,10 @@ SERVER_PROCESS::PostStartCheck( // ready to mark the server process ready but before this, // create and initialize the FORWARDER_CONNECTION // - if (m_pForwarderConnection == NULL) + if (m_pForwarderConnection == nullptr) { m_pForwarderConnection = new FORWARDER_CONNECTION(); - if (m_pForwarderConnection == NULL) + if (m_pForwarderConnection == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -694,10 +694,10 @@ SERVER_PROCESS::PostStartCheck( if (FAILED_LOG(hr)) { - if (m_pForwarderConnection != NULL) + if (m_pForwarderConnection != nullptr) { m_pForwarderConnection->DereferenceForwarderConnection(); - m_pForwarderConnection = NULL; + m_pForwarderConnection = nullptr; } if (!strEventMsg.IsEmpty()) @@ -716,13 +716,13 @@ SERVER_PROCESS::StartProcess( ) { HRESULT hr = S_OK; - PROCESS_INFORMATION processInformation = {0}; - STARTUPINFOW startupInfo = {0}; + PROCESS_INFORMATION processInformation = {}; + STARTUPINFOW startupInfo = {}; DWORD dwRetryCount = 2; // should we allow customer to config it DWORD dwCreationFlags = 0; MULTISZ mszNewEnvironment; - ENVIRONMENT_VAR_HASH *pHashTable = NULL; - PWSTR pStrStage = NULL; + ENVIRONMENT_VAR_HASH *pHashTable = nullptr; + PWSTR pStrStage = nullptr; BOOL fCriticalError = FALSE; std::map variables; @@ -815,10 +815,10 @@ SERVER_PROCESS::StartProcess( CREATE_NEW_PROCESS_GROUP; if (!CreateProcessW( - NULL, // applicationName + nullptr, // applicationName m_struCommandLine.QueryStr(), - NULL, // processAttr - NULL, // threadAttr + nullptr, // processAttr + nullptr, // threadAttr TRUE, // inheritHandles dwCreationFlags, mszNewEnvironment.QueryStr(), @@ -840,7 +840,7 @@ SERVER_PROCESS::StartProcess( goto Failure; } - if (m_hJobObject != NULL) + if (m_hJobObject != nullptr) { if (!AssignProcessToJobObject(m_hJobObject, m_hProcessHandle)) { @@ -900,17 +900,17 @@ SERVER_PROCESS::StartProcess( m_dwPort, dwRetryCount); - if (processInformation.hThread != NULL) + if (processInformation.hThread != nullptr) { CloseHandle(processInformation.hThread); - processInformation.hThread = NULL; + processInformation.hThread = nullptr; } - if (pHashTable != NULL) + if (pHashTable != nullptr) { pHashTable->Clear(); delete pHashTable; - pHashTable = NULL; + pHashTable = nullptr; } CleanUp(); @@ -919,24 +919,24 @@ SERVER_PROCESS::StartProcess( Finished: if (FAILED_LOG(hr) || m_fReady == FALSE) { - if (m_hStdErrWritePipe != NULL) + if (m_hStdErrWritePipe != nullptr) { if (m_hStdErrWritePipe != INVALID_HANDLE_VALUE) { CloseHandle(m_hStdErrWritePipe); } - m_hStdErrWritePipe = NULL; + m_hStdErrWritePipe = nullptr; } - if (m_hStdoutHandle != NULL) + if (m_hStdoutHandle != nullptr) { if (m_hStdoutHandle != INVALID_HANDLE_VALUE) { CloseHandle(m_hStdoutHandle); } - m_hStdoutHandle = NULL; + m_hStdoutHandle = nullptr; } if (m_fStdoutLogEnabled) @@ -964,7 +964,7 @@ SERVER_PROCESS::SetWindowsAuthToken( { HRESULT hr = S_OK; - if (m_hListeningProcessHandle != NULL && m_hListeningProcessHandle != INVALID_HANDLE_VALUE) + if (m_hListeningProcessHandle != nullptr && m_hListeningProcessHandle != INVALID_HANDLE_VALUE) { if (!DuplicateHandle( GetCurrentProcess(), hToken, @@ -999,7 +999,7 @@ SERVER_PROCESS::SetupStdHandles( saAttr.nLength = sizeof(SECURITY_ATTRIBUTES); saAttr.bInheritHandle = TRUE; - saAttr.lpSecurityDescriptor = NULL; + saAttr.lpSecurityDescriptor = nullptr; if (!m_fEnableOutOfProcessConsoleRedirection) { @@ -1066,7 +1066,7 @@ SERVER_PROCESS::SetupStdHandles( &saAttr, CREATE_ALWAYS, FILE_ATTRIBUTE_NORMAL, - NULL); + nullptr); if (m_hStdoutHandle == INVALID_HANDLE_VALUE) { @@ -1110,8 +1110,8 @@ SERVER_PROCESS::ReadStdErrHandle( LPVOID pContext ) { - auto pLoggingProvider = static_cast(pContext); - DBG_ASSERT(pLoggingProvider != NULL); + SERVER_PROCESS* pLoggingProvider = static_cast(pContext); + DBG_ASSERT(pLoggingProvider != nullptr); pLoggingProvider->ReadStdErrHandleInternal(); } @@ -1164,8 +1164,8 @@ SERVER_PROCESS::CheckIfServerIsUp( { HRESULT hr = S_OK; DWORD dwResult = ERROR_INSUFFICIENT_BUFFER; - MIB_TCPTABLE_OWNER_PID *pTCPInfo = NULL; - MIB_TCPROW_OWNER_PID *pOwner = NULL; + MIB_TCPTABLE_OWNER_PID *pTCPInfo = nullptr; + MIB_TCPROW_OWNER_PID *pOwner = nullptr; DWORD dwSize = 1000; // Initial size for pTCPInfo buffer int iResult = 0; SOCKET socketCheck = INVALID_SOCKET; @@ -1185,13 +1185,13 @@ SERVER_PROCESS::CheckIfServerIsUp( // New entries may be added by other processes before calling GetExtendedTcpTable dwSize += 200; - if (pTCPInfo != NULL) + if (pTCPInfo != nullptr) { HeapFree(GetProcessHeap(), 0, pTCPInfo); } pTCPInfo = (MIB_TCPTABLE_OWNER_PID*)HeapAlloc(GetProcessHeap(), 0, dwSize); - if (pTCPInfo == NULL) + if (pTCPInfo == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -1235,10 +1235,10 @@ SERVER_PROCESS::CheckIfServerIsUp( socketCheck = INVALID_SOCKET; } - if (pTCPInfo != NULL) + if (pTCPInfo != nullptr) { HeapFree(GetProcessHeap(), 0, pTCPInfo); - pTCPInfo = NULL; + pTCPInfo = nullptr; } return hr; @@ -1252,13 +1252,13 @@ SERVER_PROCESS::SendSignal( ) { HRESULT hr = S_OK; - HANDLE hThread = NULL; + HANDLE hThread = nullptr; ReferenceServerProcess(); m_hShutdownHandle = OpenProcess(SYNCHRONIZE | PROCESS_TERMINATE, FALSE, m_dwProcessId); - if (m_hShutdownHandle == NULL) + if (m_hShutdownHandle == nullptr) { // since we cannot open the process. let's terminate the process hr = HRESULT_FROM_WIN32(GetLastError()); @@ -1266,14 +1266,14 @@ SERVER_PROCESS::SendSignal( } hThread = CreateThread( - NULL, // default security attributes + nullptr, // default security attributes 0, // default stack size (LPTHREAD_START_ROUTINE)SendShutDownSignal, this, // thread function arguments 0, // default creation flags - NULL); // receive thread identifier + nullptr); // receive thread identifier - if (hThread == NULL) + if (hThread == nullptr) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; @@ -1291,10 +1291,10 @@ SERVER_PROCESS::SendSignal( } // thread should already exit CloseHandle(hThread); - hThread = NULL; + hThread = nullptr; Finished: - if (hThread != NULL) + if (hThread != nullptr) { // if the send shutdown message thread is still running, terminate it DWORD dwThreadStatus = 0; @@ -1303,7 +1303,7 @@ SERVER_PROCESS::SendSignal( TerminateThread(hThread, STATUS_CONTROL_C_EXIT); } CloseHandle(hThread); - hThread = NULL; + hThread = nullptr; } if (FAILED_LOG(hr)) @@ -1311,10 +1311,10 @@ SERVER_PROCESS::SendSignal( TerminateBackendProcess(); } - if (m_hShutdownHandle != NULL && m_hShutdownHandle != INVALID_HANDLE_VALUE) + if (m_hShutdownHandle != nullptr && m_hShutdownHandle != INVALID_HANDLE_VALUE) { CloseHandle(m_hShutdownHandle); - m_hShutdownHandle = NULL; + m_hShutdownHandle = nullptr; } DereferenceServerProcess(); @@ -1334,28 +1334,28 @@ SERVER_PROCESS::StopProcess( m_pProcessManager->IncrementRapidFailCount(); - for (INT i=0; iNumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)); @@ -1428,7 +1428,7 @@ SERVER_PROCESS::IsDebuggerIsAttached( goto Finished; } - if (processList == NULL || + if (processList == nullptr || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)) { @@ -1454,10 +1454,10 @@ SERVER_PROCESS::IsDebuggerIsAttached( dwPid); BOOL returnValue = CheckRemoteDebuggerPresent(hProcess, &fDebuggerPresent); - if (hProcess != NULL) + if (hProcess != nullptr) { CloseHandle(hProcess); - hProcess = NULL; + hProcess = nullptr; } if (!returnValue) @@ -1474,7 +1474,7 @@ SERVER_PROCESS::IsDebuggerIsAttached( Finished: - if (processList != NULL) + if (processList != nullptr) { HeapFree(GetProcessHeap(), 0, processList); } @@ -1488,7 +1488,7 @@ SERVER_PROCESS::GetChildProcessHandles( ) { HRESULT hr = S_OK; - PJOBOBJECT_BASIC_PROCESS_ID_LIST processList = NULL; + PJOBOBJECT_BASIC_PROCESS_ID_LIST processList = nullptr; DWORD dwPid = 0; DWORD dwWorkerProcessPid = 0; DWORD cbNumBytes = 1024; @@ -1501,10 +1501,10 @@ SERVER_PROCESS::GetChildProcessHandles( { dwError = NO_ERROR; - if (processList != NULL) + if (processList != nullptr) { HeapFree(GetProcessHeap(), 0, processList); - processList = NULL; + processList = nullptr; // resize cbNumBytes = cbNumBytes * 2; @@ -1515,7 +1515,7 @@ SERVER_PROCESS::GetChildProcessHandles( 0, cbNumBytes ); - if (processList == NULL) + if (processList == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -1528,7 +1528,7 @@ SERVER_PROCESS::GetChildProcessHandles( JobObjectBasicProcessIdList, processList, cbNumBytes, - NULL)) + nullptr)) { dwError = GetLastError(); if (dwError != ERROR_MORE_DATA) @@ -1539,7 +1539,7 @@ SERVER_PROCESS::GetChildProcessHandles( } } while (dwRetries++ < 5 && - processList != NULL && + processList != nullptr && (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)); if (dwError == ERROR_MORE_DATA) @@ -1549,7 +1549,7 @@ SERVER_PROCESS::GetChildProcessHandles( goto Finished; } - if (processList == NULL || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)) + if (processList == nullptr || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)) { hr = HRESULT_FROM_WIN32(ERROR_PROCESS_ABORTED); // some error @@ -1580,7 +1580,7 @@ SERVER_PROCESS::GetChildProcessHandles( Finished: - if (processList != NULL) + if (processList != nullptr) { HeapFree(GetProcessHeap(), 0, processList); } @@ -1594,8 +1594,8 @@ SERVER_PROCESS::StopAllProcessesInJobObject( ) { HRESULT hr = S_OK; - PJOBOBJECT_BASIC_PROCESS_ID_LIST processList = NULL; - HANDLE hProcess = NULL; + PJOBOBJECT_BASIC_PROCESS_ID_LIST processList = nullptr; + HANDLE hProcess = nullptr; DWORD dwWorkerProcessPid = 0; DWORD cbNumBytes = 1024; DWORD dwRetries = 0; @@ -1604,10 +1604,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject( do { - if (processList != NULL) + if (processList != nullptr) { HeapFree(GetProcessHeap(), 0, processList); - processList = NULL; + processList = nullptr; // resize cbNumBytes = cbNumBytes * 2; @@ -1618,7 +1618,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject( 0, cbNumBytes ); - if (processList == NULL) + if (processList == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -1631,7 +1631,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject( JobObjectBasicProcessIdList, processList, cbNumBytes, - NULL)) + nullptr)) { DWORD dwError = GetLastError(); if (dwError != ERROR_MORE_DATA) @@ -1642,10 +1642,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject( } } while (dwRetries++ < 5 && - processList != NULL && + processList != nullptr && (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)); - if (processList == NULL || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)) + if (processList == nullptr || (processList->NumberOfAssignedProcesses > processList->NumberOfProcessIdsInList || processList->NumberOfProcessIdsInList == 0)) { hr = HRESULT_FROM_WIN32(ERROR_NOT_ENOUGH_MEMORY); // some error @@ -1659,7 +1659,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject( hProcess = OpenProcess(PROCESS_TERMINATE, FALSE, (DWORD)processList->ProcessIdList[i]); - if (hProcess != NULL) + if (hProcess != nullptr) { if (!TerminateProcess(hProcess, 1)) { @@ -1670,10 +1670,10 @@ SERVER_PROCESS::StopAllProcessesInJobObject( WaitForSingleObject(hProcess, INFINITE); } - if (hProcess != NULL) + if (hProcess != nullptr) { CloseHandle(hProcess); - hProcess = NULL; + hProcess = nullptr; } } } @@ -1681,7 +1681,7 @@ SERVER_PROCESS::StopAllProcessesInJobObject( Finished: - if (processList != NULL) + if (processList != nullptr) { HeapFree(GetProcessHeap(), 0, processList); } @@ -1691,20 +1691,20 @@ SERVER_PROCESS::StopAllProcessesInJobObject( SERVER_PROCESS::SERVER_PROCESS() : m_cRefs(1), - m_hProcessHandle(NULL), - m_hProcessWaitHandle(NULL), + m_hProcessHandle(nullptr), + m_hProcessWaitHandle(nullptr), m_dwProcessId(0), m_cChildProcess(0), m_fReady(FALSE), m_lStopping(0L), - m_hStdoutHandle(NULL), + m_hStdoutHandle(nullptr), m_fStdoutLogEnabled(FALSE), - m_hJobObject(NULL), - m_pForwarderConnection(NULL), + m_hJobObject(nullptr), + m_pForwarderConnection(nullptr), m_dwListeningProcessId(0), - m_hListeningProcessHandle(NULL), - m_hShutdownHandle(NULL), - m_hStdErrWritePipe(NULL), + m_hListeningProcessHandle(nullptr), + m_hShutdownHandle(nullptr), + m_hStdErrWritePipe(nullptr), m_hReadThread(nullptr), m_randomGenerator(std::random_device()()) { @@ -1713,75 +1713,75 @@ SERVER_PROCESS::SERVER_PROCESS() : for (INT i=0; iDereferenceForwarderConnection(); - m_pForwarderConnection = NULL; + m_pForwarderConnection = nullptr; } } @@ -1792,17 +1792,17 @@ SERVER_PROCESS::~SERVER_PROCESS() CleanUp(); - // no need to free m_pEnvironmentVarTable, as it references to - // the same hash table hold by configuration. - // the hashtable memory will be freed once onfiguration got recycled + // no need to free m_pEnvironmentVarTable, as it references + // the same hash table held by configuration. + // the hashtable memory will be freed once configuration gets recycled - if (m_pProcessManager != NULL) + if (m_pProcessManager != nullptr) { m_pProcessManager->DereferenceProcessManager(); - m_pProcessManager = NULL; + m_pProcessManager = nullptr; } - if (m_hStdErrWritePipe != NULL) + if (m_hStdErrWritePipe != nullptr) { if (m_hStdErrWritePipe != INVALID_HANDLE_VALUE) { @@ -1810,7 +1810,7 @@ SERVER_PROCESS::~SERVER_PROCESS() CloseHandle(m_hStdErrWritePipe); } - m_hStdErrWritePipe = NULL; + m_hStdErrWritePipe = nullptr; } // Forces ReadFile to cancel, causing the read loop to complete. @@ -1845,13 +1845,13 @@ SERVER_PROCESS::~SERVER_PROCESS() m_hReadThread = nullptr; } - if (m_hStdoutHandle != NULL) + if (m_hStdoutHandle != nullptr) { if (m_hStdoutHandle != INVALID_HANDLE_VALUE) { CloseHandle(m_hStdoutHandle); } - m_hStdoutHandle = NULL; + m_hStdoutHandle = nullptr; } if (m_fStdoutLogEnabled) @@ -1896,9 +1896,9 @@ SERVER_PROCESS::RegisterProcessWait( HRESULT hr = S_OK; NTSTATUS status = 0; - _ASSERT(phWaitHandle != NULL && *phWaitHandle == NULL); + _ASSERT(phWaitHandle != nullptr && *phWaitHandle == nullptr); - *phWaitHandle = NULL; + *phWaitHandle = nullptr; // wait thread will dereference. ReferenceServerProcess(); @@ -1922,7 +1922,7 @@ SERVER_PROCESS::RegisterProcessWait( if (FAILED_LOG(hr)) { - *phWaitHandle = NULL; + *phWaitHandle = nullptr; DereferenceServerProcess(); } @@ -1960,9 +1960,9 @@ HRESULT SERVER_PROCESS::SendShutdownHttpMessage( VOID ) { HRESULT hr = S_OK; - HINTERNET hSession = NULL; - HINTERNET hConnect = NULL; - HINTERNET hRequest = NULL; + HINTERNET hSession = nullptr; + HINTERNET hConnect = nullptr; + HINTERNET hRequest = nullptr; STACK_STRU(strHeaders, 256); STRU strAppToken; @@ -1970,13 +1970,16 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) DWORD dwStatusCode = 0; DWORD dwSize = sizeof(dwStatusCode); +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header hSession = WinHttpOpen(L"", WINHTTP_ACCESS_TYPE_DEFAULT_PROXY, WINHTTP_NO_PROXY_NAME, WINHTTP_NO_PROXY_BYPASS, 0); +#pragma warning(pop) - if (hSession == NULL) + if (hSession == nullptr) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; @@ -1987,7 +1990,7 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) (USHORT)m_dwPort, 0); - if (hConnect == NULL) + if (hConnect == nullptr) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; @@ -2001,15 +2004,18 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) } strUrl.Append(L"/iisintegration"); +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header hRequest = WinHttpOpenRequest(hConnect, L"POST", strUrl.QueryStr(), - NULL, + nullptr, WINHTTP_NO_REFERER, - NULL, + nullptr, 0); +#pragma warning(pop) - if (hRequest == NULL) + if (hRequest == nullptr) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; @@ -2035,6 +2041,8 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) goto Finished; } +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header if (!WinHttpSendRequest(hRequest, strHeaders.QueryStr(), // pwszHeaders strHeaders.QueryCCH(), // dwHeadersLength @@ -2046,13 +2054,16 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } +#pragma warning(pop) - if (!WinHttpReceiveResponse(hRequest , NULL)) + if (!WinHttpReceiveResponse(hRequest , nullptr)) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } +#pragma warning(push) +#pragma warning(disable: 26477) // NULL usage via Windows header if (!WinHttpQueryHeaders(hRequest, WINHTTP_QUERY_STATUS_CODE | WINHTTP_QUERY_FLAG_NUMBER, WINHTTP_HEADER_NAME_BY_INDEX, @@ -2063,6 +2074,7 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; } +#pragma warning(pop) if (dwStatusCode != 202) { @@ -2081,17 +2093,17 @@ SERVER_PROCESS::SendShutdownHttpMessage( VOID ) if (hRequest) { WinHttpCloseHandle(hRequest); - hRequest = NULL; + hRequest = nullptr; } if (hConnect) { WinHttpCloseHandle(hConnect); - hConnect = NULL; + hConnect = nullptr; } if (hSession) { WinHttpCloseHandle(hSession); - hSession = NULL; + hSession = nullptr; } return hr; } @@ -2124,7 +2136,7 @@ SERVER_PROCESS::SendShutDownSignalInternal( // failed to send shutdown http message // try send ctrl signal // - HWND hCurrentConsole = NULL; + HWND hCurrentConsole = nullptr; BOOL fFreeConsole = FALSE; hCurrentConsole = GetConsoleWindow(); if (hCurrentConsole) @@ -2169,7 +2181,7 @@ SERVER_PROCESS::TerminateBackendProcess( if (InterlockedCompareExchange(&m_lStopping, 1L, 0L) == 0L) { // backend process will be terminated, remove the waitcallback - if (m_hProcessWaitHandle != NULL) + if (m_hProcessWaitHandle != nullptr) { UnregisterWait(m_hProcessWaitHandle); @@ -2177,14 +2189,14 @@ SERVER_PROCESS::TerminateBackendProcess( // need to dereference the object otherwise memory leak DereferenceServerProcess(); - m_hProcessWaitHandle = NULL; + m_hProcessWaitHandle = nullptr; } // cannot gracefully shutdown or timeout, terminate the process - if (m_hProcessHandle != NULL && m_hProcessHandle != INVALID_HANDLE_VALUE) + if (m_hProcessHandle != nullptr && m_hProcessHandle != INVALID_HANDLE_VALUE) { TerminateProcess(m_hProcessHandle, 0); - m_hProcessHandle = NULL; + m_hProcessHandle = nullptr; } // log a warning for ungraceful shutdown diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp index 64118b61b6fe..ce3959adc54f 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/url_utility.cpp @@ -66,7 +66,7 @@ Return Value: // Find the 3rd slash corresponding to the url // LPCWSTR pszSlash = wcschr(pszDestinationUrl, L'/'); - if (pszSlash == NULL) + if (pszSlash == nullptr) { RETURN_IF_FAILED(pstrUrl->Copy(L"/", 1)); RETURN_IF_FAILED(pstrDestination->Copy(pszDestinationUrl)); @@ -81,14 +81,6 @@ Return Value: return S_OK; } -// Change a hexadecimal digit to its numerical equivalent -#define TOHEX( ch ) \ - ((ch) > L'9' ? \ - (ch) >= L'a' ? \ - (ch) - L'a' + 10 : \ - (ch) - L'A' + 10 \ - : (ch) - L'0') - HRESULT URL_UTILITY::EscapeAbsPath( IHttpRequest * pRequest, @@ -96,8 +88,8 @@ URL_UTILITY::EscapeAbsPath( ) { STRU strAbsPath; - LPCWSTR pszAbsPath = NULL; - LPCWSTR pszFindStr = NULL; + LPCWSTR pszAbsPath = nullptr; + LPCWSTR pszFindStr = nullptr; RETURN_IF_FAILED(strAbsPath.Copy( pRequest->GetRawHttpRequest()->CookedUrl.pAbsPath, pRequest->GetRawHttpRequest()->CookedUrl.AbsPathLength / sizeof(WCHAR) )); @@ -105,7 +97,7 @@ URL_UTILITY::EscapeAbsPath( pszAbsPath = strAbsPath.QueryStr(); pszFindStr = wcschr(pszAbsPath, L'?'); - while(pszFindStr != NULL) + while(pszFindStr != nullptr) { RETURN_IF_FAILED(strEscapedUrl->Append( pszAbsPath, pszFindStr - pszAbsPath)); RETURN_IF_FAILED(strEscapedUrl->Append(L"%3F")); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp index ecd97737fe40..91dbdca04d21 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/websockethandler.cpp @@ -37,10 +37,10 @@ LIST_ENTRY WEBSOCKET_HANDLER::sm_RequestsListHead; TRACE_LOG * WEBSOCKET_HANDLER::sm_pTraceLog; WEBSOCKET_HANDLER::WEBSOCKET_HANDLER() : - _pHttpContext(NULL), - _pWebSocketContext(NULL), - _hWebSocketRequest(NULL), - _pHandler(NULL), + _pHttpContext(nullptr), + _pWebSocketContext(nullptr), + _hWebSocketRequest(nullptr), + _pHandler(nullptr), _dwOutstandingIo(0), _fCleanupInProgress(FALSE), _fIndicateCompletionToIis(FALSE), @@ -64,18 +64,18 @@ WEBSOCKET_HANDLER::Terminate( RemoveRequest(); _fCleanupInProgress = TRUE; - if (_pHttpContext != NULL) + if (_pHttpContext != nullptr) { _pHttpContext->CancelIo(); - _pHttpContext = NULL; + _pHttpContext = nullptr; } if (_hWebSocketRequest) { WinHttpCloseHandle(_hWebSocketRequest); - _hWebSocketRequest = NULL; + _hWebSocketRequest = nullptr; } - _pWebSocketContext = NULL; + _pWebSocketContext = nullptr; DeleteCriticalSection(&_RequestLock); delete this; @@ -129,7 +129,7 @@ WEBSOCKET_HANDLER::StaticTerminate( if (sm_pTraceLog) { DestroyRefTraceLog(sm_pTraceLog); - sm_pTraceLog = NULL; + sm_pTraceLog = nullptr; } } @@ -220,14 +220,14 @@ WEBSOCKET_HANDLER::IndicateCompletionToIIS( // Make sure no pending IO as there is no IIS websocket cancelation, // any unexpected callback will lead to AV. Revisit it once CanelOutGoingIO works // - if (_hWebSocketRequest != NULL && _dwOutstandingIo == 0) + if (_hWebSocketRequest != nullptr && _dwOutstandingIo == 0) { LOG_TRACE(L"WEBSOCKET_HANDLER::IndicateCompletionToIIS"); _pHandler->SetStatus(FORWARDER_DONE); _fHandleClosed = TRUE; WinHttpCloseHandle(_hWebSocketRequest); - _hWebSocketRequest = NULL; + _hWebSocketRequest = nullptr; } } @@ -279,7 +279,7 @@ Routine Description: _pWebSocketContext = (IWebSocketContext *) _pHttpContext-> GetNamedContextContainer()->GetNamedContext(IIS_WEBSOCKET); - if ( _pWebSocketContext == NULL ) + if ( _pWebSocketContext == nullptr ) { hr = HRESULT_FROM_WIN32( ERROR_FILE_NOT_FOUND ); goto Finished; @@ -292,7 +292,7 @@ Routine Description: hRequest, (DWORD_PTR) pHandler); - if (_hWebSocketRequest == NULL) + if (_hWebSocketRequest == nullptr) { hr = HRESULT_FROM_WIN32(GetLastError()); goto Finished; @@ -394,7 +394,7 @@ Routine Description: &fClose, OnReadIoCompletion, this, - NULL); + nullptr); if (FAILED_LOG(hr)) { DecrementOutstandingIo(); @@ -428,8 +428,8 @@ Routine Description: _hWebSocketRequest, &_WinHttpReceiveBuffer, RECEIVE_BUFFER_SIZE, - NULL, - NULL); + nullptr, + nullptr); if (dwError != NO_ERROR) { @@ -509,15 +509,15 @@ Routine Description: hr = _pWebSocketContext->SendConnectionClose( TRUE, uStatus, - uStatus == 1005 ? NULL : strCloseReason.QueryStr(), + uStatus == 1005 ? nullptr : strCloseReason.QueryStr(), OnWriteIoCompletion, this, - NULL); + nullptr); } else { // - // Get equivalant flags for IIS API from buffer type. + // Get equivalent flags for IIS API from buffer type. // WINHTTP_HELPER::GetFlagsFromBufferType(eBufferType, @@ -538,7 +538,7 @@ Routine Description: fFinalFragment, OnWriteIoCompletion, this, - NULL); + nullptr); } if (FAILED_LOG(hr)) @@ -607,7 +607,7 @@ Routine Description: dwError = WINHTTP_HELPER::sm_pfnWinHttpWebSocketShutdown( _hWebSocketRequest, uStatus, - strCloseReason.QueryCCH() == 0 ? NULL : (PVOID) strCloseReason.QueryStr(), + strCloseReason.QueryCCH() == 0 ? nullptr : (PVOID) strCloseReason.QueryStr(), strCloseReason.QueryCCH()); if (dwError == ERROR_IO_PENDING) @@ -638,7 +638,7 @@ Routine Description: dwError = WINHTTP_HELPER::sm_pfnWinHttpWebSocketSend( _hWebSocketRequest, eBufferType, - cbData == 0 ? NULL : &_IisReceiveBuffer, + cbData == 0 ? nullptr : &_IisReceiveBuffer, cbData ); } @@ -1099,23 +1099,24 @@ Routine Description: if (reason == ClientDisconnect || reason == ServerStateUnavailable) { // - // Calling shutdown to notify the backend about disonnect + // Calling shutdown to notify the backend about disconnect // WINHTTP_HELPER::sm_pfnWinHttpWebSocketShutdown( _hWebSocketRequest, - 1011, // indicate that a server is terminating the connection because it encountered - // an unexpected condition that prevent it from fulfilling the request - NULL, // Reason - 0); // length og Reason + 1011, // indicate that a server is terminating the connection because it encountered + // an unexpected condition that prevent it from fulfilling the request + nullptr, // Reason + 0); // length of Reason } if (reason == ServerDisconnect || reason == ServerStateUnavailable) { _pHttpContext->CancelIo(); + // - // CancelIo sometime may not be able to cannel pending websocket IO - // ResetConnection to force IISWebsocket module to release the pipeline + // CancelIo sometimes may not be able to cancel pending websocket IO. + // ResetConnection to force IISWebsocket module to release the pipeline. // _pHttpContext->GetResponse()->ResetConnection(); } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp index 8f6c5d37204e..1d0bbe742350 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp @@ -34,27 +34,27 @@ WINHTTP_HELPER::StaticInitialize( } HMODULE hWinHttp = GetModuleHandleA("winhttp.dll"); - RETURN_LAST_ERROR_IF (hWinHttp == NULL); + RETURN_LAST_ERROR_IF (hWinHttp == nullptr); sm_pfnWinHttpWebSocketCompleteUpgrade = (PFN_WINHTTP_WEBSOCKET_COMPLETE_UPGRADE) GetProcAddress(hWinHttp, "WinHttpWebSocketCompleteUpgrade"); - RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketCompleteUpgrade == NULL); + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketCompleteUpgrade == nullptr); sm_pfnWinHttpWebSocketQueryCloseStatus = (PFN_WINHTTP_WEBSOCKET_QUERY_CLOSE_STATUS) GetProcAddress(hWinHttp, "WinHttpWebSocketQueryCloseStatus"); - RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketQueryCloseStatus == NULL); + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketQueryCloseStatus == nullptr); sm_pfnWinHttpWebSocketReceive = (PFN_WINHTTP_WEBSOCKET_RECEIVE) GetProcAddress(hWinHttp, "WinHttpWebSocketReceive"); - RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketReceive == NULL); + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketReceive == nullptr); sm_pfnWinHttpWebSocketSend = (PFN_WINHTTP_WEBSOCKET_SEND) GetProcAddress(hWinHttp, "WinHttpWebSocketSend"); - RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketSend == NULL); + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketSend == nullptr); sm_pfnWinHttpWebSocketShutdown = (PFN_WINHTTP_WEBSOCKET_SHUTDOWN) GetProcAddress(hWinHttp, "WinHttpWebSocketShutdown"); - RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketShutdown == NULL); + RETURN_LAST_ERROR_IF (sm_pfnWinHttpWebSocketShutdown == nullptr); return S_OK; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp index 4f0229dc5c3c..b56414041d33 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/filewatcher.cpp @@ -99,7 +99,7 @@ FILE_WATCHER::Create( (LPTHREAD_START_ROUTINE)ChangeNotificationThread, this, 0, - NULL)); + nullptr)); if (pszDirectoryToMonitor == nullptr || pszFileNameToMonitor == nullptr || @@ -128,7 +128,7 @@ FILE_WATCHER::Create( nullptr, OPEN_EXISTING, FILE_FLAG_BACKUP_SEMANTICS | FILE_FLAG_OVERLAPPED, - NULL); + nullptr); RETURN_LAST_ERROR_IF(_hDirectory == INVALID_HANDLE_VALUE); @@ -475,7 +475,7 @@ FILE_WATCHER::StopMonitor() LOG_INFO(L"Stopping file watching."); // Signal the file watcher thread to exit - PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, NULL); + PostQueuedCompletionStatus(m_hCompletionPort, 0, FILE_WATCHER_SHUTDOWN_KEY, nullptr); WaitForWatcherThreadExit(); if (m_fShadowCopyEnabled) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp index c32bc51ced79..a77d479a2b67 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.cpp @@ -11,10 +11,10 @@ REQUESTHANDLER_CONFIG::~REQUESTHANDLER_CONFIG() { - if (m_ppStrArguments != NULL) + if (m_ppStrArguments != nullptr) { delete[] m_ppStrArguments; - m_ppStrArguments = NULL; + m_ppStrArguments = nullptr; } } @@ -27,19 +27,19 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( ) { HRESULT hr = S_OK; - REQUESTHANDLER_CONFIG *pRequestHandlerConfig = NULL; + REQUESTHANDLER_CONFIG *pRequestHandlerConfig = nullptr; STRU struHostFxrDllLocation; STRU struExeLocation; try { - if (ppAspNetCoreConfig == NULL) + if (ppAspNetCoreConfig == nullptr) { hr = E_INVALIDARG; goto Finished; } - *ppAspNetCoreConfig = NULL; + *ppAspNetCoreConfig = nullptr; pRequestHandlerConfig = new REQUESTHANDLER_CONFIG; @@ -58,7 +58,7 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( } *ppAspNetCoreConfig = pRequestHandlerConfig; - pRequestHandlerConfig = NULL; + pRequestHandlerConfig = nullptr; } catch (std::bad_alloc&) { @@ -67,10 +67,10 @@ REQUESTHANDLER_CONFIG::CreateRequestHandlerConfig( Finished: - if (pRequestHandlerConfig != NULL) + if (pRequestHandlerConfig != nullptr) { delete pRequestHandlerConfig; - pRequestHandlerConfig = NULL; + pRequestHandlerConfig = nullptr; } return hr; @@ -89,19 +89,19 @@ REQUESTHANDLER_CONFIG::Populate( STRU strEnvValue; STRU strExpandedEnvValue; STRU strApplicationFullPath; - IAppHostAdminManager *pAdminManager = NULL; - IAppHostElement *pAspNetCoreElement = NULL; - IAppHostElement *pWindowsAuthenticationElement = NULL; - IAppHostElement *pBasicAuthenticationElement = NULL; - IAppHostElement *pAnonymousAuthenticationElement = NULL; + IAppHostAdminManager *pAdminManager = nullptr; + IAppHostElement *pAspNetCoreElement = nullptr; + IAppHostElement *pWindowsAuthenticationElement = nullptr; + IAppHostElement *pBasicAuthenticationElement = nullptr; + IAppHostElement *pAnonymousAuthenticationElement = nullptr; ULONGLONG ullRawTimeSpan = 0; DWORD dwCounter = 0; DWORD dwPosition = 0; - WCHAR* pszPath = NULL; - BSTR bstrWindowAuthSection = NULL; - BSTR bstrBasicAuthSection = NULL; - BSTR bstrAnonymousAuthSection = NULL; - BSTR bstrAspNetCoreSection = NULL; + WCHAR* pszPath = nullptr; + BSTR bstrWindowAuthSection = nullptr; + BSTR bstrBasicAuthSection = nullptr; + BSTR bstrAnonymousAuthSection = nullptr; + BSTR bstrAspNetCoreSection = nullptr; std::optional launcherPathEnv; std::optional launcherArgsEnv; @@ -161,7 +161,7 @@ REQUESTHANDLER_CONFIG::Populate( } bstrWindowAuthSection = SysAllocString(CS_WINDOWS_AUTHENTICATION_SECTION); - if (bstrWindowAuthSection == NULL) + if (bstrWindowAuthSection == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -188,7 +188,7 @@ REQUESTHANDLER_CONFIG::Populate( } bstrBasicAuthSection = SysAllocString(CS_BASIC_AUTHENTICATION_SECTION); - if (bstrBasicAuthSection == NULL) + if (bstrBasicAuthSection == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -213,7 +213,7 @@ REQUESTHANDLER_CONFIG::Populate( } bstrAnonymousAuthSection = SysAllocString(CS_ANONYMOUS_AUTHENTICATION_SECTION); - if (bstrAnonymousAuthSection == NULL) + if (bstrAnonymousAuthSection == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -238,7 +238,7 @@ REQUESTHANDLER_CONFIG::Populate( } bstrAspNetCoreSection = SysAllocString(CS_ASPNETCORE_SECTION); - if (bstrAspNetCoreSection == NULL) + if (bstrAspNetCoreSection == nullptr) { hr = E_OUTOFMEMORY; goto Finished; @@ -423,28 +423,28 @@ REQUESTHANDLER_CONFIG::Populate( Finished: - if (pAspNetCoreElement != NULL) + if (pAspNetCoreElement != nullptr) { pAspNetCoreElement->Release(); - pAspNetCoreElement = NULL; + pAspNetCoreElement = nullptr; } - if (pWindowsAuthenticationElement != NULL) + if (pWindowsAuthenticationElement != nullptr) { pWindowsAuthenticationElement->Release(); - pWindowsAuthenticationElement = NULL; + pWindowsAuthenticationElement = nullptr; } - if (pAnonymousAuthenticationElement != NULL) + if (pAnonymousAuthenticationElement != nullptr) { pAnonymousAuthenticationElement->Release(); - pAnonymousAuthenticationElement = NULL; + pAnonymousAuthenticationElement = nullptr; } - if (pBasicAuthenticationElement != NULL) + if (pBasicAuthenticationElement != nullptr) { pBasicAuthenticationElement->Release(); - pBasicAuthenticationElement = NULL; + pBasicAuthenticationElement = nullptr; } return hr; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h index fc5d01b109e0..23093f828034 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/RequestHandlerLib/requesthandler_config.h @@ -236,7 +236,7 @@ class REQUESTHANDLER_CONFIG REQUESTHANDLER_CONFIG() : m_fStdoutLogEnabled(FALSE), m_hostingModel(HOSTING_UNKNOWN), - m_ppStrArguments(NULL) + m_ppStrArguments(nullptr) { } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj index bf7e421173d9..c02269e206d7 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj +++ b/src/Servers/IIS/AspNetCoreModuleV2/gtest/gtest.vcxproj @@ -7,6 +7,7 @@ {CAC1267B-8778-4257-AAC6-CAF481723B01} gtest + false gtest diff --git a/src/Servers/IIS/Directory.Build.props b/src/Servers/IIS/Directory.Build.props index e167d783b593..624773c5b877 100644 --- a/src/Servers/IIS/Directory.Build.props +++ b/src/Servers/IIS/Directory.Build.props @@ -8,6 +8,6 @@ x64 $(NetCoreTargetingPackRoot)Microsoft.NETCore.App.Host.win-$(HostArch)\$(LibNetHostAppPackVersion)\runtimes\win-$(HostArch)\native - v142 + 143 diff --git a/src/Servers/IIS/build/Build.Common.Settings b/src/Servers/IIS/build/Build.Common.Settings index 196e069eafa4..cebc071c6d4c 100644 --- a/src/Servers/IIS/build/Build.Common.Settings +++ b/src/Servers/IIS/build/Build.Common.Settings @@ -32,6 +32,12 @@ + + ..\DefaultRules.ruleset + true + $(RunCodeAnalysis) + + Use From 0a6205528ce2e15c6f566fbb4a4fb956ff8ca00d Mon Sep 17 00:00:00 2001 From: Aditya Mandaleeka Date: Sat, 5 Oct 2024 23:25:47 -0700 Subject: [PATCH 16/60] Fix several C6xxx memory warnings in ANCM. --- .../AspNetCoreModuleV2/DefaultRules.ruleset | 12 +- .../IIS/AspNetCoreModuleV2/IISLib/base64.cpp | 269 +++--------------- .../IIS/AspNetCoreModuleV2/IISLib/base64.h | 16 -- .../IIS/AspNetCoreModuleV2/IISLib/buffer.h | 2 +- .../IIS/AspNetCoreModuleV2/IISLib/hashtable.h | 6 + .../IIS/AspNetCoreModuleV2/IISLib/stringa.cpp | 10 +- .../IIS/AspNetCoreModuleV2/IISLib/stringa.h | 3 + .../IIS/AspNetCoreModuleV2/IISLib/util.cpp | 3 + .../managedexports.cpp | 1 + .../forwardinghandler.cpp | 10 +- .../serverprocess.cpp | 3 +- .../winhttphelper.cpp | 4 + 12 files changed, 75 insertions(+), 264 deletions(-) diff --git a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset index 147ad0a5677e..42d299c4f25e 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset +++ b/src/Servers/IIS/AspNetCoreModuleV2/DefaultRules.ruleset @@ -291,8 +291,8 @@ - - + + @@ -303,7 +303,7 @@ - + @@ -347,7 +347,7 @@ - + @@ -396,8 +396,8 @@ - - + + diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp index b5c910b9b573..cc4ce3f75cbe 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.cpp @@ -56,6 +56,12 @@ Return Values: if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) { return ERROR_SUCCESS; } + else if (pszEncodedString == nullptr) + { + return ERROR_INVALID_PARAMETER; + } + + *pszEncodedString = 0; if (cchEncodedStringSize < cchEncoded) { // Given buffer is too small to hold encoded string. @@ -66,8 +72,16 @@ Return Values: ib = ich = 0; while (ib < cbDecodedBufferSize) { b0 = pbDecodedBuffer[ib++]; - b1 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0; - b2 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0; + b1 = 0; + b2 = 0; + if (ib < cbDecodedBufferSize) + { + b1 = pbDecodedBuffer[ib++]; + } + if (ib < cbDecodedBufferSize) + { + b2 = pbDecodedBuffer[ib++]; + } // // The checks below for buffer overflow seems redundant to me. @@ -126,122 +140,6 @@ Return Values: } -DWORD -Base64Decode( - __in PCWSTR pszEncodedString, - __out_opt VOID * pDecodeBuffer, - __in DWORD cbDecodeBufferSize, - __out_opt DWORD * pcbDecoded - ) -/*++ - -Routine Description: - - Decode a base64-encoded string. - -Arguments: - - pszEncodedString (IN) - base64-encoded string to decode. - cbDecodeBufferSize (IN) - size in bytes of the decode buffer. - pbDecodeBuffer (OUT) - holds the decoded data. - pcbDecoded (OUT) - number of data bytes in the decoded data (if success or - STATUS_BUFFER_TOO_SMALL). - -Return Values: - - 0 - success. - E_OUTOFMEMORY - E_INVALIDARG - ---*/ -{ -constexpr auto NA = (255); -#define DECODE(x) (((ULONG)(x) < sizeof(rgbDecodeTable)) ? rgbDecodeTable[x] : NA) - - static BYTE rgbDecodeTable[128] = { - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 0-15 - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 16-31 - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 62, NA, NA, NA, 63, // 32-47 - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NA, NA, NA, 0, NA, NA, // 48-63 - NA, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79 - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, NA, NA, NA, NA, NA, // 80-95 - NA, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111 - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NA, NA, NA, NA, NA, // 112-127 - }; - - DWORD cbDecoded; - DWORD cchEncodedSize; - DWORD ich; - DWORD ib; - BYTE b0, b1, b2, b3; - BYTE * pbDecodeBuffer = (BYTE *) pDecodeBuffer; - - cchEncodedSize = (DWORD)wcslen(pszEncodedString); - if (nullptr != pcbDecoded) { - *pcbDecoded = 0; - } - - if ((0 == cchEncodedSize) || (0 != (cchEncodedSize % 4))) { - // Input string is not sized correctly to be base64. - return ERROR_INVALID_PARAMETER; - } - - // Calculate decoded buffer size. - cbDecoded = (cchEncodedSize + 3) / 4 * 3; - if (pszEncodedString[cchEncodedSize-1] == '=') { - if (pszEncodedString[cchEncodedSize-2] == '=') { - // Only one data byte is encoded in the last cluster. - cbDecoded -= 2; - } - else { - // Only two data bytes are encoded in the last cluster. - cbDecoded -= 1; - } - } - - if (nullptr != pcbDecoded) { - *pcbDecoded = cbDecoded; - } - - if (cbDecodeBufferSize == 0 && pDecodeBuffer == nullptr) { - return ERROR_SUCCESS; - } - - if (cbDecoded > cbDecodeBufferSize) { - // Supplied buffer is too small. - return ERROR_INSUFFICIENT_BUFFER; - } - - // Decode each four-byte cluster into the corresponding three data bytes. - ich = ib = 0; - while (ich < cchEncodedSize) { - b0 = DECODE(pszEncodedString[ich]); ich++; - b1 = DECODE(pszEncodedString[ich]); ich++; - b2 = DECODE(pszEncodedString[ich]); ich++; - b3 = DECODE(pszEncodedString[ich]); ich++; - - if ((NA == b0) || (NA == b1) || (NA == b2) || (NA == b3)) { - // Contents of input string are not base64. - return ERROR_INVALID_PARAMETER; - } - - pbDecodeBuffer[ib++] = (b0 << 2) | (b1 >> 4); - - if (ib < cbDecoded) { - pbDecodeBuffer[ib++] = (b1 << 4) | (b2 >> 2); - - if (ib < cbDecoded) { - pbDecodeBuffer[ib++] = (b2 << 6) | b3; - } - } - } - - DBG_ASSERT(ib == cbDecoded); - - return ERROR_SUCCESS; -} - - DWORD Base64Encode( __in_bcount(cbDecodedBufferSize) VOID * pDecodedBuffer, @@ -295,6 +193,12 @@ Return Values: if (cchEncodedStringSize == 0 && pszEncodedString == nullptr) { return ERROR_SUCCESS; } + else if (pszEncodedString == nullptr) + { + return ERROR_INVALID_PARAMETER; + } + + *pszEncodedString = 0; if (cchEncodedStringSize < cchEncoded) { // Given buffer is too small to hold encoded string. @@ -305,8 +209,16 @@ Return Values: ib = ich = 0; while (ib < cbDecodedBufferSize) { b0 = pbDecodedBuffer[ib++]; - b1 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0; - b2 = (ib < cbDecodedBufferSize) ? pbDecodedBuffer[ib++] : 0; + b1 = 0; + b2 = 0; + if (ib < cbDecodedBufferSize) + { + b1 = pbDecodedBuffer[ib++]; + } + if (ib < cbDecodedBufferSize) + { + b2 = pbDecodedBuffer[ib++]; + } // // The checks below for buffer overflow seems redundant to me. @@ -363,120 +275,3 @@ Return Values: return ERROR_SUCCESS; } - - -DWORD -Base64Decode( - __in PCSTR pszEncodedString, - __out_opt VOID * pDecodeBuffer, - __in DWORD cbDecodeBufferSize, - __out_opt DWORD * pcbDecoded - ) -/*++ - -Routine Description: - - Decode a base64-encoded string. - -Arguments: - - pszEncodedString (IN) - base64-encoded string to decode. - cbDecodeBufferSize (IN) - size in bytes of the decode buffer. - pbDecodeBuffer (OUT) - holds the decoded data. - pcbDecoded (OUT) - number of data bytes in the decoded data (if success or - STATUS_BUFFER_TOO_SMALL). - -Return Values: - - 0 - success. - E_OUTOFMEMORY - E_INVALIDARG - ---*/ -{ -#define NA (255) -#define DECODE(x) (((ULONG)(x) < sizeof(rgbDecodeTable)) ? rgbDecodeTable[x] : NA) - - static BYTE rgbDecodeTable[128] = { - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 0-15 - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, // 16-31 - NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, NA, 62, NA, NA, NA, 63, // 32-47 - 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, NA, NA, NA, 0, NA, NA, // 48-63 - NA, 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, // 64-79 - 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, NA, NA, NA, NA, NA, // 80-95 - NA, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, // 96-111 - 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, NA, NA, NA, NA, NA, // 112-127 - }; - - DWORD cbDecoded; - DWORD cchEncodedSize; - DWORD ich; - DWORD ib; - BYTE b0, b1, b2, b3; - BYTE * pbDecodeBuffer = (BYTE *) pDecodeBuffer; - - cchEncodedSize = (DWORD)strlen(pszEncodedString); - if (nullptr != pcbDecoded) { - *pcbDecoded = 0; - } - - if ((0 == cchEncodedSize) || (0 != (cchEncodedSize % 4))) { - // Input string is not sized correctly to be base64. - return ERROR_INVALID_PARAMETER; - } - - // Calculate decoded buffer size. - cbDecoded = (cchEncodedSize + 3) / 4 * 3; - if (pszEncodedString[cchEncodedSize-1] == '=') { - if (pszEncodedString[cchEncodedSize-2] == '=') { - // Only one data byte is encoded in the last cluster. - cbDecoded -= 2; - } - else { - // Only two data bytes are encoded in the last cluster. - cbDecoded -= 1; - } - } - - if (nullptr != pcbDecoded) { - *pcbDecoded = cbDecoded; - } - - if (cbDecodeBufferSize == 0 && pDecodeBuffer == nullptr) { - return ERROR_SUCCESS; - } - - if (cbDecoded > cbDecodeBufferSize) { - // Supplied buffer is too small. - return ERROR_INSUFFICIENT_BUFFER; - } - - // Decode each four-byte cluster into the corresponding three data bytes. - ich = ib = 0; - while (ich < cchEncodedSize) { - b0 = DECODE(pszEncodedString[ich]); ich++; - b1 = DECODE(pszEncodedString[ich]); ich++; - b2 = DECODE(pszEncodedString[ich]); ich++; - b3 = DECODE(pszEncodedString[ich]); ich++; - - if ((NA == b0) || (NA == b1) || (NA == b2) || (NA == b3)) { - // Contents of input string are not base64. - return ERROR_INVALID_PARAMETER; - } - - pbDecodeBuffer[ib++] = (b0 << 2) | (b1 >> 4); - - if (ib < cbDecoded) { - pbDecodeBuffer[ib++] = (b1 << 4) | (b2 >> 2); - - if (ib < cbDecoded) { - pbDecodeBuffer[ib++] = (b2 << 6) | b3; - } - } - } - - DBG_ASSERT(ib == cbDecoded); - - return ERROR_SUCCESS; -} - diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h index 885abdc6e3b2..265116d1cf52 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/base64.h @@ -15,14 +15,6 @@ Base64Encode( __out_opt DWORD * pcchEncoded ); -DWORD -Base64Decode( - __in PCWSTR pszEncodedString, - __out_opt VOID * pDecodeBuffer, - __in DWORD cbDecodeBufferSize, - __out_opt DWORD * pcbDecoded - ); - DWORD Base64Encode( __in_bcount( cbDecodedBufferSize ) VOID * pDecodedBuffer, @@ -32,13 +24,5 @@ Base64Encode( __out_opt DWORD * pcchEncoded ); -DWORD -Base64Decode( - __in PCSTR pszEncodedString, - __out_opt VOID * pDecodeBuffer, - __in DWORD cbDecodeBufferSize, - __out_opt DWORD * pcbDecoded - ); - #endif // _BASE64_HXX_ diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h index 385b73d717e3..339f307fb60a 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/buffer.h @@ -259,7 +259,7 @@ C_ASSERT( sizeof(VOID*) <= sizeof(ULONGLONG) ); // bytes. If the buffer overflows then a heap buffer will be allocated. // #define STACK_BUFFER( _name, _size ) \ - ULONGLONG __aqw##_name[ ( ( (_size) + sizeof(ULONGLONG) - 1 ) / sizeof(ULONGLONG) ) ]; \ + ULONGLONG __aqw##_name[ ( ( (_size) + sizeof(ULONGLONG) - 1 ) / sizeof(ULONGLONG) ) ]{}; \ BUFFER _name( (BYTE*)__aqw##_name, sizeof(__aqw##_name) ) // diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h index 6f0bb9de3610..c16e1cb32a87 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/hashtable.h @@ -389,6 +389,9 @@ HASH_TABLE<_Record,_Key>::FindKey( _tableLock.SharedAcquire(); + // Dereferencing NULL pointer 'pNode' + // FindNodeInternal will set a non-null pNode when true is returned, just need to figure out how to correctly SAL the method +#pragma warning(suppress: 6011) if (FindNodeInternal(key, dwHash, &pNode) && pNode->_pRecord != nullptr) { @@ -507,6 +510,9 @@ HASH_TABLE<_Record,_Key>::DeleteKey( if (FindNodeInternal(key, dwHash, &pNode, &ppPreviousNodeNextPointer)) { + // Dereferencing NULL pointer 'pNode' + // FindNodeInternal will set a non-null pNode when true is returned, just need to figure out how to correctly SAL the method +#pragma warning(suppress: 6011) *ppPreviousNodeNextPointer = pNode->_pNext; DeleteNode(pNode); _nItems--; diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp index b8ee1b11962f..d317461b792a 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.cpp @@ -135,6 +135,12 @@ STRA::QueryStr( return m_Buff.QueryPtr(); } +VOID STRA::EnsureNullTerminated() +{ + // m_cchLen represents the string's length, not the underlying buffer length + m_Buff.QueryPtr()[m_cchLen] = '\0'; +} + VOID STRA::Reset( ) @@ -696,7 +702,7 @@ Return Value: _ASSERTE( pch ); - while (pch[i] != NULL) + while ((DWORD)i < m_cchLen && pch[i] != NULL) { // // Escape characters that are in the non-printable range @@ -1154,7 +1160,7 @@ STRA::AuxAppendW( // ensure we're still NULL terminated in the right spot // (regardless of success or failure) // - QueryStr()[m_cchLen] = '\0'; + EnsureNullTerminated(); return hr; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h index 0d1f50d50c93..f58971b48444 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/stringa.h @@ -143,6 +143,9 @@ class STRA QueryStr( ) const; + + VOID EnsureNullTerminated(); + VOID Reset( ); diff --git a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp index 214ee65abfe4..37689befec92 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/IISLib/util.cpp @@ -47,6 +47,9 @@ Return Values: // we need to change it to Win32 from ("\\?\") // + // Buffer overrun while writing to 'pstrPath->QueryStr()' + // We know it's not an overrun because we just copied pszName into pstrPath and pszName is at least 4 in length +#pragma warning(suppress: 6386) pstrPath->QueryStr()[2] = L'?'; } diff --git a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp index eea153ca6954..2955ea728fff 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/InProcessRequestHandler/managedexports.cpp @@ -278,6 +278,7 @@ http_read_request_bytes( ) { HRESULT hr = S_OK; + *pvBuffer = 0; if (pInProcessHandler == nullptr) { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp index 2ebc0c6ddbf8..f53ce0e4f5a2 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/forwardinghandler.cpp @@ -1498,6 +1498,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionSendRequestOrWriteComplete( HRESULT hr = S_OK; IHttpRequest * pRequest = m_pW3Context->GetRequest(); + *pfClientError = FALSE; + // // completion for sending the initial request or request entity to // winhttp, get more request entity if available, else start receiving @@ -1599,7 +1601,7 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusHeadersAvailable( STACK_STRA(strHeaders, 2048); DWORD dwHeaderSize = bufHeaderBuffer.QuerySize(); - UNREFERENCED_PARAMETER(pfAnotherCompletionExpected); + *pfAnotherCompletionExpected = FALSE; // // Headers are available, read the status line and headers and pass @@ -1697,6 +1699,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusDataAvailable( { HRESULT hr = S_OK; + *pfAnotherCompletionExpected = FALSE; + // // Response data is available from winhttp, read it // @@ -1750,6 +1754,8 @@ FORWARDING_HANDLER::OnWinHttpCompletionStatusReadComplete( { HRESULT hr = S_OK; + *pfAnotherCompletionExpected = FALSE; + // // Response data has been read from winhttp, send it to the client // @@ -1826,6 +1832,8 @@ FORWARDING_HANDLER::OnSendingRequest( __out BOOL * pfClientError ) { + *pfClientError = FALSE; + // // This is a completion for a read from http.sys, abort in case // of failure, if we read anything write it out over WinHTTP, diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp index e1aaae6493a0..cc72e1cf6b63 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/serverprocess.cpp @@ -471,7 +471,7 @@ SERVER_PROCESS::SetupCommandLine( Finished: if (pszFullPath != nullptr) { - delete pszFullPath; + delete[] pszFullPath; } return hr; } @@ -963,6 +963,7 @@ SERVER_PROCESS::SetWindowsAuthToken( ) { HRESULT hr = S_OK; + *pTargetTokenHandle = nullptr; if (m_hListeningProcessHandle != nullptr && m_hListeningProcessHandle != INVALID_HANDLE_VALUE) { diff --git a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp index 1d0bbe742350..76c848673f43 100644 --- a/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp +++ b/src/Servers/IIS/AspNetCoreModuleV2/OutOfProcessRequestHandler/winhttphelper.cpp @@ -69,6 +69,10 @@ WINHTTP_HELPER::GetFlagsFromBufferType( __out BOOL * pfClose ) { + *pfClose = FALSE; + *pfFinalFragment = FALSE; + *pfUtf8Encoded = FALSE; + switch (BufferType) { case WINHTTP_WEB_SOCKET_BINARY_MESSAGE_BUFFER_TYPE: From 2287c782562158ebe86b438ab9792db244764b48 Mon Sep 17 00:00:00 2001 From: feiyun0112 Date: Tue, 8 Oct 2024 00:31:00 +0800 Subject: [PATCH 17/60] [OutputCaching] OutputCacheOptions.ApplicationServices is always null during initialization (#55847) --- .../OutputCaching/src/OutputCacheServiceCollectionExtensions.cs | 2 +- src/Middleware/OutputCaching/test/TestUtils.cs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs b/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs index b0184e1339a2..86267be94f29 100644 --- a/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs +++ b/src/Middleware/OutputCaching/src/OutputCacheServiceCollectionExtensions.cs @@ -50,8 +50,8 @@ public static IServiceCollection AddOutputCache(this IServiceCollection services ArgumentNullException.ThrowIfNull(services); ArgumentNullException.ThrowIfNull(configureOptions); - services.Configure(configureOptions); services.AddOutputCache(); + services.Configure(configureOptions); return services; } diff --git a/src/Middleware/OutputCaching/test/TestUtils.cs b/src/Middleware/OutputCaching/test/TestUtils.cs index e85214ec7445..ddaca73bd01b 100644 --- a/src/Middleware/OutputCaching/test/TestUtils.cs +++ b/src/Middleware/OutputCaching/test/TestUtils.cs @@ -159,6 +159,7 @@ private static IEnumerable CreateBuildersWithOutputCaching( { services.AddOutputCache(outputCachingOptions => { + Assert.NotNull(outputCachingOptions.ApplicationServices); if (options != null) { outputCachingOptions.MaximumBodySize = options.MaximumBodySize; From d2fecc6474bdfcbb2619ed8f507d351654a30018 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:03:53 -0700 Subject: [PATCH 18/60] Update dependencies from https://github.com/dotnet/source-build-reference-packages build 20241004.1 (#58252) Microsoft.SourceBuild.Intermediate.source-build-reference-packages From Version 10.0.0-alpha.1.24480.3 -> To Version 10.0.0-alpha.1.24504.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 68958c3923eb..1419b09e3674 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -339,9 +339,9 @@ 4ddd8113a29852380b7b929117bfe67f401ac320 - + https://github.com/dotnet/source-build-reference-packages - 6d8940439f10f5f1f997f09fc6a64a9aab039950 + ef671926b25634d1363de221a36b51668fb9f71d diff --git a/eng/Versions.props b/eng/Versions.props index 812d38a789e7..4a02b0009a2d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -172,7 +172,7 @@ 10.0.0-alpha.1.24473.2 - 10.0.0-alpha.1.24480.3 + 10.0.0-alpha.1.24504.1 2.2.0-beta.24327.2 From 8311f691c229ad08933db21e99a622ccb71e3dce Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:05:03 -0700 Subject: [PATCH 19/60] Update dependencies from https://github.com/dotnet/winforms build 20241004.3 (#58266) System.Drawing.Common From Version 10.0.0-alpha.1.24478.1 -> To Version 10.0.0-alpha.1.24504.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 1419b09e3674..83145a831f4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -384,9 +384,9 @@ https://github.com/dotnet/runtime 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/winforms - ff838ac7ac134944d5519c3eedf7e689b2d9f2e5 + efe6e112d821ad55a060f5c7e244c85a2478e9c3 https://github.com/dotnet/arcade diff --git a/eng/Versions.props b/eng/Versions.props index 4a02b0009a2d..ce9b52202a01 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -176,7 +176,7 @@ 2.2.0-beta.24327.2 - 10.0.0-alpha.1.24478.1 + 10.0.0-alpha.1.24504.3 9.0.0-preview.24476.1 9.0.0-preview.24476.1 From a90759ddfe6e1c6e79100c4086749614c991db37 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:05:32 -0700 Subject: [PATCH 20/60] Update dependencies from https://github.com/dotnet/extensions build 20241003.1 (#58265) Microsoft.Extensions.Diagnostics.Testing , Microsoft.Extensions.TimeProvider.Testing From Version 9.0.0-preview.9.24480.2 -> To Version 9.0.0-preview.9.24503.1 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 8 ++++---- eng/Versions.props | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 83145a831f4f..57c92581ab4f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -414,13 +414,13 @@ https://github.com/dotnet/arcade 7e8b8f4f321c8671aa01b53567d31aaa4950706f - + https://github.com/dotnet/extensions - abf85c798e1b1de34373a7f680dab1c6ac79931c + e11fb6176dbab6b027c946ff030dc14e666e1838 - + https://github.com/dotnet/extensions - abf85c798e1b1de34373a7f680dab1c6ac79931c + e11fb6176dbab6b027c946ff030dc14e666e1838 https://github.com/nuget/nuget.client diff --git a/eng/Versions.props b/eng/Versions.props index ce9b52202a01..816b43893425 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -142,8 +142,8 @@ 10.0.0-alpha.1.24504.10 10.0.0-alpha.1.24504.10 - 9.0.0-preview.9.24480.2 - 9.0.0-preview.9.24480.2 + 9.0.0-preview.9.24503.1 + 9.0.0-preview.9.24503.1 10.0.0-alpha.1.24502.7 10.0.0-alpha.1.24502.7 From 6fc4ef7acc601531c97b5d2e75054f382dcc6a73 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:07:20 -0700 Subject: [PATCH 21/60] Update dependencies from https://github.com/dotnet/source-build-externals build 20241002.3 (#58264) Microsoft.SourceBuild.Intermediate.source-build-externals From Version 10.0.0-alpha.1.24473.2 -> To Version 10.0.0-alpha.1.24502.3 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 4 ++-- eng/Versions.props | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 57c92581ab4f..f5f095dbfc40 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -372,9 +372,9 @@ 0372b5080a4aec8d73d6861ad4b993d9d0fe3a11 - + https://github.com/dotnet/source-build-externals - bc43c328b4788e3cb68e9b4dc764443f2aa29a24 + 85c00cd57c77e94d63f80eac12b834ea14ae5907 diff --git a/eng/Versions.props b/eng/Versions.props index 816b43893425..056cd2580722 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -170,7 +170,7 @@ 10.0.0-beta.24476.2 10.0.0-beta.24476.2 - 10.0.0-alpha.1.24473.2 + 10.0.0-alpha.1.24502.3 10.0.0-alpha.1.24504.1 From 3d7a25598bd54532896b11fff73d00298cf996d5 Mon Sep 17 00:00:00 2001 From: "dotnet-maestro[bot]" <42748379+dotnet-maestro[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:08:53 -0700 Subject: [PATCH 22/60] Update dependencies from https://github.com/dotnet/arcade build 20241004.4 (#58262) Microsoft.SourceBuild.Intermediate.arcade , Microsoft.DotNet.Arcade.Sdk , Microsoft.DotNet.Build.Tasks.Installers , Microsoft.DotNet.Build.Tasks.Templating , Microsoft.DotNet.Helix.Sdk , Microsoft.DotNet.RemoteExecutor From Version 10.0.0-beta.24476.2 -> To Version 10.0.0-beta.24504.4 Co-authored-by: dotnet-maestro[bot] --- eng/Version.Details.xml | 24 +++++++++++------------ eng/Versions.props | 8 ++++---- eng/common/templates-official/job/job.yml | 1 + eng/common/templates/job/job.yml | 1 + eng/common/tools.ps1 | 2 +- global.json | 4 ++-- 6 files changed, 21 insertions(+), 19 deletions(-) diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index f5f095dbfc40..b57cb6508dec 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -388,31 +388,31 @@ https://github.com/dotnet/winforms efe6e112d821ad55a060f5c7e244c85a2478e9c3 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 - + https://github.com/dotnet/arcade - 7e8b8f4f321c8671aa01b53567d31aaa4950706f + f209a925b15bc66ecb9a8825bd9595937bbe3aa1 https://github.com/dotnet/extensions diff --git a/eng/Versions.props b/eng/Versions.props index 056cd2580722..cab567d98e62 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -165,10 +165,10 @@ 6.2.4 6.2.4 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 - 10.0.0-beta.24476.2 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 + 10.0.0-beta.24504.4 10.0.0-alpha.1.24502.3 diff --git a/eng/common/templates-official/job/job.yml b/eng/common/templates-official/job/job.yml index 3d16b41c78c1..605692d2fb77 100644 --- a/eng/common/templates-official/job/job.yml +++ b/eng/common/templates-official/job/job.yml @@ -1,6 +1,7 @@ parameters: # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/templates/job/job.yml b/eng/common/templates/job/job.yml index 07d317bf8f9a..d1aeb92fcea5 100644 --- a/eng/common/templates/job/job.yml +++ b/eng/common/templates/job/job.yml @@ -4,6 +4,7 @@ parameters: componentGovernanceIgnoreDirectories: '' # Sbom related params enableSbom: true + runAsPublic: false PackageVersion: 9.0.0 BuildDropPath: '$(Build.SourcesDirectory)/artifacts' diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 9574f4eb9df0..22954477a574 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -900,7 +900,7 @@ function IsWindowsPlatform() { } function Get-Darc($version) { - $darcPath = "$TempDir\darc\$(New-Guid)" + $darcPath = "$TempDir\darc\$([guid]::NewGuid())" if ($version -ne $null) { & $PSScriptRoot\darc-init.ps1 -toolpath $darcPath -darcVersion $version | Out-Host } else { diff --git a/global.json b/global.json index b166388e1fca..01e07b559a17 100644 --- a/global.json +++ b/global.json @@ -27,7 +27,7 @@ "jdk": "11" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24476.2", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24476.2" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.24504.4", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.24504.4" } } From c9003d030d2a321d189c7d3018de4bc771a654a4 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Mon, 7 Oct 2024 10:26:18 -0700 Subject: [PATCH 23/60] Update .NET SDK (#58263) Update .NET SDK to version 9.0.100-rtm.24506.1. --- updated-dependencies: - dependency-name: Microsoft.NET.Sdk dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: github-actions[bot] Co-authored-by: github-actions[bot] --- global.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/global.json b/global.json index 01e07b559a17..f7f60a25d0b4 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "9.0.100-rc.2.24468.2" + "version": "9.0.100-rtm.24506.1" }, "tools": { - "dotnet": "9.0.100-rc.2.24468.2", + "dotnet": "9.0.100-rtm.24506.1", "runtimes": { "dotnet/x86": [ "$(MicrosoftNETCoreBrowserDebugHostTransportVersion)" From cbaa16937586385b17f44d0002e922fbf536a78d Mon Sep 17 00:00:00 2001 From: Mackinnon Buck Date: Mon, 7 Oct 2024 13:36:34 -0700 Subject: [PATCH 24/60] [Blazor] Fix template nav menu styling (#58245) --- .../BlazorWeb-CSharp/Components/Layout/NavMenu.razor | 2 +- .../Layout/NavMenu.CallsWebApi.razor | 2 +- .../ComponentsWebAssembly-CSharp/Layout/NavMenu.NoApi.razor | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor index bd05d545fc59..954d0d1db2e9 100644 --- a/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor +++ b/src/ProjectTemplates/Web.ProjectTemplates/content/BlazorWeb-CSharp/BlazorWeb-CSharp/Components/Layout/NavMenu.razor @@ -13,7 +13,7 @@
-