huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Flow RazorLanguageVersion to RazorEngine. 

- Restructured RazorLanguageVersion to be a sealed concrete type to enable things like `RazorLanguageVersion.Latest`; it also allows us to make broader changes in the future. Also, in the future if we want to add support for overriding operators to enable greater than comparisons we can as well.
- Removed version validity checks because we restrict who can construct a `RazorLanguageVersion` now. This way we don't have to check for valid versions all throughout our code.
- Added a simple `ProjectExtensibilityConfiguration` => `RazorLanguageVersion` method in the `DefaultProjectExtensibilityConfigurationFactory` to temporarily enable letting the system operate on the `RazorLanguageVersion`. Eventually that entire class will change.

#1961
This commit is contained in:
N. Taylor Mullen 2018-01-23 16:39:42 -08:00
parent af12a455ff
commit a01fa1c5b6
15 changed files with 218 additions and 87 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/Microsoft.AspNetCore.Razor.Language/Properties/Resources.Designer.cs generated
View File

@ -682,20 +682,6 @@ namespace Microsoft.AspNetCore.Razor.Language
internal static string FormatTagHelperPrefixDirective_Description()
=> GetString("TagHelperPrefixDirective_Description");
/// <summary>
/// Provided value for razor language version is unsupported or invalid: '{0}'.
/// </summary>
internal static string InvalidRazorLanguageVersion
{
get => GetString("InvalidRazorLanguageVersion");
}
/// <summary>
/// Provided value for razor language version is unsupported or invalid: '{0}'.
/// </summary>
internal static string FormatInvalidRazorLanguageVersion(object p0)
=> string.Format(CultureInfo.CurrentCulture, GetString("InvalidRazorLanguageVersion"), p0);
/// <summary>
/// Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.
/// </summary>

28
src/Microsoft.AspNetCore.Razor.Language/RazorConfiguration.cs Normal file
View File

@ -0,0 +1,28 @@
// Copyright(c) .NET Foundation.All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNetCore.Razor.Language
{
public sealed class RazorConfiguration
{
public static readonly RazorConfiguration DefaultRuntime = new RazorConfiguration(RazorLanguageVersion.Latest, designTime: false);
public static readonly RazorConfiguration DefaultDesignTime = new RazorConfiguration(RazorLanguageVersion.Latest, designTime: true);
public RazorConfiguration(RazorLanguageVersion languageVersion, bool designTime)
{
if (languageVersion == null)
{
throw new ArgumentNullException(nameof(languageVersion));
}
LanguageVersion = languageVersion;
DesignTime = designTime;
}
public RazorLanguageVersion LanguageVersion { get; }
public bool DesignTime { get; }
}
}

41
src/Microsoft.AspNetCore.Razor.Language/RazorEngine.cs
View File

