зеркало из
1
0
Форкнуть 0
Jamie Cansdale 2016-10-17 16:21:51 +01:00
Родитель 7f4b24cb9e
Коммит b5b5535745
9 изменённых файлов: 26 добавлений и 31 удалений

Просмотреть файл

@ -9,7 +9,7 @@
<PropertyGroup>
<NUSpecFile>package\NUnitTDNet.nuspec</NUSpecFile>
<SolutionFile>src\NUnitTDNetAdapter.sln</SolutionFile>
<Version>3.4.1</Version>
<Version>3.5.0</Version>
<PackagesPath>$(MSBuildProjectDirectory)\src\packages</PackagesPath>
<OutputPath>$(MSBuildProjectDirectory)\build</OutputPath>
<Properties>Version=$(Version);BuildNumber=$(BuildNumber);PreRelease=$(PreRelease);PackagesPath=$(PackagesPath);OutputPath=$(OutputPath)</Properties>

Просмотреть файл

@ -32,8 +32,8 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />
@ -87,10 +87,10 @@
</ProjectReference>
</ItemGroup>
<ItemGroup>
<None Include="packages.config" />
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
</ItemGroup>
<ItemGroup>
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
<None Include="packages.config" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.

Просмотреть файл

@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.4.1" targetFramework="net452" />
<package id="NUnit" version="3.5.0" targetFramework="net452" />
</packages>

Просмотреть файл

@ -271,11 +271,6 @@ public class OutsideNamespace
testRunner.RunMember(testListener, testAssembly, testClass);
foreach(var l in testListener.OutputLines)
{
Console.WriteLine(l.Item2 + ": " + l.Item1);
}
Assert.AreEqual(2, testListener.OutputLines.Count);
Assert.AreEqual("__OneTimeSetUp__", testListener.OutputLines[0].Item1);
Assert.AreEqual("__OneTimeTearDown__", testListener.OutputLines[1].Item1);

Просмотреть файл

@ -31,13 +31,13 @@
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<ItemGroup>
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.Engine.3.4.1\lib\nunit.engine.dll</HintPath>
<Reference Include="nunit.engine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.Engine.3.5.0\lib\nunit.engine.dll</HintPath>
<Private>True</Private>
<Aliases>ENG</Aliases>
</Reference>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.Engine.3.4.1\lib\nunit.engine.api.dll</HintPath>
<HintPath>..\packages\NUnit.Engine.3.5.0\lib\nunit.engine.api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="System" />

Просмотреть файл

@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit.ConsoleRunner" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Engine" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Extension.NUnitV2Driver" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.1" targetFramework="net20" />
<package id="NUnit.Extension.VSProjectLoader" version="3.4.1" targetFramework="net20" />
<package id="NUnit.Runners" version="3.4.1" targetFramework="net20" />
<package id="NUnit" version="3.5.0" targetFramework="net20" />
<package id="NUnit.ConsoleRunner" version="3.5.0" targetFramework="net20" />
<package id="NUnit.Engine" version="3.5.0" targetFramework="net20" />
<package id="NUnit.Extension.NUnitProjectLoader" version="3.5.0" targetFramework="net20" />
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.5.0" targetFramework="net20" />
<package id="NUnit.Extension.TeamCityEventListener" version="1.0.2" targetFramework="net20" />
<package id="NUnit.Extension.VSProjectLoader" version="3.5.0" targetFramework="net20" />
<package id="NUnit.Runners" version="3.5.0" targetFramework="net20" />
</packages>

Просмотреть файл

@ -31,7 +31,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll</HintPath>
<HintPath>..\packages\NUnit.Engine.3.5.0\lib\Mono.Cecil.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
@ -46,16 +46,16 @@
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll</HintPath>
<Reference Include="nunit.engine, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.Engine.3.5.0\lib\nunit.engine.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll</HintPath>
<HintPath>..\packages\NUnit.Engine.3.5.0\lib\nunit.engine.api.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
<Reference Include="nunit.framework, Version=3.5.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
<HintPath>..\packages\NUnit.3.5.0\lib\net45\nunit.framework.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="NUnit3.TestAdapter, Version=3.4.1.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">

Просмотреть файл

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NUnit" version="3.4.1" targetFramework="net452" />
<package id="NUnit" version="3.5.0" targetFramework="net452" />
<package id="NUnit3TestAdapter" version="3.4.1" targetFramework="net452" />
</packages>

Просмотреть файл

@ -11,8 +11,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitTDNet.Adapter.Examples
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{4C3C728C-61A3-468E-AD77-3D83D12760BF}"
ProjectSection(SolutionItems) = preProject
..\nuget\nunit3-tdnet-adapter.nuspec = ..\nuget\nunit3-tdnet-adapter.nuspec
..\install\nunitaddin.wxs = ..\install\nunitaddin.wxs
..\package\NUnitTDNet.nuspec = ..\package\NUnitTDNet.nuspec
..\package\NUnitTDNet.wxs = ..\package\NUnitTDNet.wxs
EndProjectSection
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NUnitTDNet.Expected", "NUnitTDNet.Expected\NUnitTDNet.Expected.csproj", "{888430C4-B097-4A33-8EC8-507C4A701A26}"