[release/10.0.1xx] Source code updates from dotnet/dotnet

Directory.Build.props

@@ -108,6 +108,9 @@
 
     <HostFxrVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</HostFxrVersion>
     <SharedHostVersion>$(MicrosoftNETCoreAppRuntimePackageVersion)</SharedHostVersion>
+
+    <MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
+    <MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
   </PropertyGroup>
 
   <Import Project="build/GenerateResxSource.targets" />

eng/Versions.props

@@ -65,8 +65,6 @@
     <SystemCommandLineVersion>2.0.0-rc.1.25377.103</SystemCommandLineVersion>
     <SystemCommandLineNamingConventionBinderVersion>2.0.0-beta5.25279.2</SystemCommandLineNamingConventionBinderVersion>
     <MicrosoftCodeAnalysisAnalyzerTestingVersion>1.1.2</MicrosoftCodeAnalysisAnalyzerTestingVersion>
-    <MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' != 'true'">3.11.0</MicrosoftCodeAnalysisVersionForNetAnalyzers>
-    <MicrosoftCodeAnalysisVersionForNetAnalyzers Condition="'$(DotNetBuildSourceOnly)' == 'true'">$(MicrosoftCodeAnalysisVersion)</MicrosoftCodeAnalysisVersionForNetAnalyzers>
     <MicrosoftVisualBasicVersion>10.3.0</MicrosoftVisualBasicVersion>
     <MicrosoftVisualStudioSetupConfigurationInteropVersion>3.2.2146</MicrosoftVisualStudioSetupConfigurationInteropVersion>
     <MicrosoftWindowsCsWin32PackageVersion>0.3.49-beta</MicrosoftWindowsCsWin32PackageVersion>

eng/common/core-templates/steps/source-index-stage1-publish.yml

@@ -1,6 +1,6 @@
 parameters:
-  sourceIndexUploadPackageVersion: 2.0.0-20250425.2
-  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250515.1
+  sourceIndexUploadPackageVersion: 2.0.0-20250818.1
+  sourceIndexProcessBinlogPackageVersion: 1.0.1-20250818.1
   sourceIndexPackageSource: https://pkgs.dev.azure.com/dnceng/public/_packaging/dotnet-tools/nuget/v3/index.json
   binlogPath: artifacts/log/Debug/Build.binlog
 

eng/common/sdk-task.ps1

