Merge release/dev17.13 to main (#11170)

This is an automatically generated pull request from release/dev17.13
into main.


Once all conflicts are resolved and all the tests pass, you are free to
merge the pull request. 🐯

## Troubleshooting conflicts

### Identify authors of changes which introduced merge conflicts
Scroll to the bottom, then for each file containing conflicts copy its
path into the following searches:
- https://github.com/dotnet/razor/find/release/dev17.13
- https://github.com/dotnet/razor/find/main

Usually the most recent change to a file between the two branches is
considered to have introduced the conflicts, but sometimes it will be
necessary to look for the conflicting lines and check the blame in each
branch. Generally the author whose change introduced the conflicts
should pull down this PR, fix the conflicts locally, then push up a
commit resolving the conflicts.

### Resolve merge conflicts using your local repo
Sometimes merge conflicts may be present on GitHub but merging locally
will work without conflicts. This is due to differences between the
merge algorithm used in local git versus the one used by GitHub.
``` bash
git fetch --all
git checkout -t upstream/merges/release/dev17.13-to-main
git reset --hard upstream/main
git merge upstream/release/dev17.13
# Fix merge conflicts
git commit
git push upstream merges/release/dev17.13-to-main --force
```

Author: dotnet-bot

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/CodeGeneration/DesignTimeNodeWriterTest.cs

@@ -493,7 +493,7 @@ Render Children
             ignoreLineEndingDifferences: true);
     }
 
-    [ConditionalTheory(Is.Windows)]
+    [OSSkipConditionTheory(new[] { "Linux", "OSX" })]
     [InlineData(@"test.cshtml",                     @"test.cshtml")]
     [InlineData(@"pages/test.cshtml",               @"pages\test.cshtml")]
     [InlineData(@"pages\test.cshtml",               @"pages\test.cshtml")]
@@ -540,7 +540,7 @@ public void LinePragma_Is_Adjusted_On_Windows(string fileName, string expectedFi
             ignoreLineEndingDifferences: true);
     }
 
-    [ConditionalTheory(Is.Windows)]
+    [OSSkipConditionTheory(new[] { "Linux", "OSX" })]
     [InlineData(@"test.cshtml",                     @"test.cshtml")]
     [InlineData(@"pages/test.cshtml",               @"pages\test.cshtml")]
     [InlineData(@"pages\test.cshtml",               @"pages\test.cshtml")]

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/DefaultRazorProjectFileSystemTest.cs

@@ -6,6 +6,7 @@
 using System;
 using System.IO;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Xunit;
 
 namespace Microsoft.AspNetCore.Razor.Language;
@@ -260,10 +261,15 @@ public void GetItem_ReturnsFileFromDisk()
         Assert.Equal(Path.Combine("Views", "About", "About.cshtml"), item.RelativePhysicalPath);
     }
 
