Permalink
Browse files

Upgrade to the newest version of NUnit

  • Loading branch information...
1 parent 2748355 commit 7ce0b73214cf71d629fdc70ceb6a6636c241ecf3 @jaredpar committed Apr 11, 2012
@@ -12,6 +12,8 @@
<AssemblyName>EditorUtils.UnitTest</AssemblyName>
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
<FileAlignment>512</FileAlignment>
+ <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\</SolutionDir>
+ <RestorePackages>true</RestorePackages>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<DebugSymbols>true</DebugSymbols>
@@ -88,9 +90,9 @@
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\References\Moq.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
- <HintPath>..\References\nunit.framework.dll</HintPath>
+ <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -125,13 +127,16 @@
<Name>EditorUtils</Name>
</ProjectReference>
</ItemGroup>
- <ItemGroup />
+ <ItemGroup>
+ <None Include="packages.config" />
+ </ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+ <Import Project="$(SolutionDir)\.nuget\nuget.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>
+</Project>
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+ <package id="NUnit" version="2.6.0.12054" />
+</packages>
View
@@ -89,7 +89,7 @@ $script:list11 = $list11 + $listAll
$script:listTest = @(
"Microsoft.VisualStudio.Platform.VSEditor=10.0.0.0",
"Moq=4.0.10827.0",
- "nunit.framework=2.5.7.10213"
+ "nunit.framework=2.6.0.12051"
)
$script:listTest = $listTest + $listAll + $list10
@@ -104,8 +104,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\Moq.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore">
<RequiredTargetFramework>3.0</RequiredTargetFramework>
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NUnit" version="2.5.7.10213" />
+ <package id="NUnit" version="2.6.0.12054" />
</packages>
@@ -75,8 +75,9 @@
<Reference Include="Moq, Version=4.0.10827.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
<HintPath>..\References\Moq.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NUnit" version="2.5.7.10213" />
+ <package id="NUnit" version="2.6.0.12054" />
</packages>
View
@@ -28,6 +28,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsVimShared", "VsVimShared\
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "VsVimDev10", "VsVimSpecific\VsVimDev10.csproj", "{0DE4170C-224D-47CF-BE00-B88AA14EC804}"
EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".nuget", ".nuget", "{DDBAAD63-C24D-4357-B6DA-F94577AB3E20}"
+ ProjectSection(SolutionItems) = preProject
+ .nuget\NuGet.exe = .nuget\NuGet.exe
+ .nuget\NuGet.targets = .nuget\NuGet.targets
+ EndProjectSection
+EndProject
Global
GlobalSection(TestCaseManagementSettings) = postSolution
CategoryFile = VsVim.vsmdi
@@ -141,18 +147,6 @@ Global
{0DE4170C-224D-47CF-BE00-B88AA14EC804}.Release|Mixed Platforms.Build.0 = Release|x86
{0DE4170C-224D-47CF-BE00-B88AA14EC804}.Release|x86.ActiveCfg = Release|x86
{0DE4170C-224D-47CF-BE00-B88AA14EC804}.Release|x86.Build.0 = Release|x86
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|x86.ActiveCfg = Debug|x86
- {60316861-7561-4B07-8A16-212E00A2856E}.Debug|x86.Build.0 = Debug|x86
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|Any CPU.Build.0 = Release|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|Mixed Platforms.Build.0 = Release|Any CPU
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|x86.ActiveCfg = Release|x86
- {60316861-7561-4B07-8A16-212E00A2856E}.Release|x86.Build.0 = Release|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -108,8 +108,9 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\References\Moq.dll</HintPath>
</Reference>
- <Reference Include="nunit.framework, Version=2.5.7.10213, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
- <HintPath>..\packages\NUnit.2.5.7.10213\lib\nunit.framework.dll</HintPath>
+ <Reference Include="nunit.framework, Version=2.6.0.12051, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
+ <SpecificVersion>False</SpecificVersion>
+ <HintPath>..\packages\NUnit.2.6.0.12054\lib\nunit.framework.dll</HintPath>
</Reference>
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
- <package id="NUnit" version="2.5.7.10213" />
+ <package id="NUnit" version="2.6.0.12054" />
</packages>
@@ -84,7 +84,7 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\..\Program Files (x86)\Microsoft Visual Studio 2010 SDK SP1\VisualStudioIntegration\Common\Assemblies\v2.0\Microsoft.VisualStudio.OLE.Interop.dll</HintPath>
</Reference>
- <Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+ <Reference Include="Microsoft.VisualStudio.Platform.VSEditor.Interop, Version=10.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
<HintPath>..\References\Microsoft.VisualStudio.Platform.VSEditor.Interop.dll</HintPath>
<EmbedInteropTypes>True</EmbedInteropTypes>
</Reference>
@@ -156,7 +156,7 @@
</ProjectReference>
<ProjectReference Include="..\VsVimShared\VsVimShared.csproj">
<Project>{979DEDC6-25E2-494B-9E8F-6E42078C601C}</Project>
- <Name>VsVim.Shared</Name>
+ <Name>VsVimShared</Name>
</ProjectReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
@@ -167,4 +167,4 @@
<Target Name="AfterBuild">
</Target>
-->
-</Project>
+</Project>

0 comments on commit 7ce0b73

Please sign in to comment.