diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx index f589cf9f855..9ce6a9a2f0b 100644 --- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx +++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/Diagnostics/RazorSourceGeneratorResources.resx @@ -121,7 +121,7 @@ Invalid RazorLangVersion - Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 8.0. + Invalid value '{0}' for RazorLangVersion. Valid values include 'Latest', 'Preview', or a valid version in range 1.0 to {1}. Recomputing tag helpers diff --git a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/RazorSourceGenerator.RazorProviders.cs b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/RazorSourceGenerator.RazorProviders.cs index eb089d0a7f4..20320759d8d 100644 --- a/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/RazorSourceGenerator.RazorProviders.cs +++ b/src/Compiler/Microsoft.CodeAnalysis.Razor.Compiler/src/SourceGenerators/RazorSourceGenerator.RazorProviders.cs @@ -41,7 +41,8 @@ public partial class RazorSourceGenerator diagnostic = Diagnostic.Create( RazorDiagnostics.InvalidRazorLangVersionDescriptor, Location.None, - razorLanguageVersionString); + razorLanguageVersionString, + RazorLanguageVersion.Preview.ToString()); razorLanguageVersion = RazorLanguageVersion.Latest; } diff --git a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs index c1fcd399a07..115da85f650 100644 --- a/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs +++ b/src/Compiler/test/Microsoft.NET.Sdk.Razor.SourceGenerators.Tests/RazorSourceGeneratorTests.cs @@ -10,7 +10,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -using Microsoft.AspNetCore.Razor.Language.Syntax; +using Microsoft.AspNetCore.Razor.Language; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; using Microsoft.CodeAnalysis.Test.Utilities; @@ -3101,8 +3101,8 @@ public async Task RazorLangVersion_Incorrect([CombinatorialValues("incorrect", " var result = RunGenerator(compilation!, ref driver); result.Diagnostics.Verify( - // error RZ3600: Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 8.0. - Diagnostic("RZ3600").WithArguments(langVersion).WithLocation(1, 1)); + // error RZ3600: Invalid value '{0}' for RazorLangVersion. Valid values include 'Latest', 'Preview', or a valid version in range 1.0 to {1}. + Diagnostic("RZ3600").WithArguments(langVersion, RazorLanguageVersion.Preview.ToString()).WithLocation(1, 1)); Assert.Single(result.GeneratedSources); } @@ -3272,7 +3272,7 @@ public async Task IncrementalCompilation_OnlyCompilationRuns_When_MetadataRefere Assert.Equal(2, result.GeneratedSources.Length); Assert.Empty(eventListener.Events); - var reference = (PortableExecutableReference) project.MetadataReferences[^1]; + var reference = (PortableExecutableReference)project.MetadataReferences[^1]; project = project.RemoveMetadataReference(reference) .AddMetadataReference(MetadataReference.CreateFromFile(reference.FilePath!));