[Pkg-cli-libs-commits] [SCM] nunit branch, master, updated. debian/2.5.10.11092+dfsg-3-11-ge508942
Julian Taylor
jtaylor.debian at googlemail.com
Sun Apr 15 16:19:07 UTC 2012
The following commit has been merged in the master branch:
commit 6e27589100ac38c1280bf7a43a9d565b0c5d6ff9
Author: Julian Taylor <jtaylor.debian at googlemail.com>
Date: Sun Apr 15 17:04:33 2012 +0200
refresh patches
diff --git a/debian/patches/05_build_xml_doc_for_nunit.core.dpatch b/debian/patches/05_build_xml_doc_for_nunit.core.dpatch
index fdececb..040a93a 100644
--- a/debian/patches/05_build_xml_doc_for_nunit.core.dpatch
+++ b/debian/patches/05_build_xml_doc_for_nunit.core.dpatch
@@ -3,24 +3,24 @@
@@ -44,8 +44,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;DEBUG;NET_2_0</DefineConstants>
+ <DefineConstants>TRACE;DEBUG;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
-+ <DocumentationFile>..\..\bin\Debug\lib\nunit.core.xml</DocumentationFile>
++ <DocumentationFile>..\..\..\bin\Debug\lib\nunit.core.xml</DocumentationFile>
<DebugSymbols>true</DebugSymbols>
<FileAlignment>4096</FileAlignment>
<NoWarn>1699</NoWarn>
@@ -62,8 +61,7 @@
<ConfigurationOverrideFile>
</ConfigurationOverrideFile>
- <DefineConstants>TRACE;NET_2_0</DefineConstants>
+ <DefineConstants>TRACE;CLR_2_0,NET_2_0,CS_3_0</DefineConstants>
- <DocumentationFile>
- </DocumentationFile>
-+ <DocumentationFile>..\..\bin\Release\lib\nunit.core.xml</DocumentationFile>
++ <DocumentationFile>..\..\..\bin\Release\lib\nunit.core.xml</DocumentationFile>
<FileAlignment>4096</FileAlignment>
<NoWarn>1699</NoWarn>
<Optimize>true</Optimize>
-@@ -207,4 +205,4 @@
+@@ -210,4 +208,4 @@
<PostBuildEvent>
</PostBuildEvent>
</PropertyGroup>
diff --git a/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch b/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
index f3d7e39..a83de04 100644
--- a/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
+++ b/debian/patches/instantiate-a-ProjectService-when-creating-a-domain.patch
@@ -12,11 +12,9 @@ Bug: https://bugs.launchpad.net/nunitv2/+bug/928421
src/ClientUtilities/util/Services/DomainManager.cs | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
-diff --git a/src/ClientUtilities/util/Services/DomainManager.cs b/src/ClientUtilities/util/Services/DomainManager.cs
-index 3c86207..1993e37 100644
--- a/src/ClientUtilities/util/Services/DomainManager.cs
+++ b/src/ClientUtilities/util/Services/DomainManager.cs
-@@ -55,6 +55,8 @@ namespace NUnit.Util
+@@ -56,6 +56,8 @@
public AppDomain CreateDomain( TestPackage package )
{
AppDomainSetup setup = new AppDomainSetup();
@@ -25,4 +23,3 @@ index 3c86207..1993e37 100644
//For paralell tests, we need to use distinct application name
setup.ApplicationName = "Tests" + "_" + Environment.TickCount;
---
diff --git a/debian/patches/use_default_framework.patch b/debian/patches/use_default_framework.patch
index af9336b..d9e7a53 100644
--- a/debian/patches/use_default_framework.patch
+++ b/debian/patches/use_default_framework.patch
@@ -2,8 +2,6 @@ Description: use default framework
generated with:
find . -name "*.csproj" | xargs sed -i "s/ToolsVersion=\"3.5\"//"
find . -name "*.csproj" | xargs sed -i -n '/TargetFrameworkVersion/ !p'
-diff --git a/src/ClientUtilities/tests/nunit.util.tests.csproj b/src/ClientUtilities/tests/nunit.util.tests.csproj
-index ff2a0bd..34ef65e 100644
--- a/src/ClientUtilities/tests/nunit.util.tests.csproj
+++ b/src/ClientUtilities/tests/nunit.util.tests.csproj
@@ -1,5 +1,5 @@
@@ -13,25 +11,59 @@ index ff2a0bd..34ef65e 100644
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+--- a/src/ClientUtilities/tests/resources/DebugOnly.csproj
++++ b/src/ClientUtilities/tests/resources/DebugOnly.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>DebugOnly</RootNamespace>
+ <AssemblyName>DebugOnly</AssemblyName>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/ClientUtilities/util/nunit.util.dll.csproj b/src/ClientUtilities/util/nunit.util.dll.csproj
-index 4242c3a..75e1843 100644
+--- a/src/ClientUtilities/tests/resources/DisabledProject.csproj
++++ b/src/ClientUtilities/tests/resources/DisabledProject.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -10,7 +10,6 @@
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>DisabledProject</RootNamespace>
+ <AssemblyName>DisabledProject</AssemblyName>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ </PropertyGroup>
+ <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+--- a/src/ClientUtilities/tests/resources/MissingOutputPath.csproj
++++ b/src/ClientUtilities/tests/resources/MissingOutputPath.csproj
+@@ -9,7 +9,6 @@
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>MissingOutputPath</RootNamespace>
+ <AssemblyName>MissingOutputPath</AssemblyName>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <OutputPath>bin\Common\</OutputPath>
+ </PropertyGroup>
--- a/src/ClientUtilities/util/nunit.util.dll.csproj
+++ b/src/ClientUtilities/util/nunit.util.dll.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
@@ -40,12 +72,10 @@ index 4242c3a..75e1843 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.csproj b/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.csproj
-index 5b65d17..7d4d789 100644
--- a/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.csproj
+++ b/src/ConsoleRunner/nunit-console-exe/nunit-console.exe.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -59,8 +89,6 @@ index 5b65d17..7d4d789 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/ConsoleRunner/nunit-console/nunit-console.csproj b/src/ConsoleRunner/nunit-console/nunit-console.csproj
-index 6528791..99bcff9 100644
--- a/src/ConsoleRunner/nunit-console/nunit-console.csproj
+++ b/src/ConsoleRunner/nunit-console/nunit-console.csproj
@@ -1,5 +1,5 @@
@@ -78,8 +106,6 @@ index 6528791..99bcff9 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/ConsoleRunner/tests/nunit-console.tests.csproj b/src/ConsoleRunner/tests/nunit-console.tests.csproj
-index 14c1247..5fc5de7 100644
--- a/src/ConsoleRunner/tests/nunit-console.tests.csproj
+++ b/src/ConsoleRunner/tests/nunit-console.tests.csproj
@@ -1,5 +1,5 @@
@@ -97,8 +123,6 @@ index 14c1247..5fc5de7 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/GuiComponents/UiKit/nunit.uikit.dll.csproj b/src/GuiComponents/UiKit/nunit.uikit.dll.csproj
-index ff3d8b8..a0a1ab8 100644
--- a/src/GuiComponents/UiKit/nunit.uikit.dll.csproj
+++ b/src/GuiComponents/UiKit/nunit.uikit.dll.csproj
@@ -1,5 +1,5 @@
@@ -107,7 +131,7 @@ index ff3d8b8..a0a1ab8 100644
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
@@ -116,12 +140,10 @@ index ff3d8b8..a0a1ab8 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/GuiComponents/tests/nunit.uikit.tests.csproj b/src/GuiComponents/tests/nunit.uikit.tests.csproj
-index aaa07f3..bd4d4de 100644
--- a/src/GuiComponents/tests/nunit.uikit.tests.csproj
+++ b/src/GuiComponents/tests/nunit.uikit.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -135,12 +157,10 @@ index aaa07f3..bd4d4de 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/GuiException/UiException/nunit.uiexception.dll.csproj b/src/GuiException/UiException/nunit.uiexception.dll.csproj
-index 0f48448..4afaf78 100644
--- a/src/GuiException/UiException/nunit.uiexception.dll.csproj
+++ b/src/GuiException/UiException/nunit.uiexception.dll.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
@@ -154,31 +174,27 @@ index 0f48448..4afaf78 100644
<FileAlignment>512</FileAlignment>
<AssemblyOriginatorKeyFile>..\..\..\..\src\GuiException\UiException\stackSgKey.snk</AssemblyOriginatorKeyFile>
</PropertyGroup>
-diff --git a/src/GuiException/tests/nunit.uiexception.tests.csproj b/src/GuiException/tests/nunit.uiexception.tests.csproj
-index 0997e40..de55ce2 100644
--- a/src/GuiException/tests/nunit.uiexception.tests.csproj
+++ b/src/GuiException/tests/nunit.uiexception.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -9,7 +9,6 @@
- <OutputType>Library</OutputType>
- <RootNamespace>NUnit.UiException.Tests</RootNamespace>
- <AssemblyName>nunit.uiexception.tests</AssemblyName>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- <FileAlignment>512</FileAlignment>
+@@ -15,7 +15,6 @@
+ <OldToolsVersion>3.5</OldToolsVersion>
+ <UpgradeBackupLocation />
+ <TargetFrameworkProfile />
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-diff --git a/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.csproj b/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.csproj
-index 71b5f46..970b35b 100644
+ <DebugSymbols>true</DebugSymbols>
--- a/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.csproj
+++ b/src/GuiRunner/nunit-gui-exe/nunit-gui.exe.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -192,17 +208,15 @@ index 71b5f46..970b35b 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/GuiRunner/nunit-gui/nunit-gui.csproj b/src/GuiRunner/nunit-gui/nunit-gui.csproj
-index f895794..6c28f25 100644
--- a/src/GuiRunner/nunit-gui/nunit-gui.csproj
+++ b/src/GuiRunner/nunit-gui/nunit-gui.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
@@ -211,12 +225,10 @@ index f895794..6c28f25 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/GuiRunner/tests/nunit-gui.tests.csproj b/src/GuiRunner/tests/nunit-gui.tests.csproj
-index 1443a80..c5f8467 100644
--- a/src/GuiRunner/tests/nunit-gui.tests.csproj
+++ b/src/GuiRunner/tests/nunit-gui.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -230,17 +242,15 @@ index 1443a80..c5f8467 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/NUnitCore/core/nunit.core.dll.csproj b/src/NUnitCore/core/nunit.core.dll.csproj
-index 303ba82..76ea93d 100644
--- a/src/NUnitCore/core/nunit.core.dll.csproj
+++ b/src/NUnitCore/core/nunit.core.dll.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -37,7 +37,6 @@
<IsWebBootstrapper>true</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
@@ -249,17 +259,15 @@ index 303ba82..76ea93d 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/NUnitCore/interfaces/nunit.core.interfaces.dll.csproj b/src/NUnitCore/interfaces/nunit.core.interfaces.dll.csproj
-index 0e6faee..712b6e0 100644
--- a/src/NUnitCore/interfaces/nunit.core.interfaces.dll.csproj
+++ b/src/NUnitCore/interfaces/nunit.core.interfaces.dll.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
@@ -268,74 +276,32 @@ index 0e6faee..712b6e0 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/NUnitCore/tests/nunit.core.tests.csproj b/src/NUnitCore/tests/nunit.core.tests.csproj
-index 827499c..ecaf476 100644
--- a/src/NUnitCore/tests/nunit.core.tests.csproj
+++ b/src/NUnitCore/tests/nunit.core.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -37,7 +37,6 @@
<IsWebBootstrapper>true</IsWebBootstrapper>
<UseApplicationTrust>false</UseApplicationTrust>
<BootstrapperEnabled>true</BootstrapperEnabled>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/NUnitFixtures/fixtures/nunit.fixtures.csproj b/src/NUnitFixtures/fixtures/nunit.fixtures.csproj
-index c09a127..0cbc77a 100644
---- a/src/NUnitFixtures/fixtures/nunit.fixtures.csproj
-+++ b/src/NUnitFixtures/fixtures/nunit.fixtures.csproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\lib\</OutputPath>
-diff --git a/src/NUnitFixtures/tests/nunit.fixtures.tests.csproj b/src/NUnitFixtures/tests/nunit.fixtures.tests.csproj
-index 317b99d..ca7ada2 100644
---- a/src/NUnitFixtures/tests/nunit.fixtures.tests.csproj
-+++ b/src/NUnitFixtures/tests/nunit.fixtures.tests.csproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/NUnitFramework/framework/nunit.framework.dll.csproj b/src/NUnitFramework/framework/nunit.framework.dll.csproj
-index 2432274..57991d9 100644
--- a/src/NUnitFramework/framework/nunit.framework.dll.csproj
+++ b/src/NUnitFramework/framework/nunit.framework.dll.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
@@ -344,31 +310,27 @@ index 2432274..57991d9 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\framework\</OutputPath>
-diff --git a/src/NUnitFramework/tests/nunit.framework.tests.csproj b/src/NUnitFramework/tests/nunit.framework.tests.csproj
-index 33f1db0..a447d6a 100644
--- a/src/NUnitFramework/tests/nunit.framework.tests.csproj
+++ b/src/NUnitFramework/tests/nunit.framework.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
+ <ProductVersion>9.0.30729</ProductVersion>
@@ -22,7 +22,6 @@
<UpgradeBackupLocation>
</UpgradeBackupLocation>
<OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/NUnitMocks/mocks/nunit.mocks.csproj b/src/NUnitMocks/mocks/nunit.mocks.csproj
-index 23f7ea8..69b8ddf 100644
--- a/src/NUnitMocks/mocks/nunit.mocks.csproj
+++ b/src/NUnitMocks/mocks/nunit.mocks.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -382,12 +344,10 @@ index 23f7ea8..69b8ddf 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\framework\</OutputPath>
-diff --git a/src/NUnitMocks/tests/nunit.mocks.tests.csproj b/src/NUnitMocks/tests/nunit.mocks.tests.csproj
-index f6e9f40..b5e56a7 100644
--- a/src/NUnitMocks/tests/nunit.mocks.tests.csproj
+++ b/src/NUnitMocks/tests/nunit.mocks.tests.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -401,12 +361,10 @@ index f6e9f40..b5e56a7 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/NUnitTestServer/nunit-agent-exe/nunit-agent.exe.csproj b/src/NUnitTestServer/nunit-agent-exe/nunit-agent.exe.csproj
-index cd602e9..8ef411d 100644
--- a/src/NUnitTestServer/nunit-agent-exe/nunit-agent.exe.csproj
+++ b/src/NUnitTestServer/nunit-agent-exe/nunit-agent.exe.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -420,27 +378,6 @@ index cd602e9..8ef411d 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/NUnitTestServer/nunit-server-exe/nunit-server.exe.csproj b/src/NUnitTestServer/nunit-server-exe/nunit-server.exe.csproj
-index 09d6a86..76abca6 100644
---- a/src/NUnitTestServer/nunit-server-exe/nunit-server.exe.csproj
-+++ b/src/NUnitTestServer/nunit-server-exe/nunit-server.exe.csproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/PNUnit/agent/pnunit-agent.csproj b/src/PNUnit/agent/pnunit-agent.csproj
-index 6d6ebbc..9334c75 100644
--- a/src/PNUnit/agent/pnunit-agent.csproj
+++ b/src/PNUnit/agent/pnunit-agent.csproj
@@ -1,5 +1,5 @@
@@ -449,17 +386,15 @@ index 6d6ebbc..9334c75 100644
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -23,7 +23,6 @@
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -29,7 +29,6 @@
+ <OldToolsVersion>0.0</OldToolsVersion>
+ <UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
- <NoWin32Manifest>true</NoWin32Manifest>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/PNUnit/launcher/pnunit-launcher.csproj b/src/PNUnit/launcher/pnunit-launcher.csproj
-index 452547f..eb1fdbd 100644
+ <SccAuxPath>
+ </SccAuxPath>
+ <NoWin32Manifest>true</NoWin32Manifest>
--- a/src/PNUnit/launcher/pnunit-launcher.csproj
+++ b/src/PNUnit/launcher/pnunit-launcher.csproj
@@ -1,5 +1,5 @@
@@ -468,36 +403,32 @@ index 452547f..eb1fdbd 100644
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -23,7 +23,6 @@
+ <ProductVersion>9.0.30729</ProductVersion>
+@@ -31,7 +31,6 @@
+ <OldToolsVersion>0.0</OldToolsVersion>
+ <UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
- <NoWin32Manifest>true</NoWin32Manifest>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <NoWin32Manifest>true</NoWin32Manifest>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/PNUnit/pnunit.framework/pnunit.framework.csproj b/src/PNUnit/pnunit.framework/pnunit.framework.csproj
-index c85efe0..c7e1cf0 100644
--- a/src/PNUnit/pnunit.framework/pnunit.framework.csproj
+++ b/src/PNUnit/pnunit.framework/pnunit.framework.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
<ProjectType>Local</ProjectType>
<ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
+@@ -28,7 +28,6 @@
+ <OldToolsVersion>0.0</OldToolsVersion>
<UpgradeBackupLocation>
</UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <SccAuxPath>
+ </SccAuxPath>
</PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\framework\</OutputPath>
-diff --git a/src/PNUnit/tests/pnunit.tests.csproj b/src/PNUnit/tests/pnunit.tests.csproj
-index c632c84..eeaf675 100644
--- a/src/PNUnit/tests/pnunit.tests.csproj
+++ b/src/PNUnit/tests/pnunit.tests.csproj
@@ -1,5 +1,5 @@
@@ -515,31 +446,44 @@ index c632c84..eeaf675 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\</OutputPath>
-diff --git a/src/tests/loadtest-assembly/loadtest-assembly.csproj b/src/tests/loadtest-assembly/loadtest-assembly.csproj
-index 45f23fb..efa737f 100644
---- a/src/tests/loadtest-assembly/loadtest-assembly.csproj
-+++ b/src/tests/loadtest-assembly/loadtest-assembly.csproj
+--- a/src/ProjectEditor/editor/nunit-editor.csproj
++++ b/src/ProjectEditor/editor/nunit-editor.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-@@ -15,7 +15,6 @@
- <OldToolsVersion>2.0</OldToolsVersion>
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
+@@ -10,7 +10,6 @@
+ <AppDesignerFolder>Properties</AppDesignerFolder>
+ <RootNamespace>NUnit.ProjectEditor</RootNamespace>
+ <AssemblyName>nunit-editor</AssemblyName>
- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
+ <FileAlignment>512</FileAlignment>
+ <ApplicationIcon>App.ico</ApplicationIcon>
+ </PropertyGroup>
+--- a/src/ProjectEditor/tests/nunit-editor.tests.csproj
++++ b/src/ProjectEditor/tests/nunit-editor.tests.csproj
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" encoding="utf-8"?>
+-<Project ToolsVersion="3.5" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
++<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+ <PropertyGroup>
+ <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+ <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+@@ -11,7 +11,6 @@
+ <RootNamespace>NUnit.ProjectEditor.Tests</RootNamespace>
+ <AssemblyName>nunit-editor.tests</AssemblyName>
+ <FileAlignment>512</FileAlignment>
+- <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
-diff --git a/src/tests/mock-assembly/mock-assembly.csproj b/src/tests/mock-assembly/mock-assembly.csproj
-index 7a3788f..aca902a 100644
--- a/src/tests/mock-assembly/mock-assembly.csproj
+++ b/src/tests/mock-assembly/mock-assembly.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -553,12 +497,10 @@ index 7a3788f..aca902a 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/tests/nonamespace-assembly/nonamespace-assembly.csproj b/src/tests/nonamespace-assembly/nonamespace-assembly.csproj
-index d79a0be..b0a909b 100644
--- a/src/tests/nonamespace-assembly/nonamespace-assembly.csproj
+++ b/src/tests/nonamespace-assembly/nonamespace-assembly.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -572,12 +514,10 @@ index d79a0be..b0a909b 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/tests/test-assembly/test-assembly.csproj b/src/tests/test-assembly/test-assembly.csproj
-index 937a8ba..67963ae 100644
--- a/src/tests/test-assembly/test-assembly.csproj
+++ b/src/tests/test-assembly/test-assembly.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -591,31 +531,10 @@ index 937a8ba..67963ae 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/tests/test-utilities/test-utilities.csproj b/src/tests/test-utilities/test-utilities.csproj
-index 7378bbf..56b4140 100644
--- a/src/tests/test-utilities/test-utilities.csproj
+++ b/src/tests/test-utilities/test-utilities.csproj
@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
--<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
-@@ -22,7 +22,6 @@
- <UpgradeBackupLocation>
- </UpgradeBackupLocation>
- <OldToolsVersion>2.0</OldToolsVersion>
-- <TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
- </PropertyGroup>
- <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
- <OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/src/tests/timing-tests/timing-tests.csproj b/src/tests/timing-tests/timing-tests.csproj
-index 29ab2dc..d1e07a4 100644
---- a/src/tests/timing-tests/timing-tests.csproj
-+++ b/src/tests/timing-tests/timing-tests.csproj
-@@ -1,5 +1,5 @@
- <?xml version="1.0" encoding="utf-8"?>
+ <?xml version="1.0" encoding="utf-8"?>
-<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" >
<PropertyGroup>
@@ -629,13 +548,3 @@ index 29ab2dc..d1e07a4 100644
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>..\..\..\bin\Debug\tests\</OutputPath>
-diff --git a/tools/src/Gensyntax/GenSyntax.csproj b/tools/src/Gensyntax/GenSyntax.csproj
-index 51953da..3f84e4b 100644
---- a/tools/src/Gensyntax/GenSyntax.csproj
-+++ b/tools/src/Gensyntax/GenSyntax.csproj
-@@ -1,4 +1,4 @@
--<Project DefaultTargets="Build" ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-+<Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
- <PropertyGroup>
- <ProjectType>Local</ProjectType>
- <ProductVersion>9.0.21022</ProductVersion>
--
nunit
More information about the Pkg-cli-libs-commits
mailing list