diff --git a/build/buildorder.props b/build/buildorder.props index d27a28c5cb..4671c2bf63 100644 --- a/build/buildorder.props +++ b/build/buildorder.props @@ -7,7 +7,6 @@ - diff --git a/build/repo.props b/build/repo.props index 15ca73dba3..e1ceb4fc8c 100644 --- a/build/repo.props +++ b/build/repo.props @@ -72,7 +72,8 @@ @@ -97,6 +98,7 @@ $(RepositoryRoot)src\Shared\**\*.*proj; $(RepositoryRoot)src\Tools\**\*.*proj; $(RepositoryRoot)src\Middleware\**\*.*proj; + $(RepositoryRoot)src\Razor\**\*.*proj; " Exclude=" @(ProjectToExclude); diff --git a/build/submodules.props b/build/submodules.props index 8b3af6dfc1..20ff66acb5 100644 --- a/build/submodules.props +++ b/build/submodules.props @@ -42,7 +42,6 @@ - diff --git a/eng/Baseline.Designer.props b/eng/Baseline.Designer.props index b83086b359..70ce243290 100644 --- a/eng/Baseline.Designer.props +++ b/eng/Baseline.Designer.props @@ -459,6 +459,18 @@ + + + 2.2.0 + + + + + + + + + 2.2.0 @@ -466,6 +478,32 @@ + + + 2.2.0 + + + + + + + 2.2.0 + + + + + 2.2.0 + + + + + + 2.2.0 + + + + + 2.2.0 @@ -717,6 +755,21 @@ + + + 2.2.0 + + + + + + + + + + + + 2.2.0 @@ -758,6 +811,12 @@ + + + 2.2.0 + + + 2.2.0 diff --git a/eng/Baseline.xml b/eng/Baseline.xml index 791995fe4e..075e8e4d39 100644 --- a/eng/Baseline.xml +++ b/eng/Baseline.xml @@ -59,7 +59,12 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. + + + + + @@ -80,8 +85,10 @@ build of ASP.NET Core 2.2.x. Update this list when preparing for a new patch. + + diff --git a/eng/Dependencies.props b/eng/Dependencies.props index 9414ecc32e..4c546e4768 100644 --- a/eng/Dependencies.props +++ b/eng/Dependencies.props @@ -23,6 +23,10 @@ and are generated based on the last package release. + + + + @@ -44,6 +48,7 @@ and are generated based on the last package release. + diff --git a/eng/ProjectReferences.props b/eng/ProjectReferences.props index 5c6239bfb6..f89a94017f 100644 --- a/eng/ProjectReferences.props +++ b/eng/ProjectReferences.props @@ -85,5 +85,20 @@ + + + + + + + + + + + + + + + diff --git a/eng/targets/CSharp.Common.props b/eng/targets/CSharp.Common.props index 29c167c722..8e774beb44 100644 --- a/eng/targets/CSharp.Common.props +++ b/eng/targets/CSharp.Common.props @@ -11,7 +11,7 @@ - + diff --git a/eng/targets/FSharp.Common.targets b/eng/targets/FSharp.Common.targets new file mode 100644 index 0000000000..d631e77830 --- /dev/null +++ b/eng/targets/FSharp.Common.targets @@ -0,0 +1,4 @@ + + + + diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs deleted file mode 100644 index 891a4849ed..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeSerializer.cs +++ /dev/null @@ -1,46 +0,0 @@ -// 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.IO; -using Microsoft.AspNetCore.Razor.Language.Intermediate; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public static class IntermediateNodeSerializer - { - public static string Serialize(IntermediateNode node) - { - using (var writer = new StringWriter()) - { - var walker = new Walker(writer); - walker.Visit(node); - - return writer.ToString(); - } - } - - private class Walker : IntermediateNodeWalker - { - private readonly IntermediateNodeWriter _visitor; - private readonly TextWriter _writer; - - public Walker(TextWriter writer) - { - _visitor = new IntermediateNodeWriter(writer); - _writer = writer; - } - - public TextWriter Writer { get; } - - public override void VisitDefault(IntermediateNode node) - { - _visitor.Visit(node); - _writer.WriteLine(); - - _visitor.Depth++; - base.VisitDefault(node); - _visitor.Depth--; - } - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs deleted file mode 100644 index a75da6a2fc..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/IntermediateNodeVerifier.cs +++ /dev/null @@ -1,275 +0,0 @@ -// 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; -using System.Collections.Generic; -using System.IO; -using System.Linq; -using System.Text; -using Microsoft.AspNetCore.Razor.Language.Intermediate; -using Xunit; -using Xunit.Sdk; - -namespace Microsoft.AspNetCore.Razor.Language.IntegrationTests -{ - public static class IntermediateNodeVerifier - { - public static void Verify(IntermediateNode node, string[] baseline) - { - var walker = new Walker(baseline); - walker.Visit(node); - walker.AssertReachedEndOfBaseline(); - } - - private class Walker : IntermediateNodeWalker - { - private readonly string[] _baseline; - private readonly IntermediateNodeWriter _visitor; - private readonly StringWriter _writer; - - private int _index; - - public Walker(string[] baseline) - { - _writer = new StringWriter(); - - _visitor = new IntermediateNodeWriter(_writer); - _baseline = baseline; - - } - - public TextWriter Writer { get; } - - public override void VisitDefault(IntermediateNode node) - { - var expected = _index < _baseline.Length ? _baseline[_index++] : null; - - // Write the node as text for comparison - _writer.GetStringBuilder().Clear(); - _visitor.Visit(node); - var actual = _writer.GetStringBuilder().ToString(); - - AssertNodeEquals(node, Ancestors, expected, actual); - - _visitor.Depth++; - base.VisitDefault(node); - _visitor.Depth--; - } - - public void AssertReachedEndOfBaseline() - { - // Since we're walking the nodes of our generated code there's the chance that our baseline is longer. - Assert.True(_baseline.Length == _index, "Not all lines of the baseline were visited!"); - } - - private void AssertNodeEquals(IntermediateNode node, IEnumerable ancestors, string expected, string actual) - { - if (string.Equals(expected, actual)) - { - // YAY!!! everything is great. - return; - } - - if (expected == null) - { - var message = "The node is missing from baseline."; - throw new IntermediateNodeBaselineException(node, Ancestors.ToArray(), expected, actual, message); - } - - int charsVerified = 0; - AssertNestingEqual(node, ancestors, expected, actual, ref charsVerified); - AssertNameEqual(node, ancestors, expected, actual, ref charsVerified); - AssertDelimiter(node, expected, actual, true, ref charsVerified); - AssertLocationEqual(node, ancestors, expected, actual, ref charsVerified); - AssertDelimiter(node, expected, actual, false, ref charsVerified); - AssertContentEqual(node, ancestors, expected, actual, ref charsVerified); - - throw new InvalidOperationException("We can't figure out HOW these two things are different. This is a bug."); - } - - private void AssertNestingEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var i = 0; - for (; i < expected.Length; i++) - { - if (expected[i] != ' ') - { - break; - } - } - - var failed = false; - var j = 0; - for (; j < i; j++) - { - if (actual.Length <= j || actual[j] != ' ') - { - failed = true; - break; - } - } - - if (actual.Length <= j + 1 || actual[j] == ' ') - { - failed = true; - } - - if (failed) - { - var message = "The node is at the wrong level of nesting. This usually means a child is missing."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified = j; - } - - private void AssertNameEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedName = GetName(expected, charsVerified); - var actualName = GetName(actual, charsVerified); - - if (!string.Equals(expectedName, actualName)) - { - var message = $"Node names are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedName.Length; - } - - // Either both strings need to have a delimiter next or neither should. - private void AssertDelimiter(IntermediateNode node, string expected, string actual, bool required, ref int charsVerified) - { - if (charsVerified == expected.Length && required) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{expected}'."); - } - - if (charsVerified == actual.Length && required) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - if (charsVerified == expected.Length && charsVerified == actual.Length) - { - return; - } - - var expectedDelimiter = expected.IndexOf(" - ", charsVerified); - if (expectedDelimiter != charsVerified && expectedDelimiter != -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - var actualDelimiter = actual.IndexOf(" - ", charsVerified); - if (actualDelimiter != charsVerified && actualDelimiter != -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{actual}'."); - } - - Assert.Equal(expectedDelimiter, actualDelimiter); - - charsVerified += 3; - } - - private void AssertLocationEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedLocation = GetLocation(expected, charsVerified); - var actualLocation = GetLocation(actual, charsVerified); - - if (!string.Equals(expectedLocation, actualLocation)) - { - var message = $"Locations are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedLocation.Length; - } - - private void AssertContentEqual(IntermediateNode node, IEnumerable ancestors, string expected, string actual, ref int charsVerified) - { - var expectedContent = GetContent(expected, charsVerified); - var actualContent = GetContent(actual, charsVerified); - - if (!string.Equals(expectedContent, actualContent)) - { - var message = $"Contents are not equal."; - throw new IntermediateNodeBaselineException(node, ancestors.ToArray(), expected, actual, message); - } - - charsVerified += expectedContent.Length; - } - - private string GetName(string text, int start) - { - var delimiter = text.IndexOf(" - ", start); - if (delimiter == -1) - { - throw new InvalidOperationException($"Baseline text is not well-formed: '{text}'."); - } - - return text.Substring(start, delimiter - start); - } - - private string GetLocation(string text, int start) - { - var delimiter = text.IndexOf(" - ", start); - return delimiter == -1 ? text.Substring(start) : text.Substring(start, delimiter - start); - } - - private string GetContent(string text, int start) - { - return start == text.Length ? string.Empty : text.Substring(start); - } - - private class IntermediateNodeBaselineException : XunitException - { - public IntermediateNodeBaselineException(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage) - : base(Format(node, ancestors, expected, actual, userMessage)) - { - Node = node; - Expected = expected; - Actual = actual; - } - - public IntermediateNode Node { get; } - - public string Actual { get; } - - public string Expected { get; } - - private static string Format(IntermediateNode node, IntermediateNode[] ancestors, string expected, string actual, string userMessage) - { - var builder = new StringBuilder(); - builder.AppendLine(userMessage); - builder.AppendLine(); - - if (expected != null) - { - builder.Append("Expected: "); - builder.AppendLine(expected); - } - - if (actual != null) - { - builder.Append("Actual: "); - builder.AppendLine(actual); - } - - if (ancestors != null) - { - builder.AppendLine(); - builder.AppendLine("Path:"); - - foreach (var ancestor in ancestors) - { - builder.AppendLine(ancestor.ToString()); - } - } - - return builder.ToString(); - } - } - } - } -} diff --git a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs b/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs deleted file mode 100644 index bb92350872..0000000000 --- a/src/Components/test/Microsoft.AspNetCore.Components.Build.Test/Razor/RazorDiagnosticSerializer.cs +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -namespace Microsoft.AspNetCore.Razor.Language -{ - public class RazorDiagnosticSerializer - { - public static string Serialize(RazorDiagnostic diagnostic) - { - return diagnostic.ToString(); - } - } -} diff --git a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj index 3132ca06c3..4c14003842 100644 --- a/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj +++ b/src/Mvc/test/Microsoft.AspNetCore.Mvc.Razor.Test/Microsoft.AspNetCore.Mvc.Razor.Test.csproj @@ -8,6 +8,7 @@ + diff --git a/src/Razor/.gitignore b/src/Razor/.gitignore deleted file mode 100644 index a0265568eb..0000000000 --- a/src/Razor/.gitignore +++ /dev/null @@ -1,40 +0,0 @@ -[Oo]bj/ -[Bb]in/ -TestResults/ -.nuget/ -.build/ -.testPublish/ -*.sln.ide/ -_ReSharper.*/ -packages/ -artifacts/ -.build/ -PublishProfiles/ -*.user -*.suo -*.cache -*.docstates -_ReSharper.* -nuget.exe -project.lock.json -*net45.csproj -*net451.csproj -*k10.csproj -*.psess -*.vsp -*.pidb -*.userprefs -*DS_Store -*.ncrunchsolution -*.*sdf -*.ipch -.build/ -.vs/ -launchSettings.json -global.json -.vscode/* -BenchmarkDotNet.Artifacts/ -Microsoft.VisualStudio.RazorExtension.nuget.props -Microsoft.VisualStudio.RazorExtension.nuget.targets -msbuild.binlog -msbuild.log diff --git a/src/Razor/Directory.Build.props b/src/Razor/Directory.Build.props deleted file mode 100644 index fc7aabfa0e..0000000000 --- a/src/Razor/Directory.Build.props +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - - - Microsoft ASP.NET Core - https://github.com/aspnet/AspNetCore - git - $(MSBuildThisFileDirectory) - $(MSBuildThisFileDirectory)build\Key.snk - true - true - 7.3 - $(MSBuildThisFileDirectory)..\Shared\ - - - - - - - diff --git a/src/Razor/Directory.Build.targets b/src/Razor/Directory.Build.targets deleted file mode 100644 index 4bcc9df925..0000000000 --- a/src/Razor/Directory.Build.targets +++ /dev/null @@ -1,8 +0,0 @@ - - - $(MicrosoftNETCoreApp30PackageVersion) - $(NETStandardLibrary20PackageVersion) - - 99.9 - - diff --git a/src/Razor/NuGetPackageVerifier.json b/src/Razor/NuGetPackageVerifier.json deleted file mode 100644 index 22ef3c09c0..0000000000 --- a/src/Razor/NuGetPackageVerifier.json +++ /dev/null @@ -1,7 +0,0 @@ -{ - "Default": { - "rules": [ - "DefaultCompositeRule" - ] - } -} diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/DefaultRazorCompiledItem.cs b/src/Razor/Razor.Runtime/src/Hosting/DefaultRazorCompiledItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/DefaultRazorCompiledItem.cs rename to src/Razor/Razor.Runtime/src/Hosting/DefaultRazorCompiledItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/IRazorSourceChecksumMetadata.cs b/src/Razor/Razor.Runtime/src/Hosting/IRazorSourceChecksumMetadata.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/IRazorSourceChecksumMetadata.cs rename to src/Razor/Razor.Runtime/src/Hosting/IRazorSourceChecksumMetadata.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItem.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItem.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItem.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItem.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemExtensions.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemExtensions.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemLoader.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemLoader.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemLoader.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemLoader.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemMetadataAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemMetadataAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorCompiledItemMetadataAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorCompiledItemMetadataAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorConfigurationNameAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorConfigurationNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorConfigurationNameAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorConfigurationNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorExtensionAssemblyNameAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorExtensionAssemblyNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorExtensionAssemblyNameAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorExtensionAssemblyNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorLanguageVersionAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorLanguageVersionAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorLanguageVersionAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorLanguageVersionAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorSourceChecksumAttribute.cs b/src/Razor/Razor.Runtime/src/Hosting/RazorSourceChecksumAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Hosting/RazorSourceChecksumAttribute.cs rename to src/Razor/Razor.Runtime/src/Hosting/RazorSourceChecksumAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj similarity index 62% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj rename to src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj index 3d5e8026f4..9839c62c97 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Microsoft.AspNetCore.Razor.Runtime.csproj +++ b/src/Razor/Razor.Runtime/src/Microsoft.AspNetCore.Razor.Runtime.csproj @@ -11,11 +11,8 @@ - - - - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs b/src/Razor/Razor.Runtime/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/AssemblyInfo.cs rename to src/Razor/Razor.Runtime/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs b/src/Razor/Razor.Runtime/src/Properties/Resources.Designer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Properties/Resources.Designer.cs rename to src/Razor/Razor.Runtime/src/Properties/Resources.Designer.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx b/src/Razor/Razor.Runtime/src/Resources.resx similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Resources.resx rename to src/Razor/Razor.Runtime/src/Resources.resx diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperExecutionContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperExecutionContext.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperExecutionContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperRunner.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperRunner.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperRunner.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs b/src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperScopeManager.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/Runtime/TagHelpers/TagHelperScopeManager.cs rename to src/Razor/Razor.Runtime/src/Runtime/TagHelpers/TagHelperScopeManager.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/baseline.netcore.json b/src/Razor/Razor.Runtime/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Runtime/baseline.netcore.json rename to src/Razor/Razor.Runtime/src/baseline.netcore.json diff --git a/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj new file mode 100644 index 0000000000..f7c41bfcd5 --- /dev/null +++ b/src/Razor/Razor.Runtime/test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj @@ -0,0 +1,21 @@ + + + + $(StandardTestTfms) + $(DefaultItemExcludes);TestFiles\**\* + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperExecutionContextTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperRunnerTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperRunnerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TagHelperScopeManagerTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/CommonTagHelpers.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs b/src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs rename to src/Razor/Razor.Runtime/test/Runtime/TagHelpers/TestTagHelpers/TagHelperDescriptorFactoryTagHelpers.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/TagHelperDocumentation.nl-BE.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/en-GB/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/en/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/en/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/en/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/fr-FR/TagHelperDocumentation.fr-FR.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml b/src/Razor/Razor.Runtime/test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml rename to src/Razor/Razor.Runtime/test/TestFiles/Localized/fr/TagHelperDocumentation.fr.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml b/src/Razor/Razor.Runtime/test/TestFiles/NotLocalized/TagHelperDocumentation.xml similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/TestFiles/NotLocalized/TagHelperDocumentation.xml rename to src/Razor/Razor.Runtime/test/TestFiles/NotLocalized/TagHelperDocumentation.xml diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/xunit.runner.json b/src/Razor/Razor.Runtime/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/xunit.runner.json rename to src/Razor/Razor.Runtime/test/xunit.runner.json diff --git a/src/Razor/Razor.sln b/src/Razor/Razor.sln index 0048dde79a..70997b7b98 100644 --- a/src/Razor/Razor.sln +++ b/src/Razor/Razor.sln @@ -1,85 +1,58 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 15 -VisualStudioVersion = 15.0.27130.2036 -MinimumVisualStudioVersion = 15.0.26730.03 -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C0D6505-79B3-49D0-B4C3-176F0F1836ED}" - ProjectSection(SolutionItems) = preProject - src\Directory.Build.props = src\Directory.Build.props - EndProjectSection -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{92463391-81BE-462B-AC3C-78C6C760741F}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "src\Microsoft.AspNetCore.Razor\Microsoft.AspNetCore.Razor.csproj", "{EDA30434-C567-44DC-B8B6-2566A7F77163}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "src\Microsoft.AspNetCore.Razor.Runtime\Microsoft.AspNetCore.Razor.Runtime.csproj", "{D0196096-1B01-4133-AACE-1A10A0F7247C}" -EndProject +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{F8C12DD6-659D-405A-AA27-FB22AD92A010}" ProjectSection(SolutionItems) = preProject .editorconfig = .editorconfig - build\dependencies.props = build\dependencies.props - Directory.Build.props = Directory.Build.props - Directory.Build.targets = Directory.Build.targets - build\repo.props = build\repo.props - build\repo.targets = build\repo.targets - build\sources.props = build\sources.props EndProjectSection EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "test\Microsoft.AspNetCore.Razor.Runtime.Test\Microsoft.AspNetCore.Razor.Runtime.Test.csproj", "{277AB67E-9C8D-4799-A18C-C628E70A8664}" +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor", "Razor", "{FD09AA4B-FD90-4B88-8E74-77FBF96AFF07}" EndProject -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}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor", "Razor\src\Microsoft.AspNetCore.Razor.csproj", "{50B155AF-6778-4FBF-AF97-0AD3DFF11564}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Test", "Razor\test\Microsoft.AspNetCore.Razor.Test.csproj", "{6F476A56-25E8-4BDC-82D5-4EBA01D93765}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Razor.Runtime", "Razor.Runtime", "{CD0A594B-445E-41A0-8C91-1DE90923E66F}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime", "Razor.Runtime\src\Microsoft.AspNetCore.Razor.Runtime.csproj", "{CF24C860-423A-4336-8D17-2276249BC945}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Runtime.Test", "Razor.Runtime\test\Microsoft.AspNetCore.Razor.Runtime.Test.csproj", "{B98E84E5-1E26-4722-9F6B-039CED7711C2}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU - DebugNoVSIX|Any CPU = DebugNoVSIX|Any CPU Release|Any CPU = Release|Any CPU - ReleaseNoVSIX|Any CPU = ReleaseNoVSIX|Any CPU EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.Release|Any CPU.Build.0 = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {EDA30434-C567-44DC-B8B6-2566A7F77163}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.Release|Any CPU.Build.0 = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {D0196096-1B01-4133-AACE-1A10A0F7247C}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Debug|Any CPU.Build.0 = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Release|Any CPU.ActiveCfg = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.Release|Any CPU.Build.0 = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {277AB67E-9C8D-4799-A18C-C628E70A8664}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Debug|Any CPU.Build.0 = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.ActiveCfg = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.DebugNoVSIX|Any CPU.Build.0 = Debug|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.ActiveCfg = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.Release|Any CPU.Build.0 = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.ActiveCfg = Release|Any CPU - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8}.ReleaseNoVSIX|Any CPU.Build.0 = Release|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Debug|Any CPU.Build.0 = Debug|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Release|Any CPU.ActiveCfg = Release|Any CPU + {50B155AF-6778-4FBF-AF97-0AD3DFF11564}.Release|Any CPU.Build.0 = Release|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6F476A56-25E8-4BDC-82D5-4EBA01D93765}.Release|Any CPU.Build.0 = Release|Any CPU + {CF24C860-423A-4336-8D17-2276249BC945}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {CF24C860-423A-4336-8D17-2276249BC945}.Debug|Any CPU.Build.0 = Debug|Any CPU + {CF24C860-423A-4336-8D17-2276249BC945}.Release|Any CPU.ActiveCfg = Release|Any CPU + {CF24C860-423A-4336-8D17-2276249BC945}.Release|Any CPU.Build.0 = Release|Any CPU + {B98E84E5-1E26-4722-9F6B-039CED7711C2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B98E84E5-1E26-4722-9F6B-039CED7711C2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B98E84E5-1E26-4722-9F6B-039CED7711C2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B98E84E5-1E26-4722-9F6B-039CED7711C2}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution - {EDA30434-C567-44DC-B8B6-2566A7F77163} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {D0196096-1B01-4133-AACE-1A10A0F7247C} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED} - {277AB67E-9C8D-4799-A18C-C628E70A8664} = {92463391-81BE-462B-AC3C-78C6C760741F} - {323553F0-14AB-4FBD-9CF0-1CC0BE8056F8} = {92463391-81BE-462B-AC3C-78C6C760741F} + {50B155AF-6778-4FBF-AF97-0AD3DFF11564} = {FD09AA4B-FD90-4B88-8E74-77FBF96AFF07} + {6F476A56-25E8-4BDC-82D5-4EBA01D93765} = {FD09AA4B-FD90-4B88-8E74-77FBF96AFF07} + {CF24C860-423A-4336-8D17-2276249BC945} = {CD0A594B-445E-41A0-8C91-1DE90923E66F} + {B98E84E5-1E26-4722-9F6B-039CED7711C2} = {CD0A594B-445E-41A0-8C91-1DE90923E66F} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {0035341D-175A-4D05-95E6-F1C2785A1E26} + SolutionGuid = {779069AC-1F9F-407F-92C7-28507D91D64E} EndGlobalSection EndGlobal diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj similarity index 71% rename from src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj rename to src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj index 7fe876cb7d..0a80d84969 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor/Microsoft.AspNetCore.Razor.csproj +++ b/src/Razor/Razor/src/Microsoft.AspNetCore.Razor.csproj @@ -16,8 +16,8 @@ Microsoft.AspNetCore.Razor.TagHelpers.ITagHelper - - + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs b/src/Razor/Razor/src/Properties/AssemblyInfo.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/Properties/AssemblyInfo.cs rename to src/Razor/Razor/src/Properties/AssemblyInfo.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs b/src/Razor/Razor/src/TagHelpers/DefaultTagHelperContent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/DefaultTagHelperContent.cs rename to src/Razor/Razor/src/TagHelpers/DefaultTagHelperContent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNameAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeNameAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNameAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeNameAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNotBoundAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeNotBoundAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeNotBoundAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeNotBoundAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeValueStyle.cs b/src/Razor/Razor/src/TagHelpers/HtmlAttributeValueStyle.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlAttributeValueStyle.cs rename to src/Razor/Razor/src/TagHelpers/HtmlAttributeValueStyle.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlTargetElementAttribute.cs b/src/Razor/Razor/src/TagHelpers/HtmlTargetElementAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/HtmlTargetElementAttribute.cs rename to src/Razor/Razor/src/TagHelpers/HtmlTargetElementAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelper.cs b/src/Razor/Razor/src/TagHelpers/ITagHelper.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelper.cs rename to src/Razor/Razor/src/TagHelpers/ITagHelper.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelperComponent.cs b/src/Razor/Razor/src/TagHelpers/ITagHelperComponent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ITagHelperComponent.cs rename to src/Razor/Razor/src/TagHelpers/ITagHelperComponent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/NullHtmlEncoder.cs b/src/Razor/Razor/src/TagHelpers/NullHtmlEncoder.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/NullHtmlEncoder.cs rename to src/Razor/Razor/src/TagHelpers/NullHtmlEncoder.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/OutputElementHintAttribute.cs b/src/Razor/Razor/src/TagHelpers/OutputElementHintAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/OutputElementHintAttribute.cs rename to src/Razor/Razor/src/TagHelpers/OutputElementHintAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ReadOnlyTagHelperAttributeList.cs b/src/Razor/Razor/src/TagHelpers/ReadOnlyTagHelperAttributeList.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/ReadOnlyTagHelperAttributeList.cs rename to src/Razor/Razor/src/TagHelpers/ReadOnlyTagHelperAttributeList.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/RestrictChildrenAttribute.cs b/src/Razor/Razor/src/TagHelpers/RestrictChildrenAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/RestrictChildrenAttribute.cs rename to src/Razor/Razor/src/TagHelpers/RestrictChildrenAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelper.cs b/src/Razor/Razor/src/TagHelpers/TagHelper.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelper.cs rename to src/Razor/Razor/src/TagHelpers/TagHelper.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttribute.cs b/src/Razor/Razor/src/TagHelpers/TagHelperAttribute.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttribute.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttributeList.cs b/src/Razor/Razor/src/TagHelpers/TagHelperAttributeList.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperAttributeList.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperAttributeList.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperComponent.cs b/src/Razor/Razor/src/TagHelpers/TagHelperComponent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperComponent.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperComponent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContent.cs b/src/Razor/Razor/src/TagHelpers/TagHelperContent.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContent.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperContent.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContext.cs b/src/Razor/Razor/src/TagHelpers/TagHelperContext.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperContext.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperContext.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperOutput.cs b/src/Razor/Razor/src/TagHelpers/TagHelperOutput.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagHelperOutput.cs rename to src/Razor/Razor/src/TagHelpers/TagHelperOutput.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs b/src/Razor/Razor/src/TagHelpers/TagMode.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagMode.cs rename to src/Razor/Razor/src/TagHelpers/TagMode.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs b/src/Razor/Razor/src/TagHelpers/TagStructure.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/TagStructure.cs rename to src/Razor/Razor/src/TagHelpers/TagStructure.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/baseline.netcore.json b/src/Razor/Razor/src/baseline.netcore.json similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/baseline.netcore.json rename to src/Razor/Razor/src/baseline.netcore.json diff --git a/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj new file mode 100644 index 0000000000..04e4b086cb --- /dev/null +++ b/src/Razor/Razor/test/Microsoft.AspNetCore.Razor.Test.csproj @@ -0,0 +1,21 @@ + + + + $(StandardTestTfms) + $(DefaultItemExcludes);TestFiles\**\* + + + + + + + + + + + + + + + + diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs b/src/Razor/Razor/test/TagHelpers/DefaultTagHelperContentTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/DefaultTagHelperContentTest.cs rename to src/Razor/Razor/test/TagHelpers/DefaultTagHelperContentTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/NullHtmlEncoderTest.cs b/src/Razor/Razor/test/TagHelpers/NullHtmlEncoderTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/NullHtmlEncoderTest.cs rename to src/Razor/Razor/test/TagHelpers/NullHtmlEncoderTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs rename to src/Razor/Razor/test/TagHelpers/ReadOnlyTagHelperAttributeListTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperAttributeListTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperAttributeListTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperAttributeListTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperContextTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperContextTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperContextTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperContextTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperOutputTest.cs b/src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/TagHelpers/TagHelperOutputTest.cs rename to src/Razor/Razor/test/TagHelpers/TagHelperOutputTest.cs diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/xunit.runner.json b/src/Razor/Razor/test/xunit.runner.json similarity index 100% rename from src/Razor/test/Microsoft.AspNetCore.Razor.Test/xunit.runner.json rename to src/Razor/Razor/test/xunit.runner.json diff --git a/src/Razor/build.cmd b/src/Razor/build.cmd deleted file mode 100644 index f4169ea5e4..0000000000 --- a/src/Razor/build.cmd +++ /dev/null @@ -1,3 +0,0 @@ -@ECHO OFF -SET RepoRoot="%~dp0..\.." -%RepoRoot%\build.cmd -LockFile %RepoRoot%\korebuild-lock.txt -Path %~dp0 %* diff --git a/src/Razor/build.sh b/src/Razor/build.sh deleted file mode 100644 index d5bb0cf631..0000000000 --- a/src/Razor/build.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" -repo_root="$DIR/../.." -"$repo_root/build.sh" --path "$DIR" --lockfile "$repo_root/korebuild-lock.txt" "$@" diff --git a/src/Razor/build/Key.snk b/src/Razor/build/Key.snk deleted file mode 100644 index e10e4889c1..0000000000 Binary files a/src/Razor/build/Key.snk and /dev/null differ diff --git a/src/Razor/build/buildpipeline/linux.groovy b/src/Razor/build/buildpipeline/linux.groovy deleted file mode 100644 index 903f218bb8..0000000000 --- a/src/Razor/build/buildpipeline/linux.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('Ubuntu16.04', 'latest-or-auto-docker') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Razor/build/buildpipeline/osx.groovy b/src/Razor/build/buildpipeline/osx.groovy deleted file mode 100644 index aaac63686b..0000000000 --- a/src/Razor/build/buildpipeline/osx.groovy +++ /dev/null @@ -1,10 +0,0 @@ -@Library('dotnet-ci') _ - -simpleNode('OSX10.12','latest') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - sh './build.sh --ci' - } -} diff --git a/src/Razor/build/buildpipeline/pipeline.groovy b/src/Razor/build/buildpipeline/pipeline.groovy deleted file mode 100644 index e915cadae1..0000000000 --- a/src/Razor/build/buildpipeline/pipeline.groovy +++ /dev/null @@ -1,18 +0,0 @@ -import org.dotnet.ci.pipelines.Pipeline - -def windowsPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/windows.groovy') -def linuxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/linux.groovy') -def osxPipeline = Pipeline.createPipeline(this, 'build/buildpipeline/osx.groovy') -String configuration = 'Release' -def parameters = [ - 'Configuration': configuration -] - -windowsPipeline.triggerPipelineOnEveryGithubPR("Windows ${configuration} x64 Build", parameters) -windowsPipeline.triggerPipelineOnGithubPush(parameters) - -linuxPipeline.triggerPipelineOnEveryGithubPR("Ubuntu 16.04 ${configuration} Build", parameters) -linuxPipeline.triggerPipelineOnGithubPush(parameters) - -osxPipeline.triggerPipelineOnEveryGithubPR("OSX 10.12 ${configuration} Build", parameters) -osxPipeline.triggerPipelineOnGithubPush(parameters) diff --git a/src/Razor/build/buildpipeline/windows.groovy b/src/Razor/build/buildpipeline/windows.groovy deleted file mode 100644 index 26f49c395d..0000000000 --- a/src/Razor/build/buildpipeline/windows.groovy +++ /dev/null @@ -1,12 +0,0 @@ -@Library('dotnet-ci') _ - -// 'node' indicates to Jenkins that the enclosed block runs on a node that matches -// the label 'windows-with-vs' -simpleNode('Windows.10.Amd64.EnterpriseRS3.ASPNET.Open') { - stage ('Checking out source') { - checkout scm - } - stage ('Build') { - bat '.\\run.cmd -CI default-build' - } -} diff --git a/src/Razor/build/dependencies.props b/src/Razor/build/dependencies.props deleted file mode 100644 index 14d59a6be2..0000000000 --- a/src/Razor/build/dependencies.props +++ /dev/null @@ -1,25 +0,0 @@ - - - $(MSBuildAllProjects);$(MSBuildThisFileFullPath) - - - 0.10.13 - 3.0.0-alpha1-20181108.5 - 3.0.0-alpha1-10717 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-preview1-26907-05 - 3.0.0-preview-181106-14 - 3.0.0-preview-181106-14 - 3.0.0-alpha1-10717 - 3.0.0-preview1-26907-05 - 15.6.1 - 4.10.0 - 2.0.3 - 0.10.0 - 2.3.1 - 2.4.0 - - - - diff --git a/src/Razor/build/repo.props b/src/Razor/build/repo.props deleted file mode 100644 index 58a02ecf2f..0000000000 --- a/src/Razor/build/repo.props +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/src/Razor/build/sources.props b/src/Razor/build/sources.props deleted file mode 100644 index 9215df9751..0000000000 --- a/src/Razor/build/sources.props +++ /dev/null @@ -1,17 +0,0 @@ - - - - - $(DotNetRestoreSources) - - $(RestoreSources); - https://dotnet.myget.org/F/dotnet-core/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-dev/api/v3/index.json; - https://dotnet.myget.org/F/aspnetcore-tools/api/v3/index.json; - - - $(RestoreSources); - https://api.nuget.org/v3/index.json; - - - diff --git a/src/Razor/src/Directory.Build.props b/src/Razor/src/Directory.Build.props deleted file mode 100644 index 052553775a..0000000000 --- a/src/Razor/src/Directory.Build.props +++ /dev/null @@ -1,10 +0,0 @@ - - - - - $(NoWarn);CS1591 - true - aspnetcore;cshtml;razor - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj deleted file mode 100644 index e4cb3304ab..0000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Runtime.Test/Microsoft.AspNetCore.Razor.Runtime.Test.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netcoreapp3.0 - $(DefaultItemExcludes);TestFiles\**\* - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj b/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj deleted file mode 100644 index d79be042f2..0000000000 --- a/src/Razor/test/Microsoft.AspNetCore.Razor.Test/Microsoft.AspNetCore.Razor.Test.csproj +++ /dev/null @@ -1,25 +0,0 @@ - - - - netcoreapp3.0 - $(DefaultItemExcludes);TestFiles\**\* - - - - - - - - - - - - - - - - - - - - diff --git a/src/Razor/version.props b/src/Razor/version.props deleted file mode 100644 index e0500341ee..0000000000 --- a/src/Razor/version.props +++ /dev/null @@ -1,10 +0,0 @@ - - - 3.0.0 - alpha1 - $(VersionPrefix) - $(VersionPrefix)-$(VersionSuffix)-final - t000 - a- - - diff --git a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs index b0693ab7a2..07a5d6edde 100644 --- a/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs +++ b/src/Servers/Kestrel/test/FunctionalTests/RequestTests.cs @@ -675,7 +675,12 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests } } - await Assert.ThrowsAsync(async () => await readTcs.Task).DefaultTimeout(); + var thrownEx = await Assert.ThrowsAnyAsync(async () => await readTcs.Task).DefaultTimeout(); + + // https://github.com/aspnet/AspNetCore-Internal/issues/1521 + // In more recent versions of Kestrel, we expect this to always be a TaskCanceledException, + // but without the changes in https://github.com/aspnet/KestrelHttpServer/pull/2844, this is flaky. + Assert.True(thrownEx is TaskCanceledException || thrownEx is IOException, $"{thrownEx} is neither a TaskCanceledException nor IOException."); // The cancellation token for only the last request should be triggered. var abortedRequestId = await registrationTcs.Task.DefaultTimeout(); diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/CaseSensitiveBoundAttributeComparer.cs b/src/Shared/Razor/CaseSensitiveBoundAttributeComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor/TagHelpers/CaseSensitiveBoundAttributeComparer.cs rename to src/Shared/Razor/CaseSensitiveBoundAttributeComparer.cs