@ -15,26 +15,35 @@ namespace Microsoft.AspNetCore.Razor.Language
return Create(configure: null);
}
public static RazorEngine Create(Action<IRazorEngineBuilder> configure)
{
var builder = new DefaultRazorEngineBuilder(designTime: false);
AddDefaults(builder);
AddRuntimeDefaults(builder);
configure?.Invoke(builder);
return builder.Build();
}
public static RazorEngine Create(Action<IRazorEngineBuilder> configure) => CreateCore(RazorConfiguration.DefaultRuntime, configure);
public static RazorEngine CreateDesignTime()
{
return CreateDesignTime(configure: null);
}
public static RazorEngine CreateDesignTime(Action<IRazorEngineBuilder> configure)
public static RazorEngine CreateDesignTime(Action<IRazorEngineBuilder> configure) => CreateCore(RazorConfiguration.DefaultDesignTime, configure);
// Internal since RazorEngine APIs are going to be obsolete.
internal static RazorEngine CreateCore(RazorConfiguration configuration, Action<IRazorEngineBuilder> configure)
{
var builder = new DefaultRazorEngineBuilder(designTime: true);
if (configuration == null)
{
throw new ArgumentNullException(nameof(configuration));
}
var builder = new DefaultRazorEngineBuilder(configuration.DesignTime);
AddDefaults(builder);
AddDesignTimeDefaults(builder);
if (configuration.DesignTime)
{
AddDesignTimeDefaults(configuration, builder);
}
else
{
AddRuntimeDefaults(configuration, builder);
}
configure?.Invoke(builder);
return builder.Build();
}
@ -99,10 +108,10 @@ namespace Microsoft.AspNetCore.Razor.Language
builder.Features.Add(configurationFeature);
}
internal static void AddRuntimeDefaults(IRazorEngineBuilder builder)
internal static void AddRuntimeDefaults(RazorConfiguration configuration, IRazorEngineBuilder builder)
{
// Configure options
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorParserOptions.LatestRazorLanguageVersion));
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: configuration.LanguageVersion));
builder.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: false));
// Intermediate Node Passes
@ -113,10 +122,10 @@ namespace Microsoft.AspNetCore.Razor.Language
builder.AddTargetExtension(new PreallocatedAttributeTargetExtension());
}
internal static void AddDesignTimeDefaults(IRazorEngineBuilder builder)
internal static void AddDesignTimeDefaults(RazorConfiguration configuration, IRazorEngineBuilder builder)
{
// Configure options
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: true, version: RazorParserOptions.LatestRazorLanguageVersion));
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: true, version: configuration.LanguageVersion));
builder.Features.Add(new DefaultRazorCodeGenerationOptionsFeature(designTime: true));
builder.Features.Add(new SuppressChecksumOptionsFeature());

49
src/Microsoft.AspNetCore.Razor.Language/RazorLanguageVersion.cs
View File

@ -1,33 +1,50 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNetCore.Razor.Language
{
public enum RazorLanguageVersion
public sealed class RazorLanguageVersion : IEquatable<RazorLanguageVersion>
{
Version1_0 = 1,
public static readonly RazorLanguageVersion Version_1_0 = new RazorLanguageVersion(1, 0);
Version1_1 = 2,
public static readonly RazorLanguageVersion Version_1_1 = new RazorLanguageVersion(1, 1);
Version2_0 = 3,
public static readonly RazorLanguageVersion Version_2_0 = new RazorLanguageVersion(2, 0);
Version2_1 = 4,
}
public static readonly RazorLanguageVersion Version_2_1 = new RazorLanguageVersion(2, 1);
internal static class RazorLanguageVersionExtensions
{
internal static bool IsValid(this RazorLanguageVersion version)
public static readonly RazorLanguageVersion Latest = Version_2_1;
// Don't want anyone else constructing language versions.
private RazorLanguageVersion(int major, int minor)
{
switch (version)
Major = major;
Minor = minor;
}
public int Major { get; }
public int Minor { get; }
public bool Equals(RazorLanguageVersion other)
{
if (other == null)
{
case RazorLanguageVersion.Version1_0:
case RazorLanguageVersion.Version1_1:
case RazorLanguageVersion.Version2_0:
case RazorLanguageVersion.Version2_1:
return true;
return false;
}
return false;
// We're the only one who can create RazorLanguageVersions so reference equality is sufficient.
return ReferenceEquals(this, other);
}
public override int GetHashCode()
{
// We don't need to do anything special for our hash code since reference equality is what we're going for.
return base.GetHashCode();
}
public override string ToString() => $"Razor '{Major}.{Minor}'";
}
}

9
src/Microsoft.AspNetCore.Razor.Language/RazorParserFeatureFlags.cs
View File

