diff --git a/WebFx.sln b/WebFx.sln index 16a2fb71ac..34b64e7c36 100644 --- a/WebFx.sln +++ b/WebFx.sln @@ -1,7 +1,7 @@  Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio 2013 -VisualStudioVersion = 12.0.30110.0 +VisualStudioVersion = 12.0.21005.1 MinimumVisualStudioVersion = 10.0.40219.1 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{DAAE4C74-D06F-4874-A166-33305D2643CE}" EndProject @@ -11,8 +11,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor. EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.k10", "src\Microsoft.AspNet.Mvc.Razor\Microsoft.AspNet.Mvc.Razor.k10.csproj", "{0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.Host.net45", "src\Microsoft.AspNet.Mvc.Razor.Host\Microsoft.AspNet.Mvc.Razor.Host.net45.csproj", "{A25566C9-97C7-4770-BBC1-9B815D3B1380}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.Host.k10", "src\Microsoft.AspNet.Mvc.Razor.Host\Microsoft.AspNet.Mvc.Razor.Host.k10.csproj", "{613579ED-7B96-4F5C-8DBF-D2C580257BE2}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.ModelBinding.k10", "src\Microsoft.AspNet.Mvc.ModelBinding\Microsoft.AspNet.Mvc.ModelBinding.k10.csproj", "{24947215-86AB-4DD0-B94E-88B1EC4DC877}" @@ -33,8 +31,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{3BA657BF-2 EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.ModelBinding.Test.net45", "test\Microsoft.AspNet.Mvc.ModelBinding.Test\Microsoft.AspNet.Mvc.ModelBinding.Test.net45.csproj", "{42195A56-42C0-4CFF-A982-B6E24EFC6356}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Razor.Host.Test.net45", "test\Microsoft.AspNet.Mvc.Razor.Host.Test\Microsoft.AspNet.Mvc.Razor.Host.Test.net45.csproj", "{537CC0EE-4B62-4789-9AE9-94BE28E0D25A}" -EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MvcSample.Web.net45", "samples\MvcSample.Web\MvcSample.Web.net45.csproj", "{688ABC8B-BFA9-4CFF-9458-A466FEBB0448}" EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Microsoft.AspNet.Mvc.Core.k10", "src\Microsoft.AspNet.Mvc.Core\Microsoft.AspNet.Mvc.Core.k10.csproj", "{5E701B23-73E4-45D2-8521-1D7A94E152F1}" @@ -75,10 +71,6 @@ Global {0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063}.Debug|Any CPU.Build.0 = Debug|Any CPU {0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063}.Release|Any CPU.ActiveCfg = Release|Any CPU {0D2C8C3D-AFC3-4E1F-A6D8-9F690EE5E063}.Release|Any CPU.Build.0 = Release|Any CPU - {A25566C9-97C7-4770-BBC1-9B815D3B1380}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A25566C9-97C7-4770-BBC1-9B815D3B1380}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A25566C9-97C7-4770-BBC1-9B815D3B1380}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A25566C9-97C7-4770-BBC1-9B815D3B1380}.Release|Any CPU.Build.0 = Release|Any CPU {613579ED-7B96-4F5C-8DBF-D2C580257BE2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {613579ED-7B96-4F5C-8DBF-D2C580257BE2}.Debug|Any CPU.Build.0 = Debug|Any CPU {613579ED-7B96-4F5C-8DBF-D2C580257BE2}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -103,10 +95,6 @@ Global {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Debug|Any CPU.Build.0 = Debug|Any CPU {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Release|Any CPU.ActiveCfg = Release|Any CPU {42195A56-42C0-4CFF-A982-B6E24EFC6356}.Release|Any CPU.Build.0 = Release|Any CPU - {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {537CC0EE-4B62-4789-9AE9-94BE28E0D25A}.Release|Any CPU.Build.0 = Release|Any CPU {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Debug|Any CPU.Build.0 = Debug|Any CPU {688ABC8B-BFA9-4CFF-9458-A466FEBB0448}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -159,7 +147,6 @@ Global {222CA408-93EE-473A-9325-D04989EC9FEF} = {DAAE4C74-D06F-4874-A166-33305D2643CE} {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} {4EB70D0E-E27E-4C42-AB58-BC8B325EDFB3} = {32285FA4-6B46-4D6B-A840-2B13E4C8B58E} - {A25566C9-97C7-4770-BBC1-9B815D3B1380} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {28AA31B2-6504-432D-8599-1501FE0B100A} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {236CDB04-8FDA-4152-9A5B-7F98C19C663A} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} {365CA5C6-037D-4E6E-AF05-F5FA42E024EB} = {6C2EDE5B-CA31-42DD-A352-84B10CC70C98} @@ -176,11 +163,10 @@ Global {688ABC8B-BFA9-4CFF-9458-A466FEBB0448} = {222CA408-93EE-473A-9325-D04989EC9FEF} {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} = {3BA657BF-28B1-42DA-B5B0-1C4601FCF7B1} - {537CC0EE-4B62-4789-9AE9-94BE28E0D25A} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} - {42195A56-42C0-4CFF-A982-B6E24EFC6356} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} - {998C5A2E-D043-465F-BE19-076D27444289} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {3EB2CFF9-6E67-4C03-9AC4-2DD169024938} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {68FC3791-A9E4-4EDE-93A5-C7AC7DC0ED6E} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} + {42195A56-42C0-4CFF-A982-B6E24EFC6356} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} + {998C5A2E-D043-465F-BE19-076D27444289} = {49EBEEDD-E117-4B91-B4BA-56FB80AF4F3C} {5A219830-3C19-475D-901F-E580BA87DFF8} = {A4E25DA1-9BC1-4534-BDAA-4AEB7C089B0F} EndGlobalSection EndGlobal diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/Resources.Designer.cs deleted file mode 100644 index 97d038e5a3..0000000000 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/Properties/Resources.Designer.cs +++ /dev/null @@ -1,78 +0,0 @@ -// -namespace Microsoft.AspNet.Mvc.Razor.Host -{ - using System.Globalization; - using System.Reflection; - using System.Resources; - - internal static class Resources - { - private static readonly ResourceManager _resourceManager - = new ResourceManager("Microsoft.AspNet.Mvc.Razor.Host.Resources", typeof(Resources).GetTypeInfo().Assembly); - - /// - /// The 'inherits' keyword is not allowed when a '{0}' keyword is used. - /// - internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword - { - get { return GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"); } - } - - /// - /// The 'inherits' keyword is not allowed when a '{0}' keyword is used. - /// - internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0); - } - - /// - /// The '{0}' keyword must be followed by a type name on the same line. - /// - internal static string MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName - { - get { return GetString("MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName"); } - } - - /// - /// The '{0}' keyword must be followed by a type name on the same line. - /// - internal static string FormatMvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName"), p0); - } - - /// - /// Only one '{0}' statement is allowed in a file. - /// - internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed - { - get { return GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"); } - } - - /// - /// Only one '{0}' statement is allowed in a file. - /// - internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0) - { - return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0); - } - - 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; - } - } -} diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/Resources.resx b/src/Microsoft.AspNet.Mvc.Razor.Host/Resources.resx deleted file mode 100644 index 57f9ae7094..0000000000 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/Resources.resx +++ /dev/null @@ -1,129 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 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 - - - The 'inherits' keyword is not allowed when a '{0}' keyword is used. - - - The '{0}' keyword must be followed by a type name on the same line. - - - Only one '{0}' statement is allowed in a file. - - \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json b/src/Microsoft.AspNet.Mvc.Razor.Host/project.json deleted file mode 100644 index b881507539..0000000000 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/project.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "version": "0.1-alpha-*", - "dependencies": { - "Microsoft.AspNet.Razor": "0.1-alpha-*", - "Common": "" - }, - "configurations": { - "net45": {}, - "k10": { - "dependencies": { - "System.Diagnostics.Debug": "4.0.10.0", - "System.Globalization": "4.0.10.0", - "System.IO": "4.0.0.0", - "System.Linq": "4.0.0.0", - "System.Reflection": "4.0.10.0", - "System.Resources.ResourceManager": "4.0.0.0", - "System.Runtime": "4.0.20.0", - "System.Runtime.Extensions": "4.0.10.0" - } - } - } -} \ No newline at end of file diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor/IMvcRazorHost.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Razor.Host/IMvcRazorHost.cs rename to src/Microsoft.AspNet.Mvc.Razor/IMvcRazorHost.cs diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs b/src/Microsoft.AspNet.Mvc.Razor/MvcRazorCodeParser.cs similarity index 98% rename from src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs rename to src/Microsoft.AspNet.Mvc.Razor/MvcRazorCodeParser.cs index 04abf3bb4e..dd562e8e3a 100644 --- a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorCodeParser.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/MvcRazorCodeParser.cs @@ -1,6 +1,5 @@ using System; using System.Globalization; -using Microsoft.AspNet.Mvc.Razor.Host; using Microsoft.AspNet.Razor.Generator; using Microsoft.AspNet.Razor.Parser; using Microsoft.AspNet.Razor.Text; diff --git a/src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs b/src/Microsoft.AspNet.Mvc.Razor/MvcRazorHost.cs similarity index 100% rename from src/Microsoft.AspNet.Mvc.Razor.Host/MvcRazorHost.cs rename to src/Microsoft.AspNet.Mvc.Razor/MvcRazorHost.cs diff --git a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs index ed41ce5d4e..e114e5d827 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs +++ b/src/Microsoft.AspNet.Mvc.Razor/Properties/Resources.Designer.cs @@ -42,6 +42,54 @@ namespace Microsoft.AspNet.Mvc.Razor return string.Format(CultureInfo.CurrentCulture, GetString("LayoutCannotBeLocated"), p0); } + /// + /// The 'inherits' keyword is not allowed when a '{0}' keyword is used. + /// + internal static string MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword + { + get { return GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"); } + } + + /// + /// The 'inherits' keyword is not allowed when a '{0}' keyword is used. + /// + internal static string FormatMvcRazorCodeParser_CannotHaveModelAndInheritsKeyword(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_CannotHaveModelAndInheritsKeyword"), p0); + } + + /// + /// The '{0}' keyword must be followed by a type name on the same line. + /// + internal static string MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName + { + get { return GetString("MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName"); } + } + + /// + /// The '{0}' keyword must be followed by a type name on the same line. + /// + internal static string FormatMvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_ModelKeywordMustBeFollowedByTypeName"), p0); + } + + /// + /// Only one '{0}' statement is allowed in a file. + /// + internal static string MvcRazorCodeParser_OnlyOneModelStatementIsAllowed + { + get { return GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"); } + } + + /// + /// Only one '{0}' statement is allowed in a file. + /// + internal static string FormatMvcRazorCodeParser_OnlyOneModelStatementIsAllowed(object p0) + { + return string.Format(CultureInfo.CurrentCulture, GetString("MvcRazorCodeParser_OnlyOneModelStatementIsAllowed"), p0); + } + /// /// RenderBody can only be called from a layout page. /// diff --git a/src/Microsoft.AspNet.Mvc.Razor/Resources.resx b/src/Microsoft.AspNet.Mvc.Razor/Resources.resx index 54573601cc..d0604cb9a4 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/Resources.resx +++ b/src/Microsoft.AspNet.Mvc.Razor/Resources.resx @@ -123,6 +123,15 @@ The layout view '{0}' could not be located. + + The 'inherits' keyword is not allowed when a '{0}' keyword is used. + + + The '{0}' keyword must be followed by a type name on the same line. + + + Only one '{0}' statement is allowed in a file. + RenderBody can only be called from a layout page. diff --git a/src/Microsoft.AspNet.Mvc.Razor/project.json b/src/Microsoft.AspNet.Mvc.Razor/project.json index 206b4ac822..0e60a3a081 100644 --- a/src/Microsoft.AspNet.Mvc.Razor/project.json +++ b/src/Microsoft.AspNet.Mvc.Razor/project.json @@ -9,7 +9,6 @@ "Microsoft.AspNet.Mvc.Core" : "", "Microsoft.AspNet.Mvc.ModelBinding" : "", "Microsoft.AspNet.Mvc.Rendering" : "", - "Microsoft.AspNet.Mvc.Razor.Host" : "", "Microsoft.CodeAnalysis.Common" : "0.7-beta-*", "Microsoft.CodeAnalysis.CSharp" : "0.7-beta-*", "System.Reflection.Metadata.Ecma335": "0.7-beta-*", diff --git a/src/Microsoft.AspNet.Mvc/project.json b/src/Microsoft.AspNet.Mvc/project.json index 8ceab4ef72..603eff4357 100644 --- a/src/Microsoft.AspNet.Mvc/project.json +++ b/src/Microsoft.AspNet.Mvc/project.json @@ -11,8 +11,7 @@ "Microsoft.AspNet.Mvc.Core": "", "Microsoft.AspNet.Mvc.Razor": "", "Microsoft.AspNet.Mvc.ModelBinding": "", - "Microsoft.AspNet.Mvc.Rendering": "", - "Microsoft.AspNet.Mvc.Razor.Host": "" + "Microsoft.AspNet.Mvc.Rendering": "" }, "configurations": { "net45": {}, diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json deleted file mode 100644 index 3ff2d0842f..0000000000 --- a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/project.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "version" : "0.1-alpha-*", - "dependencies": { - "Microsoft.AspNet.Razor" : "0.1-alpha-*", - "Microsoft.AspNet.Testing" : "0.1-alpha-*", - "Microsoft.AspNet.Mvc.Razor.Host" : "", - "Xunit.KRunner": "0.1-alpha-*", - "xunit.abstractions": "2.0.0-aspnet-*", - "xunit.assert": "2.0.0-aspnet-*", - "xunit.core": "2.0.0-aspnet-*", - "xunit.execution": "2.0.0-aspnet-*" - }, - "commands": { - "test": "Xunit.KRunner" - }, - "configurations": { - "net45": { - "dependencies": { - "Moq": "4.2.1312.1622", - "System.Reflection": "" - } - } - } -} \ No newline at end of file diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorCodeParserTest.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Razor.Host.Test/MvcRazorCodeParserTest.cs rename to test/Microsoft.AspNet.Mvc.Razor.Test/MvcRazorCodeParserTest.cs diff --git a/test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory.cs b/test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs similarity index 100% rename from test/Microsoft.AspNet.Mvc.Razor.Host.Test/SpanFactory.cs rename to test/Microsoft.AspNet.Mvc.Razor.Test/SpanFactory.cs diff --git a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json index 80924a4882..938b0e2de5 100644 --- a/test/Microsoft.AspNet.Mvc.Razor.Test/project.json +++ b/test/Microsoft.AspNet.Mvc.Razor.Test/project.json @@ -4,7 +4,6 @@ "Microsoft.AspNet.FileSystems": "0.1-alpha-*", "Microsoft.AspNet.Razor": "0.1-alpha-*", "Microsoft.AspNet.Mvc.Razor" : "", - "Microsoft.AspNet.Mvc.Razor.Host" : "", "Microsoft.AspNet.Testing" : "0.1-alpha-*", "Xunit.KRunner": "0.1-alpha-*", "xunit.abstractions": "2.0.0-aspnet-*",