diff options
author | Lluis Sanchez <llsan@microsoft.com> | 2019-03-20 18:55:57 +0300 |
---|---|---|
committer | Lluis Sanchez <llsan@microsoft.com> | 2019-03-20 19:10:34 +0300 |
commit | b14cae42f57650e9de2dd31d1beab5f90a4d44ec (patch) | |
tree | 642ceda8e7036c93534acd1e35d03bd056bcafa1 /main/src/addins/AspNet | |
parent | 402fa466190345ebf4149df4b97f1c0ea1a74895 (diff) | |
parent | 50941aa1dfd7225ff445f1b14e92b0e9e6ad57d6 (diff) |
Merge branch 'release-8.0' into master-vnext
Diffstat (limited to 'main/src/addins/AspNet')
8 files changed, 22 insertions, 309 deletions
diff --git a/main/src/addins/AspNet/Makefile.am b/main/src/addins/AspNet/Makefile.am deleted file mode 100644 index 9039c5e753..0000000000 --- a/main/src/addins/AspNet/Makefile.am +++ /dev/null @@ -1,11 +0,0 @@ -include $(top_srcdir)/xbuild.include -EXTRA_DIST += \ - $(wildcard lib/*) \ - $(wildcard Templates/MvcCommon/*.cshtml)\ - $(wildcard Templates/*.cshtml)\ - $(wildcard Templates/*.ts)\ - $(wildcard Templates/*.css)\ - $(wildcard Templates/*.scss)\ - $(wildcard Templates/*.less)\ - $(wildcard Templates/*.json)\ - $(wildcard Templates/Projects/Files/*.aspx) diff --git a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj index 0738534865..749d205b4f 100644 --- a/main/src/addins/AspNet/MonoDevelop.AspNet.csproj +++ b/main/src/addins/AspNet/MonoDevelop.AspNet.csproj @@ -1,7 +1,6 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Import Project="..\..\..\MonoDevelop.props" /> <Import Project="$(ReferencesGtk)" /> - <Import Project="$(ReferencesRoslyn)" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -10,6 +9,10 @@ <OutputPath>..\..\..\build\AddIns\AspNet</OutputPath> <AllowUnsafeBlocks>true</AllowUnsafeBlocks> <RARResolveFromCandidateAssemblyFiles>true</RARResolveFromCandidateAssemblyFiles> + <!-- + This needs to be ported to the new editor, and currently makes use of many, many deprecated APIs. + --> + <NoWarn>$(NoWarn);618;612</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> @@ -69,51 +72,11 @@ <Name>MonoDevelop.Xml</Name> <Private>False</Private> </ProjectReference> - <Reference Include="Microsoft.Web.Infrastructure"> - <HintPath>..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll</HintPath> - </Reference> - <Reference Include="System.Web.Razor"> - <HintPath>..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Helpers"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages.Deployment"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.WebPages.Razor"> - <HintPath>..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Mvc"> - <HintPath>..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Web.Mvc" Condition="!Exists('$(SolutionDir)\..\.git')" /> <ProjectReference Include="..\..\..\external\nrefactory\ICSharpCode.NRefactory\ICSharpCode.NRefactory.csproj"> <Project>{3B2A5653-EC97-4001-BB9B-D90F1AF2C371}</Project> <Name>ICSharpCode.NRefactory</Name> <Private>False</Private> </ProjectReference> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="Mono.TextTemplating"> - <HintPath>..\..\..\packages\Mono.TextTemplating.1.3.1\lib\net45\Mono.TextTemplating.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Reference Include="System" /> @@ -127,6 +90,14 @@ <Reference Include="System.Xml.Linq" /> <Reference Include="System.ServiceModel" /> <Reference Include="System.Runtime.Serialization" /> + <PackageReference Include="Microsoft.AspNet.Mvc" version="5.2.7" PrivateAssets="runtime" /> + <IncludeCopyLocal Include="System.Web.Mvc.dll" /> + <IncludeCopyLocal Include="System.Web.Razor.dll" /> + <IncludeCopyLocal Include="System.Web.Helpers.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.Deployment.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.Razor.dll" /> + <IncludeCopyLocal Include="System.Web.WebPages.dll" /> + <IncludeCopyLocal Include="Microsoft.Web.Infrastructure.dll" /> </ItemGroup> <ItemGroup> <EmbeddedResource Include="Properties\MonoDevelop.AspNet.addin.xml" /> @@ -277,238 +248,10 @@ <Compile Include="Gui\MonoDevelop.AspNet.Projects.GtkAspNetProjectTemplateWizardPageWidget.cs" /> </ItemGroup> <ItemGroup> - <None Include="Razor\Razor-templates.xml"> - <SubType>Designer</SubType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="CodeTemplates\CSharp\AddController\ControllerWithEmptyReadAndWriteActions.tt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="CodeTemplates\CSharp\AddController\Empty.tt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="CodeTemplates\CSharp\AddView\Aspx\Empty.tt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="CodeTemplates\CSharp\AddView\Razor\Empty.tt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\Controller.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\LayoutPage.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\PartialViewPageRazor.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\UserControl.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\ViewContentPage.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\ViewMasterPage.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\ViewPage.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\ViewPageRazor.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Mvc\WebConfigViews.xft.xml"> - <SubType>Designer</SubType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebConfig-Application.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebConfig-SubDir.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\MasterPage-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\MasterPage-Empty.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\NestedMasterPage.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebContentForm.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebControl-Empty.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebForm-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\NestedMasterPage-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebControl-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebForm-Empty.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebHandler-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebService-Empty.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebService-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebHandler-Empty.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebForms\WebContentForm-CodeBehind.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\PreprocessedRazorTemplate.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\_Layout.cshtml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\_ViewStart.cshtml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\Error.cshtml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\HomeController.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\HomeControllerTest.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\Index.cshtml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\MvcCommon\ViewPageRazor.cshtml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.Mvc.5.2.3\lib\net45\System.Web.Mvc.dll"> - <Link>System.Web.Mvc.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.Razor.3.2.3\lib\net45\System.Web.Razor.dll"> - <Link>System.Web.Razor.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.Helpers.dll"> - <Link>System.Web.Helpers.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Deployment.dll"> - <Link>System.Web.WebPages.Deployment.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.dll"> - <Link>System.Web.WebPages.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.AspNet.WebPages.3.2.3\lib\net45\System.Web.WebPages.Razor.dll"> - <Link>System.Web.WebPages.Razor.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="..\..\..\packages\Microsoft.Web.Infrastructure.1.0.0.0\lib\net40\Microsoft.Web.Infrastructure.dll"> - <Link>Microsoft.Web.Infrastructure.dll</Link> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="packages.config" /> - <None Include="Templates\Projects\MvcProject.xpt.xml"> - <SubType>Designer</SubType> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\EmptyProject.xpt.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\WebFormsProject.xpt.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\Files\Default.aspx"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\Files\Default.aspx.designer.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\Files\Default.aspx.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\GlobalAsax.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Global.tt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\RouteConfig.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\WebApiConfig.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\Projects\Files\Test.cs"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\EmptyCssFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\EmptyLessFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\EmptyScssFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\EmptyJsonFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\EmptyTypeScriptFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\StylesheetTemplate.css"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\StylesheetTemplate.less"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\StylesheetTemplate.scss"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\JsonFileTemplate.json"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\TypeScriptFileTemplate.ts"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\npmConfigurationFile.json"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="Templates\npmConfigurationFile.xft.xml"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - </ItemGroup> - <ItemGroup> - <Content Include="Html\Schemas\readme.txt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="Html\Schemas\W3C-License.html"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="Html\Schemas\xhtml1-frameset.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="Html\Schemas\xhtml1-strict.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> - <Content Include="Html\Schemas\xhtml1-transitional.xsd"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </Content> + <ExtensionContent Include="Razor\Razor-templates.xml" /> + <ExtensionContent Include="CodeTemplates\**\*.*" /> + <ExtensionContent Include="Templates\**\*.*" /> + <ExtensionContent Include="Html\Schemas\**\*.*" /> </ItemGroup> <ItemGroup> <InternalsVisibleTo Include="MonoDevelop.AspNet.Tests" /> diff --git a/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs index 4a018b416d..75035713ca 100644 --- a/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs +++ b/main/src/addins/AspNet/Projects/GtkAspNetProjectTemplateWizardPageWidget.cs @@ -28,7 +28,6 @@ using System;
using Gdk;
using Gtk;
-using Mono.TextEditor;
using MonoDevelop.Components;
using MonoDevelop.Core;
diff --git a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs index f675987cae..4bff87759b 100644 --- a/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs +++ b/main/src/addins/AspNet/Razor/RazorCSharpEditorExtension.cs @@ -32,7 +32,6 @@ using System.Threading; using System.Threading.Tasks; using System.Web.Razor.Generator; using System.Web.Razor.Parser.SyntaxTree; -using Mono.TextEditor; using MonoDevelop.Core; using MonoDevelop.Core.Text; using MonoDevelop.Ide.Editor; @@ -579,6 +578,7 @@ namespace MonoDevelop.AspNet.Razor return base.GetCurrentParameterIndex (startOffset, token); } + [Obsolete] public override Task<MonoDevelop.Ide.CodeCompletion.ParameterHintingResult> HandleParameterCompletionAsync ( CodeCompletionContext completionContext, char completionChar, CancellationToken token) { diff --git a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj index 198ab9de75..f1865d841a 100644 --- a/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj +++ b/main/src/addins/AspNet/Tests/MonoDevelop.AspNet.Tests.csproj @@ -1,7 +1,6 @@ <Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <Import Project="..\..\..\..\MonoDevelop.props" /> <Import Project="$(ReferencesGtk)" /> - <Import Project="$(ReferencesRoslyn)" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -10,19 +9,15 @@ <TestRunnerCommand>..\..\..\..\build\bin\mdtool.exe</TestRunnerCommand> <TestRunnerArgs>run-md-tests</TestRunnerArgs> <OutputPath>..\..\..\..\build\tests</OutputPath> + <!-- + This needs to be ported to the new editor, and currently makes use of many, many deprecated APIs. + --> + <NoWarn>$(NoWarn);618;612</NoWarn> </PropertyGroup> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' " /> <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' " /> <ItemGroup> <Reference Include="System" /> - <Reference Include="System.Reflection.Metadata"> - <HintPath>..\..\..\..\build\bin\System.Reflection.Metadata.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.Collections.Immutable"> - <HintPath>..\..\..\..\build\bin\System.Collections.Immutable.dll</HintPath> - <Private>False</Private> - </Reference> </ItemGroup> <ItemGroup> <Compile Include="Razor\Dom\RazorCodeBlockParsingTests.cs" /> @@ -88,6 +83,7 @@ <ProjectReference Include="..\..\..\..\external\guiunit\src\framework\GuiUnit_NET_4_5.csproj"> <Project>{D12F0F7B-8DE3-43EC-BA49-41052D065A9B}</Project> <Name>GuiUnit_NET_4_5</Name> + <Private>False</Private> </ProjectReference> <ProjectReference Include="..\..\MonoDevelop.SourceEditor2\MonoDevelop.SourceEditor.csproj"> <Project>{F8F92AA4-A376-4679-A9D4-60E7B7FBF477}</Project> diff --git a/main/src/addins/AspNet/Tests/WebForms/WebFormsSyntaxModeTests.cs b/main/src/addins/AspNet/Tests/WebForms/WebFormsSyntaxModeTests.cs index c1cfaf73b9..5bc6374f44 100644 --- a/main/src/addins/AspNet/Tests/WebForms/WebFormsSyntaxModeTests.cs +++ b/main/src/addins/AspNet/Tests/WebForms/WebFormsSyntaxModeTests.cs @@ -26,9 +26,6 @@ using System.Linq;
using NUnit.Framework;
-using Mono.TextEditor;
-using Mono.TextEditor.Highlighting;
-using MonoDevelop.AspNet.WebForms;
namespace MonoDevelop.AspNet.Tests.WebForms
{
diff --git a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs index 41a22f1779..32a25b15c5 100644 --- a/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs +++ b/main/src/addins/AspNet/WebForms/ILanguageCompletionBuilder.cs @@ -26,9 +26,6 @@ using System; using System.Collections.Generic; -using Mono.TextEditor; -using MonoDevelop.Ide.CodeCompletion; -using MonoDevelop.Ide.Editor; using MonoDevelop.Ide.TypeSystem; using MonoDevelop.Xml.Dom; using MonoDevelop.AspNet.Projects; diff --git a/main/src/addins/AspNet/packages.config b/main/src/addins/AspNet/packages.config deleted file mode 100644 index a3f69291e3..0000000000 --- a/main/src/addins/AspNet/packages.config +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="Microsoft.AspNet.Mvc" version="5.2.3" targetFramework="net45" /> - <package id="Microsoft.AspNet.Razor" version="3.2.3" targetFramework="net45" /> - <package id="Microsoft.AspNet.WebPages" version="3.2.3" targetFramework="net45" /> - <package id="Microsoft.Web.Infrastructure" version="1.0.0.0" targetFramework="net45" /> - <package id="Mono.TextTemplating" version="1.3.1" targetFramework="net45" /> -</packages> |