@ -1,22 +1,15 @@
// Copyright (c) .NET Foundation. All rights reserved.
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
namespace Microsoft.AspNetCore.Razor.Language
{
internal abstract class RazorParserFeatureFlags
{
public static RazorParserFeatureFlags Create(RazorLanguageVersion version)
{
if (!version.IsValid())
{
throw new ArgumentException(Resources.FormatInvalidRazorLanguageVersion(version.ToString()));
}
var allowMinimizedBooleanTagHelperAttributes = false;
if (version == RazorLanguageVersion.Version2_1)
if (version == RazorLanguageVersion.Version_2_1)
{
allowMinimizedBooleanTagHelperAttributes = true;
}

10
src/Microsoft.AspNetCore.Razor.Language/RazorParserOptions.cs
View File

@ -8,15 +8,13 @@ namespace Microsoft.AspNetCore.Razor.Language
{
public abstract class RazorParserOptions
{
internal static readonly RazorLanguageVersion LatestRazorLanguageVersion = RazorLanguageVersion.Version2_1;
public static RazorParserOptions CreateDefault()
{
return new DefaultRazorParserOptions(
Array.Empty<DirectiveDescriptor>(),
designTime: false,
parseLeadingDirectives: false,
version: LatestRazorLanguageVersion);
version: RazorLanguageVersion.Latest);
}
public static RazorParserOptions Create(Action<RazorParserOptionsBuilder> configure)
@ -26,7 +24,7 @@ namespace Microsoft.AspNetCore.Razor.Language
throw new ArgumentNullException(nameof(configure));
}
var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: LatestRazorLanguageVersion);
var builder = new DefaultRazorParserOptionsBuilder(designTime: false, version: RazorLanguageVersion.Latest);
configure(builder);
var options = builder.Build();
@ -40,7 +38,7 @@ namespace Microsoft.AspNetCore.Razor.Language
throw new ArgumentNullException(nameof(configure));
}
var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: LatestRazorLanguageVersion);
var builder = new DefaultRazorParserOptionsBuilder(designTime: true, version: RazorLanguageVersion.Latest);
configure(builder);
var options = builder.Build();
@ -61,7 +59,7 @@ namespace Microsoft.AspNetCore.Razor.Language
/// </remarks>
public abstract bool ParseLeadingDirectives { get; }
public virtual RazorLanguageVersion Version { get; } = LatestRazorLanguageVersion;
public virtual RazorLanguageVersion Version { get; } = RazorLanguageVersion.Latest;
internal virtual RazorParserFeatureFlags FeatureFlags { get; }
}

3
src/Microsoft.AspNetCore.Razor.Language/Resources.resx
View File

@ -261,9 +261,6 @@
<data name="TagHelperPrefixDirective_Description" xml:space="preserve">
<value>Specify a prefix that is required in an element name for it to be included in Tag Helper processing.</value>
</data>
<data name="InvalidRazorLanguageVersion" xml:space="preserve">
<value>Provided value for razor language version is unsupported or invalid: '{0}'.</value>
</data>
<data name="AddTagHelperDirective_StringToken_Description" xml:space="preserve">
<value>Add tag helpers from the specified type name and assembly name. Specify '*' for the type name to include all tag helper types from the specified assembly.</value>
</data>

41
src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/DefaultProjectExtensibilityConfigurationFactory.cs
View File

@ -5,6 +5,7 @@ using System;
using System.Collections.Generic;
using System.Threading;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Razor.Language;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
{
@ -72,10 +73,14 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
}
}
RazorLanguageVersion languageVersion = null;
if (razorAssembly != null && mvcAssembly != null)
{
languageVersion = GetLanguageVersion(razorAssembly);
// This means we've definitely found a supported Razor version and an MVC version.
return new MvcExtensibilityConfiguration(
languageVersion,
ProjectExtensibilityConfigurationKind.ApproximateMatch,
new ProjectExtensibilityAssembly(razorAssembly),
new ProjectExtensibilityAssembly(mvcAssembly));
@ -92,10 +97,46 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
mvcAssembly = new AssemblyIdentity(MvcAssemblyName, DefaultMvcVersion);
}
if (languageVersion == null)
{
languageVersion = GetLanguageVersion(razorAssembly);
}
return new MvcExtensibilityConfiguration(
languageVersion,
ProjectExtensibilityConfigurationKind.Fallback,
new ProjectExtensibilityAssembly(razorAssembly),
new ProjectExtensibilityAssembly(mvcAssembly));
}
// Internal for testing
internal static RazorLanguageVersion GetLanguageVersion(AssemblyIdentity razorAssembly)
{
// This is inferred from the assembly for now, the Razor language version will eventually flow from MSBuild.
var razorAssemblyVersion = razorAssembly.Version;
if (razorAssemblyVersion.Major == 1)
{
if (razorAssemblyVersion.Minor >= 1)
{
return RazorLanguageVersion.Version_1_1;
}
return RazorLanguageVersion.Version_1_0;
}
if (razorAssemblyVersion.Major == 2)
{
if (razorAssemblyVersion.Minor >= 1)
{
return RazorLanguageVersion.Version_2_1;
}
return RazorLanguageVersion.Version_2_0;
}
// Couldn't determine version based off of assembly, fallback to latest.
return RazorLanguageVersion.Latest;
}
}
}

