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

Transition Microsoft.AspNet.Razor from csproj to kproj. 

Needed to modify some source to use new resx format.

#32
This commit is contained in:
N. Taylor Mullen 2014-05-30 10:31:49 -07:00
parent dd90767036
commit 9a6a3af450
17 changed files with 1114 additions and 126 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
Razor.sln
View File

@ -1,19 +1,15 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio 2013
VisualStudioVersion = 12.0.21005.1
# Visual Studio 14
VisualStudioVersion = 14.0.21722.1
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{3C0D6505-79B3-49D0-B4C3-176F0F1836ED}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{92463391-81BE-462B-AC3C-78C6C760741F}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Razor.Test", "test\Microsoft.AspNet.Razor.Test\Microsoft.AspNet.Razor.Test.csproj", "{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor", "src\Microsoft.AspNet.Razor\Microsoft.AspNet.Razor.kproj", "{EDA30434-C567-44DC-B8B6-2566A7F77163}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.TestCommon", "test\Microsoft.TestCommon\Microsoft.TestCommon.csproj", "{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Razor.net45", "src\Microsoft.AspNet.Razor\Microsoft.AspNet.Razor.net45.csproj", "{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Razor.k10", "src\Microsoft.AspNet.Razor\Microsoft.AspNet.Razor.k10.csproj", "{F5A44105-08E2-4602-8231-DAFDDC9A146E}"
Project("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}") = "Microsoft.AspNet.Razor.Test", "test\Microsoft.AspNet.Razor.Test\Microsoft.AspNet.Razor.Test.kproj", "{87C7338B-0C06-4C7B-BE75-A2368AE26797}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@ -21,30 +17,20 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE}.Debug|Any CPU.Build.0 = Debug|Any CPU
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE}.Release|Any CPU.Build.0 = Debug|Any CPU
{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}.Release|Any CPU.ActiveCfg = Debug|Any CPU
{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0}.Release|Any CPU.Build.0 = Debug|Any CPU
{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7}.Release|Any CPU.Build.0 = Release|Any CPU
{F5A44105-08E2-4602-8231-DAFDDC9A146E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{F5A44105-08E2-4602-8231-DAFDDC9A146E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{F5A44105-08E2-4602-8231-DAFDDC9A146E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{F5A44105-08E2-4602-8231-DAFDDC9A146E}.Release|Any CPU.Build.0 = Release|Any CPU
{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}.Release|Any CPU.ActiveCfg = Release|Any CPU
{EDA30434-C567-44DC-B8B6-2566A7F77163}.Release|Any CPU.Build.0 = Release|Any CPU
{87C7338B-0C06-4C7B-BE75-A2368AE26797}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{87C7338B-0C06-4C7B-BE75-A2368AE26797}.Debug|Any CPU.Build.0 = Debug|Any CPU
{87C7338B-0C06-4C7B-BE75-A2368AE26797}.Release|Any CPU.ActiveCfg = Release|Any CPU
{87C7338B-0C06-4C7B-BE75-A2368AE26797}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{8B129FF9-0B8F-4E0C-8DFC-0137D8550FB7} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
{F5A44105-08E2-4602-8231-DAFDDC9A146E} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
{0BB62A1D-E6B5-49FA-9E3C-6AF679A66DFE} = {92463391-81BE-462B-AC3C-78C6C760741F}
{FCCC4CB7-BAF7-4A57-9F89-E5766FE536C0} = {92463391-81BE-462B-AC3C-78C6C760741F}
{EDA30434-C567-44DC-B8B6-2566A7F77163} = {3C0D6505-79B3-49D0-B4C3-176F0F1836ED}
{87C7338B-0C06-4C7B-BE75-A2368AE26797} = {92463391-81BE-462B-AC3C-78C6C760741F}
EndGlobalSection
EndGlobal

0
src/Microsoft.AspNet.Razor/Common/CommonResources.resx → src/Microsoft.AspNet.Razor/CommonResources.resx
View File

16
src/Microsoft.AspNet.Razor/Editor/BackgroundParser.cs
View File

@ -191,7 +191,7 @@ namespace Microsoft.AspNet.Razor.Editor
public void QueueChange(TextChange change)
{
RazorEditorTrace.TraceLine(RazorResources.Trace_QueuingParse(Path.GetFileName(_fileName), change));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_QueuingParse(Path.GetFileName(_fileName), change));
EnsureOnThread();
lock (_stateLock)
{
@ -306,7 +306,7 @@ namespace Microsoft.AspNet.Razor.Editor
try
{
RazorEditorTrace.TraceLine(RazorResources.Trace_BackgroundThreadStart(fileNameOnly));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadStart(fileNameOnly));
EnsureOnThread();
#if K10
@ -319,7 +319,7 @@ namespace Microsoft.AspNet.Razor.Editor
WorkParcel parcel = _main.GetParcel();
if (parcel.Changes.Any())
{
RazorEditorTrace.TraceLine(RazorResources.Trace_ChangesArrived(fileNameOnly, parcel.Changes.Count));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_ChangesArrived(fileNameOnly, parcel.Changes.Count));
try
{
DocumentParseCompleteEventArgs args = null;
@ -356,7 +356,7 @@ namespace Microsoft.AspNet.Razor.Editor
sw.Reset();
#endif
RazorEditorTrace.TraceLine(
RazorResources.Trace_ParseComplete(
RazorResources.FormatTrace_ParseComplete(
fileNameOnly,
elapsedMs.HasValue ? elapsedMs.Value.ToString(CultureInfo.InvariantCulture) : "?"));
@ -376,7 +376,7 @@ namespace Microsoft.AspNet.Razor.Editor
sw.Reset();
#endif
_currentParseTree = results.Document;
RazorEditorTrace.TraceLine(RazorResources.Trace_TreesCompared(
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_TreesCompared(
fileNameOnly,
elapsedMs.HasValue ? elapsedMs.Value.ToString(CultureInfo.InvariantCulture) : "?",
treeStructureChanged));
@ -392,7 +392,7 @@ namespace Microsoft.AspNet.Razor.Editor
else
{
// Parse completed but we were cancelled in the mean time. Add these to the discarded changes set
RazorEditorTrace.TraceLine(RazorResources.Trace_ChangesDiscarded(fileNameOnly, allChanges.Count));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_ChangesDiscarded(fileNameOnly, allChanges.Count));
_previouslyDiscarded = allChanges;
}
@ -426,7 +426,7 @@ namespace Microsoft.AspNet.Razor.Editor
}
else
{
RazorEditorTrace.TraceLine(RazorResources.Trace_NoChangesArrived(fileNameOnly));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_NoChangesArrived(fileNameOnly));
#if NET45
// No Yield in CoreCLR
@ -444,7 +444,7 @@ namespace Microsoft.AspNet.Razor.Editor
}
finally
{
RazorEditorTrace.TraceLine(RazorResources.Trace_BackgroundThreadShutdown(fileNameOnly));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_BackgroundThreadShutdown(fileNameOnly));
// Clean up main thread resources
_main.Dispose();

4
src/Microsoft.AspNet.Razor/Editor/RazorEditorTrace.cs
View File

@ -21,7 +21,7 @@ namespace Microsoft.AspNet.Razor.Editor
#if NET45
// No Trace in CoreCLR
Trace.WriteLine(RazorResources.Trace_Startup(
Trace.WriteLine(RazorResources.FormatTrace_Startup(
enabled ? RazorResources.Trace_Enabled : RazorResources.Trace_Disabled));
#endif
_enabled = enabled;
@ -42,7 +42,7 @@ namespace Microsoft.AspNet.Razor.Editor
#if NET45
// No Trace in CoreCLR
Trace.WriteLine(RazorResources.Trace_Format(
Trace.WriteLine(RazorResources.FormatTrace_Format(
String.Format(CultureInfo.CurrentCulture, format, args)));
#endif
}

203
src/Microsoft.AspNet.Razor/Microsoft.AspNet.Razor.kproj Normal file
View File

@ -0,0 +1,203 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">12.0</VisualStudioVersion>
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
</PropertyGroup>
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
</PropertyGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.Props" Condition="'$(VSToolsPath)' != ''" />
<PropertyGroup Label="Globals">
<ProjectGuid>eda30434-c567-44dc-b8b6-2566a7f77163</ProjectGuid>
<OutputType>Library</OutputType>
</PropertyGroup>
<PropertyGroup Condition="$(OutputType) == 'Console'">
<DebuggerFlavor>ConsoleDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="$(OutputType) == 'Web'">
<DebuggerFlavor>WebDebugger</DebuggerFlavor>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'" Label="Configuration">
</PropertyGroup>
<PropertyGroup>
<SchemaVersion>2.0</SchemaVersion>
</PropertyGroup>
<ItemGroup>
<Compile Include="Common\HashCodeCombiner.cs" />
<Compile Include="CSharpRazorCodeLanguage.cs" />
<Compile Include="DocumentParseCompleteEventArgs.cs" />
<Compile Include="Editor\AutoCompleteEditHandler.cs" />
<Compile Include="Editor\BackgroundParser.cs" />
<Compile Include="Editor\EditorHints.cs" />
<Compile Include="Editor\EditResult.cs" />
<Compile Include="Editor\ImplicitExpressionEditHandler.cs" />
<Compile Include="Editor\RazorEditorTrace.cs" />
<Compile Include="Editor\SingleLineMarkupEditHandler.cs" />
<Compile Include="Editor\SpanEditHandler.cs" />
<Compile Include="GeneratorResults.cs" />
<Compile Include="Generator\AddImportCodeGenerator.cs" />
<Compile Include="Generator\AttributeBlockCodeGenerator.cs" />
<Compile Include="Generator\BlockCodeGenerator.cs" />
<Compile Include="Generator\CodeGeneratorContext.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\ChunkVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CodeBuilder.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CodeBuilderResult.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CodeVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CodeWriter.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpCodeBuilder.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpCodeWriter.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpCodeWritingScope.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpDisableWarningScope.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpLineMappingWriter.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\CSharpPaddingBuilder.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpBaseTypeVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpClassAttributeVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpCodeVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpDesignTimeHelpersVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpHelperVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpTypeMemberVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\CSharp\Visitors\CSharpUsingVisitor.cs" />
<Compile Include="Generator\Compiler\CodeBuilder\IChunkVisitor.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\Chunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\ChunkBlock.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\CodeAttributeChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\DynamicCodeAttributeChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\ExpressionBlockChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\ExpressionChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\HelperChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\LiteralChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\LiteralCodeAttributeChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\ResolveUrlChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\SectionChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\SessionStateChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\SetBaseTypeChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\SetLayoutChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\StatementChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\TemplateChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\TypeMemberChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\Chunks\UsingChunk.cs" />
<Compile Include="Generator\Compiler\CodeTree\CodeTree.cs" />
<Compile Include="Generator\Compiler\CodeTree\CodeTreeBuilder.cs" />
<Compile Include="Generator\Compiler\LineMappings\LineMapping.cs" />
<Compile Include="Generator\Compiler\LineMappings\LineMappingManager.cs" />
<Compile Include="Generator\Compiler\LineMappings\MappingLocation.cs" />
<Compile Include="Generator\CSharpRazorCodeGenerator.cs" />
<Compile Include="Generator\DynamicAttributeBlockCodeGenerator.cs" />
<Compile Include="Generator\ExpressionCodeGenerator.cs" />
<Compile Include="Generator\ExpressionRenderingMode.cs" />
<Compile Include="Generator\GeneratedClassContext.cs" />
<Compile Include="Generator\HelperCodeGenerator.cs" />
<Compile Include="Generator\HybridCodeGenerator.cs" />
<Compile Include="Generator\IBlockCodeGenerator.cs" />
<Compile Include="Generator\ISpanCodeGenerator.cs" />
<Compile Include="Generator\LiteralAttributeCodeGenerator.cs" />
<Compile Include="Generator\MarkupCodeGenerator.cs" />
<Compile Include="Generator\RazorCodeGenerator.cs" />
<Compile Include="Generator\RazorCommentCodeGenerator.cs" />
<Compile Include="Generator\RazorDirectiveAttributeCodeGenerator.cs" />
<Compile Include="Generator\ResolveUrlCodeGenerator.cs" />
<Compile Include="Generator\SectionCodeGenerator.cs" />
<Compile Include="Generator\SetBaseTypeCodeGenerator.cs" />
<Compile Include="Generator\SetLayoutCodeGenerator.cs" />
<Compile Include="Generator\SpanCodeGenerator.cs" />
<Compile Include="Generator\StatementCodeGenerator.cs" />
<Compile Include="Generator\TemplateBlockCodeGenerator.cs" />
<Compile Include="Generator\TypeMemberCodeGenerator.cs" />
<Compile Include="GlobalSuppressions.cs" />
<Compile Include="ParserResults.cs" />
<Compile Include="Parser\BalancingModes.cs" />
<Compile Include="Parser\CallbackVisitor.cs" />
<Compile Include="Parser\ConditionalAttributeCollapser.cs" />
<Compile Include="Parser\CSharpCodeParser.cs" />
<Compile Include="Parser\CSharpCodeParser.Directives.cs" />
<Compile Include="Parser\CSharpCodeParser.Expressions.cs" />
<Compile Include="Parser\CSharpCodeParser.Statements.cs" />
<Compile Include="Parser\CSharpLanguageCharacteristics.cs" />
<Compile Include="Parser\HtmlLanguageCharacteristics.cs" />
<Compile Include="Parser\HtmlMarkupParser.Block.cs" />
<Compile Include="Parser\HtmlMarkupParser.cs" />
<Compile Include="Parser\HtmlMarkupParser.Document.cs" />
<Compile Include="Parser\HtmlMarkupParser.Section.cs" />
<Compile Include="Parser\ISyntaxTreeRewriter.cs" />
<Compile Include="Parser\LanguageCharacteristics.cs" />
<Compile Include="Parser\MarkupCollapser.cs" />
<Compile Include="Parser\MarkupRewriter.cs" />
<Compile Include="Parser\ParserBase.cs" />
<Compile Include="Parser\ParserContext.cs" />
<Compile Include="Parser\ParserHelpers.cs" />
<Compile Include="Parser\ParserVisitor.cs" />
<Compile Include="Parser\ParserVisitorExtensions.cs" />
<Compile Include="Parser\RazorParser.cs" />
<Compile Include="Parser\SyntaxConstants.cs" />
<Compile Include="Parser\SyntaxTree\AcceptedCharacters.cs" />
<Compile Include="Parser\SyntaxTree\Block.cs" />
<Compile Include="Parser\SyntaxTree\BlockBuilder.cs" />
<Compile Include="Parser\SyntaxTree\BlockType.cs" />
<Compile Include="Parser\SyntaxTree\EquivalenceComparer.cs" />
<Compile Include="Parser\SyntaxTree\RazorError.cs" />
<Compile Include="Parser\SyntaxTree\Span.cs" />
<Compile Include="Parser\SyntaxTree\SpanBuilder.cs" />
<Compile Include="Parser\SyntaxTree\SpanKind.cs" />
<Compile Include="Parser\SyntaxTree\SyntaxTreeNode.cs" />
<Compile Include="Parser\TextReaderExtensions.cs" />
<Compile Include="Parser\TokenizerBackedParser.cs" />
<Compile Include="Parser\TokenizerBackedParser.Helpers.cs" />
<Compile Include="Parser\WhitespaceRewriter.cs" />
<Compile Include="PartialParseResult.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Properties\CommonResources.Designer.cs" />
<Compile Include="Properties\RazorResources.Designer.cs" />
<Compile Include="RazorCodeLanguage.cs" />
<Compile Include="RazorDebugHelpers.cs" />
<Compile Include="RazorDirectiveAttribute.cs" />
<Compile Include="RazorEditorParser.cs" />
<Compile Include="RazorEngineHost.cs" />
<Compile Include="RazorTemplateEngine.cs" />
<Compile Include="StateMachine.cs" />
<Compile Include="Text\BufferingTextReader.cs" />
<Compile Include="Text\ITextBuffer.cs" />
<Compile Include="Text\LineTrackingStringBuffer.cs" />
<Compile Include="Text\LocationTagged.cs" />
<Compile Include="Text\LookaheadTextReader.cs" />
<Compile Include="Text\LookaheadToken.cs" />
<Compile Include="Text\SeekableTextReader.cs" />
<Compile Include="Text\SourceLocation.cs" />
<Compile Include="Text\SourceLocationTracker.cs" />
<Compile Include="Text\SourceSpan.cs" />
<Compile Include="Text\TextBufferReader.cs" />
<Compile Include="Text\TextChange.cs" />
<Compile Include="Text\TextChangeType.cs" />
<Compile Include="Text\TextDocumentReader.cs" />
<Compile Include="Text\TextExtensions.cs" />
<Compile Include="Tokenizer\CSharpHelpers.cs" />
<Compile Include="Tokenizer\CSharpKeywordDetector.cs" />
<Compile Include="Tokenizer\CSharpTokenizer.cs" />
<Compile Include="Tokenizer\HtmlTokenizer.cs" />
<Compile Include="Tokenizer\ITokenizer.cs" />
<Compile Include="Tokenizer\Symbols\CSharpKeyword.cs" />
<Compile Include="Tokenizer\Symbols\CSharpSymbol.cs" />
<Compile Include="Tokenizer\Symbols\CSharpSymbolType.cs" />
<Compile Include="Tokenizer\Symbols\HtmlSymbol.cs" />
<Compile Include="Tokenizer\Symbols\HtmlSymbolType.cs" />
<Compile Include="Tokenizer\Symbols\ISymbol.cs" />
<Compile Include="Tokenizer\Symbols\KnownSymbolType.cs" />
<Compile Include="Tokenizer\Symbols\SymbolBase.cs" />
<Compile Include="Tokenizer\Symbols\SymbolExtensions.cs" />
<Compile Include="Tokenizer\Symbols\SymbolTypeSuppressions.cs" />
<Compile Include="Tokenizer\Tokenizer.cs" />
<Compile Include="Tokenizer\TokenizerView.cs" />
<Compile Include="Tokenizer\XmlHelpers.cs" />
<Compile Include="Utils\CharUtils.cs" />
<Compile Include="Utils\DisposableAction.cs" />
<Compile Include="Utils\EnumeratorExtensions.cs" />
<Compile Include="Utils\EnumUtil.cs" />
</ItemGroup>
<ItemGroup>
<Content Include="CommonResources.resx" />
<Content Include="project.json" />
<Content Include="RazorResources.resx" />
</ItemGroup>
<Import Project="$(VSToolsPath)\AspNet\Microsoft.Web.AspNet.targets" Condition="'$(VSToolsPath)' != ''" />
</Project>

20
src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Directives.cs
View File

@ -139,12 +139,12 @@ namespace Microsoft.AspNet.Razor.Parser
}
else
{
error = RazorResources.ErrorComponent_Character(CurrentSymbol.Content);
error = RazorResources.FormatErrorComponent_Character(CurrentSymbol.Content);
}
Context.OnError(
CurrentLocation,
RazorResources.ParseError_Unexpected_Character_At_Helper_Name_Start(error));
RazorResources.FormatParseError_Unexpected_Character_At_Helper_Name_Start(error));
PutCurrentBack();
Output(SpanKind.MetaCode);
return;
@ -161,7 +161,7 @@ namespace Microsoft.AspNet.Razor.Parser
AcceptWhile(IsSpacingToken(includeNewLines: false, includeComments: true)); // Don't accept newlines.
// Expecting an identifier (helper name)
bool errorReported = !Required(CSharpSymbolType.Identifier, errorIfNotFound: true, errorBase: RazorResources.ParseError_Unexpected_Character_At_Helper_Name_Start);
bool errorReported = !Required(CSharpSymbolType.Identifier, errorIfNotFound: true, errorBase: RazorResources.FormatParseError_Unexpected_Character_At_Helper_Name_Start);
if (!errorReported)
{
Assert(CSharpSymbolType.Identifier);
@ -179,7 +179,7 @@ namespace Microsoft.AspNet.Razor.Parser
errorReported = true;
Context.OnError(
CurrentLocation,
RazorResources.ParseError_MissingCharAfterHelperName("("));
RazorResources.FormatParseError_MissingCharAfterHelperName("("));
}
}
else
@ -218,7 +218,7 @@ namespace Microsoft.AspNet.Razor.Parser
{
Context.OnError(
errorLocation,
RazorResources.ParseError_MissingCharAfterHelperParameters(
RazorResources.FormatParseError_MissingCharAfterHelperParameters(
Language.GetSample(CSharpSymbolType.LeftBrace)));
}
}
@ -292,7 +292,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (nested)
{
Context.OnError(CurrentLocation, RazorResources.ParseError_Sections_Cannot_Be_Nested(RazorResources.SectionExample_CS));
Context.OnError(CurrentLocation, RazorResources.FormatParseError_Sections_Cannot_Be_Nested(RazorResources.SectionExample_CS));
errorReported = true;
}
@ -302,7 +302,7 @@ namespace Microsoft.AspNet.Razor.Parser
string sectionName = String.Empty;
if (!Required(CSharpSymbolType.Identifier,
errorIfNotFound: true,
errorBase: RazorResources.ParseError_Unexpected_Character_At_Section_Name_Start))
errorBase: RazorResources.FormatParseError_Unexpected_Character_At_Section_Name_Start))
{
if (!errorReported)
{
@ -363,7 +363,7 @@ namespace Microsoft.AspNet.Razor.Parser
{
editHandler.AutoCompleteString = "}";
Context.OnError(CurrentLocation,
RazorResources.ParseError_Expected_X(
RazorResources.FormatParseError_Expected_X(
Language.GetSample(CSharpSymbolType.RightBrace)));
}
else
@ -390,7 +390,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (!At(CSharpSymbolType.LeftBrace))
{
Context.OnError(CurrentLocation,
RazorResources.ParseError_Expected_X(Language.GetSample(CSharpSymbolType.LeftBrace)));
RazorResources.FormatParseError_Expected_X(Language.GetSample(CSharpSymbolType.LeftBrace)));
CompleteBlock();
Output(SpanKind.MetaCode);
return;
@ -415,7 +415,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (!At(CSharpSymbolType.RightBrace))
{
editHandler.AutoCompleteString = "}";
Context.OnError(block.Start, RazorResources.ParseError_Expected_EndOfBlock_Before_EOF(block.Name, "}", "{"));
Context.OnError(block.Start, RazorResources.FormatParseError_Expected_EndOfBlock_Before_EOF(block.Name, "}", "{"));
CompleteBlock();
Output(SpanKind.Code);
}

8
src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.Statements.cs
View File

@ -28,7 +28,7 @@ namespace Microsoft.AspNet.Razor.Parser
protected virtual void ReservedDirective(bool topLevel)
{
Context.OnError(CurrentLocation, RazorResources.ParseError_ReservedWord(CurrentSymbol.Content));
Context.OnError(CurrentLocation, RazorResources.FormatParseError_ReservedWord(CurrentSymbol.Content));
AcceptAndMoveNext();
Span.EditHandler.AcceptedCharacters = AcceptedCharacters.None;
Span.CodeGenerator = SpanCodeGenerator.Null;
@ -319,7 +319,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (!At(CSharpSymbolType.LeftBrace))
{
Context.OnError(CurrentLocation,
RazorResources.ParseError_SingleLine_ControlFlowStatements_Not_Allowed(
RazorResources.FormatParseError_SingleLine_ControlFlowStatements_Not_Allowed(
Language.GetSample(CSharpSymbolType.LeftBrace),
CurrentSymbol.Content));
}
@ -510,7 +510,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (At(CSharpSymbolType.Keyword))
{
Context.OnError(CurrentLocation,
RazorResources.ParseError_Unexpected_Keyword_After_At(
RazorResources.FormatParseError_Unexpected_Keyword_After_At(
CSharpLanguageCharacteristics.GetKeyword(CurrentSymbol.Keyword.Value)));
}
else if (At(CSharpSymbolType.LeftBrace))
@ -604,7 +604,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (EndOfFile)
{
Context.OnError(block.Start, RazorResources.ParseError_Expected_EndOfBlock_Before_EOF(block.Name, '}', '{'));
Context.OnError(block.Start, RazorResources.FormatParseError_Expected_EndOfBlock_Before_EOF(block.Name, '}', '{'));
}
else if (acceptTerminatingBrace)
{

4
src/Microsoft.AspNet.Razor/Parser/CSharpCodeParser.cs
View File

@ -264,7 +264,7 @@ namespace Microsoft.AspNet.Razor.Parser
}
else
{
Context.OnError(CurrentLocation, RazorResources.ParseError_Unexpected_Character_At_Start_Of_CodeBlock_CS(CurrentSymbol.Content));
Context.OnError(CurrentLocation, RazorResources.FormatParseError_Unexpected_Character_At_Start_Of_CodeBlock_CS(CurrentSymbol.Content));
}
}
finally
@ -501,7 +501,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (!success)
{
AcceptUntil(CSharpSymbolType.LessThan);
Context.OnError(block.Start, RazorResources.ParseError_Expected_EndOfBlock_Before_EOF(block.Name, ")", "("));
Context.OnError(block.Start, RazorResources.FormatParseError_Expected_EndOfBlock_Before_EOF(block.Name, ")", "("));
}
// If necessary, put an empty-content marker symbol here

10
src/Microsoft.AspNet.Razor/Parser/HtmlMarkupParser.Block.cs
View File

@ -666,7 +666,7 @@ namespace Microsoft.AspNet.Razor.Parser
bool seenClose = Optional(HtmlSymbolType.CloseAngle);
if (!seenClose)
{
Context.OnError(tag.Item2, RazorResources.ParseError_UnfinishedTag(tag.Item1.Content));
Context.OnError(tag.Item2, RazorResources.FormatParseError_UnfinishedTag(tag.Item1.Content));
}
else
{
@ -744,7 +744,7 @@ namespace Microsoft.AspNet.Razor.Parser
SkipToAndParseCode(HtmlSymbolType.CloseAngle);
if (!Optional(HtmlSymbolType.CloseAngle))
{
Context.OnError(tagStart, RazorResources.ParseError_UnfinishedTag("script"));
Context.OnError(tagStart, RazorResources.FormatParseError_UnfinishedTag("script"));
}
seenEndScript = true;
}
@ -781,11 +781,11 @@ namespace Microsoft.AspNet.Razor.Parser
}
if (currentTag != null)
{
Context.OnError(currentTag.Item2, RazorResources.ParseError_MissingEndTag(currentTag.Item1.Content));
Context.OnError(currentTag.Item2, RazorResources.FormatParseError_MissingEndTag(currentTag.Item1.Content));
}
else
{
Context.OnError(tagStart, RazorResources.ParseError_UnexpectedEndTag(tagName));
Context.OnError(tagStart, RazorResources.FormatParseError_UnexpectedEndTag(tagName));
}
return false;
}
@ -800,7 +800,7 @@ namespace Microsoft.AspNet.Razor.Parser
tags.Pop();
}
Tuple<HtmlSymbol, SourceLocation> tag = tags.Pop();
Context.OnError(tag.Item2, RazorResources.ParseError_MissingEndTag(tag.Item1.Content));
Context.OnError(tag.Item2, RazorResources.FormatParseError_MissingEndTag(tag.Item1.Content));
}
else if (complete)
{

6
src/Microsoft.AspNet.Razor/Parser/TokenizerBackedParser.Helpers.cs
View File

@ -73,7 +73,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (EndOfFile && !mode.HasFlag(BalancingModes.NoErrorOnFailure))
{
Context.OnError(start,
RazorResources.ParseError_Expected_CloseBracket_Before_EOF(
RazorResources.FormatParseError_Expected_CloseBracket_Before_EOF(
Language.GetSample(left),
Language.GetSample(right)));
}
@ -121,7 +121,7 @@ namespace Microsoft.AspNet.Razor.Parser
if (!mode.HasFlag(BalancingModes.NoErrorOnFailure))
{
Context.OnError(start,
RazorResources.ParseError_Expected_CloseBracket_Before_EOF(
RazorResources.FormatParseError_Expected_CloseBracket_Before_EOF(
Language.GetSample(left),
Language.GetSample(right)));
}
@ -353,7 +353,7 @@ namespace Microsoft.AspNet.Razor.Parser
}
else
{
error = RazorResources.ErrorComponent_Character(CurrentSymbol.Content);
error = RazorResources.FormatErrorComponent_Character(CurrentSymbol.Content);
}
Context.OnError(

91
src/Microsoft.AspNet.Razor/Properties/CommonResources.Designer.cs generated
View File

@ -1,5 +1,4 @@
// <auto-generated />
namespace Microsoft.AspNet.Razor
{
using System.Globalization;
@ -19,10 +18,26 @@ namespace Microsoft.AspNet.Razor
get { return GetString("Argument_Cannot_Be_Null_Or_Empty"); }
}
/// <summary>
/// Value cannot be null or an empty string.
/// </summary>
internal static string FormatArgument_Cannot_Be_Null_Or_Empty()
{
return GetString("Argument_Cannot_Be_Null_Or_Empty");
}
/// <summary>
/// Value must be between {0} and {1}.
/// </summary>
internal static string Argument_Must_Be_Between(object p0, object p1)
internal static string Argument_Must_Be_Between
{
get { return GetString("Argument_Must_Be_Between"); }
}
/// <summary>
/// Value must be between {0} and {1}.
/// </summary>
internal static string FormatArgument_Must_Be_Between(object p0, object p1)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_Between"), p0, p1);
}
@ -30,7 +45,15 @@ namespace Microsoft.AspNet.Razor
/// <summary>
/// Value must be a value from the "{0}" enumeration.
/// </summary>
internal static string Argument_Must_Be_Enum_Member(object p0)
internal static string Argument_Must_Be_Enum_Member
{
get { return GetString("Argument_Must_Be_Enum_Member"); }
}
/// <summary>
/// Value must be a value from the "{0}" enumeration.
/// </summary>
internal static string FormatArgument_Must_Be_Enum_Member(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_Enum_Member"), p0);
}
@ -38,7 +61,15 @@ namespace Microsoft.AspNet.Razor
/// <summary>
/// Value must be greater than {0}.
/// </summary>
internal static string Argument_Must_Be_GreaterThan(object p0)
internal static string Argument_Must_Be_GreaterThan
{
get { return GetString("Argument_Must_Be_GreaterThan"); }
}
/// <summary>
/// Value must be greater than {0}.
/// </summary>
internal static string FormatArgument_Must_Be_GreaterThan(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_GreaterThan"), p0);
}
@ -46,7 +77,15 @@ namespace Microsoft.AspNet.Razor
/// <summary>
/// Value must be greater than or equal to {0}.
/// </summary>
internal static string Argument_Must_Be_GreaterThanOrEqualTo(object p0)
internal static string Argument_Must_Be_GreaterThanOrEqualTo
{
get { return GetString("Argument_Must_Be_GreaterThanOrEqualTo"); }
}
/// <summary>
/// Value must be greater than or equal to {0}.
/// </summary>
internal static string FormatArgument_Must_Be_GreaterThanOrEqualTo(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_GreaterThanOrEqualTo"), p0);
}
@ -54,7 +93,15 @@ namespace Microsoft.AspNet.Razor
/// <summary>
/// Value must be less than {0}.
/// </summary>
internal static string Argument_Must_Be_LessThan(object p0)
internal static string Argument_Must_Be_LessThan
{
get { return GetString("Argument_Must_Be_LessThan"); }
}
/// <summary>
/// Value must be less than {0}.
/// </summary>
internal static string FormatArgument_Must_Be_LessThan(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_LessThan"), p0);
}
@ -62,7 +109,15 @@ namespace Microsoft.AspNet.Razor
/// <summary>
/// Value must be less than or equal to {0}.
/// </summary>
internal static string Argument_Must_Be_LessThanOrEqualTo(object p0)
internal static string Argument_Must_Be_LessThanOrEqualTo
{
get { return GetString("Argument_Must_Be_LessThanOrEqualTo"); }
}
/// <summary>
/// Value must be less than or equal to {0}.
/// </summary>
internal static string FormatArgument_Must_Be_LessThanOrEqualTo(object p0)
{
return string.Format(CultureInfo.CurrentCulture, GetString("Argument_Must_Be_LessThanOrEqualTo"), p0);
}
@ -75,10 +130,28 @@ namespace Microsoft.AspNet.Razor
get { return GetString("Argument_Must_Be_Null_Or_Non_Empty"); }
}
private static string GetString(string name)
/// <summary>
/// Value cannot be an empty string. It must either be null or a non-empty string.
/// </summary>
internal static string FormatArgument_Must_Be_Null_Or_Non_Empty()
{
string value = _resourceManager.GetString(name);
return GetString("Argument_Must_Be_Null_Or_Non_Empty");
}
private static string GetString(string name, params string[] formatterNames)
{
var value = _resourceManager.GetString(name);
System.Diagnostics.Debug.Assert(value != null);
if (formatterNames != null)
{
for (var i = 0; i < formatterNames.Length; i++)
{
value = value.Replace("{" + formatterNames[i] + "}", "{" + i + "}");
}
}
return value;
}
}

805
src/Microsoft.AspNet.Razor/Properties/RazorResources.Designer.cs generated
View File

File diff suppressed because it is too large Load Diff

6
src/Microsoft.AspNet.Razor/RazorEditorParser.cs
View File

@ -131,10 +131,10 @@ namespace Microsoft.AspNet.Razor
Stopwatch sw = new Stopwatch();
sw.Start();
#endif
RazorEditorTrace.TraceLine(RazorResources.Trace_EditorReceivedChange(Path.GetFileName(FileName), change));
RazorEditorTrace.TraceLine(RazorResources.FormatTrace_EditorReceivedChange(Path.GetFileName(FileName), change));
if (change.NewBuffer == null)
{
throw new ArgumentException(RazorResources.Structure_Member_CannotBeNull(
throw new ArgumentException(RazorResources.FormatStructure_Member_CannotBeNull(
"Buffer",
"TextChange"), "change");
}
@ -171,7 +171,7 @@ namespace Microsoft.AspNet.Razor
sw.Reset();
#endif
RazorEditorTrace.TraceLine(
RazorResources.Trace_EditorProcessedChange(
RazorResources.FormatTrace_EditorProcessedChange(
Path.GetFileName(FileName),
changeString, elapsedMs.HasValue ? elapsedMs.Value.ToString(CultureInfo.InvariantCulture) : "?",
result.ToString()));

2
src/Microsoft.AspNet.Razor/RazorResources.resx
View File

@ -118,7 +118,7 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<data name="ActiveParser_Must_Be_Code_Or_Markup_Parser" xml:space="preserve">
<value>The active parser must the same as either the markup or code parser.</value>
<value>The active parser must be the same as either the markup or code parser.</value>
</data>
<data name="BlockName_Code" xml:space="preserve">
<value>code</value>

8
src/Microsoft.AspNet.Razor/Text/TextChange.cs
View File

@ -28,19 +28,19 @@ namespace Microsoft.AspNet.Razor.Text
{
if (oldPosition < 0)
{
throw new ArgumentOutOfRangeException("oldPosition", CommonResources.Argument_Must_Be_GreaterThanOrEqualTo(0));
throw new ArgumentOutOfRangeException("oldPosition", CommonResources.FormatArgument_Must_Be_GreaterThanOrEqualTo(0));
}
if (newPosition < 0)
{
throw new ArgumentOutOfRangeException("newPosition", CommonResources.Argument_Must_Be_GreaterThanOrEqualTo(0));
throw new ArgumentOutOfRangeException("newPosition", CommonResources.FormatArgument_Must_Be_GreaterThanOrEqualTo(0));
}
if (oldLength < 0)
{
throw new ArgumentOutOfRangeException("oldLength", CommonResources.Argument_Must_Be_GreaterThanOrEqualTo(0));
throw new ArgumentOutOfRangeException("oldLength", CommonResources.FormatArgument_Must_Be_GreaterThanOrEqualTo(0));
}
if (newLength < 0)
{
throw new ArgumentOutOfRangeException("newLength", CommonResources.Argument_Must_Be_GreaterThanOrEqualTo(0));
throw new ArgumentOutOfRangeException("newLength", CommonResources.FormatArgument_Must_Be_GreaterThanOrEqualTo(0));
}
if (oldBuffer == null)
{

2
src/Microsoft.AspNet.Razor/Tokenizer/TokenizerView.cs
View File

@ -43,7 +43,7 @@ namespace Microsoft.AspNet.Razor.Tokenizer
{
// We've already passed this symbol
throw new InvalidOperationException(
RazorResources.TokenizerView_CannotPutBack(
RazorResources.FormatTokenizerView_CannotPutBack(
symbol.Start.AbsoluteIndex + symbol.Content.Length,
Source.Position));
}

13
src/Microsoft.AspNet.Razor/project.json
View File

@ -1,9 +1,6 @@
{
"version": "0.1-alpha-*",
"configurations": {
"net45": {},
"k10": {
"dependencies": {
"version": "0.1-alpha-*",
"dependencies": {
"System.Collections": "4.0.0.0",
"System.Diagnostics.Debug": "4.0.10.0",
"System.Diagnostics.Tools": "4.0.0.0",
@ -19,7 +16,9 @@
"System.Threading": "4.0.0.0",
"System.Threading.Tasks": "4.0.10.0",
"System.Threading.Thread": "4.0.0.0"
}
},
"configurations": {
"net45": { },
"k10": { }
}
}
}