Merge pull request #76 from nunit/issue-75

Update to use final release of NUnit 3.0. Fixes #75
nunit · Nov 16, 2015 · 0905635 · 0905635
2 parents eb61f08 + a22d1ed
commit 0905635
Show file tree

Hide file tree

Showing 14 changed files with 42 additions and 24 deletions.
diff --git a/demo/NUnitTestDemo/NUnit3TestDemo.csproj b/demo/NUnitTestDemo/NUnit3TestDemo.csproj
@@ -36,9 +36,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.0.5790.16288, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.0.5797.27534, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NUnit.3.0.0-rc-2\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\packages\NUnit.3.0.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Configuration" />

diff --git a/demo/NUnitTestDemo/packages.config b/demo/NUnitTestDemo/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-rc-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0" targetFramework="net45" />
 </packages>
diff --git a/lib/Mono.Cecil.dll b/lib/Mono.Cecil.dll
diff --git a/lib/nunit.engine.api.dll b/lib/nunit.engine.api.dll
diff --git a/lib/nunit.engine.dll b/lib/nunit.engine.dll
diff --git a/nunit3-vs-adapter.build b/nunit3-vs-adapter.build
@@ -7,7 +7,7 @@
 
 
     <!-- Set version number for package -->
-    <property name="package.version" value="3.0.6-ctp-6"/>
+    <property name="package.version" value="3.0.7-ctp-7"/>
 
     <!-- Define package name, including version -->
     <property name="package.base.name" value="NUnit3TestAdapter"/>

diff --git a/src/NUnitTestAdapter/NUnit3TestAdapter.csproj b/src/NUnitTestAdapter/NUnit3TestAdapter.csproj
@@ -54,11 +54,13 @@
       <HintPath>$(MSBuildProgramFiles32)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="nunit.engine">
-      <HintPath>..\..\lib\nunit.engine.dll</HintPath>
+    <Reference Include="nunit.engine, Version=3.0.5797.27553, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine.api">
-      <HintPath>..\..\lib\nunit.engine.api.dll</HintPath>
+    <Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.api.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Data" />
@@ -92,6 +94,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="NUnitAdapter.snk" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/src/NUnitTestAdapter/packages.config b/src/NUnitTestAdapter/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit.Engine" version="3.0.0" targetFramework="net35" />
+</packages>
diff --git a/src/NUnitTestAdapterInstall/NUnit3TestAdapterInstall.csproj b/src/NUnitTestAdapterInstall/NUnit3TestAdapterInstall.csproj
@@ -105,6 +105,7 @@
       <IncludeInVSIX>true</IncludeInVSIX>
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <None Include="packages.config" />
     <None Include="source.extension.vsixmanifest">
       <SubType>Designer</SubType>
     </None>
@@ -138,14 +139,17 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Reference Include="Mono.Cecil">
-      <HintPath>..\..\lib\Mono.Cecil.dll</HintPath>
+    <Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\Mono.Cecil.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine">
-      <HintPath>..\..\lib\nunit.engine.dll</HintPath>
+    <Reference Include="nunit.engine, Version=3.0.5797.27553, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine.api">
-      <HintPath>..\..\lib\nunit.engine.api.dll</HintPath>
+    <Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.api.dll</HintPath>
     </Reference>
   </ItemGroup>
   <PropertyGroup>

diff --git a/src/NUnitTestAdapterInstall/packages.config b/src/NUnitTestAdapterInstall/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="NUnit.Engine" version="3.0.0" targetFramework="net45" />
+</packages>
diff --git a/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj b/src/NUnitTestAdapterTests/NUnit3TestAdapterTests.csproj
@@ -40,15 +40,17 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>$(MSBuildProgramFiles32)\Microsoft Visual Studio 11.0\Common7\IDE\CommonExtensions\Microsoft\TestWindow\Microsoft.VisualStudio.TestPlatform.ObjectModel.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine">
-      <HintPath>..\..\lib\nunit.engine.dll</HintPath>
+    <Reference Include="nunit.engine, Version=3.0.5797.27553, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.engine.api">
-      <HintPath>..\..\lib\nunit.engine.api.dll</HintPath>
+    <Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\NUnit.Engine.3.0.0\lib\nunit.engine.api.dll</HintPath>
     </Reference>
-    <Reference Include="nunit.framework, Version=3.0.5790.16288, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.0.5797.27534, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NUnit.3.0.0-rc-2\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.3.0.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />

diff --git a/src/NUnitTestAdapterTests/packages.config b/src/NUnitTestAdapterTests/packages.config
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-rc-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0" targetFramework="net45" />
+  <package id="NUnit.Engine" version="3.0.0" targetFramework="net45" />
 </packages>
diff --git a/src/mock-assembly/mock-assembly.csproj b/src/mock-assembly/mock-assembly.csproj
@@ -79,9 +79,9 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="nunit.framework, Version=3.0.5790.16288, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
+    <Reference Include="nunit.framework, Version=3.0.5797.27534, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\NUnit.3.0.0-rc-2\lib\net45\nunit.framework.dll</HintPath>
+      <HintPath>..\..\packages\NUnit.3.0.0\lib\net45\nunit.framework.dll</HintPath>
     </Reference>
     <Reference Include="System">
       <Name>System</Name>

diff --git a/src/mock-assembly/packages.config b/src/mock-assembly/packages.config
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NUnit" version="3.0.0-rc-2" targetFramework="net45" />
+  <package id="NUnit" version="3.0.0" targetFramework="net45" />
 </packages>