22
src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/MvcExtensibilityConfiguration.cs
View File

@ -4,6 +4,7 @@
using System;
using System.Collections.Generic;
using System.Linq;
using Microsoft.AspNetCore.Razor.Language;
using Microsoft.Extensions.Internal;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
@ -11,6 +12,7 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
internal class MvcExtensibilityConfiguration : ProjectExtensibilityConfiguration
{
public MvcExtensibilityConfiguration(
RazorLanguageVersion languageVersion,
ProjectExtensibilityConfigurationKind kind,
ProjectExtensibilityAssembly razorAssembly,
ProjectExtensibilityAssembly mvcAssembly)
@ -28,19 +30,24 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
Kind = kind;
RazorAssembly = razorAssembly;
MvcAssembly = mvcAssembly;
LanguageVersion = languageVersion;
Assemblies = new[] { RazorAssembly, MvcAssembly, };
}
public override IReadOnlyList<ProjectExtensibilityAssembly> Assemblies { get; }
// MVC: '2.0.0' (fallback) or MVC: '2.1.3'
public override string DisplayName => $"MVC: {MvcAssembly.Identity.Version.ToString(3)}" + (Kind == ProjectExtensibilityConfigurationKind.Fallback? " (fallback)" : string.Empty);
// MVC: '2.0.0' (fallback) | Razor Language '2.0.0'
// or
// MVC: '2.1.3' | Razor Language '2.1.3'
public override string DisplayName => $"MVC: {MvcAssembly.Identity.Version.ToString(3)}" + (Kind == ProjectExtensibilityConfigurationKind.Fallback? " (fallback)" : string.Empty) + " | " + LanguageVersion;
public override ProjectExtensibilityConfigurationKind Kind { get; }
public override ProjectExtensibilityAssembly RazorAssembly { get; }
public override RazorLanguageVersion LanguageVersion { get; }
public ProjectExtensibilityAssembly MvcAssembly { get; }
public override bool Equals(ProjectExtensibilityConfiguration other)
@ -51,10 +58,11 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
}
// We're intentionally ignoring the 'Kind' here. That's mostly for diagnostics and doesn't influence any behavior.
return Enumerable.SequenceEqual(
Assemblies.OrderBy(a => a.Identity.Name).Select(a => a.Identity),
other.Assemblies.OrderBy(a => a.Identity.Name).Select(a => a.Identity),
AssemblyIdentityEqualityComparer.NameAndVersion);
return LanguageVersion == other.LanguageVersion &&
Enumerable.SequenceEqual(
Assemblies.OrderBy(a => a.Identity.Name).Select(a => a.Identity),
other.Assemblies.OrderBy(a => a.Identity.Name).Select(a => a.Identity),
AssemblyIdentityEqualityComparer.NameAndVersion);
}
public override int GetHashCode()
@ -65,6 +73,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
hash.Add(assembly);
}
hash.Add(LanguageVersion);
return hash;
}

3
src/Microsoft.CodeAnalysis.Razor.Workspaces/ProjectSystem/ProjectExtensibilityConfiguration.cs
View File

