Skip to content

Commit 264ce25

Browse files
committed
Merged
2 parents 0e8119d + e0cfa48 commit 264ce25

File tree

2 files changed

+139
-128
lines changed

2 files changed

+139
-128
lines changed
Lines changed: 133 additions & 124 deletions
Original file line numberDiff line numberDiff line change
@@ -1,125 +1,134 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3-
<PropertyGroup>
4-
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
5-
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
6-
<ProjectGuid>{18B0B97B-8795-4DC2-A1E7-8070255BE718}</ProjectGuid>
7-
<OutputType>Library</OutputType>
8-
<AppDesignerFolder>Properties</AppDesignerFolder>
9-
<RootNamespace>AngleSharp.Io.Tests</RootNamespace>
10-
<AssemblyName>AngleSharp.Io.Tests</AssemblyName>
11-
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
12-
<FileAlignment>512</FileAlignment>
13-
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
14-
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
15-
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
16-
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
17-
<IsCodedUITest>False</IsCodedUITest>
18-
<TestProjectType>UnitTest</TestProjectType>
19-
<TargetFrameworkProfile />
20-
</PropertyGroup>
21-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
22-
<DebugSymbols>true</DebugSymbols>
23-
<DebugType>full</DebugType>
24-
<Optimize>false</Optimize>
25-
<OutputPath>bin\Debug\</OutputPath>
26-
<DefineConstants>DEBUG;TRACE</DefineConstants>
27-
<ErrorReport>prompt</ErrorReport>
28-
<WarningLevel>4</WarningLevel>
29-
</PropertyGroup>
30-
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
31-
<DebugType>pdbonly</DebugType>
32-
<Optimize>true</Optimize>
33-
<OutputPath>bin\Release\</OutputPath>
34-
<DefineConstants>TRACE</DefineConstants>
35-
<ErrorReport>prompt</ErrorReport>
36-
<WarningLevel>4</WarningLevel>
37-
</PropertyGroup>
38-
<ItemGroup>
39-
<Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
40-
<HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.dll</HintPath>
41-
<Private>True</Private>
42-
</Reference>
43-
<Reference Include="FluentAssertions.Core, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
44-
<HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.Core.dll</HintPath>
45-
<Private>True</Private>
46-
</Reference>
47-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
48-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
49-
<Private>True</Private>
50-
</Reference>
51-
<Reference Include="System" />
52-
<Reference Include="System.Net.Http" />
53-
<Reference Include="System.Xml" />
54-
<Reference Include="System.Xml.Linq" />
55-
</ItemGroup>
56-
<Choose>
57-
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
58-
<ItemGroup>
59-
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
60-
</ItemGroup>
61-
</When>
62-
<Otherwise />
63-
</Choose>
64-
<ItemGroup>
65-
<ProjectReference Include="..\..\..\AngleSharp.Core\src\AngleSharp\AngleSharp.Core.csproj">
66-
<Project>{91f78c48-287e-41b5-9e49-44d6e1e31290}</Project>
67-
<Name>AngleSharp.Core</Name>
68-
</ProjectReference>
69-
<ProjectReference Include="..\AngleSharp.Io\AngleSharp.Io.csproj">
70-
<Project>{5b570639-7b4a-4a66-b283-9481f6a481ed}</Project>
71-
<Name>AngleSharp.Io</Name>
72-
</ProjectReference>
73-
</ItemGroup>
74-
<ItemGroup>
75-
<Compile Include="DisposableStream.cs" />
76-
<Compile Include="Helper.cs" />
77-
<Compile Include="Integration\DocumentTests.cs" />
78-
<Compile Include="Network\CookieHandlingTests.cs" />
79-
<Compile Include="Network\AboutTests.cs" />
80-
<Compile Include="Network\DataRequesterTests.cs" />
81-
<Compile Include="Network\FileRequesterTests.cs" />
82-
<Compile Include="Network\FtpRequesterTests.cs" />
83-
<Compile Include="Network\HttpClientRequesterTests.cs" />
84-
<Compile Include="Network\Mocks\HttpMockHandler.cs" />
85-
<Compile Include="Network\Mocks\HttpMockState.cs" />
86-
<Compile Include="Network\ResponseTests.cs" />
87-
<Compile Include="Network\WebSocketTests.cs" />
88-
<Compile Include="Properties\AssemblyInfo.cs" />
89-
</ItemGroup>
90-
<ItemGroup>
91-
<None Include="packages.config" />
92-
</ItemGroup>
93-
<ItemGroup>
94-
<Content Include="TestContent.txt">
95-
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
96-
</Content>
97-
</ItemGroup>
98-
<Choose>
99-
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
100-
<ItemGroup>
101-
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
102-
<Private>False</Private>
103-
</Reference>
104-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
105-
<Private>False</Private>
106-
</Reference>
107-
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108-
<Private>False</Private>
109-
</Reference>
110-
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111-
<Private>False</Private>
112-
</Reference>
113-
</ItemGroup>
114-
</When>
115-
</Choose>
116-
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
117-
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
118-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
119-
Other similar extension points exist, see Microsoft.Common.targets.
120-
<Target Name="BeforeBuild">
121-
</Target>
122-
<Target Name="AfterBuild">
123-
</Target>
124-
-->
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props" Condition="Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" />
4+
<PropertyGroup>
5+
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
6+
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
7+
<ProjectGuid>{18B0B97B-8795-4DC2-A1E7-8070255BE718}</ProjectGuid>
8+
<OutputType>Library</OutputType>
9+
<AppDesignerFolder>Properties</AppDesignerFolder>
10+
<RootNamespace>AngleSharp.Io.Tests</RootNamespace>
11+
<AssemblyName>AngleSharp.Io.Tests</AssemblyName>
12+
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
13+
<FileAlignment>512</FileAlignment>
14+
<ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
15+
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>
16+
<VSToolsPath Condition="'$(VSToolsPath)' == ''">$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)</VSToolsPath>
17+
<ReferencePath>$(ProgramFiles)\Common Files\microsoft shared\VSTT\$(VisualStudioVersion)\UITestExtensionPackages</ReferencePath>
18+
<IsCodedUITest>False</IsCodedUITest>
19+
<TestProjectType>UnitTest</TestProjectType>
20+
<TargetFrameworkProfile />
21+
<NuGetPackageImportStamp>
22+
</NuGetPackageImportStamp>
23+
</PropertyGroup>
24+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
25+
<DebugSymbols>true</DebugSymbols>
26+
<DebugType>full</DebugType>
27+
<Optimize>false</Optimize>
28+
<OutputPath>bin\Debug\</OutputPath>
29+
<DefineConstants>DEBUG;TRACE</DefineConstants>
30+
<ErrorReport>prompt</ErrorReport>
31+
<WarningLevel>4</WarningLevel>
32+
</PropertyGroup>
33+
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
34+
<DebugType>pdbonly</DebugType>
35+
<Optimize>true</Optimize>
36+
<OutputPath>bin\Release\</OutputPath>
37+
<DefineConstants>TRACE</DefineConstants>
38+
<ErrorReport>prompt</ErrorReport>
39+
<WarningLevel>4</WarningLevel>
40+
</PropertyGroup>
41+
<ItemGroup>
42+
<Reference Include="AngleSharp, Version=0.10.0.0, Culture=neutral, PublicKeyToken=e83494dcdc6d31ea, processorArchitecture=MSIL">
43+
<HintPath>..\packages\AngleSharp.0.10.0\lib\net45\AngleSharp.dll</HintPath>
44+
<Private>True</Private>
45+
</Reference>
46+
<Reference Include="FluentAssertions, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
47+
<HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.dll</HintPath>
48+
<Private>True</Private>
49+
</Reference>
50+
<Reference Include="FluentAssertions.Core, Version=4.13.1.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
51+
<HintPath>..\packages\FluentAssertions.4.13.1\lib\net45\FluentAssertions.Core.dll</HintPath>
52+
<Private>True</Private>
53+
</Reference>
54+
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
55+
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
56+
<Private>True</Private>
57+
</Reference>
58+
<Reference Include="System" />
59+
<Reference Include="System.Net.Http" />
60+
<Reference Include="System.Xml" />
61+
<Reference Include="System.Xml.Linq" />
62+
</ItemGroup>
63+
<Choose>
64+
<When Condition="('$(VisualStudioVersion)' == '10.0' or '$(VisualStudioVersion)' == '') and '$(TargetFrameworkVersion)' == 'v3.5'">
65+
<ItemGroup>
66+
<Reference Include="Microsoft.VisualStudio.QualityTools.UnitTestFramework, Version=10.1.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL" />
67+
</ItemGroup>
68+
</When>
69+
<Otherwise />
70+
</Choose>
71+
<ItemGroup>
72+
<ProjectReference Include="..\AngleSharp.Io\AngleSharp.Io.csproj">
73+
<Project>{5b570639-7b4a-4a66-b283-9481f6a481ed}</Project>
74+
<Name>AngleSharp.Io</Name>
75+
</ProjectReference>
76+
</ItemGroup>
77+
<ItemGroup>
78+
<Compile Include="DisposableStream.cs" />
79+
<Compile Include="Helper.cs" />
80+
<Compile Include="Integration\DocumentTests.cs" />
81+
<Compile Include="Network\CookieHandlingTests.cs" />
82+
<Compile Include="Network\AboutTests.cs" />
83+
<Compile Include="Network\DataRequesterTests.cs" />
84+
<Compile Include="Network\FileRequesterTests.cs" />
85+
<Compile Include="Network\FtpRequesterTests.cs" />
86+
<Compile Include="Network\HttpClientRequesterTests.cs" />
87+
<Compile Include="Network\Mocks\HttpMockHandler.cs" />
88+
<Compile Include="Network\Mocks\HttpMockState.cs" />
89+
<Compile Include="Network\ResponseTests.cs" />
90+
<Compile Include="Network\WebSocketTests.cs" />
91+
<Compile Include="Properties\AssemblyInfo.cs" />
92+
</ItemGroup>
93+
<ItemGroup>
94+
<None Include="packages.config" />
95+
</ItemGroup>
96+
<ItemGroup>
97+
<Content Include="TestContent.txt">
98+
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
99+
</Content>
100+
</ItemGroup>
101+
<Choose>
102+
<When Condition="'$(VisualStudioVersion)' == '10.0' And '$(IsCodedUITest)' == 'True'">
103+
<ItemGroup>
104+
<Reference Include="Microsoft.VisualStudio.QualityTools.CodedUITestFramework, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
105+
<Private>False</Private>
106+
</Reference>
107+
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Common, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
108+
<Private>False</Private>
109+
</Reference>
110+
<Reference Include="Microsoft.VisualStudio.TestTools.UITest.Extension, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
111+
<Private>False</Private>
112+
</Reference>
113+
<Reference Include="Microsoft.VisualStudio.TestTools.UITesting, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
114+
<Private>False</Private>
115+
</Reference>
116+
</ItemGroup>
117+
</When>
118+
</Choose>
119+
<Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
120+
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
121+
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
122+
<PropertyGroup>
123+
<ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
124+
</PropertyGroup>
125+
<Error Condition="!Exists('..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NUnit3TestAdapter.3.10.0\build\net35\NUnit3TestAdapter.props'))" />
126+
</Target>
127+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
128+
Other similar extension points exist, see Microsoft.Common.targets.
129+
<Target Name="BeforeBuild">
130+
</Target>
131+
<Target Name="AfterBuild">
132+
</Target>
133+
-->
125134
</Project>
Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="FluentAssertions" version="4.13.1" targetFramework="net45" />
4-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="AngleSharp" version="0.10.0" targetFramework="net45" />
4+
<package id="FluentAssertions" version="4.13.1" targetFramework="net45" />
5+
<package id="NUnit" version="3.4.1" targetFramework="net45" />
6+
<package id="NUnit3TestAdapter" version="3.10.0" targetFramework="net45" />
57
</packages>

0 commit comments

Comments
 (0)