dotnet · akoeplinger · Sep 19, 2025 · Sep 12, 2025 · Sep 12, 2025 · Sep 12, 2025
diff --git a/eng/Version.Details.props b/eng/Version.Details.props
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/common/core-templates/steps/generate-sbom.yml b/eng/common/core-templates/steps/generate-sbom.yml
@@ -5,7 +5,7 @@
 # IgnoreDirectories - Directories to ignore for SBOM generation. This will be passed through to the CG component detector.
 
 parameters:
-  PackageVersion: 10.0.0
+  PackageVersion: 11.0.0
   BuildDropPath: '$(System.DefaultWorkingDirectory)/artifacts'
   PackageName: '.NET'
   ManifestDirPath: $(Build.ArtifactStagingDirectory)/sbom

diff --git a/eng/common/core-templates/steps/source-index-stage1-publish.yml b/eng/common/core-templates/steps/source-index-stage1-publish.yml
@@ -1,6 +1,6 @@
 parameters:
-  sourceIndexUploadPackageVersion: 2.0.0-20250818.1
-  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
+  sourceIndexUploadPackageVersion: 2.0.0-20250906.1
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250906.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   binlogPath: artifacts/log/Debug/Build.binlog
 

diff --git a/eng/common/sdk-task.sh b/eng/common/sdk-task.sh
@@ -10,7 +10,7 @@ show_usage() {
 
     echo "Advanced settings:"
     echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
-    echo "  --noWarnAsError          Do not warn as error
+    echo "  --noWarnAsError          Do not warn as error"
     echo ""
     echo "Command line arguments not listed above are passed thru to msbuild."
 }

diff --git a/global.json b/global.json
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25461.111",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25461.111",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

@@ -22,8 +22,8 @@
   </ItemGroup>
 
   <ItemGroup Condition="'$(DotNetBuildSourceOnly)' == 'true'">
-    <!-- Reference 6.0.0 targeting packs in Source Build -->
-    <FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.0" />
+    <!-- Reference 6.0 targeting packs in Source Build -->
+    <FrameworkReference Update="Microsoft.AspNetCore.App" TargetingPackVersion="6.0.2" />
     <FrameworkReference Update="Microsoft.NETCore.App" TargetingPackVersion="6.0.0" />
   </ItemGroup>
 