@ -3,6 +3,7 @@
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Razor.Language;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
{
@ -16,6 +17,8 @@ namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
public abstract ProjectExtensibilityAssembly RazorAssembly { get; }
public abstract RazorLanguageVersion LanguageVersion { get; }
public abstract bool Equals(ProjectExtensibilityConfiguration other);
public abstract override int GetHashCode();

9
src/Microsoft.VisualStudio.Editor.Razor/DefaultTemplateEngineFactoryService.cs
View File

@ -15,6 +15,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
internal class DefaultTemplateEngineFactoryService : RazorTemplateEngineFactoryService
{
private readonly static MvcExtensibilityConfiguration DefaultConfiguration = new MvcExtensibilityConfiguration(
RazorLanguageVersion.Version_2_0,
ProjectExtensibilityConfigurationKind.Fallback,
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Razor.Language", new Version("2.0.0.0"))),
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Mvc.Razor", new Version("2.0.0.0"))));
@ -41,11 +42,13 @@ namespace Microsoft.VisualStudio.Editor.Razor
// In 15.5 we expect projectPath to be a directory, NOT the path to the csproj.
var project = FindProject(projectPath);
var configuration = (project?.Configuration as MvcExtensibilityConfiguration) ?? DefaultConfiguration;
var razorLanguageVersion = configuration.LanguageVersion;
var razorConfiguration = new RazorConfiguration(razorLanguageVersion, designTime: true);
RazorEngine engine;
if (configuration.RazorAssembly.Identity.Version.Major == 1)
if (razorLanguageVersion.Major == 1)
{
engine = RazorEngine.CreateDesignTime(b =>
engine = RazorEngine.CreateCore(razorConfiguration, b =>
{
configure?.Invoke(b);
@ -63,7 +66,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
}
else
{
engine = RazorEngine.CreateDesignTime(b =>
engine = RazorEngine.CreateCore(razorConfiguration, b =>
{
configure?.Invoke(b);

6
test/Microsoft.AspNetCore.Razor.Language.Test/DefaultRazorParsingPhaseTest.cs
View File

@ -15,7 +15,7 @@ namespace Microsoft.AspNetCore.Razor.Language
var engine = RazorEngine.CreateEmpty(builder =>
{
builder.Phases.Add(phase);
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorParserOptions.LatestRazorLanguageVersion));
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest));
});
var codeDocument = TestRazorCodeDocument.CreateEmpty();
@ -35,7 +35,7 @@ namespace Microsoft.AspNetCore.Razor.Language
var engine = RazorEngine.CreateEmpty((builder) =>
{
builder.Phases.Add(phase);
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorParserOptions.LatestRazorLanguageVersion));
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest));
builder.Features.Add(new MyParserOptionsFeature());
});
@ -58,7 +58,7 @@ namespace Microsoft.AspNetCore.Razor.Language
var engine = RazorEngine.CreateEmpty((builder) =>
{
builder.Phases.Add(phase);
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorParserOptions.LatestRazorLanguageVersion));
builder.Features.Add(new DefaultRazorParserOptionsFeature(designTime: false, version: RazorLanguageVersion.Latest));
builder.Features.Add(new MyParserOptionsFeature());
});

14
test/Microsoft.AspNetCore.Razor.Language.Test/RazorParserFeatureFlagsTest.cs
View File

@ -12,7 +12,7 @@ namespace Microsoft.AspNetCore.Razor.Language
public void Create_LatestVersion_AllowsMinimizedBooleanTagHelperAttributes()
{
// Arrange & Act
var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version2_1);
var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_2_1);
// Assert
Assert.True(context.AllowMinimizedBooleanTagHelperAttributes);
@ -22,20 +22,10 @@ namespace Microsoft.AspNetCore.Razor.Language
public void Create_OlderVersion_DoesNotAllowMinimizedBooleanTagHelperAttributes()
{
// Arrange & Act
var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version1_1);
var context = RazorParserFeatureFlags.Create(RazorLanguageVersion.Version_1_1);
// Assert
Assert.False(context.AllowMinimizedBooleanTagHelperAttributes);
}
[Fact]
public void Create_UnknownVersion_Throws()
{
// Arrange, Act & Assert
var exception = Assert.Throws<ArgumentException>(
() => RazorParserFeatureFlags.Create(0));
Assert.Equal("Provided value for razor language version is unsupported or invalid: '0'.", exception.Message);
}
}
}

52
test/Microsoft.CodeAnalysis.Razor.Workspaces.Test/ProjectSystem/DefaultProjectExtensibilityConfigurationFactoryTest.cs
View File

