Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@
<value>Invalid RazorLangVersion</value>
</data>
<data name="InvalidRazorLangMessage" xml:space="preserve">
<value>Invalid value '{0}'' for RazorLangVersion. Valid values include 'Latest' or a valid version in range 1.0 to 8.0.</value>
<value>Invalid value '{0}' for RazorLangVersion. Valid values include 'Latest', 'Preview', or a valid version in range 1.0 to {1}.</value>
</data>
<data name="RecomputingTagHelpersTitle" xml:space="preserve">
<value>Recomputing tag helpers</value>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,8 @@ public partial class RazorSourceGenerator
diagnostic = Diagnostic.Create(
RazorDiagnostics.InvalidRazorLangVersionDescriptor,
Location.None,
razorLanguageVersionString);
razorLanguageVersionString,
RazorLanguageVersion.Preview.ToString());
razorLanguageVersion = RazorLanguageVersion.Latest;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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);
}

Expand Down Expand Up @@ -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!));
Expand Down