diff options
| author | Lluis Sanchez <llsan@microsoft.com> | 2019-03-21 03:02:26 +0300 |
|---|---|---|
| committer | Lluis Sanchez <llsan@microsoft.com> | 2019-03-21 12:08:48 +0300 |
| commit | e466141ef7b2c39585e29f94c28f6deb82e8be97 (patch) | |
| tree | a8e8661e23ea0eac955ea0fe106f14453f8997cf /main/src/addins/Xml/Tests | |
| parent | ea8b962d5ed27ad8dd52594124d35eb0bea4b714 (diff) | |
| parent | 228695e2dc646fb2ad812c06bebfe33ca9f69601 (diff) | |
Merge branch 'new-service-model' into new-doc-model
Diffstat (limited to 'main/src/addins/Xml/Tests')
| -rw-r--r-- | main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj | 23 | ||||
| -rw-r--r-- | main/src/addins/Xml/Tests/packages.config | 4 |
2 files changed, 8 insertions, 19 deletions
diff --git a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj index 0d71e05910..1a07bf6ca3 100644 --- a/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj +++ b/main/src/addins/Xml/Tests/MonoDevelop.Xml.Tests.csproj @@ -1,5 +1,6 @@ <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="4.0"> <Import Project="..\..\..\..\MonoDevelop.props" /> + <Import Project="$(ReferencesGtk)" /> <PropertyGroup> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> @@ -9,6 +10,10 @@ <TargetFrameworkVersion>$(MDFrameworkVersion)</TargetFrameworkVersion> <OutputPath>..\..\..\..\build\tests</OutputPath> <DefineConstants>TRACE</DefineConstants> + <!-- + 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' " /> @@ -26,6 +31,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.Xml.csproj"> <Project>{86DFC74A-B0B6-4C73-9E05-9098DA8FA5F1}</Project> @@ -35,24 +41,17 @@ <ProjectReference Include="..\..\..\..\tests\IdeUnitTests\IdeUnitTests.csproj"> <Project>{F7B2B155-7CF4-42C4-B5AF-63C0667D2E4F}</Project> <Name>IdeUnitTests</Name> + <Private>False</Private> </ProjectReference> <ProjectReference Include="..\..\..\..\tests\UnitTests\UnitTests.csproj"> <Project>{1497D0A8-AFF1-4938-BC22-BE79B358BA5B}</Project> <Name>UnitTests</Name> + <Private>False</Private> </ProjectReference> </ItemGroup> <ItemGroup> <Reference Include="System" /> <Reference Include="System.Xml" /> - <Reference Include="Microsoft.CodeAnalysis"> - <HintPath>..\..\..\..\build\bin\Microsoft.CodeAnalysis.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="System.ValueTuple"> - <HintPath>..\..\..\..\packages\System.ValueTuple.4.4.0\lib\net47\System.ValueTuple.dll</HintPath> - <Private>False</Private> - </Reference> - <Reference Include="gdk-sharp, Version=2.12.0.0, Culture=neutral, PublicKeyToken=35e10195dab3c99f" /> </ItemGroup> <ItemGroup> <Compile Include="Parser\ActiveElementStartPathTestFixture.cs" /> @@ -125,11 +124,5 @@ <Link>Resources\xhtml1-strict.xsd</Link> </EmbeddedResource> </ItemGroup> - <ItemGroup> - <None Include="packages.config" /> - </ItemGroup> - <ItemGroup> - <Folder Include="CodeCompletion\" /> - </ItemGroup> <Import Project="$(MSBuildBinPath)\Microsoft.CSharp.targets" /> </Project> diff --git a/main/src/addins/Xml/Tests/packages.config b/main/src/addins/Xml/Tests/packages.config deleted file mode 100644 index f0c788e020..0000000000 --- a/main/src/addins/Xml/Tests/packages.config +++ /dev/null @@ -1,4 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<packages> - <package id="System.ValueTuple" version="4.4.0" targetFramework="net471" /> -</packages> |