@ -2,12 +2,64 @@
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
using System;
using Microsoft.AspNetCore.Razor.Language;
using Xunit;
namespace Microsoft.CodeAnalysis.Razor.ProjectSystem
{
public class DefaultProjectExtensibilityConfigurationFactoryTest
{
public static TheoryData LanguageVersionMappingData
{
get
{
return new TheoryData<AssemblyIdentity, RazorLanguageVersion>
{
{ new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("1.0.0.0")), RazorLanguageVersion.Version_1_0 },
{ new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("1.1.0.0")), RazorLanguageVersion.Version_1_1 },
{ new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("2.0.0.0")), RazorLanguageVersion.Version_2_0 },
{ new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("2.1.0.0")), RazorLanguageVersion.Version_2_1 },
};
}
}
[Theory]
[MemberData(nameof(LanguageVersionMappingData))]
public void GetLanguageVersion_MapsExactVersionsCorrectly(AssemblyIdentity assemblyIdentity, RazorLanguageVersion expectedVersion)
{
// Act
var languageVersion = DefaultProjectExtensibilityConfigurationFactory.GetLanguageVersion(assemblyIdentity);
// Assert
Assert.Same(expectedVersion, languageVersion);
}
[Fact]
public void GetLanguageVersion_MapsFuture_1_0_VersionsCorrectly()
{
// Arrange
var assemblyIdentity = new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("1.3.0.0"));
// Act
var languageVersion = DefaultProjectExtensibilityConfigurationFactory.GetLanguageVersion(assemblyIdentity);
// Assert
Assert.Same(RazorLanguageVersion.Version_1_1, languageVersion);
}
[Fact]
public void GetLanguageVersion_MapsFuture_2_0_VersionsCorrectly()
{
// Arrange
var assemblyIdentity = new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("2.3.0.0"));
// Act
var languageVersion = DefaultProjectExtensibilityConfigurationFactory.GetLanguageVersion(assemblyIdentity);
// Assert
Assert.Same(RazorLanguageVersion.Latest, languageVersion);
}
[Theory]
[InlineData("1.0.0.0", "1.0.0.0")]
[InlineData("1.1.0.0", "1.1.0.0")]

4
test/Microsoft.VisualStudio.Editor.Razor.Test/DefaultTemplateEngineFactoryServiceTest.cs
View File

@ -38,6 +38,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
projectManager.ProjectUpdated(new ProjectSnapshotUpdateContext(Project)
{
Configuration = new MvcExtensibilityConfiguration(
RazorLanguageVersion.Version_2_0,
ProjectExtensibilityConfigurationKind.ApproximateMatch,
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Mvc.Razor", new Version("2.0.0.0"))),
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("2.0.0.0")))),
@ -67,6 +68,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
projectManager.ProjectUpdated(new ProjectSnapshotUpdateContext(Project)
{
Configuration = new MvcExtensibilityConfiguration(
RazorLanguageVersion.Version_1_1,
ProjectExtensibilityConfigurationKind.ApproximateMatch,
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Mvc.Razor", new Version("1.1.3.0"))),
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("1.1.3.0")))),
@ -96,6 +98,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
projectManager.ProjectUpdated(new ProjectSnapshotUpdateContext(Project)
{
Configuration = new MvcExtensibilityConfiguration(
RazorLanguageVersion.Version_1_0,
ProjectExtensibilityConfigurationKind.ApproximateMatch,
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Mvc.Razor", new Version("1.0.0.0"))),
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("1.0.0.0")))),
@ -124,6 +127,7 @@ namespace Microsoft.VisualStudio.Editor.Razor
projectManager.ProjectUpdated(new ProjectSnapshotUpdateContext(Project)
{
Configuration = new MvcExtensibilityConfiguration(
RazorLanguageVersion.Latest,
ProjectExtensibilityConfigurationKind.ApproximateMatch,
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Mvc.Razor", new Version("3.0.0.0"))),
new ProjectExtensibilityAssembly(new AssemblyIdentity("Microsoft.AspNetCore.Razor", new Version("3.0.0.0")))),