diff --git a/src/Cli/dotnet/Parser.cs b/src/Cli/dotnet/Parser.cs
@@ -427,10 +427,11 @@ public override void Write(HelpContext context)
 
     private class PrintCliSchemaAction : SynchronousCommandLineAction
     {
-        internal PrintCliSchemaAction()
+        public PrintCliSchemaAction()
         {
             Terminating = true;
         }
+
         public override int Invoke(ParseResult parseResult)
         {
             CliSchema.PrintCliSchema(parseResult.CommandResult, parseResult.InvocationConfiguration.Output, Program.TelemetryClient);

diff --git a/src/Layout/redist/targets/BundledSdks.targets b/src/Layout/redist/targets/BundledSdks.targets
@@ -2,7 +2,7 @@
 
   <ItemGroup>
     <BundledSdk Include="NuGet.Build.Tasks.Pack" Version="$(NuGetBuildTasksPackPackageVersion)" />
-    <BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <BundledSdk Include="Microsoft.NET.Sdk.WindowsDesktop" Version="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
     <BundledSdk Include="FSharp.NET.Sdk" Version="1.0.4-bundled-0100" />
     <BundledSdk Include="Microsoft.Docker.Sdk" Version="1.1.0" />
 

diff --git a/src/Layout/redist/targets/BundledTemplates.targets b/src/Layout/redist/targets/BundledTemplates.targets
@@ -3,8 +3,8 @@
   <ItemGroup Label=".NET 10.0 templates">
     <Bundled100Templates Include="Microsoft.DotNet.Web.ItemTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebItemTemplates100PackageVersion)" />
     <Bundled100Templates Include="Microsoft.DotNet.Web.ProjectTemplates.10.0" PackageVersion="$(MicrosoftDotNetWebProjectTemplates100PackageVersion)" UseVersionForTemplateInstallPath="true" />
-    <Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
-    <Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" Condition="'$(DotNetBuildSourceOnly)' != 'true'" />
+    <Bundled100Templates Include="Microsoft.Dotnet.WinForms.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
+    <Bundled100Templates Include="Microsoft.Dotnet.Wpf.ProjectTemplates" PackageVersion="$(MicrosoftNETSdkWindowsDesktopPackageVersion)" />
   </ItemGroup>
 
   <ItemGroup>
@@ -56,11 +56,6 @@
   </Target>
 
   <Target Name="LayoutTemplatesForSDK" DependsOnTargets="CalculateTemplatesVersions;GetRepoTemplates">
-    <ItemGroup Condition="!$(ProductMonikerRid.StartsWith('win'))">
-      <BundledTemplatesWithInstallPaths Remove="Microsoft.Dotnet.Wpf.ProjectTemplates" />
-      <BundledTemplatesWithInstallPaths Remove="Microsoft.Dotnet.WinForms.ProjectTemplates" />
-    </ItemGroup>
-
     <Copy SourceFiles="%(BundledTemplatesWithInstallPaths.RestoredNupkgPath)"
           DestinationFolder="$(RedistInstallerLayoutPath)templates\%(BundledTemplatesWithInstallPaths.BundledTemplateInstallPath)"
           Condition="'%(BundledTemplatesWithInstallPaths.TemplateFrameworkVersion)' == '10.0'" />

@@ -368,6 +368,9 @@ public T ReadNonNullObject<T>(string propertyName, ReadProperties<T> readPropert
         return ReadNonNullObject(readProperties);
     }
 
+    public T ReadNonNullObjectOrDefault<T>(string propertyName, ReadProperties<T> readProperties, T defaultValue)
+        => TryReadPropertyName(propertyName) ? ReadNonNullObject(readProperties) : defaultValue;
+
     public T[]? ReadArray<T>(ReadValue<T> readElement)
     {
         if (TryReadNull())

@@ -2,6 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System.Diagnostics;
+using Microsoft.AspNetCore.Mvc.Razor.Extensions;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Language.Components;
 
@@ -14,14 +15,16 @@ public static TagHelperDescriptor ReadTagHelper(JsonDataReader reader)
 
     public static TagHelperDescriptor ReadTagHelperFromProperties(JsonDataReader reader)
     {
-        var kind = reader.ReadNonNullString(nameof(TagHelperDescriptor.Kind));
+        var flags = (TagHelperFlags)reader.ReadByte(nameof(TagHelperDescriptor.Flags));
+        var kind = (TagHelperKind)reader.ReadByteOrDefault(nameof(TagHelperDescriptor.Kind), defaultValue: (byte)TagHelperKind.Component);
+        var runtimeKind = (RuntimeKind)reader.ReadByteOrDefault(nameof(TagHelperDescriptor.RuntimeKind), defaultValue: (byte)RuntimeKind.IComponent);
         var name = reader.ReadNonNullString(nameof(TagHelperDescriptor.Name));
         var assemblyName = reader.ReadNonNullString(nameof(TagHelperDescriptor.AssemblyName));
 
         var displayName = reader.ReadStringOrNull(nameof(TagHelperDescriptor.DisplayName));
+        var typeNameObject = ReadTypeNameObject(reader, nameof(TagHelperDescriptor.TypeName));
         var documentationObject = ReadDocumentationObject(reader, nameof(TagHelperDescriptor.Documentation));
         var tagOutputHint = reader.ReadStringOrNull(nameof(TagHelperDescriptor.TagOutputHint));
-        var caseSensitive = reader.ReadBooleanOrTrue(nameof(TagHelperDescriptor.CaseSensitive));
 
         var tagMatchingRules = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.TagMatchingRules), ReadTagMatchingRule);
         var boundAttributes = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.BoundAttributes), ReadBoundAttribute);
