diff --git a/Razor.Slim.slnf b/Razor.Slim.slnf index 8328075c493..add7a3e0507 100644 --- a/Razor.Slim.slnf +++ b/Razor.Slim.slnf @@ -9,7 +9,7 @@ "src\\Compiler\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport\\Microsoft.NET.Sdk.Razor.SourceGenerators.Transport.csproj", "src\\Compiler\\tools\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal\\Microsoft.AspNetCore.Mvc.Razor.Extensions.Tooling.Internal.csproj", "src\\Compiler\\tools\\Microsoft.CodeAnalysis.Razor.Tooling.Internal\\Microsoft.CodeAnalysis.Razor.Tooling.Internal.csproj", - "src\\Shared\\Microsoft.AspNetCore.Razor.LanguageSupport\\Microsoft.AspNetCore.Razor.LanguageSupport.csproj", + "src\\Shared\\Microsoft.AspNetCore.Razor.Utilities.Shared\\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj", "src\\Razor\\src\\Microsoft.AspNetCore.Razor.Common\\Microsoft.AspNetCore.Razor.Common.csproj", "src\\Razor\\src\\Microsoft.CodeAnalysis.Razor.Workspaces\\Microsoft.CodeAnalysis.Razor.Workspaces.csproj", "src\\Razor\\src\\Microsoft.CodeAnalysis.Remote.Razor\\Microsoft.CodeAnalysis.Remote.Razor.csproj", diff --git a/Razor.sln b/Razor.sln index 7b6223f03c0..ed5096f56f6 100644 --- a/Razor.sln +++ b/Razor.sln @@ -118,7 +118,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.NET.Sdk.Razor.Sou EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Shared", "Shared", "{3AE210D1-C435-4693-BF79-2EF13ED554B9}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.LanguageSupport", "src\Shared\Microsoft.AspNetCore.Razor.LanguageSupport\Microsoft.AspNetCore.Razor.LanguageSupport.csproj", "{BEF172F0-D1C2-4043-BF45-8E520FF79321}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Microsoft.AspNetCore.Razor.Utilities.Shared", "src\Shared\Microsoft.AspNetCore.Razor.Utilities.Shared\Microsoft.AspNetCore.Razor.Utilities.Shared.csproj", "{BEF172F0-D1C2-4043-BF45-8E520FF79321}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.AspNetCore.Mvc.Razor.Extensions", "Microsoft.AspNetCore.Mvc.Razor.Extensions", "{DE461FC6-663E-4362-9B33-C5A88C7B4DB8}" EndProject diff --git a/docs/ProjectsAndLayering.md b/docs/ProjectsAndLayering.md index 2d6cfa6a0d9..f38b1acf4ec 100644 --- a/docs/ProjectsAndLayering.md +++ b/docs/ProjectsAndLayering.md @@ -8,7 +8,7 @@ This project is shared between all layers (both compiler and tooling) to provide - Target Framework: `net7.0;netstandard2.0;net472` - Projects: - - Microsoft.AspNetCore.Razor.LanguageSupport + - Microsoft.AspNetCore.Razor.Utilities.Shared ### Compiler diff --git a/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj b/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj index 7877ad8bcb4..5de69e66c46 100644 --- a/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj +++ b/src/Compiler/Microsoft.AspNetCore.Razor.Language/src/Microsoft.AspNetCore.Razor.Language.csproj @@ -1,4 +1,4 @@ - + Razor is a markup syntax for adding server-side logic to web pages. This package contains the Razor parser and code generation infrastructure. @@ -9,8 +9,7 @@ - - + diff --git a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs index 07532c59bc6..4a9f8576f21 100644 --- a/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs +++ b/src/Compiler/test/Microsoft.AspNetCore.Razor.Test.Common/Language/IntegrationTests/RazorIntegrationTestBase.cs @@ -12,8 +12,6 @@ using System.Runtime.InteropServices; using System.Text; using Microsoft.AspNetCore.Components; -using Microsoft.AspNetCore.Components.RenderTree; -using Microsoft.AspNetCore.Razor.Common; using Microsoft.AspNetCore.Razor.Language.CodeGeneration; using Microsoft.CodeAnalysis; using Microsoft.CodeAnalysis.CSharp; diff --git a/src/Compiler/tools/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal.csproj b/src/Compiler/tools/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal.csproj index 3cf4ded14df..d11ce227632 100644 --- a/src/Compiler/tools/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal.csproj +++ b/src/Compiler/tools/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal/Microsoft.AspNetCore.Razor.SourceGenerator.Tooling.Internal.csproj @@ -25,7 +25,7 @@ - + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/Microsoft.AspNetCore.Razor.Common.csproj b/src/Razor/src/Microsoft.AspNetCore.Razor.Common/Microsoft.AspNetCore.Razor.Common.csproj index 59f41bb5434..6d76299812a 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/Microsoft.AspNetCore.Razor.Common.csproj +++ b/src/Razor/src/Microsoft.AspNetCore.Razor.Common/Microsoft.AspNetCore.Razor.Common.csproj @@ -11,15 +11,13 @@ - - - + diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj index 5db3dd20da7..c2b82bd58bd 100644 --- a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Microsoft.VisualStudio.Mac.RazorAddin.csproj @@ -62,7 +62,7 @@ - + diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml index 078fb098df5..6d87b189c5b 100644 --- a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml +++ b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/Properties/_Manifest.addin.xml @@ -5,7 +5,7 @@ - + diff --git a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/mpack/addin.info b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/mpack/addin.info index 92a04fcdcdb..3a346bda381 100644 --- a/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/mpack/addin.info +++ b/src/Razor/src/Microsoft.VisualStudio.Mac.RazorAddin/mpack/addin.info @@ -4,7 +4,7 @@ - + diff --git a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj index 6f5bfa5f9c1..7fc8e47f1ba 100644 --- a/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj +++ b/src/Razor/src/Microsoft.VisualStudio.RazorExtension/Microsoft.VisualStudio.RazorExtension.csproj @@ -190,7 +190,7 @@ - + TargetFramework=$(DefaultNetFxTargetFramework) diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj b/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj deleted file mode 100644 index 0e16d7a92b8..00000000000 --- a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Microsoft.AspNetCore.Razor.LanguageSupport.csproj +++ /dev/null @@ -1,10 +0,0 @@ - - - - netstandard2.0;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) - Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server library assets. - false - false - - - diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/ImmutableArrayExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs similarity index 88% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/ImmutableArrayExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs index 1b04b3ce5a2..563010db4fa 100644 --- a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/ImmutableArrayExtensions.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ImmutableArrayExtensions.cs @@ -1,9 +1,7 @@ // Copyright (c) .NET Foundation. All rights reserved. // Licensed under the MIT license. See License.txt in the project root for license information. -using System.Collections.Immutable; - -namespace Microsoft.AspNetCore.Razor; +namespace System.Collections.Immutable; /// /// extension methods diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/KeyValuePairExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/KeyValuePairExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/KeyValuePairExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/KeyValuePairExtensions.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/CallerArgumentExpressionAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/CallerArgumentExpressionAttribute.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/CallerArgumentExpressionAttribute.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/CallerArgumentExpressionAttribute.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/CompilerFeatureRequiredAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/CompilerFeatureRequiredAttribute.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/CompilerFeatureRequiredAttribute.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/CompilerFeatureRequiredAttribute.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Index.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/Index.cs similarity index 98% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Index.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/Index.cs index 42a79050a56..3f39f97d913 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Index.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/Index.cs @@ -146,7 +146,7 @@ public override string ToString() [DoesNotReturn] private static void ThrowValueArgumentOutOfRange_NeedNonNegNumException() - => throw new ArgumentOutOfRangeException("value", "Non-negative number required."); + => throw new ArgumentOutOfRangeException("value", SR.Non_negative_number_required); } #endif diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/NullableAttributes.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/NullableAttributes.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/NullableAttributes.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/NullableAttributes.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Range.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/Range.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Range.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/Range.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/RequiredMemberAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/RequiredMemberAttribute.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/RequiredMemberAttribute.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/RequiredMemberAttribute.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/SetsRequiredMembersAttribute.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/SetsRequiredMembersAttribute.cs similarity index 100% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/SetsRequiredMembersAttribute.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/LanguageSupport/SetsRequiredMembersAttribute.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/ListExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ListExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/ListExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/ListExtensions.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj new file mode 100644 index 00000000000..c844f57a1f2 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Microsoft.AspNetCore.Razor.Utilities.Shared.csproj @@ -0,0 +1,25 @@ + + + + netstandard2.0;$(DefaultNetCoreTargetFramework);$(DefaultNetFxTargetFramework) + Razor is a markup syntax for adding server-side logic to web pages. This package contains the language server library assets. + false + false + Microsoft.AspNetCore.Razor + + + + + + + + + + true + $(ProjectName).Resources + + + + + + diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/NullableExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/NullableExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/NullableExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/NullableExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ArrayBuilderPool`1.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ArrayBuilderPool`1.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ArrayBuilderPool`1.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ArrayBuilderPool`1.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ArrayBuilderPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ArrayBuilderPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ArrayBuilderPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ArrayBuilderPool`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DefaultPool.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DefaultPool.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DefaultPool.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DefaultPool.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DictionaryPool`2.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DictionaryPool`2.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DictionaryPool`2.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DictionaryPool`2.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DictionaryPool`2.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DictionaryPool`2.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/DictionaryPool`2.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/DictionaryPool`2.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/HashSetPool`1.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/HashSetPool`1.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/HashSetPool`1.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/HashSetPool`1.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/HashSetPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/HashSetPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/HashSetPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/HashSetPool`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ListPool`1.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ListPool`1.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ListPool`1.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ListPool`1.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ListPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ListPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ListPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ListPool`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/PooledObjectExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledObjectExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/PooledObjectExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledObjectExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/PooledObject`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledObject`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/PooledObject`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/PooledObject`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ReferenceEqualityHashSetPool`1.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ReferenceEqualityHashSetPool`1.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ReferenceEqualityHashSetPool`1.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ReferenceEqualityHashSetPool`1.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ReferenceEqualityHashSetPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ReferenceEqualityHashSetPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/ReferenceEqualityHashSetPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/ReferenceEqualityHashSetPool`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StackPool`1.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StackPool`1.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StackPool`1.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StackPool`1.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StackPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StackPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StackPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StackPool`1.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StopwatchPool.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StopwatchPool.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StopwatchPool.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StopwatchPool.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StopwatchPool.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StopwatchPool.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StopwatchPool.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StopwatchPool.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringBuilderPool.Policy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringBuilderPool.Policy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringBuilderPool.Policy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringBuilderPool.Policy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringBuilderPool.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringBuilderPool.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringBuilderPool.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringBuilderPool.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.OrdinalIgnoreCasePolicy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.OrdinalIgnoreCasePolicy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.OrdinalIgnoreCasePolicy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.OrdinalIgnoreCasePolicy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.OrdinalPolicy.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.OrdinalPolicy.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.OrdinalPolicy.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.OrdinalPolicy.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/PooledObjects/StringDictionaryPool`1.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/PooledObjects/StringDictionaryPool`1.cs diff --git a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Properties/AssemblyInfo.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Properties/AssemblyInfo.cs similarity index 97% rename from src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Properties/AssemblyInfo.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Properties/AssemblyInfo.cs index 6e45c765cf9..11a5d66662e 100644 --- a/src/Shared/Microsoft.AspNetCore.Razor.LanguageSupport/Properties/AssemblyInfo.cs +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Properties/AssemblyInfo.cs @@ -11,6 +11,9 @@ [assembly: InternalsVisibleTo("Microsoft.CodeAnalysis.Razor, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.NET.Sdk.Razor.SourceGenerators, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] +// Razor compiler test assemblies +[assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Test.Common.Compiler, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + // Razor tooling assemblies [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Common, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.LanguageServer, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] @@ -55,3 +58,4 @@ // Benchmarks [assembly: InternalsVisibleTo("Microsoft.AspNetCore.Razor.Microbenchmarks, PublicKey=0024000004800000940000000602000000240000525341310004000001000100f33a29044fa9d740c9b3213a93e57c84b472c84e0b8a0e1ae48e67a9f8f6de9d5f7f3d52ac23e48ac51801f1dc950abe901da34d2a9e3baadb141a17c77ef3c565dd5ee5054b91cf63bb3c6ab83f72ab3aafe93d0fc3c2348b764fafb0b1c0733de51459aeab46580384bf9d74c4e28164b7cde247f891ba07891c9d872ad2bb")] + diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/SR.resx b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/SR.resx new file mode 100644 index 00000000000..06f0b7520d2 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/SR.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Non-negative number required. + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.cs.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.cs.xlf new file mode 100644 index 00000000000..be12bc44c16 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.cs.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.de.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.de.xlf new file mode 100644 index 00000000000..b0dc8931433 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.de.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.es.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.es.xlf new file mode 100644 index 00000000000..c753dfd64d6 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.es.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.fr.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.fr.xlf new file mode 100644 index 00000000000..56c41e94dcc --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.fr.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.it.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.it.xlf new file mode 100644 index 00000000000..17ba454d845 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.it.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ja.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ja.xlf new file mode 100644 index 00000000000..5e2df03e27c --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ja.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ko.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ko.xlf new file mode 100644 index 00000000000..ba24edeeaa6 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ko.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pl.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pl.xlf new file mode 100644 index 00000000000..45a2f229391 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pl.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pt-BR.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pt-BR.xlf new file mode 100644 index 00000000000..0e8b3c7849f --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.pt-BR.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ru.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ru.xlf new file mode 100644 index 00000000000..aea655a24bf --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.ru.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.tr.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.tr.xlf new file mode 100644 index 00000000000..7cd7a0d2090 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.tr.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hans.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hans.xlf new file mode 100644 index 00000000000..a6087fe5b26 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hans.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hant.xlf b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hant.xlf new file mode 100644 index 00000000000..795f08604b2 --- /dev/null +++ b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Resources/xlf/SR.zh-Hant.xlf @@ -0,0 +1,12 @@ + + + + + + Non-negative number required. + Non-negative number required. + + + + + \ No newline at end of file diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/StringBuilderExtensions.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringBuilderExtensions.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/StringBuilderExtensions.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/StringBuilderExtensions.cs diff --git a/src/Razor/src/Microsoft.AspNetCore.Razor.Common/Utilities/ReferenceEqualityComparer.cs b/src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ReferenceEqualityComparer.cs similarity index 100% rename from src/Razor/src/Microsoft.AspNetCore.Razor.Common/Utilities/ReferenceEqualityComparer.cs rename to src/Shared/Microsoft.AspNetCore.Razor.Utilities.Shared/Utilities/ReferenceEqualityComparer.cs