Skip to content

Commit

Permalink
Migrating Infra-Test csproj Files (as part of issue #58)
Browse files Browse the repository at this point in the history
  • Loading branch information
David-Desmaisons committed Jun 14, 2018
1 parent 9d077ac commit cff6b43
Show file tree
Hide file tree
Showing 10 changed files with 77 additions and 289 deletions.
22 changes: 11 additions & 11 deletions Neutronium.sln
Original file line number Diff line number Diff line change
Expand Up @@ -74,11 +74,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "JavascriptFrameworks", "Jav
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infra", "Infra", "{95F6E684-BFA1-4208-9B8D-99BF3EB5FE43}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JavascriptFrameworkTesterHelper", "Tests\Infra\Tests.Infra.JavascriptEngineTesterHelper\JavascriptFrameworkTesterHelper.csproj", "{25EC8826-104C-4346-B648-CF7AB591399A}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "JavascriptFrameworkTesterHelper", "Tests\Infra\Tests.Infra.JavascriptEngineTesterHelper\JavascriptFrameworkTesterHelper.csproj", "{25EC8826-104C-4346-B648-CF7AB591399A}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WebBrowserEngineTesterHelper", "Tests\Infra\Tests.Infra.HTMLEngineTesterHelper\WebBrowserEngineTesterHelper.csproj", "{335A20F1-F421-4EB1-9961-EE487350818E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WebBrowserEngineTesterHelper", "Tests\Infra\Tests.Infra.HTMLEngineTesterHelper\WebBrowserEngineTesterHelper.csproj", "{335A20F1-F421-4EB1-9961-EE487350818E}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IntegratedContextTesterHelper", "Tests\Infra\Tests.Infra.IntegratedContextTesterHelper.Window\IntegratedContextTesterHelper.csproj", "{614BBB6D-D7C4-494A-929E-067EE62573CE}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "IntegratedContextTesterHelper", "Tests\Infra\Tests.Infra.IntegratedContextTesterHelper.Window\IntegratedContextTesterHelper.csproj", "{614BBB6D-D7C4-494A-929E-067EE62573CE}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{0BFA5CDC-1C54-4682-A4AB-934D0A14F3E1}"
EndProject
Expand Down Expand Up @@ -469,32 +469,32 @@ Global
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|Any CPU.Build.0 = Debug|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|Mixed Platforms.Build.0 = Debug|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x64.ActiveCfg = Debug|x64
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x64.Build.0 = Debug|x64
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x64.ActiveCfg = Debug|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x64.Build.0 = Debug|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x86.ActiveCfg = Debug|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Debug|x86.Build.0 = Debug|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|Any CPU.ActiveCfg = Release|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|Any CPU.Build.0 = Release|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|Mixed Platforms.ActiveCfg = Release|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|Mixed Platforms.Build.0 = Release|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x64.ActiveCfg = Release|x64
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x64.Build.0 = Release|x64
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x64.ActiveCfg = Release|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x64.Build.0 = Release|Any CPU
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x86.ActiveCfg = Release|x86
{25EC8826-104C-4346-B648-CF7AB591399A}.Release|x86.Build.0 = Release|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.ActiveCfg = Debug|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|Mixed Platforms.Build.0 = Debug|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.ActiveCfg = Debug|x64
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.Build.0 = Debug|x64
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.ActiveCfg = Debug|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x64.Build.0 = Debug|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x86.ActiveCfg = Debug|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Debug|x86.Build.0 = Debug|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|Any CPU.Build.0 = Release|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|Mixed Platforms.ActiveCfg = Release|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|Mixed Platforms.Build.0 = Release|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x64.ActiveCfg = Release|x64
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x64.Build.0 = Release|x64
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x64.ActiveCfg = Release|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x64.Build.0 = Release|Any CPU
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x86.ActiveCfg = Release|x86
{335A20F1-F421-4EB1-9961-EE487350818E}.Release|x86.Build.0 = Release|x86
{614BBB6D-D7C4-494A-929E-067EE62573CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
Expand Down

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,159 +1,34 @@
<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" />
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{335A20F1-F421-4EB1-9961-EE487350818E}</ProjectGuid>
<OutputType>Library</OutputType>
<AppDesignerFolder>Properties</AppDesignerFolder>
<RootNamespace>Tests.Infra.WebBrowserEngineTesterHelper</RootNamespace>
<AssemblyName>Tests.Infra.WebBrowserEngineTesterHelper</AssemblyName>
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
<TargetFrameworkProfile />
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x86'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x86\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x86'">
<OutputPath>bin\x86\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x86</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
<DebugSymbols>true</DebugSymbols>
<OutputPath>bin\x64\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<DebugType>full</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
<OutputPath>bin\x64\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<Optimize>true</Optimize>
<DebugType>pdbonly</DebugType>
<PlatformTarget>x64</PlatformTarget>
<ErrorReport>prompt</ErrorReport>
<CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
<TargetFramework>net452</TargetFramework>

<IsPackable>false</IsPackable>

<Platforms>AnyCPU;x86</Platforms>
</PropertyGroup>

<ItemGroup>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System" />
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.Core" />
<Reference Include="System.IO.Compression" />
<Reference Include="System.Numerics" />
<Reference Include="System.Runtime.InteropServices.RuntimeInformation, Version=4.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\System.Runtime.InteropServices.RuntimeInformation.4.3.0\lib\net45\System.Runtime.InteropServices.RuntimeInformation.dll</HintPath>
</Reference>
<Reference Include="System.Windows" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Data" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xml" />
<Reference Include="WindowsBase" />
<Reference Include="xunit.abstractions, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.abstractions.2.0.1\lib\net35\xunit.abstractions.dll</HintPath>
</Reference>
<Reference Include="xunit.core, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.core.2.3.1\lib\netstandard1.1\xunit.core.dll</HintPath>
</Reference>
<Reference Include="xunit.execution.dotnet, Version=2.3.1.3858, Culture=neutral, PublicKeyToken=8d05b1bb7a6fdb6c, processorArchitecture=MSIL">
<HintPath>..\..\..\packages\xunit.extensibility.execution.2.3.1\lib\netstandard1.1\xunit.execution.dotnet.dll</HintPath>
</Reference>
<PackageReference Include="xunit" Version="2.3.1" />
</ItemGroup>
<ItemGroup>
<Compile Include="Context\IBasicWindowLessHTMLEngineProvider.cs" />
<Compile Include="Context\WindowlessIntegratedTestEnvironment.cs" />
<Compile Include="Context\WindowlessTestEnvironment.cs" />
<Compile Include="HtmlContext\ConventionalTestHtmlProvider.cs" />
<Compile Include="HtmlContext\ITestHtmlProvider.cs" />
<Compile Include="HtmlContext\NullTestHtmlProvider.cs" />
<Compile Include="HtmlContext\TestContext.cs" />
<Compile Include="Properties\AssemblyInfo.cs" />
<Compile Include="Threading\DispatcherContextTaskScheduler.cs" />
<Compile Include="Threading\DispatcherTaskFactory.cs" />
<Compile Include="Windowless\IWindowlessHTMLEngine.cs" />
<Compile Include="Windowless\IWindowlessHTMLEngineBuilder.cs" />
<Compile Include="Windowless\TestBase.cs" />
<Compile Include="Windowless\TestLogger.cs" />
<Compile Include="Window\AssemblyHelper.cs" />
<Compile Include="Window\DispatcherHelper.cs" />
<Compile Include="Window\IWindowTestHTMLEngineEnvironment.cs" />
<Compile Include="Window\IWPFWindowWrapper.cs" />
<Compile Include="Window\WpfThread.cs" />
<Compile Include="Window\WPFWindowTestWrapper.cs" />
<Compile Include="Window\WPFWindowWrapper.cs" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\Neutronium.WPF\Neutronium.WPF.csproj">
<Project>{dcfc58e7-4d5b-43c5-827e-5d6f975f4995}</Project>
<Name>Neutronium.WPF</Name>
</ProjectReference>
<ProjectReference Include="..\..\..\Neutronium.Core\Neutronium.Core.csproj">
<Project>{9b18b122-a2fc-4537-ab68-5e1ec9959db8}</Project>
<Name>Neutronium.Core</Name>
</ProjectReference>
</ItemGroup>
<ItemGroup>

<ItemGroup>
<Content Include="Html\Empty.html">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Neutronium.WPF\Neutronium.WPF.csproj" />
<ProjectReference Include="..\..\..\Neutronium.Core\Neutronium.Core.csproj" />
</ItemGroup>


<ItemGroup>
<None Include="packages.config" />
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
<Reference Include="System.Xaml" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
<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>
</PropertyGroup>
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.props'))" />
<Error Condition="!Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets'))" />
</Target>
<Import Project="..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets" Condition="Exists('..\..\..\packages\xunit.core.2.3.1\build\xunit.core.targets')" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
Other similar extension points exist, see Microsoft.Common.targets.
<Target Name="BeforeBuild">
</Target>
<Target Name="AfterBuild">
</Target>
-->

</Project>
38 changes: 0 additions & 38 deletions Tests/Infra/Tests.Infra.HTMLEngineTesterHelper/packages.config

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="AutoFixture.Xunit2" Version="4.4.0" />
<PackageReference Include="FluentAssertions">
<Version>5.3.2</Version>
</PackageReference>
<PackageReference Include="FsCheck.Xunit" Version="2.10.10" />
<PackageReference Include="NSubstitute">
<Version>3.1.0</Version>
</PackageReference>
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
<PackageReference Include="xunit" Version="2.3.1" />
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
<DotNetCliToolReference Include="dotnet-xunit" Version="2.3.1" />
</ItemGroup>


Expand Down
Loading

0 comments on commit cff6b43

Please sign in to comment.