@@ -31,9 +34,8 @@ public static TagHelperDescriptor ReadTagHelperFromProperties(JsonDataReader rea
         var diagnostics = reader.ReadImmutableArrayOrEmpty(nameof(TagHelperDescriptor.Diagnostics), ReadDiagnostic);
 
         return new TagHelperDescriptor(
-            kind, name, assemblyName,
-            displayName!, documentationObject,
-            tagOutputHint, caseSensitive,
+            flags, kind, runtimeKind, name, assemblyName,
+            displayName!, typeNameObject, documentationObject, tagOutputHint,
             tagMatchingRules, boundAttributes, allowedChildTags,
             metadata, diagnostics);
 
@@ -93,25 +95,14 @@ static BoundAttributeDescriptor ReadFromProperties(JsonDataReader reader)
                 var containingType = reader.ReadStringOrNull(nameof(BoundAttributeDescriptor.ContainingType));
                 var documentationObject = ReadDocumentationObject(reader, nameof(BoundAttributeDescriptor.Documentation));
                 var parameters = reader.ReadImmutableArrayOrEmpty(nameof(BoundAttributeDescriptor.Parameters), ReadBoundAttributeParameter);
-
-                var metadataKind = (MetadataKind)reader.ReadByteOrDefault("MetadataKind", defaultValue: (byte)MetadataKind.None);
-
-                var metadataObject = metadataKind switch
-                {
-                    MetadataKind.None => MetadataObject.None,
-                    MetadataKind.TypeParameter => reader.ReadNonNullObject(nameof(BoundAttributeDescriptor.Metadata), ReadTypeParameterMetadata),
-                    MetadataKind.Property => reader.ReadNonNullObject(nameof(BoundAttributeDescriptor.Metadata), ReadPropertyMetadata),
-                    MetadataKind.ChildContentParameter => ChildContentParameterMetadata.Default,
-                    _ => Assumed.Unreachable<MetadataObject>($"Unexpected MetadataKind '{metadataKind}'."),
-                };
-
+                var metadata = ReadMetadata(reader, nameof(BoundAttributeDescriptor.Metadata));
                 var diagnostics = reader.ReadImmutableArrayOrEmpty(nameof(BoundAttributeDescriptor.Diagnostics), ReadDiagnostic);
 
                 return new BoundAttributeDescriptor(
                     flags, name!, propertyName, typeNameObject,
                     indexerNamePrefix, indexerTypeNameObject,
                     documentationObject, displayName, containingType,
-                    parameters, metadataObject, diagnostics);
+                    parameters, metadata, diagnostics);
             }
         }
 
@@ -154,12 +145,29 @@ static TypeNameObject ReadTypeNameObject(JsonDataReader reader, string propertyN
                 return default;
             }
 
+            if (reader.TryReadNull())
+            {
+                return default;
+            }
+
             if (reader.IsInteger)
             {
                 var index = reader.ReadByte();
                 return new(index);
             }
 
+            if (reader.IsObjectStart)
+            {
+                return reader.ReadNonNullObject(static reader =>
+                {
+                    var fullName = reader.ReadNonNullString(nameof(TypeNameObject.FullName));
+                    var namespaceName = reader.ReadStringOrNull(nameof(TypeNameObject.Namespace));
+                    var name = reader.ReadStringOrNull(nameof(TypeNameObject.Name));
+
+                    return TypeNameObject.From(fullName, namespaceName, name);
+                });
+            }
+
             Debug.Assert(reader.IsString);
 
             var fullName = reader.ReadNonNullString();
@@ -210,24 +218,22 @@ static DocumentationObject ReadCore(JsonDataReader reader)
             }
         }
 
