fix of navigationdata line numbers
This commit is contained in:
Terje Sandstrom
Родитель
7480673f92
Коммит
99bf2a4b13
|
|
@ -1,110 +1,110 @@
|
|||
<?xml version="1.0"?>
|
||||
<project name="NUnitTestAdapter" default="build" basedir=".">
|
||||
|
||||
<description>
|
||||
This script is used to build, test and package the NUnit VS adapter.
|
||||
</description>
|
||||
|
||||
|
||||
<!-- Set version number for package -->
|
||||
<property name="package.version" value="1.0"/>
|
||||
|
||||
<!-- Define package name, including version -->
|
||||
<property name="package.base.name" value="NUnitVisualStudioTestAdapter"/>
|
||||
<property name="package.name" value="${package.base.name}-${package.version}"/>
|
||||
|
||||
<!-- Define various directories used -->
|
||||
<property name="project.base.dir"
|
||||
value="${project::get-base-directory()}"/>
|
||||
<property name="project.package.dir"
|
||||
value="${path::combine(project.base.dir,'package')}"/>
|
||||
<property name="project.nuget.dir"
|
||||
value="${path::combine(project.base.dir,'nuget')}"/>
|
||||
<property name="project.lib.dir"
|
||||
value="${path::combine(project.base.dir, 'lib')}"/>
|
||||
|
||||
<property name="package.working.dir"
|
||||
value="${path::combine(project.package.dir, package.name)}"/>
|
||||
<property name="install.release.dir"
|
||||
value="${path::combine(project.base.dir, 'src\NUnitTestAdapterInstall\bin\Release')}"/>
|
||||
|
||||
<target name="build" description="Build the adapter (NYI)"/>
|
||||
|
||||
<target name="test" description="Test the adapter (NYI)"/>
|
||||
|
||||
<target name="package" desciption="Package the adapter"
|
||||
depends="package-vsix,package-zip,package-nuget-1,package-nuget-2"/>
|
||||
|
||||
<target name="package-vsix">
|
||||
|
||||
<!-- Copy the vsix package, built by Visual Studio. -->
|
||||
<property name="source.vsix.file" value="NUnitTestAdapter.vsix"/>
|
||||
<property name="target.vsix.file" value="${package.name}.vsix"/>
|
||||
<copy file="${path::combine(install.release.dir, source.vsix.file)}"
|
||||
tofile="${path::combine(project.package.dir, target.vsix.file)}"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-zip">
|
||||
|
||||
<!-- Create the working directory -->
|
||||
<mkdir dir="${package.working.dir}"/>
|
||||
|
||||
<!-- Copy binaries to the working directory for zipping. -->
|
||||
<copy todir="${package.working.dir}">
|
||||
<fileset basedir="${install.release.dir}">
|
||||
<include name="NUnit.VisualStudio.TestAdapter.dll"/>
|
||||
<include name="nunit.util.dll"/>
|
||||
<include name="nunit.core.dll"/>
|
||||
<include name="nunit.core.interfaces.dll"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create the zip package -->
|
||||
<property name="zip.file.name" value="${package.name}.zip"/>
|
||||
<zip ziplevel="9"
|
||||
zipfile="${project.package.dir}/${zip.file.name}">
|
||||
<fileset basedir="${package.working.dir}" prefix="${package.name}">
|
||||
<include name="**"/>
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-nuget-1">
|
||||
|
||||
<property name="nuget.package.name" value="NUnitVisualStudioTestAdapter"/>
|
||||
<property name="nuget.internal.id" value="NUnitTestAdapter"/>
|
||||
<call target="create-nuget-package"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-nuget-2">
|
||||
|
||||
<property name="nuget.package.name" value="NUnitVisualStudioTestAdapterAndFramework"/>
|
||||
<property name="nuget.internal.id" value="NUnitTestAdapter.WithFramework"/>
|
||||
<call target="create-nuget-package"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="create-nuget-package">
|
||||
|
||||
<copy file="${project.nuget.dir}/${nuget.package.name}.nuspec"
|
||||
tofile="${project.package.dir}/${nuget.package.name}-${package.version}.nuspec"
|
||||
overwrite="true">
|
||||
<filterchain>
|
||||
<expandproperties/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<exec program="NuGet.exe"
|
||||
workingdir="${project.package.dir}"
|
||||
commandline="pack ${nuget.package.name}-${package.version}.nuspec" />
|
||||
|
||||
<move file="${project.package.dir}/${nuget.internal.id}.${package.version}.nupkg"
|
||||
tofile="${project.package.dir}/${nuget.package.name}-${package.version}.nupkg"/>
|
||||
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
||||
<?xml version="1.0"?>
|
||||
<project name="NUnitTestAdapter" default="build" basedir=".">
|
||||
|
||||
<description>
|
||||
This script is used to build, test and package the NUnit VS adapter.
|
||||
</description>
|
||||
|
||||
|
||||
<!-- Set version number for package -->
|
||||
<property name="package.version" value="1.0"/>
|
||||
|
||||
<!-- Define package name, including version -->
|
||||
<property name="package.base.name" value="NUnitVisualStudioTestAdapter"/>
|
||||
<property name="package.name" value="${package.base.name}-${package.version}"/>
|
||||
|
||||
<!-- Define various directories used -->
|
||||
<property name="project.base.dir"
|
||||
value="${project::get-base-directory()}"/>
|
||||
<property name="project.package.dir"
|
||||
value="${path::combine(project.base.dir,'package')}"/>
|
||||
<property name="project.nuget.dir"
|
||||
value="${path::combine(project.base.dir,'nuget')}"/>
|
||||
<property name="project.lib.dir"
|
||||
value="${path::combine(project.base.dir, 'lib')}"/>
|
||||
|
||||
<property name="package.working.dir"
|
||||
value="${path::combine(project.package.dir, package.name)}"/>
|
||||
<property name="install.release.dir"
|
||||
value="${path::combine(project.base.dir, 'src\NUnitTestAdapterInstall\bin\Release')}"/>
|
||||
|
||||
<target name="build" description="Build the adapter (NYI)"/>
|
||||
|
||||
<target name="test" description="Test the adapter (NYI)"/>
|
||||
|
||||
<target name="package" desciption="Package the adapter"
|
||||
depends="package-vsix,package-zip,package-nuget-1,package-nuget-2"/>
|
||||
|
||||
<target name="package-vsix">
|
||||
|
||||
<!-- Copy the vsix package, built by Visual Studio. -->
|
||||
<property name="source.vsix.file" value="NUnitTestAdapter.vsix"/>
|
||||
<property name="target.vsix.file" value="${package.name}.vsix"/>
|
||||
<copy file="${path::combine(install.release.dir, source.vsix.file)}"
|
||||
tofile="${path::combine(project.package.dir, target.vsix.file)}"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-zip">
|
||||
|
||||
<!-- Create the working directory -->
|
||||
<mkdir dir="${package.working.dir}"/>
|
||||
|
||||
<!-- Copy binaries to the working directory for zipping. -->
|
||||
<copy todir="${package.working.dir}">
|
||||
<fileset basedir="${install.release.dir}">
|
||||
<include name="NUnit.VisualStudio.TestAdapter.dll"/>
|
||||
<include name="nunit.util.dll"/>
|
||||
<include name="nunit.core.dll"/>
|
||||
<include name="nunit.core.interfaces.dll"/>
|
||||
</fileset>
|
||||
</copy>
|
||||
|
||||
<!-- Create the zip package -->
|
||||
<property name="zip.file.name" value="${package.name}.zip"/>
|
||||
<zip ziplevel="9"
|
||||
zipfile="${project.package.dir}/${zip.file.name}">
|
||||
<fileset basedir="${package.working.dir}" prefix="${package.name}">
|
||||
<include name="**"/>
|
||||
</fileset>
|
||||
</zip>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-nuget-1">
|
||||
|
||||
<property name="nuget.package.name" value="NUnitVisualStudioTestAdapter"/>
|
||||
<property name="nuget.internal.id" value="NUnitTestAdapter"/>
|
||||
<call target="create-nuget-package"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="package-nuget-2">
|
||||
|
||||
<property name="nuget.package.name" value="NUnitVisualStudioTestAdapterAndFramework"/>
|
||||
<property name="nuget.internal.id" value="NUnitTestAdapter.WithFramework"/>
|
||||
<call target="create-nuget-package"/>
|
||||
|
||||
</target>
|
||||
|
||||
<target name="create-nuget-package">
|
||||
|
||||
<copy file="${project.nuget.dir}/${nuget.package.name}.nuspec"
|
||||
tofile="${project.package.dir}/${nuget.package.name}-${package.version}.nuspec"
|
||||
overwrite="true">
|
||||
<filterchain>
|
||||
<expandproperties/>
|
||||
</filterchain>
|
||||
</copy>
|
||||
|
||||
<exec program="NuGet.exe"
|
||||
workingdir="${project.package.dir}"
|
||||
commandline="pack ${nuget.package.name}-${package.version}.nuspec" />
|
||||
|
||||
<move file="${project.package.dir}/${nuget.internal.id}.${package.version}.nupkg"
|
||||
tofile="${project.package.dir}/${nuget.package.name}-${package.version}.nupkg"/>
|
||||
|
||||
</target>
|
||||
|
||||
</project>
|
||||
|
||||
|
|
|
|||
|
|
@ -3,7 +3,7 @@
|
|||
<Identifier Id="NUnitTestAdapterInstall..7c53286e-ac4f-485f-915c-5ec5a4c47b0c">
|
||||
<Name>NUnit Test Adapter</Name>
|
||||
<Author>Charlie Poole</Author>
|
||||
<Version>1.0.0.44</Version>
|
||||
<Version>1.0.0.108</Version>
|
||||
<Description xml:space="preserve">NUnit adapter for integrated test execution under Visual Studio 2012 (all updates),and Visual Studio 2013 (all updates). Compatible with NUnit 2.0 through 2.6.3.</Description>
|
||||
<Locale>1033</Locale>
|
||||
<MoreInfoUrl>http://nunit.org/index.php?p=vsTestAdapter&r=2.6.3</MoreInfoUrl>
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
using System;
|
||||
using System.Globalization;
|
||||
using System.Threading.Tasks;
|
||||
|
||||
namespace NUnit.VisualStudio.TestAdapter.Tests
|
||||
{
|
||||
// Contains methods used in testing use of DiaSession.
|
||||
|
|
@ -22,10 +21,9 @@ namespace NUnit.VisualStudio.TestAdapter.Tests
|
|||
|
||||
|
||||
} // minLineRelease = maxLineDebug = maxLineRelease = 23
|
||||
|
||||
|
||||
public void SimpleMethod_Void_NoArgs()
|
||||
{
|
||||
// minLineDebug = 26
|
||||
{// minLineDebug = 26
|
||||
const int answer = 42; // minLineRelease = 27
|
||||
Console.Write(answer);
|
||||
} // maxLineDebug = maxLineRelease = 29
|
||||
|
|
@ -43,8 +41,7 @@ namespace NUnit.VisualStudio.TestAdapter.Tests
|
|||
} // maxLineDebug = maxLineRelease = 41
|
||||
|
||||
public int SimpleMethod_ReturnsInt_NoArgs()
|
||||
{
|
||||
// minLineDebug = 44
|
||||
{// minLineDebug = 44
|
||||
const int answer = 42; // minLineRelease = 45
|
||||
return answer; // maxLineRelease = 46
|
||||
} // maxLineDebug = 47
|
||||
|
|
@ -83,8 +80,7 @@ namespace NUnit.VisualStudio.TestAdapter.Tests
|
|||
public class NestedClass
|
||||
{
|
||||
public void SimpleMethod_Void_NoArgs()
|
||||
{
|
||||
// minLineDebug = 83
|
||||
{// minLineDebug = 83
|
||||
const int answer = 42; // minLineRelease = 84
|
||||
Console.Write(answer);
|
||||
} // maxLineDebug = maxLineRelease = 86
|
||||
|
|
|
|||
Загрузка…
Ссылка в новой задаче