Skip to content
This repository was archived by the owner on Dec 19, 2018. It is now read-only.

Commit b900a82

Browse files
rynowakrynowak
committed
Refocus Razor runtime assemblies
Microsoft.AspNetCore.Razor becomes the home for TagHelper-related types that you use in your code. Microsoft.AspNetCore.Razor.Runtime becomes the home type types you need to build a view engine. User code should not need this package anymore. None of these are breaking changes due to typeforwards.
1 parent 4b93741 commit b900a82

30 files changed

+81
-51
lines changed

‎Razor.sln‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Microsoft Visual Studio Solution File, Format Version 12.00
22
# Visual Studio 15
3-
VisualStudioVersion = 15.0.27128.0
3+
VisualStudioVersion = 15.0.27130.2010
44
MinimumVisualStudioVersion = 15.0.26730.03
55
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C0D6505-79B3-49D0-B4C3-176F0F1836ED}"
66
ProjectSection(SolutionItems) = preProject
@@ -82,11 +82,13 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.
8282
EndProject
8383
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Design.Test", "test\Microsoft.AspNetCore.Razor.Design.Test\Microsoft.AspNetCore.Razor.Design.Test.csproj", "{1D90F276-E1CA-4FDF-A173-EB889E7D3150}"
8484
EndProject
85-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.GenerateTool", "src\Microsoft.AspNetCore.Razor.GenerateTool\Microsoft.AspNetCore.Razor.GenerateTool.csproj", "{8052F088-1204-427B-BB0D-BE3D3BA6811B}"
85+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.GenerateTool", "src\Microsoft.AspNetCore.Razor.GenerateTool\Microsoft.AspNetCore.Razor.GenerateTool.csproj", "{8052F088-1204-427B-BB0D-BE3D3BA6811B}"
8686
EndProject
87-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.Tasks", "src\Microsoft.AspNetCore.Razor.Tasks\Microsoft.AspNetCore.Razor.Tasks.csproj", "{043B9497-C0BA-4770-9210-4456D2F81CE0}"
87+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Tasks", "src\Microsoft.AspNetCore.Razor.Tasks\Microsoft.AspNetCore.Razor.Tasks.csproj", "{043B9497-C0BA-4770-9210-4456D2F81CE0}"
8888
EndProject
89-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNetCore.Razor.TagHelperTool", "src\Microsoft.AspNetCore.Razor.TagHelperTool\Microsoft.AspNetCore.Razor.TagHelperTool.csproj", "{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780}"
89+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.TagHelperTool", "src\Microsoft.AspNetCore.Razor.TagHelperTool\Microsoft.AspNetCore.Razor.TagHelperTool.csproj", "{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780}"
90+
EndProject
91+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "test\Microsoft.AspNetCore.Razor.Test\Microsoft.AspNetCore.Razor.Test.csproj", "{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}"
9092
EndProject
9193
Global
9294
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -366,6 +368,14 @@ Global
366368
{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780}.Release|Any CPU.Build.0 = Release|Any CPU
367369
{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
368370
{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
371+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
372+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.Build.0 = Debug|Any CPU
373+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU
374+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU
375+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.ActiveCfg = Release|Any CPU
376+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.Build.0 = Release|Any CPU
377+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU
378+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU
369379
EndGlobalSection
370380
GlobalSection(SolutionProperties) = preSolution
371381
HideSolutionNode = FALSE
@@ -405,6 +415,7 @@ Global
405415
{8052F088-1204-427B-BB0D-BE3D3BA6811B} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
406416
{043B9497-C0BA-4770-9210-4456D2F81CE0} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
407417
{AFD77E2F-1A4A-4C2C-9EA9-7E48C8926780} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
418+
{323553F0-14AB-4FBD-9CF0-1CC0BE8056F8} = {92463391-81BE-462B-AC3C-78C6C760741F}
408419
EndGlobalSection
409420
GlobalSection(ExtensibilityGlobals) = postSolution
410421
SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26}

‎shared/Microsoft.AspNetCore.Razor.TagHelpers.Testing.Sources/CaseSensitiveBoundAttributeComparer.cs‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Collections.Generic;
66
using System.IO;
77
using Microsoft.AspNetCore.Html;
8-
using Microsoft.Extensions.Internal;
98

109
namespace Microsoft.AspNetCore.Razor.TagHelpers.Testing
1110
{
@@ -35,11 +34,7 @@ public bool Equals(TagHelperAttribute attributeX, TagHelperAttribute attributeY)
3534

3635
public int GetHashCode(TagHelperAttribute attribute)
3736
{
38-
var hashCodeCombiner = HashCodeCombiner.Start();
39-
hashCodeCombiner.Add(attribute.GetHashCode());
40-
hashCodeCombiner.Add(attribute.Name, StringComparer.Ordinal);
41-
42-
return hashCodeCombiner.CombinedHash;
37+
return attribute.GetHashCode();
4338
}
4439

4540
private string GetString(object value)

‎src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj‎

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,8 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Summary>Runtime components for rendering Razor pages and implementing tag helpers.</Summary>
5-
<Description>$(Summary)
6-
7-
Commonly used types:
8-
Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute
9-
Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute
10-
Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
4+
<Description>Runtime infrastructure for rendering Razor pages and tag helpers.</Description>
115
<TargetFramework>netstandard2.0</TargetFramework>
12-
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
136
<PackageTags>$(PackageTags);taghelper;taghelpers</PackageTags>
147
</PropertyGroup>
158

@@ -20,7 +13,6 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
2013
<ItemGroup>
2114
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
2215
<PackageReference Include="Microsoft.Extensions.CopyOnWriteDictionary.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsCopyOnWriteDictionarySourcesPackageVersion)" />
23-
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
2416
</ItemGroup>
2517

2618
</Project>

‎src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,24 @@
22
// Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
33

44
using System.Runtime.CompilerServices;
5+
using Microsoft.AspNetCore.Razor.TagHelpers;
56

67
[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Runtime.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")]
8+
9+
[assembly: TypeForwardedTo(typeof(DefaultTagHelperContent))]
10+
[assembly: TypeForwardedTo(typeof(HtmlAttributeNameAttribute))]
11+
[assembly: TypeForwardedTo(typeof(HtmlAttributeNotBoundAttribute))]
12+
[assembly: TypeForwardedTo(typeof(HtmlTargetElementAttribute))]
13+
[assembly: TypeForwardedTo(typeof(ITagHelper))]
14+
[assembly: TypeForwardedTo(typeof(ITagHelperComponent))]
15+
[assembly: TypeForwardedTo(typeof(NullHtmlEncoder))]
16+
[assembly: TypeForwardedTo(typeof(OutputElementHintAttribute))]
17+
[assembly: TypeForwardedTo(typeof(ReadOnlyTagHelperAttributeList))]
18+
[assembly: TypeForwardedTo(typeof(RestrictChildrenAttribute))]
19+
[assembly: TypeForwardedTo(typeof(TagHelper))]
20+
[assembly: TypeForwardedTo(typeof(TagHelperAttribute))]
21+
[assembly: TypeForwardedTo(typeof(TagHelperAttributeList))]
22+
[assembly: TypeForwardedTo(typeof(TagHelperComponent))]
23+
[assembly: TypeForwardedTo(typeof(TagHelperContent))]
24+
[assembly: TypeForwardedTo(typeof(TagHelperContext))]
25+
[assembly: TypeForwardedTo(typeof(TagHelperOutput))]

‎src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj‎

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,23 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<Description>Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure.</Description>
4+
<Summary>Razor is a markup syntax for adding server-side logic to web pages. This package contains runtime components for rendering Razor pages and implementing tag helpers.</Summary>
5+
<Description>$(Summary)
6+
7+
Commonly used types:
8+
Microsoft.AspNetCore.Razor.TagHelpers.HtmlAttributeNameAttribute
9+
Microsoft.AspNetCore.Razor.TagHelpers.HtmlTargetElementAttribute
10+
Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper</Description>
511
<TargetFramework>netstandard2.0</TargetFramework>
12+
<PackageTags>$(PackageTags);taghelper;taghelpers</PackageTags>
13+
14+
<!-- Required to implement an HtmlEncoder -->
15+
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
616
</PropertyGroup>
717

18+
<ItemGroup>
19+
<PackageReference Include="Microsoft.AspNetCore.Html.Abstractions" Version="$(MicrosoftAspNetCoreHtmlAbstractionsPackageVersion)" />
20+
<PackageReference Include="Microsoft.Extensions.HashCodeCombiner.Sources" PrivateAssets="All" Version="$(MicrosoftExtensionsHashCodeCombinerSourcesPackageVersion)" />
21+
</ItemGroup>
22+
823
</Project>

src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/DefaultTagHelperContent.cs renamed to src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs

File renamed without changes.

src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNameAttribute.cs renamed to src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNameAttribute.cs

File renamed without changes.

src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlAttributeNotBoundAttribute.cs renamed to src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNotBoundAttribute.cs

File renamed without changes.

src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/HtmlTargetElementAttribute.cs renamed to src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlTargetElementAttribute.cs

File renamed without changes.

src/Microsoft.AspNetCore.Razor.Runtime/TagHelpers/ITagHelper.cs renamed to src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelper.cs

File renamed without changes.

0 commit comments

Comments
 (0)