-        static MetadataCollection ReadMetadata(JsonDataReader reader, string propertyName)
+        static MetadataObject ReadMetadata(JsonDataReader reader, string propertyName)
         {
-            return reader.TryReadPropertyName(propertyName)
-                ? reader.ReadNonNullObject(ReadFromProperties)
-                : MetadataCollection.Empty;
+            var metadataKind = (MetadataKind)reader.ReadByteOrDefault(WellKnownPropertyNames.MetadataKind, defaultValue: (byte)MetadataKind.None);
 
-            static MetadataCollection ReadFromProperties(JsonDataReader reader)
+            return metadataKind switch
             {
-                using var builder = new MetadataBuilder();
-
-                while (reader.TryReadNextPropertyName(out var key))
-                {
-                    var value = reader.ReadString();
-                    builder.Add(key, value);
-                }
-
-                return builder.Build();
-            }
+                MetadataKind.None => MetadataObject.None,
+                MetadataKind.TypeParameter => reader.ReadNonNullObjectOrDefault(propertyName, ReadTypeParameterMetadata, defaultValue: TypeParameterMetadata.Default),
+                MetadataKind.Property => reader.ReadNonNullObjectOrDefault(propertyName, ReadPropertyMetadata, defaultValue: PropertyMetadata.Default),
+                MetadataKind.ChildContentParameter => ChildContentParameterMetadata.Default,
+                MetadataKind.Bind => reader.ReadNonNullObjectOrDefault(propertyName, ReadBindMetadata, defaultValue: BindMetadata.Default),
+                MetadataKind.Component => reader.ReadNonNullObjectOrDefault(propertyName, ReadComponentMetadata, defaultValue: ComponentMetadata.Default),
+                MetadataKind.EventHandler => reader.ReadNonNullObject(propertyName, ReadEventHandlerMetadata),
+                MetadataKind.ViewComponent => reader.ReadNonNullObject(propertyName, ReadViewComponentMetadata),
+                _ => Assumed.Unreachable<MetadataObject>($"Unexpected MetadataKind '{metadataKind}'."),
+            };
         }
 
         static TypeParameterMetadata ReadTypeParameterMetadata(JsonDataReader reader)
@@ -257,5 +263,52 @@ static PropertyMetadata ReadPropertyMetadata(JsonDataReader reader)
 
             return builder.Build();
         }
+
+        static BindMetadata ReadBindMetadata(JsonDataReader reader)
+        {
+            var builder = new BindMetadata.Builder
+            {
+                IsFallback = reader.ReadBooleanOrFalse(nameof(BindMetadata.IsFallback)),
+                ValueAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ValueAttribute)),
+                ChangeAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ChangeAttribute)),
+                ExpressionAttribute = reader.ReadStringOrNull(nameof(BindMetadata.ExpressionAttribute)),
+                TypeAttribute = reader.ReadStringOrNull(nameof(BindMetadata.TypeAttribute)),
+                IsInvariantCulture = reader.ReadBooleanOrFalse(nameof(BindMetadata.IsInvariantCulture)),
+                Format = reader.ReadStringOrNull(nameof(BindMetadata.Format))
+            };
+
+            return builder.Build();
+        }
+    }
+
+    static ComponentMetadata ReadComponentMetadata(JsonDataReader reader)
+    {
+        var builder = new ComponentMetadata.Builder
+        {
+            IsGeneric = reader.ReadBooleanOrFalse(nameof(ComponentMetadata.IsGeneric)),
+            HasRenderModeDirective = reader.ReadBooleanOrFalse(nameof(ComponentMetadata.HasRenderModeDirective))
+        };
+
+        return builder.Build();
+    }
+
+    static EventHandlerMetadata ReadEventHandlerMetadata(JsonDataReader reader)
+    {
+        var builder = new EventHandlerMetadata.Builder
+        {
+            EventArgsType = reader.ReadNonNullString(nameof(EventHandlerMetadata.EventArgsType))
+        };
+
+        return builder.Build();
+    }
+
+    static ViewComponentMetadata ReadViewComponentMetadata(JsonDataReader reader)
+    {
+        var builder = new ViewComponentMetadata.Builder
+        {
+            Name = reader.ReadNonNullString(nameof(ViewComponentMetadata.Name))
+        };
+
+        return builder.Build();
     }
 }