@@ -7,13 +7,14 @@ Param(
   [switch] $restore,
   [switch] $prepareMachine,
   [switch][Alias('nobl')]$excludeCIBinaryLog,
+  [switch]$noWarnAsError,
   [switch] $help,
   [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties
 )
 
 $ci = $true
 $binaryLog = if ($excludeCIBinaryLog) { $false } else { $true }
-$warnAsError = $true
+$warnAsError = if ($noWarnAsError) { $false } else { $true }
 
 . $PSScriptRoot\tools.ps1
 

eng/common/sdk-task.sh

@@ -10,6 +10,7 @@ show_usage() {
 
     echo "Advanced settings:"
     echo "  --excludeCIBinarylog     Don't output binary log (short: -nobl)"
+    echo "  --noWarnAsError          Do not warn as error
     echo ""
     echo "Command line arguments not listed above are passed thru to msbuild."
 }
@@ -52,6 +53,7 @@ exclude_ci_binary_log=false
 restore=false
 help=false
 properties=''
+warnAsError=true
 
 while (($# > 0)); do
   lowerI="$(echo $1 | tr "[:upper:]" "[:lower:]")"
@@ -73,6 +75,10 @@ while (($# > 0)); do
       exclude_ci_binary_log=true
       shift 1
       ;;
+    --noWarnAsError)
+      warnAsError=false
+      shift 1
+      ;;
     --help)
       help=true
       shift 1
@@ -85,7 +91,6 @@ while (($# > 0)); do
 done
 
 ci=true
-warnAsError=true
 
 if $help; then
   show_usage

eng/common/tools.ps1

@@ -553,7 +553,7 @@ function LocateVisualStudio([object]$vsRequirements = $null){
 
   if (!(Test-Path $vsWhereExe)) {
     Create-Directory $vsWhereDir
-    Write-Host 'Downloading vswhere $vswhereVersion'
+    Write-Host "Downloading vswhere $vswhereVersion"
     $ProgressPreference = 'SilentlyContinue' # Don't display the console progress UI - it's a huge perf hit
     Retry({
       Invoke-WebRequest "https://netcorenativeassets.blob.core.windows.net/resource-packages/external/windows/vswhere/$vswhereVersion/vswhere.exe" -OutFile $vswhereExe

global.json

@@ -7,7 +7,7 @@
     "errorMessage": "The .NET SDK is not installed or is not configured correctly. Please run ./build to install the correct SDK version locally."
   },
   "tools": {
-    "dotnet": "10.0.100-rc.1.25411.109",
+    "dotnet": "10.0.100-rc.1.25420.111",
     "runtimes": {
       "dotnet": [
         "$(MicrosoftNETCorePlatformsPackageVersion)"
@@ -21,8 +21,8 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25420.109",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25420.109",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25427.104",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25427.104",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0",
     "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2737382"

src/RazorSdk/Tool/DiscoverCommand.cs

@@ -7,8 +7,8 @@
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis;
 using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Serialization;
 using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils;
+using Microsoft.NET.Sdk.Razor.Tool.Json;
 using Newtonsoft.Json;
 
 namespace Microsoft.NET.Sdk.Razor.Tool
@@ -246,8 +246,7 @@ private static void Serialize(Stream stream, IReadOnlyList<TagHelperDescriptor>
             using (var writer = new StreamWriter(stream, Encoding.UTF8, bufferSize: 4096, leaveOpen: true))
             {
                 var serializer = new JsonSerializer();
-                serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
-                serializer.Converters.Add(new RazorDiagnosticJsonConverter());
+                serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance);
 
                 serializer.Serialize(writer, tagHelpers);
             }

src/RazorSdk/Tool/GenerateCommand.cs

@@ -6,9 +6,8 @@
 using System.Diagnostics;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.CodeAnalysis.CSharp;
-using Microsoft.CodeAnalysis.Razor;
-using Microsoft.CodeAnalysis.Razor.Serialization;
 using Microsoft.NET.Sdk.Razor.Tool.CommandLineUtils;
+using Microsoft.NET.Sdk.Razor.Tool.Json;
 using Newtonsoft.Json;
 
 namespace Microsoft.NET.Sdk.Razor.Tool
@@ -309,8 +308,7 @@ private IReadOnlyList<TagHelperDescriptor> GetTagHelpers(string tagHelperManifes
                 var reader = new JsonTextReader(new StreamReader(stream));
 
                 var serializer = new JsonSerializer();
-                serializer.Converters.Add(new RazorDiagnosticJsonConverter());
-                serializer.Converters.Add(new TagHelperDescriptorJsonConverter());
+                serializer.Converters.Add(TagHelperDescriptorJsonConverter.Instance);
 
                 var descriptors = serializer.Deserialize<IReadOnlyList<TagHelperDescriptor>>(reader);
                 return descriptors;

src/RazorSdk/Tool/Json/Assumed.cs

@@ -0,0 +1,157 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Diagnostics;
+using System.Diagnostics.CodeAnalysis;
+using System.Runtime.CompilerServices;
+
+namespace Microsoft.NET.Sdk.Razor.Tool.Json;
+
+internal static partial class Assumed
+{
+    public static void NotNull<T>(
+        [NotNull] this T? value,
+        string? message = null,
+        [CallerArgumentExpression(nameof(value))] string? valueExpression = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        where T : class
+    {
+        if (value is null)
+        {
+            ThrowInvalidOperation(message ?? Strings.FormatExpected_0_to_be_non_null(valueExpression), path, line);
+        }
+    }
+
+    public static void NotNull<T>(
+        [NotNull] this T? value,
+        [InterpolatedStringHandlerArgument(nameof(value))] ThrowIfNullInterpolatedStringHandler<T> message,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        where T : class
+    {
+        if (value is null)
+        {
+            ThrowInvalidOperation(message.GetFormattedText(), path, line);
+        }
+    }
+
+    public static void NotNull<T>(
+        [NotNull] this T? value,
+        string? message = null,
+        [CallerArgumentExpression(nameof(value))] string? valueExpression = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        where T : struct
+    {
+        if (value is null)
+        {
+            ThrowInvalidOperation(message ?? Strings.FormatExpected_0_to_be_non_null(valueExpression), path, line);
+        }
+    }
+
+    public static void NotNull<T>(
+        [NotNull] this T? value,
+        [InterpolatedStringHandlerArgument(nameof(value))] ThrowIfNullInterpolatedStringHandler<T> message,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        where T : struct
+    {
+        if (value is null)
+        {
+            ThrowInvalidOperation(message.GetFormattedText(), path, line);
+        }
+    }
+
+    public static void False(
+        [DoesNotReturnIf(true)] bool condition,
+        string? message = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+    {
+        if (condition)
+        {
+            ThrowInvalidOperation(message ?? Strings.Expected_condition_to_be_false, path, line);
+        }
+    }
+
+    public static void False(
+        [DoesNotReturnIf(true)] bool condition,
+        [InterpolatedStringHandlerArgument(nameof(condition))] ThrowIfFalseInterpolatedStringHandler message,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+    {
+        if (condition)
+        {
+            ThrowInvalidOperation(message.GetFormattedText(), path, line);
+        }
+    }
+
+    [DebuggerStepThrough]
+    [MethodImpl(MethodImplOptions.AggressiveInlining)]
+    public static void True(
+        [DoesNotReturnIf(false)] bool condition,
+        string? message = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+    {
+        if (!condition)
+        {
+            ThrowInvalidOperation(message ?? Strings.Expected_condition_to_be_true, path, line);
+        }
+    }
+
+    /// <summary>
+    ///  Can be called at points that are assumed to be unreachable at runtime.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"/>
+    [DoesNotReturn]
+    public static void Unreachable(
+        string? message = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        => ThrowInvalidOperation(message ?? Strings.This_program_location_is_thought_to_be_unreachable, path, line);
+
+    /// <summary>
+    ///  Can be called at points that are assumed to be unreachable at runtime.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"/>
+    [DoesNotReturn]
+    public static void Unreachable(
+        UnreachableInterpolatedStringHandler message,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        => ThrowInvalidOperation(message.GetFormattedText(), path, line);
+
+    /// <summary>
+    ///  Can be called at points that are assumed to be unreachable at runtime.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"/>
+    [DoesNotReturn]
+    public static T Unreachable<T>(
+        string? message = null,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        => ThrowInvalidOperation<T>(message ?? Strings.This_program_location_is_thought_to_be_unreachable, path, line);
+
+    /// <summary>
+    ///  Can be called at points that are assumed to be unreachable at runtime.
+    /// </summary>
+    /// <exception cref="InvalidOperationException"/>
+    [DoesNotReturn]
+    public static T Unreachable<T>(
+        UnreachableInterpolatedStringHandler message,
+        [CallerFilePath] string? path = null,
+        [CallerLineNumber] int line = 0)
+        => ThrowInvalidOperation<T>(message.GetFormattedText(), path, line);
+
+    [DebuggerHidden]
+    [DoesNotReturn]
+    private static void ThrowInvalidOperation(string message, string? path, int line)
+        => ThrowHelper.ThrowInvalidOperationException(message + Environment.NewLine + Strings.FormatFile_0_Line_1(path, line));
+
+    [DebuggerHidden]
+    [DoesNotReturn]
+    private static T ThrowInvalidOperation<T>(string message, string? path, int line)
+        => ThrowHelper.ThrowInvalidOperationException<T>(message + Environment.NewLine + Strings.FormatFile_0_Line_1(path, line));
+}