-    // "This test does not makes sense for case sensitive Operating Systems."
-    [ConditionalFact(Is.Windows)]
+    [Fact]
     public void GetItem_MismatchedCase_ReturnsFileFromDisk()
     {
+        if (!RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
+        {
+            // "This test does not makes sense for case sensitive Operating Systems."
+            return;
+        }
+
         // Arrange
         var filePath = "/Views/About/About.cshtml";
         var lowerCaseTestFolder = TestFolder.ToLowerInvariant();

src/Compiler/Microsoft.AspNetCore.Razor.Language/test/Microsoft.AspNetCore.Razor.Language.Test.csproj

@@ -30,6 +30,7 @@
     <Compile Include="..\..\shared\JsonReaderExtensions.cs" LinkBase="Shared" />
     <Compile Include="..\..\shared\RazorDiagnosticJsonConverter.cs" LinkBase="Shared" />
     <Compile Include="..\..\shared\TagHelperDescriptorJsonConverter.cs" LinkBase="Shared" />
+    <Compile Include="..\..\..\Razor\test\OSSkipConditionFactAttribute.cs" LinkBase="Shared" />
   </ItemGroup>
 
   <ItemGroup>

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FilePathComparer.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore.Razor.Utilities;
+using System.Runtime.InteropServices;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
@@ -14,7 +14,7 @@ public static StringComparer Instance
     {
         get
         {
-            return _instance ??= PlatformInformation.IsLinux
+            return _instance ??= RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
                 ? StringComparer.Ordinal
                 : StringComparer.OrdinalIgnoreCase;
         }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/CSharp/FilePathComparison.cs

@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using System;
-using Microsoft.AspNetCore.Razor.Utilities;
+using System.Runtime.InteropServices;
 
 namespace Microsoft.CodeAnalysis.Razor;
 
@@ -14,7 +14,7 @@ public static StringComparison Instance
     {
         get
         {
-            return _instance ??= PlatformInformation.IsLinux
+            return _instance ??= RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
                 ? StringComparison.Ordinal
                 : StringComparison.OrdinalIgnoreCase;
         }

src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/Language/CodeGeneration/CodeWriterExtensions.cs

@@ -8,8 +8,8 @@
 using System.Diagnostics;
 using System.Globalization;
 using System.Linq;
+using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Razor.Language.Intermediate;
-using Microsoft.AspNetCore.Razor.Utilities;
 
 namespace Microsoft.AspNetCore.Razor.Language.CodeGeneration;
 
@@ -661,7 +661,7 @@ public static IDisposable BuildEnhancedLinePragma(this CodeWriter writer, Source
 
     private static SourceSpan RemapFilePathIfNecessary(SourceSpan sourceSpan, CodeRenderingContext context)
     {
-        if (context.Options.RemapLinePragmaPathsOnWindows && PlatformInformation.IsWindows)
+        if (context.Options.RemapLinePragmaPathsOnWindows && RuntimeInformation.IsOSPlatform(OSPlatform.Windows))
         {
             // ISSUE: https://github.com/dotnet/razor/issues/9108
             // The razor tooling normalizes paths to be forward slash based, regardless of OS.

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/DefaultLanguageServerFeatureOptions.cs

@@ -1,7 +1,7 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the MIT license. See License.txt in the project root for license information.
 
-using Microsoft.AspNetCore.Razor.Utilities;
+using System.Runtime.InteropServices;
 using Microsoft.CodeAnalysis.Razor.Workspaces;
 
 namespace Microsoft.AspNetCore.Razor.LanguageServer;
@@ -25,7 +25,8 @@ internal class DefaultLanguageServerFeatureOptions : LanguageServerFeatureOption
 
     // Code action and rename paths in Windows VS Code need to be prefixed with '/':
     // https://github.com/dotnet/razor/issues/8131
-    public override bool ReturnCodeActionAndRenamePathsWithPrefixedSlash => PlatformInformation.IsWindows;
+    public override bool ReturnCodeActionAndRenamePathsWithPrefixedSlash
+        => RuntimeInformation.IsOSPlatform(OSPlatform.Windows);
 
     public override bool ShowAllCSharpCodeActions => false;
 

src/Razor/src/Microsoft.AspNetCore.Razor.LanguageServer/RemoteRazorProjectFileSystem.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
+using System.Runtime.InteropServices;
 using Microsoft.AspNetCore.Razor.Language;
 using Microsoft.AspNetCore.Razor.Utilities;
 using Microsoft.CodeAnalysis.Razor;
@@ -81,7 +82,7 @@ protected override string NormalizeAndEnsureValidPath(string path)
 
         static bool IsPathRootedForPlatform(string path)
         {
-            if (PlatformInformation.IsWindows && path == "/")
+            if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && path == "/")
             {
                 // We have to special case windows and "/" because for some reason Path.IsPathRooted returns true on windows for a single "/" path.
                 return false;

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/FilePathNormalizer.cs

@@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Utilities;
 
 internal static class FilePathNormalizer
 {
-    private static readonly Func<char, char> s_charConverter = PlatformInformation.IsLinux
+    private static readonly Func<char, char> s_charConverter = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
         ? c => c
         : char.ToLowerInvariant;
 
@@ -223,7 +223,7 @@ private static (int start, int length) NormalizeCore(ReadOnlySpan<char> source,
         // Replace slashes in our normalized span.
         NormalizeAndDedupeSlashes(destination, ref charsWritten);
 
-        if (PlatformInformation.IsWindows &&
+        if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) &&
             charsWritten > 1 &&
             destination is ['/', ..] and not ['/', '/', ..])
         {

src/Razor/src/Microsoft.AspNetCore.Razor.ProjectEngineHost/Utilities/RazorProjectInfoFactory.cs

@@ -5,6 +5,7 @@
 using System.Collections.Immutable;
 using System.Diagnostics.CodeAnalysis;
 using System.IO;
+using System.Runtime.InteropServices;
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Razor.Language;
@@ -33,7 +34,7 @@ internal readonly record struct ConversionResult(RazorProjectInfo? ProjectInfo,
 
     static RazorProjectInfoFactory()
     {
-        s_stringComparison = PlatformInformation.IsLinux
+        s_stringComparison = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
             ? StringComparison.Ordinal
             : StringComparison.OrdinalIgnoreCase;
     }